From 3442ebc1c32a85d5b055a235b78d8d18d70797ec Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 26 Aug 2020 12:47:04 +0900
Subject: [PATCH 001/278] improve gallery intent for certain apps

---
 CHANGES.md                                                      | 1 +
 .../src/main/java/im/vector/lib/multipicker/ImagePicker.kt      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index db98189499..d2026678e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,7 @@ Bugfix 🐛:
  - Can't handle ongoing call events in background (#1992)
  - Crash / Attachment viewer: Cannot draw a recycled Bitmap #2034
  - Login with Matrix-Id | Autodiscovery fails if identity server is invalid and Homeserver ok (#2027)
+ - Improve support for image selection with intent changes (#1376)
 
 Translations 🗣:
  -
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
index 39bd0c27cc..ec87e027f9 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -82,7 +82,7 @@ class ImagePicker(override val requestCode: Int) : Picker<MultiPickerImageType>(
     }
 
     override fun createIntent(): Intent {
-        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+        return Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
             type = "image/*"

From ebc1725f5b9848e4c633427ae91b09d8a6206439 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 23 Sep 2020 02:12:04 +0000
Subject: [PATCH 002/278] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index efbb583ec9..dac6b366ce 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2574,4 +2574,9 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="sent_verification_conclusion">驗證結論</string>
 
     <string name="universal_link_malformed">連結格式錯誤</string>
-</resources>
+<string name="no_permissions_to_start_webrtc_call">您沒有在此聊天室開始通話的權限</string>
+    <string name="delete_account_data_warning">刪除類型為 %1$s 的帳號資料？
+\n
+\n小心使用，它可能會導致意料之外的行為。</string>
+
+    </resources>

From 8aae5b2599ab7217e94e5a8c56bf7f139c74f416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 22 Sep 2020 15:17:15 +0000
Subject: [PATCH 003/278] Translated using Weblate (Estonian)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 5fd84ffb47..5a35f77cdf 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2557,4 +2557,9 @@
     <string name="sent_verification_conclusion">Verifitseerimise tulemus</string>
 
     <string name="universal_link_malformed">Link oli vigane</string>
-</resources>
+<string name="no_permissions_to_start_webrtc_call">Sul ei ole õigusi siin jututoas helistamiseks</string>
+    <string name="delete_account_data_warning">Kas kustutame %1$s tüüpi kasutajakonto andmed\?
+\n
+\nKuna nii mõndagi ootamatut võib juhtuda, siis kasuta seda võimalust mõningase ettevaatusega.</string>
+
+    </resources>

From 5b7bfe5302daf02338033db49cab0737150dd26c Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Wed, 23 Sep 2020 20:08:25 +0000
Subject: [PATCH 004/278] Translated using Weblate (German)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index db116d9912..d075cc44dd 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2683,5 +2683,12 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="sent_a_poll">Umfrage</string>
     <string name="sent_a_bot_buttons">Bot-Schaltflächen</string>
     <string name="sent_a_reaction">Reagierte mit: %s</string>
-    <string name="universal_link_malformed">Der Link war nicht korrekt</string>
-</resources>
+    <string name="universal_link_malformed">Der Link war fehlerhaft</string>
+<string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
+    <string name="sent_verification_conclusion">Ergebnis der Überprüfung</string>
+
+    <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
+\n
+\nVorsicht! Es kann zu unerwartetem Verhalten führen.</string>
+
+    </resources>

From 63718ab4f2947efc72842fa0c8df03d1992aea63 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 23 Sep 2020 12:43:41 +0000
Subject: [PATCH 005/278] Translated using Weblate (Italian)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/it/
---
 vector/src/main/res/values-it/strings.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 190e1610aa..3ea31027a4 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1635,7 +1635,7 @@
     <string name="settings_call_ringtone_use_default_stun">Permetti chiamate dal Server di appoggio</string>
     <string name="settings_call_ringtone_use_default_stun_sum">"Se il tuo Home Server non ne ha un proprio Server d\'appoggio verrà usato %s  (il Server d\'appoggio verrà a conoscenza del tuo indirizzo IP durante le chiamate)"</string>
     <string name="invite_no_identity_server_error">Per poterlo fare, aggiungi un Identity Server nelle Impostazioni.</string>
-    <string name="settings_background_fdroid_sync_mode">Modalità sync in background (Sperimentale)</string>
+    <string name="settings_background_fdroid_sync_mode">Modalità sync in background</string>
     <string name="settings_background_fdroid_sync_mode_battery">Ottimizzato per la batteria</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element si sincronizzerà in background in modo da non consumare la poca batteria disponibile.
 \nA seconda del livello della batteria, il sistema operativo potrebbe ritardare la sincronizzazione.</string>
@@ -2669,4 +2669,22 @@
 
     <string name="error_opening_banned_room">Impossibile aprire una stanza dove sei stato bandito.</string>
     <string name="room_error_not_found">Impossibile trovare questa stanza. Assicurati che esista.</string>
+<string name="no_permissions_to_start_webrtc_call">Non hai il permesso di avviare una chiamata in questa stanza</string>
+    <plurals name="seconds">
+	<item quantity="one">%d secondo</item>
+	<item quantity="other">%d secondi</item>
+</plurals>
+
+    <string name="settings_show_room_member_state_events">Mostra eventi di stato dei membri della stanza</string>
+    <string name="settings_show_room_member_state_events_summary">Includi eventi di invito/entrata/uscita/kick/ban e modifiche di avatar/nome.</string>
+    <string name="sent_a_poll">Sondaggio</string>
+    <string name="sent_a_bot_buttons">Pulsanti bot</string>
+    <string name="sent_a_reaction">Reagito con: %s</string>
+    <string name="sent_verification_conclusion">Conclusione della verifica</string>
+
+    <string name="delete_account_data_warning">Eliminare i dati dell\'account di tipo %1$s\?
+\n
+\nUsalo con attenzione, può avere comportamenti imprevisti.</string>
+
+    <string name="universal_link_malformed">Il collegamento non è corretto</string>
 </resources>

From be2c6295907d37368172c3415d3af8c29657821d Mon Sep 17 00:00:00 2001
From: call_xz <m4003095577@gomen-da.com>
Date: Wed, 23 Sep 2020 12:46:51 +0000
Subject: [PATCH 006/278] Translated using Weblate (Japanese)

Currently translated at 49.2% (922 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ja/
---
 vector/src/main/res/values-ja/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 66c6eb53d3..9f98d6f7e3 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1227,4 +1227,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     </plurals>
 
     <string name="cannot_call_yourself">自分自身には通話できません</string>
-</resources>
+<string name="settings_send_markdown">マークダウン書式</string>
+    <string name="settings_send_markdown_summary">メッセージ送信前にマークダウン書式を適用します。これにより、アスタリスクを使用して斜体のテキストを表示するなどの高度な書式設定が利用できます。</string>
+    <string name="preference_voice_and_video">音声とビデオ</string>
+    </resources>

From 32e8caab0377302a228dea9a8565f1e4fdaa6fdb Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Tue, 22 Sep 2020 16:32:08 +0000
Subject: [PATCH 007/278] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (1866 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
---
 vector/src/main/res/values-pt-rBR/strings.xml | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 399dff3c89..fbf710feaf 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1315,7 +1315,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
 
     <string name="settings_notification_privacy_no_background_sync">O aplicativo <b>não</b> precisa de se conectar ao servidor em segundo plano, isto deve reduzir a utilização da bateria</string>
-    <string name="settings_background_fdroid_sync_mode">Sincronização em segundo plano (Experimental)</string>
+    <string name="settings_background_fdroid_sync_mode">Sincronização em segundo plano</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimizado para bateria</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element sincronizará em segundo plano para preservar os recursos limitados do aparelho (bateria).
 \nDependendo do estado dos recursos do seu aparelho, a sincronização pode ser adiada pelo sistema operacional.</string>
@@ -2643,4 +2643,28 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Atenção! Última tentativa restante antes de você ser desconectada/o!</string>
     <string name="too_many_pin_failures">Muitos erros, você foi desconectada/o</string>
+<string name="no_permissions_to_start_webrtc_call">Você não tem permissão para iniciar uma chamada nesta sala</string>
+    <string name="settings_phone_number_empty">Nenhum número de telefone foi adicionado à sua conta</string>
+    <string name="settings_emails">Endereços de e-mail</string>
+    <string name="settings_emails_empty">Nenhum e-mail foi adicionado à sua conta</string>
+    <string name="settings_phone_numbers">Números de telefone</string>
+    <string name="settings_remove_three_pid_confirmation_content">Remover %s\?</string>
+    <string name="error_threepid_auth_failed">Certifique-se de ter clicado no link do e-mail que enviamos para você.</string>
+
+    <plurals name="seconds">
+	<item quantity="one">%d segundo</item>
+	<item quantity="other">%d segundos</item>
+</plurals>
+
+    <string name="settings_show_room_member_state_events_summary">Mostrar quando alguém for convidado/entrar/sair/banido e mostrar alterações de foto de perfil e de nome e sobrenome.</string>
+    <string name="settings_emails_and_phone_numbers_title">E-mails e números de telefone</string>
+    <string name="settings_emails_and_phone_numbers_summary">Editar e-mails e números de telefone vinculados à sua conta Matrix</string>
+
+    <string name="settings_text_message_sent_hint">Código</string>
+    <string name="login_msisdn_notice">Por favor, use o formato internacional (o número de telefone precisa começar com \'+\')</string>
+    <string name="confirm_your_identity_quad_s">Confirme sua identidade verificando este login, concedendo a ele acesso a mensagens criptografadas.</string>
+    <string name="error_opening_banned_room">Não é possível carregar uma sala da qual você foi banido.</string>
+    <string name="room_error_not_found">Não foi possível encontrar esta sala. Certifique-se de que ela existe.</string>
+
+    <string name="universal_link_malformed">O link não está correto</string>
 </resources>

From e02b0aad6fa9983761f61a640824230c4e34ddf3 Mon Sep 17 00:00:00 2001
From: Lua <tehLuaX@protonmail.com>
Date: Tue, 22 Sep 2020 23:59:36 +0000
Subject: [PATCH 008/278] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/pt_BR/
---
 vector/src/main/play/listings/pt_BR/title.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/play/listings/pt_BR/title.txt b/vector/src/main/play/listings/pt_BR/title.txt
index 70c9f7030b..5d2ae0c353 100644
--- a/vector/src/main/play/listings/pt_BR/title.txt
+++ b/vector/src/main/play/listings/pt_BR/title.txt
@@ -1 +1 @@
-Element (antigo Riot.im)
+Element (o novo Riot.im)

From c2a938a17c5c84463596b8e98fbb5c36272471d1 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Tue, 22 Sep 2020 20:09:07 +0000
Subject: [PATCH 009/278] Translated using Weblate (Russian)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 39 +++++++++++++----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 5d9c44518f..4512389abf 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -99,7 +99,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -833,13 +833,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -847,7 +847,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -857,45 +857,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1030,20 +1030,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1304,7 +1304,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1355,7 +1355,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -2730,4 +2730,9 @@
     <string name="sent_verification_conclusion">Результат проверки</string>
 
     <string name="universal_link_malformed">Ссылка была искажена</string>
-</resources>
+<string name="no_permissions_to_start_webrtc_call">У вас нет разрешения на запуск звонка в этой комнате</string>
+    <string name="delete_account_data_warning">Удалить данные учетной записи типа %1$s\?
+\n
+\nИспользуйте с осторожностью, это может привести к неожиданному поведению.</string>
+
+    </resources>

From 62f620f79be278397ebaad25b0d3007e5f460e17 Mon Sep 17 00:00:00 2001
From: Cristian Greco <cristian@regolo.cc>
Date: Wed, 23 Sep 2020 20:21:43 +0200
Subject: [PATCH 010/278] Add workflow for Update Gradle Wrapper Action.

This action keeps Gradle Wrapper up-to-date to the latest release. It
will run every day at midnight (UTC) and create a pull request if a new
Gradle version is available. The updated Wrapper script is validated
(with checksum verification) during the update process, and the Wrapper
is setup so that it will validate the Gradle binary itself on first run
of the new version.

Signed-off-by: Cristian Greco <cristian@regolo.cc>
---
 .github/workflows/update-gradle-wrapper.yml | 18 ++++++++++++++++++
 CHANGES.md                                  |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/update-gradle-wrapper.yml

diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
new file mode 100644
index 0000000000..4a786a9339
--- /dev/null
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -0,0 +1,18 @@
+name: Update Gradle Wrapper
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Update Gradle Wrapper
+        uses: gradle-update/update-gradle-wrapper-action@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          target-branch: develop
diff --git a/CHANGES.md b/CHANGES.md
index a4d1976a04..294747619c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,7 +27,7 @@ SDK API changes ⚠️:
  - Rename `tryThis` to `tryOrNull`
 
 Build 🧱:
- -
+ - Update Gradle Wrapper Action
 
 Other changes:
  - Add an advanced action to reset an account data entry

From 6958d114a9299e32cd325367701d2a0af06d9500 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 25 Sep 2020 14:09:25 +0200
Subject: [PATCH 011/278] Version++

---
 CHANGES.md          | 24 ++++++++++++++++++++++++
 vector/build.gradle |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6837fa8313..aa319bf0c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,27 @@
+Changes in Element 1.0.9 (2020-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ - 
+
+Build 🧱:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.0.8 (2020-09-25)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index ef0124dcc7..0c7985b45d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -17,7 +17,7 @@ androidExtensions {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 0
-ext.versionPatch = 8
+ext.versionPatch = 9
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 21f1848499536eac69c62de02a179c03d258cefb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Sat, 26 Sep 2020 11:30:08 +0200
Subject: [PATCH 012/278] Fix Splash screen layout, especially on small screens

---
 CHANGES.md                                    |   2 +-
 .../main/res/layout/fragment_login_splash.xml | 285 ++++++++++--------
 vector/src/main/res/values/styles_login.xml   |   7 -
 3 files changed, 165 insertions(+), 129 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index aa319bf0c9..813450fd0c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Fix Splash layout on small screens
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 2a43ece5ec..62e61a4219 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -3,144 +3,187 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?riotx_background">
+    android:background="?riotx_background"
+    android:paddingStart="36dp"
+    android:paddingTop="@dimen/layout_vertical_margin"
+    android:paddingEnd="36dp"
+    android:paddingBottom="@dimen/layout_vertical_margin">
 
-    <androidx.core.widget.NestedScrollView
+    <!-- Strategy: 5 Spaces are used to spread the remaining space, using weight -->
+
+    <Space
+        android:id="@+id/loginSplashSpace1"
         android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashLogoContainer"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread_inside"
+        app:layout_constraintVertical_weight="4" />
+
+    <LinearLayout
+        android:id="@+id/loginSplashLogoContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace1">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            style="@style/LoginContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        <ImageView
+            android:id="@+id/loginSplashLogo"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/element_logo_green"
+            android:transitionName="loginLogoTransition" />
 
-            <ImageView
-                android:id="@+id/loginSplashLogo"
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:src="@drawable/element_logo_green"
-                android:transitionName="loginLogoTransition"
-                app:layout_constraintBottom_toTopOf="@+id/logoType"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
+        <ImageView
+            android:id="@+id/logoType"
+            android:layout_width="wrap_content"
+            android:layout_height="44dp"
+            android:layout_marginTop="8dp"
+            android:src="@drawable/element_logotype"
+            android:tint="?colorAccent" />
 
-            <ImageView
-                android:id="@+id/logoType"
-                android:layout_width="wrap_content"
-                android:layout_height="44dp"
-                android:layout_marginTop="8dp"
-                android:src="@drawable/element_logotype"
-                android:tint="?colorAccent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/loginSplashLogo" />
+    </LinearLayout>
 
-            <TextView
-                android:id="@+id/loginSplashTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:gravity="center"
-                android:text="@string/login_splash_title"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Title"
-                android:transitionName="loginTitleTransition"
-                app:layout_constraintBottom_toTopOf="@+id/loginSplashText1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/logoType" />
+    <Space
+        android:id="@+id/loginSplashSpace2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashTitle"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashLogoContainer"
+        app:layout_constraintVertical_weight="1" />
 
-            <ImageView
-                android:id="@+id/loginSplashPicto1"
-                android:layout_width="32dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="2dp"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_login_splash_message_circle"
-                android:tint="?riotx_text_secondary"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/loginSplashText1" />
+    <TextView
+        android:id="@+id/loginSplashTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/login_splash_title"
+        android:textAppearance="@style/TextAppearance.Vector.Login.Title"
+        android:transitionName="loginTitleTransition"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace2" />
 
-            <TextView
-                android:id="@+id/loginSplashText1"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="96dp"
-                android:gravity="start"
-                android:text="@string/login_splash_text1"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
-                app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle" />
+    <Space
+        android:id="@+id/loginSplashSpace3"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashContent"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashTitle"
+        app:layout_constraintVertical_weight="2" />
 
-            <ImageView
-                android:id="@+id/loginSplashPicto2"
-                android:layout_width="32dp"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_login_splash_lock"
-                android:tint="?riotx_text_secondary"
-                app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-                app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginSplashContent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace3">
 
-            <TextView
-                android:id="@+id/loginSplashText2"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="start"
-                android:text="@string/login_splash_text2"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="@id/loginSplashText1"
-                app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
+        <ImageView
+            android:id="@+id/loginSplashPicto1"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_login_splash_message_circle"
+            android:tint="?riotx_text_secondary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText1" />
 
-            <ImageView
-                android:id="@+id/loginSplashPicto3"
-                android:layout_width="32dp"
-                android:layout_height="wrap_content"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_login_splash_sliders"
-                android:tint="?riotx_text_secondary"
-                app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
-                app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
+        <TextView
+            android:id="@+id/loginSplashText1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:gravity="start"
+            android:text="@string/login_splash_text1"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/loginSplashText3"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="start"
-                android:text="@string/login_splash_text3"
-                android:textAppearance="@style/TextAppearance.Vector.Login.Text"
-                app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
-                app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
+        <ImageView
+            android:id="@+id/loginSplashPicto2"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_login_splash_lock"
+            android:tint="?riotx_text_secondary"
+            app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
 
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/loginSplashSubmit"
-                style="@style/Style.Vector.Login.Button"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="48dp"
-                android:text="@string/login_splash_submit"
-                android:transitionName="loginSubmitTransition"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSplashText3" />
+        <TextView
+            android:id="@+id/loginSplashText2"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="start"
+            android:text="@string/login_splash_text2"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/loginSplashText1"
+            app:layout_constraintTop_toBottomOf="@+id/loginSplashText1" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <ImageView
+            android:id="@+id/loginSplashPicto3"
+            android:layout_width="32dp"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/ic_login_splash_sliders"
+            android:tint="?riotx_text_secondary"
+            app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
 
-    </androidx.core.widget.NestedScrollView>
+        <TextView
+            android:id="@+id/loginSplashText3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="start"
+            android:text="@string/login_splash_text3"
+            android:textAppearance="@style/TextAppearance.Vector.Login.Text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/loginSplashText1"
+            app:layout_constraintTop_toBottomOf="@+id/loginSplashText2" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <Space
+        android:id="@+id/loginSplashSpace4"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashSubmit"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashContent"
+        app:layout_constraintVertical_weight="2" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/loginSplashSubmit"
+        style="@style/Style.Vector.Login.Button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/login_splash_submit"
+        android:transitionName="loginSubmitTransition"
+        app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace5"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashSpace4" />
+
+    <Space
+        android:id="@+id/loginSplashSpace5"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loginSplashSubmit"
+        app:layout_constraintVertical_weight="4" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml
index 6dab3fac51..8cba34daf3 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="LoginContainer">
-        <item name="android:paddingTop">32dp</item>
-        <item name="android:paddingBottom">32dp</item>
-        <item name="android:paddingStart">36dp</item>
-        <item name="android:paddingEnd">36dp</item>
-    </style>
-
     <item name="loginLogo" type="id" />
     <item name="loginFormScrollView" type="id" />
     <item name="loginFormContainer" type="id" />

From 1ed0ef094839deee12fff57c4fba407d2fb640ac Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sat, 26 Sep 2020 12:02:22 +0200
Subject: [PATCH 013/278] Disable animation on title

---
 .../main/java/im/vector/app/features/login/LoginActivity.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index 2a692c2d53..0eb4ef3e32 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -146,8 +146,10 @@ open class LoginActivity : VectorBaseActivity(), ToolbarConfigurable, UnlockedAc
                         LoginServerSelectionFragment::class.java,
                         option = { ft ->
                             findViewById<View?>(R.id.loginSplashLogo)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            findViewById<View?>(R.id.loginSplashTitle)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
-                            findViewById<View?>(R.id.loginSplashSubmit)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
+                            // Disable transition of text
+                            // findViewById<View?>(R.id.loginSplashTitle)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
+                            // No transition here now actually
+                            // findViewById<View?>(R.id.loginSplashSubmit)?.let { ft.addSharedElement(it, ViewCompat.getTransitionName(it) ?: "") }
                             // TODO Disabled because it provokes a flickering
                             // ft.setCustomAnimations(enterAnim, exitAnim, popEnterAnim, popExitAnim)
                         })

From ae84a0bbe96e47a7f2bb8f87d9d60a34651060ae Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Fri, 25 Sep 2020 04:48:20 +0000
Subject: [PATCH 014/278] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 3cbcbb0875..5a9e3a9066 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1511,7 +1511,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_add_3pid_authentication_needed">需要身份认证</string>
 
 
-    <string name="settings_background_fdroid_sync_mode">后台同步模式（实验性）</string>
+    <string name="settings_background_fdroid_sync_mode">后台同步模式</string>
     <string name="settings_background_fdroid_sync_mode_battery">电池优化</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element 将在后台以保留设备有限资源（电池）的方式同步。
 \n取决于您的设备资源状态，同步可能被操作系统推迟。</string>
@@ -2578,4 +2578,21 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 
     <string name="error_opening_banned_room">无法打开您被封禁的聊天室。</string>
     <string name="room_error_not_found">无法找到此聊天室。请确认它存在。</string>
+<string name="no_permissions_to_start_webrtc_call">您没有权限在此聊天室发起通话</string>
+    <plurals name="seconds">
+	<item quantity="other">%d 秒</item>
+</plurals>
+
+    <string name="settings_show_room_member_state_events">显示聊天室成员状态事件</string>
+    <string name="settings_show_room_member_state_events_summary">包括邀请/加入/离开/踢掉/封禁事件和头像/昵称变更。</string>
+    <string name="sent_a_poll">轮询</string>
+    <string name="sent_a_bot_buttons">机器人按钮</string>
+    <string name="sent_a_reaction">回应：%s</string>
+    <string name="sent_verification_conclusion">验证结果</string>
+
+    <string name="delete_account_data_warning">是否删除类型 %1$s 的账户数据？
+\n
+\n小心使用，它可能导致意外行为。</string>
+
+    <string name="universal_link_malformed">链接格式不正确</string>
 </resources>

From 667ea844f2eea1e1f3c18de0b877082cc9490431 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Fri, 25 Sep 2020 17:51:21 +0000
Subject: [PATCH 015/278] Translated using Weblate (Czech)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/cs/
---
 vector/src/main/res/values-cs/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 745d938555..919acc53b7 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2623,4 +2623,9 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="sent_verification_conclusion">Výsledek ověření</string>
 
     <string name="universal_link_malformed">Odkaz byl chybně zformován</string>
-</resources>
+<string name="no_permissions_to_start_webrtc_call">K zahájení hovoru v této místnosti nemáte oprávnění</string>
+    <string name="delete_account_data_warning">Smazat údaje účtu typu %1$s\?
+\n
+\nOpatrně, může vést k neočekávanému chování.</string>
+
+    </resources>

From c14bf80b40fe65062f8e5f6e3b4e1a1de5f7dc19 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Sat, 26 Sep 2020 07:19:02 +0000
Subject: [PATCH 016/278] Translated using Weblate (Czech)

Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/cs/
---
 .../src/main/res/values-cs/strings.xml        | 212 ++++++++++++++----
 1 file changed, 169 insertions(+), 43 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
index 9e208f812a..57828ac182 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -4,47 +4,47 @@
     <string name="summary_user_sent_image">Uživatel %1$s poslal obrázek.</string>
     <string name="summary_user_sent_sticker">Uživatel %1$s poslal nálepku.</string>
 
-    <string name="notice_room_invite_no_invitee">Pozvánka od uživatele %s</string>
+    <string name="notice_room_invite_no_invitee">Pozvání od uživatele %s</string>
     <string name="notice_room_invite">Uživatel %1$s pozval uživatele %2$s</string>
     <string name="notice_room_invite_you">Uživatel %1$s vás pozval</string>
-    <string name="notice_room_join">Uživatel %1$s se připojil</string>
+    <string name="notice_room_join">%1$s vstoupil do místnosti</string>
     <string name="notice_room_leave">Uživatel %1$s odešel</string>
-    <string name="notice_room_reject">Uživatel %1$s odmítl pozvání</string>
-    <string name="notice_room_kick">Uživatel %1$s vykopl uživatele %2$s</string>
-    <string name="notice_room_unban">Uživatel %1$s znovu povolil vstup uživateli %2$s</string>
-    <string name="notice_room_ban">Uživatel %1$s vykázal uživatele %2$s</string>
-    <string name="notice_room_withdraw">Uživatel %1$s zrušil pozvání pro uživatele %2$s</string>
-    <string name="notice_avatar_url_changed">Uživatel %1$s změnil svůj profilový obrázek</string>
-    <string name="notice_display_name_set">Uživatel %1$s nastavil své zobrazované jméno na %2$s</string>
-    <string name="notice_display_name_changed_from">Uživatel %1$s změnil své zobrazované jméno z %2$s na %3$s</string>
-    <string name="notice_display_name_removed">Uživatel %1$s odstranil své zobrazované jméno (%2$s)</string>
-    <string name="notice_room_topic_changed">Uživatel %1$s změnil téma na: %2$s</string>
-    <string name="notice_room_name_changed">Uživatel %1$s změnil název místnosti na: %2$s</string>
-    <string name="notice_placed_video_call">Uživatel %s uskutečnil videohovor.</string>
-    <string name="notice_placed_voice_call">Uživatel %s uskutečnil hlasový hovor.</string>
-    <string name="notice_answered_call">Uživatel %s přijal hovor.</string>
-    <string name="notice_ended_call">Uživatel %s ukončil hovor.</string>
-    <string name="notice_made_future_room_visibility">Uživatel %1$s nastavit viditelnost budoucích zpráv v místnosti pro %2$s</string>
+    <string name="notice_room_reject">%1$s odmítli pozvání</string>
+    <string name="notice_room_kick">%1$s vykopli %2$s</string>
+    <string name="notice_room_unban">%1$s zrušil vykázání %2$s</string>
+    <string name="notice_room_ban">%1$s vykázali %2$s</string>
+    <string name="notice_room_withdraw">%1$s zrušili pozvání pro %2$s</string>
+    <string name="notice_avatar_url_changed">%1$s změnili svůj profilový obrázek</string>
+    <string name="notice_display_name_set">%1$s nastavili své veřejné jméno na %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s změnili své veřejné jméno z %2$s na %3$s</string>
+    <string name="notice_display_name_removed">%1$s odstranili své veřejné jméno (%2$s)</string>
+    <string name="notice_room_topic_changed">%1$s změnili téma na: %2$s</string>
+    <string name="notice_room_name_changed">%1$s změnili název místnosti na: %2$s</string>
+    <string name="notice_placed_video_call">%s uskutečnili videohovor.</string>
+    <string name="notice_placed_voice_call">%s uskutečnili hlasový hovor.</string>
+    <string name="notice_answered_call">%s přijali hovor.</string>
+    <string name="notice_ended_call">%s ukončili hovor.</string>
+    <string name="notice_made_future_room_visibility">%1$s nastavili viditelnost budoucí historie místnosti pro %2$s</string>
     <string name="notice_room_visibility_invited">všechny členy místnosti od chvíle, kdy budou pozváni.</string>
     <string name="notice_room_visibility_joined">všechny členy místnosti od chvíle, kdy se připojí.</string>
     <string name="notice_room_visibility_shared">všechny členy místnosti.</string>
     <string name="notice_room_visibility_world_readable">kohokoliv.</string>
     <string name="notice_room_visibility_unknown">neznámým (%s).</string>
-    <string name="notice_end_to_end">Uživatel %1$s zapnul end-to-end šifrování (%2$s)</string>
+    <string name="notice_end_to_end">%1$s zapnuli end-to-end šifrování (%2$s)</string>
 
-    <string name="notice_requested_voip_conference">Uživatel %1$s požádal o VoIP konferenci</string>
+    <string name="notice_requested_voip_conference">%1$s požádali o VoIP konferenci</string>
     <string name="notice_voip_started">Začala VoIP konference</string>
     <string name="notice_voip_finished">VoIP konference skončila</string>
 
     <string name="notice_avatar_changed_too">(profilový obrázek byl také změněn)</string>
-    <string name="notice_room_name_removed">Uživatel %1$s odstranil název místnosti</string>
-    <string name="notice_room_topic_removed">Uživatel %1$s odstranil téma místnosti</string>
-    <string name="notice_profile_change_redacted">Uživatel %1$s aktualizoval svůj profil %2$s</string>
-    <string name="notice_room_third_party_invite">Uživatel %1$s do této místnosti pozval uživatele %2$s</string>
-    <string name="notice_room_third_party_registered_invite">Uživatel %1$s přijal pozvání pro %2$s</string>
+    <string name="notice_room_name_removed">%1$s odstranili název místnosti</string>
+    <string name="notice_room_topic_removed">%1$s odstranili téma místnosti</string>
+    <string name="notice_profile_change_redacted">%1$s aktualizovali svůj profil %2$s</string>
+    <string name="notice_room_third_party_invite">%1$s do této místnosti pozvali %2$s</string>
+    <string name="notice_room_third_party_registered_invite">%1$s přijali pozvání pro %2$s</string>
 
     <string name="notice_crypto_unable_to_decrypt">** Nelze dešifrovat: %s **</string>
-    <string name="notice_crypto_error_unkwown_inbound_session_id">Odesílatelovo zařízení neposlalo klíče pro tuto zprávu.</string>
+    <string name="notice_crypto_error_unkwown_inbound_session_id">Odesílatelovo zařízení nám neposlalo klíče pro tuto zprávu.</string>
 
     <string name="could_not_redact">Nelze vymazat</string>
     <string name="unable_to_send_message">Zprávu nelze odeslat</string>
@@ -54,7 +54,7 @@
     <string name="network_error">Chyba sítě</string>
     <string name="matrix_error">Chyba v Matrixu</string>
 
-    <string name="room_error_join_failed_empty_room">V současnosti není možné se znovu připojit do prázdné místnosti.</string>
+    <string name="room_error_join_failed_empty_room">V současnosti není možné znovu vstoupit do prázdné místnosti.</string>
 
     <string name="encrypted_message">Šifrovaná zpráva</string>
 
@@ -74,35 +74,161 @@
 
     <string name="room_displayname_empty_room">Prázdná místnost</string>
 
-    <string name="notice_room_update">Uživatel %s upgradoval tuto místnost.</string>
+    <string name="notice_room_update">%s povýšili tuto místnost.</string>
 
     <string name="notice_event_redacted_with_reason">Zpráva byla smazána [důvod: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Zpráva smazána uživatelem %1$s [důvod: %2$s]</string>
-    <string name="notice_room_third_party_revoked_invite">Uživatel %1$s obnovil pozvánku do místnosti pro uživatele %2$s</string>
-    <string name="initial_sync_start_importing_account">Úvodní synchronizace:
-\nImport účtu…</string>
+    <string name="notice_room_third_party_revoked_invite">%1$s zrušili pozvánku do místnosti pro %2$s</string>
+    <string name="initial_sync_start_importing_account">Úvodní synchronizace: 
+\nImportuji účet…</string>
     <string name="initial_sync_start_importing_account_crypto">Úvodní synchronizace: 
-\nImport klíčů</string>
+\nImportuji klíče</string>
     <string name="initial_sync_start_importing_account_rooms">Úvodní synchronizace: 
-\nImport místností</string>
+\nImportuji místnosti</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Úvodní synchronizace: 
-\nImport místností, kterými jste členy</string>
+\nImportuji místností, jichž jste členy</string>
     <string name="initial_sync_start_importing_account_left_rooms">Úvodní synchronizace: 
-\nImport opuštěných místností</string>
+\nImportuji místnost, jež jste opustili</string>
     <string name="initial_sync_start_importing_account_groups">Úvodní synchronizace: 
-\nImport skupin</string>
+\nImportuji komunity</string>
     <string name="initial_sync_start_importing_account_data">Úvodní synchronizace: 
-\nImport dat účtu</string>
+\nImportuji data účtu</string>
 
-    <string name="event_status_sending_message">Odesílání zprávy…</string>
+    <string name="event_status_sending_message">Odesílám zprávu…</string>
 
-    <string name="initial_sync_start_importing_account_invited_rooms">Úvodní synchronizace:
-\nImport pozvánek</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Úvodní synchronizace: 
+\nImportuji pozvání</string>
     <string name="clear_timeline_send_queue">Vymazat frontu neodeslaných zpráv</string>
 
-    <string name="notice_room_invite_with_reason">Uživatel %1$s pozval uživatele %2$s. Důvod: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">Uživatel %1$s váš pozval. Důvod: %2$s</string>
-    <string name="notice_room_leave_with_reason">Uživatel %1$s odešel. Důvod: %2$s</string>
+    <string name="notice_room_invite_with_reason">%1$s pozvali %2$s. Důvod: %3$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s vás pozvali. Důvod: %2$s</string>
+    <string name="notice_room_leave_with_reason">%1$s opustil místnost. Důvod: %2$s</string>
     <string name="notice_event_redacted">Zpráva odstraněna</string>
     <string name="notice_event_redacted_by">Zprávu odstranil/a %1$s</string>
+<string name="summary_you_sent_image">Poslali jste obrázek.</string>
+    <string name="summary_you_sent_sticker">Poslali jste nálepku.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Vaše pozvání</string>
+    <string name="notice_room_created">%1$s založil místnost</string>
+    <string name="notice_room_created_by_you">Vy jste založili místnost</string>
+    <string name="notice_room_invite_by_you">Pozvali jste %1$s</string>
+    <string name="notice_room_join_by_you">Vstoupili jste do místnosti</string>
+    <string name="notice_room_leave_by_you">Opustili jste místnost</string>
+    <string name="notice_room_reject_by_you">Odmítli jste pozvání</string>
+    <string name="notice_room_kick_by_you">Vykopli jste %1$s</string>
+    <string name="notice_room_unban_by_you">Zrušili jste vykázání pro %1$s</string>
+    <string name="notice_room_ban_by_you">Vykázali jste %1$s</string>
+    <string name="notice_room_withdraw_by_you">Stáhli jste pozvánku od %1$s zpět</string>
+    <string name="notice_avatar_url_changed_by_you">Změnili jste svůj profilový obrázek</string>
+    <string name="notice_display_name_set_by_you">Změnili jste své veřejné jméno na %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">Změnili jste své veřejné jméno z %1$s na %2$s</string>
+    <string name="notice_display_name_removed_by_you">Odstranili jste své veřejné jméno (%1$s)</string>
+    <string name="notice_room_topic_changed_by_you">Změnili jste téma na: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s změnili obrázek místnosti</string>
+    <string name="notice_room_avatar_changed_by_you">Změnili jste obrázek místnosti</string>
+    <string name="notice_room_name_changed_by_you">Změnili jste jméno místnosti na: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Zahájili jste video hovor.</string>
+    <string name="notice_placed_voice_call_by_you">Zahájili jste hlasový hovor.</string>
+    <string name="notice_call_candidates">%s poslali data, aby mohli zahájit hovor.</string>
+    <string name="notice_call_candidates_by_you">Poslali jste data, abyste mohli zahájit hovor.</string>
+    <string name="notice_answered_call_by_you">Přijali jste hovor.</string>
+    <string name="notice_ended_call_by_you">Ukončili jste hovor.</string>
+    <string name="notice_made_future_room_visibility_by_you">Učinili jste budoucí historii místnosti viditelnou pro %1$s</string>
+    <string name="notice_end_to_end_by_you">Zapnuli jste end-to-end šifrování (%1$s)</string>
+    <string name="notice_room_update_by_you">Povýšili jste tuto místnost.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Požádali jste o VoIP konferenci</string>
+    <string name="notice_room_name_removed_by_you">Odstranili jste jméno místnosti</string>
+    <string name="notice_room_topic_removed_by_you">Odstranili jste téma místnosti</string>
+    <string name="notice_room_avatar_removed">%1$s odstranili obrázek místnosti</string>
+    <string name="notice_room_avatar_removed_by_you">Odstranili jste obrázek místnosti</string>
+    <string name="notice_profile_change_redacted_by_you">Aktualizovali jste svů profil %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Poslali jste %1$s pozvání ke vstupu do místnosti</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Zrušili jste pozvánku ke vstupu do místnosti pro %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Přijali jste pozvání pro %1$s</string>
+
+    <string name="notice_widget_added">%1$s přidali widget %2$s</string>
+    <string name="notice_widget_added_by_you">Přidali jste widget %1$s</string>
+    <string name="notice_widget_removed">%1$s odstranili widget %2$s</string>
+    <string name="notice_widget_removed_by_you">Odstranili jste widget %1$s</string>
+    <string name="notice_widget_modified">%1$s změnil widget %2$s</string>
+    <string name="notice_widget_modified_by_you">Změnili jste widget %1$s</string>
+
+    <string name="power_level_admin">Správce</string>
+    <string name="power_level_moderator">Moderátor</string>
+    <string name="power_level_default">Výchozí</string>
+    <string name="power_level_custom">Vlastní (%1$d)</string>
+    <string name="power_level_custom_no_value">Vlastní</string>
+
+    <string name="notice_power_level_changed_by_you">Změnili jste %1$s stupeň oprávnění.</string>
+    <string name="notice_power_level_changed">%1$s změnili %2$s stupeň oprávnění.</string>
+    <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason">Pozvání od %1$s. Důvod: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Vaše pozvání. Důvod: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Pozvali jste %1$s. Důvod: %2$s</string>
+    <string name="notice_room_join_with_reason">%1$s vstoupili do místnosti. Důvod: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Vstoupili jste do místnosti. Důvod: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Opustili jste místnost. Důvod: %1$s</string>
+    <string name="notice_room_reject_with_reason">%1$s pozvání odmítli. Důvod: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Odmítli jste pozvání. Důvod: %1$s</string>
+    <string name="notice_room_kick_with_reason">%1$s vykopnuli %2$s. Důvod: %3$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Vykopnuli jste %1$s. Důvod: %2$s</string>
+    <string name="notice_room_unban_with_reason">%1$s zrušili %2$s vykázání. Důvod: %3$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Zrušili jste %1$s vykázání. Důvod: %2$s</string>
+    <string name="notice_room_ban_with_reason">%1$s vykázali %2$s. Důvod: %3$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Vykázali jste %1$s. Důvod: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason">%1$s poslali %2$s pozvání, aby vstoupili do místnosti. Důvod: %3$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">"Poslali jste %1$s pozvání, aby  vstoupili do místnosti. Důvod: %2$s"</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zrušili pozvání do místnosti pro %2$s. Důvod: %3$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zrušili jste pozvání do místnosti pro %1$s. Důvod: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason">%1$s přijali pozvání pro %2$s. Důvod: %3$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Přijali jste pozvání pro %1$s. Důvod: %2$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s zrušili pozvání pro %2$s. Důvod: %3$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Zrušili jste pozvání od %1$s. Důvod: %2$s</string>
+
+    <plurals name="notice_room_aliases_added">
+	<item quantity="one">%1$s přidali %2$s jako adresu pro tuto místnost.</item>
+	<item quantity="few">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
+	<item quantity="other">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
+</plurals>
+
+    <plurals name="notice_room_aliases_added_by_you">
+	<item quantity="one">Přidali jste %1$s jako adresu pro tuto místnost.</item>
+	<item quantity="few">Přidali jste %1$s jako adresy pro tuto místnost.</item>
+	<item quantity="other">Přidali jste %1$s jako adresy pro tuto místnost.</item>
+</plurals>
+
+    <plurals name="notice_room_aliases_removed">
+	<item quantity="one">%1$s odstranili %2$s jako adresu pro tuto místnost.</item>
+	<item quantity="few">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
+	<item quantity="other">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
+</plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+	<item quantity="one">Odstranili jste %2$s jako adresu pro tuto místnost.</item>
+	<item quantity="few">Odstranili jste %2$s jako adresuy pro tuto místnost.</item>
+	<item quantity="other">Odstranili jste %2$s jako adresy pro tuto místnost.</item>
+</plurals>
+
+    <string name="notice_room_aliases_added_and_removed">%1$s přidali %2$ a odstranili %3$s jako adresy pro tuto místnost.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Přidali jste %1$s a odstranili %2$s jako adresy pro tuto místnost.</string>
+
+    <string name="notice_room_canonical_alias_set">%1$s nastavili hlavní adresu této místnosti na %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Nastavili jste %1$s na hlavní adresu této místnosti.</string>
+    <string name="notice_room_canonical_alias_unset">%1$s odstranili hlavní adresu této místnosti.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Odstranili jste hlavní adresu této místnosti.</string>
+
+    <string name="notice_room_guest_access_can_join">"%1$s  povolili hostům vstoupit do místnosti."</string>
+    <string name="notice_room_guest_access_can_join_by_you">Povolili jste hostům vstoupit do místnosti.</string>
+    <string name="notice_room_guest_access_forbidden">%1$s zamezili hostům vstoupit do místnosti.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Zamezili jste hostům vstoupit do místnosti.</string>
+
+    <string name="notice_end_to_end_ok">%1$s zapnuli end-to-end šifrování.</string>
+    <string name="notice_end_to_end_ok_by_you">Zapnuli jste end-to-end šifrování.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s zapnuli end-to-end šifrování (neznámý algoritmus %2$s).</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Zapnuli jste end-to-end šifrování (neznámý algoritmus %2$s).</string>
+
+    <string name="key_verification_request_fallback_message">%s žádá ověření Vašeho klíče, ale Váš klient nepodporuje ověření klíče v chatu. Budete muset k ověření klíčů použít zastaralý způsob ověření.</string>
+
 </resources>

From d6d9ece045ca4824992fe00204034393b0b2537f Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Sat, 26 Sep 2020 09:17:39 +0000
Subject: [PATCH 017/278] Translated using Weblate (Russian)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 4512389abf..f4e870d913 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1181,7 +1181,7 @@
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Отключить ограничения</string>
 
     <string name="settings_troubleshoot_test_battery_title">Оптимизация батареи</string>
-    <string name="settings_troubleshoot_test_battery_success">Оптимизация батареи не влияет на Райот.</string>
+    <string name="settings_troubleshoot_test_battery_success">Оптимизация батареи не влияет на Element.</string>
     <string name="settings_troubleshoot_test_battery_failed">Если пользователь оставляет устройство в отключенном от сети и в неподвижном состоянии в течение некоторого времени при выключенном экране, устройство переходит в режим Doze. Это предотвращает доступ приложений к сети и откладывает выполнение заданий, синхронизацию и передачу стандартных аварийных сигналов.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Игнорировать оптимизацию</string>
 
@@ -1196,7 +1196,7 @@
     <string name="startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений.
 На следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите.</string>
 
-    <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Райот.</string>
+    <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Element.</string>
     <string name="settings_info_area_show">Показать информацию</string>
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>

From 77f06b962d85e88ce00ca61060d9209353a9b3be Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 28 Sep 2020 16:57:36 +0200
Subject: [PATCH 018/278] PIN code: request PIN code if phone has been locked

---
 CHANGES.md                                     |  2 +-
 .../java/im/vector/app/VectorApplication.kt    | 18 ++++++++++++++++++
 .../im/vector/app/features/pin/PinLocker.kt    |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 813450fd0c..25da8f0108 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,7 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
- -
+ - PIN code: request PIN code if phone has been locked
 
 Bugfix 🐛:
  - Fix Splash layout on small screens
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index 4b0ef66459..4f89763cda 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -17,7 +17,10 @@
 package im.vector.app
 
 import android.app.Application
+import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.content.res.Configuration
 import android.os.Handler
 import android.os.HandlerThread
@@ -92,6 +95,15 @@ class VectorApplication :
     // font thread handler
     private var fontThreadHandler: Handler? = null
 
+    private val powerKeyReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent) {
+            if (intent.action == Intent.ACTION_SCREEN_OFF
+                    && vectorPreferences.useFlagPinCode()) {
+                pinLocker.screenIsOff()
+            }
+        }
+    }
+
     override fun onCreate() {
         enableStrictModeIfNeeded()
         super.onCreate()
@@ -163,6 +175,12 @@ class VectorApplication :
         ProcessLifecycleOwner.get().lifecycle.addObserver(pinLocker)
         // This should be done as early as possible
         // initKnownEmojiHashSet(appContext)
+
+        applicationContext.registerReceiver(powerKeyReceiver, IntentFilter().apply {
+            // Looks like i cannot receive OFF, if i don't have both ON and OFF
+            addAction(Intent.ACTION_SCREEN_OFF)
+            addAction(Intent.ACTION_SCREEN_ON)
+        })
     }
 
     private fun enableStrictModeIfNeeded() {
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
index 3fc4152ee6..adc618d82e 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
@@ -81,6 +81,11 @@ class PinLocker @Inject constructor(
         computeState()
     }
 
+    fun screenIsOff() {
+        shouldBeLocked = true
+        computeState()
+    }
+
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     fun entersForeground() {
         val timeElapsedSinceBackground = SystemClock.elapsedRealtime() - entersBackgroundTs

From 7bf510880f026d4f4974dea02cda5a8b1261f607 Mon Sep 17 00:00:00 2001
From: OLIVIER Thomas <thomas.olivier3@protonmail.com>
Date: Sun, 27 Sep 2020 09:36:13 +0000
Subject: [PATCH 019/278] Translated using Weblate (French)

Currently translated at 92.0% (1725 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/fr/
---
 vector/src/main/res/values-fr/strings.xml | 54 ++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index d58f22b399..48df26c6d8 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1583,7 +1583,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="settings_call_ringtone_use_default_stun">Autoriser le serveur d’assistance d’appel de secours</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Utilisera %s comme assistant quand votre serveur d’accueil n’en offre pas (votre adresse IP sera partagée lors d’un appel)</string>
     <string name="invite_no_identity_server_error">Ajoutez un serveur d’identité dans vos paramètres pour réaliser cette action.</string>
-    <string name="settings_background_fdroid_sync_mode">Mode de synchronisation en arrière-plan (expérimental)</string>
+    <string name="settings_background_fdroid_sync_mode">Mode de synchronisation en arrière-plan</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimisé pour la batterie</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element se synchronisera en arrière-plan de façon à préserver les ressources limitées de l’appareil (batterie).
 \nSelon l’état des ressources de votre appareil, la synchronisation peut être retardée par le système d’exploitation.</string>
@@ -2377,4 +2377,54 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="identity_server_set_alternative_notice_no_default">Renseignez l’URL d’un serveur d’identité</string>
     <string name="identity_server_set_alternative_submit">Valider</string>
 
-</resources>
+<string name="play_video">Lancer</string>
+    <string name="pause_video">Pause</string>
+    <string name="dismiss">Ignorer</string>
+
+
+    <string name="no_permissions_to_start_conf_call">Vous n\'avez pas la permission de commencer une téléconférence dans ce salon</string>
+    <string name="no_permissions_to_start_webrtc_call">Vous n\'avez pas la permission de commencer un appel dans ce salon</string>
+    <string name="conference_call_in_progress">Une téléconférence est déjà en cours !</string>
+    <string name="video_meeting">Commencer une réunion vidéo</string>
+    <string name="audio_meeting">Commencer une réunion audio</string>
+    <string name="audio_video_meeting_description">Les réunions utilisent les règles de sécurités et les permissions de Jitsi. Toutes les personnes actuellement dans ce salon recevrons une invitation à participer à la réunion.</string>
+    <string name="cannot_call_yourself">Vous ne pouvez pas passer un appel avec vous-même</string>
+    <string name="cannot_call_yourself_with_invite">Vous ne pouvez pas passer un appel avec vous-même, attendez que les participants accepte l\'invitation</string>
+    <string name="failed_to_add_widget">Échec de l\'ajout du module d\'information (widget)</string>
+    <string name="failed_to_remove_widget">Échec de la suppression du module d\'information (widget)</string>
+    <string name="call_notification_answer">Accepter</string>
+    <string name="call_notification_reject">Refuser</string>
+    <string name="call_notification_hangup">Raccrocher</string>
+
+    <string name="action_copy">Copier</string>
+    <string name="dialog_title_success">Succès</string>
+
+    <string name="bottom_action_notification">Notifications</string>
+    <string name="call_failed_no_connection_description">Impossible d\'établir une connexion en temps réel.
+\nVeuillez demander à l\'administrateur de votre serveur domestique de configurer un serveur TURN afin que les appels fonctionnent de manière fiable.</string>
+
+    <string name="call_select_sound_device">Sélectionner un appareil audio</string>
+    <string name="sound_device_phone">Téléphone</string>
+    <string name="sound_device_speaker">Hauts-parleurs</string>
+    <string name="sound_device_headset">Écouteurs</string>
+    <string name="sound_device_wireless_headset">Écouteurs sans fil</string>
+    <string name="call_switch_camera">Changer de caméra</string>
+    <string name="auth_msisdn_already_defined">Le numéro de téléphone est déjà défini.</string>
+    <string name="login_error_ssl_peer_unverified">Erreur SSL : l\'identité du pair n\'a pas été vérifiée.</string>
+    <string name="login_error_ssl_other">Erreur SSL.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Prévenir les appels accidentels</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Demandez une confirmation avant de commencer un appel</string>
+    <string name="active_call_with_duration">Appel actif (%s)</string>
+    <string name="return_to_call">Retour à l\'appel</string>
+
+    <string name="room_participants_action_cancel_invite">Annuler l\'invitation</string>
+    <string name="room_participants_action_ignore_title">Ignorer l\'utilisateur</string>
+    <string name="room_participants_action_ignore_prompt_msg">Ignorer cet utilisateur aura pour effet de supprimer ses messages des espaces que vous partagez.
+\n
+\nVous pouvez annuler cette action à tout moment dans les paramètres généraux.</string>
+    <string name="room_participants_action_cancel_invite_title">Annuler l\'invitation</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Êtes-vous sûr de vouloir annuler l\'invitation pour cet utilisateur \?</string>
+    <string name="room_participants_ban_title">Bloquer l\'utilisateur</string>
+    <string name="room_participants_ban_reason">Motif du blocage</string>
+    <string name="room_participants_unban_title">Débloquer l\'utilisateur</string>
+    </resources>

From 6a67c0fd0d611ac0048a851d018ae5283be1ae06 Mon Sep 17 00:00:00 2001
From: John <papadop@protonmail.com>
Date: Sun, 27 Sep 2020 20:00:34 +0000
Subject: [PATCH 020/278] Translated using Weblate (Greek)

Currently translated at 15.0% (282 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/el/
---
 vector/src/main/res/values-el/strings.xml | 36 +++++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 499f4a0549..945ea8029c 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -31,7 +31,7 @@
     <string name="send_bug_report_include_logs">Αποστολή πληροφοριών</string>
     <string name="room_recents_start_chat">Έναρξη συνομιλίας</string>
     <string name="directory_server_fail_to_retrieve_server">Ο διακομιστής είναι μη διαθέσιμος ή υπερφορτωμένος</string>
-    <string name="view_decrypted_source">Προβολή του αποκρυπτογραφημένου κώδικα</string>
+    <string name="view_decrypted_source">Προβολή αποκρυπτογραφημένου κώδικα</string>
     <string name="view_source">Προβολή κώδικα</string>
     <string name="today">Σήμερα</string>
 
@@ -69,11 +69,11 @@
 
     <string name="later">Αργότερα</string>
     <string name="forward">Μπροστά</string>
-    <string name="delete">Διαγαρφή</string>
+    <string name="delete">Διαγραφή</string>
     <string name="rename">Μετονομασία</string>
     <string name="report_content">Αναφορά περιεχομένου</string>
     <string name="active_call">Ενεργή κλήση</string>
-    <string name="ongoing_conference_call_video">βίντεο</string>
+    <string name="ongoing_conference_call_video">Βίντεο</string>
     <string name="missing_permissions_warning">Κάποια χαρακτηριστικά μπορεί να μην είναι διαθέσιμα λόγω ελλιπών δικαιωμάτων…</string>
     <string name="missing_permissions_error">Αυτή η ενέργεια δεν είναι δυνατή λόγω ελλιπών δικαιωμάτων.</string>
     <string name="device_information">Πληροφορίες συσκευής</string>
@@ -151,8 +151,8 @@
     <string name="generic_label">%1$s :</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
-    <string name="ongoing_conference_call_voice">ήχος</string>
-    <string name="cannot_start_call">Η κλήση δεν ήταν δυνατή, παρακαλώ δοκιμάστε αργότερα</string>
+    <string name="ongoing_conference_call_voice">Ήχος</string>
+    <string name="cannot_start_call">Δεν είναι δυνατή η έναρξη της κλήσης, δοκιμάστε αργότερα</string>
     <string name="missing_permissions_title_to_start_conf_call">Η κλήση δεν ήταν δυνατή</string>
     <string name="show_info_area_always">Πάντα</string>
     <string name="show_info_area_messages_and_errors">Για μηνύματα και σφάλματα</string>
@@ -338,4 +338,28 @@
     <string name="bottom_action_people">Άτομα</string>
     <string name="home_filter_placeholder_people">Αναζήτηση ατόμων</string>
     <string name="tab_title_search_people">ΑΤΟΜΑ</string>
-</resources>
+<string name="resources_script">Λτνκ</string>
+
+    <string name="notification_sync_init">Αρχικοποίηση υπηρεσίας</string>
+    <string name="notification_listening_for_events">Αναμονή για συμβάντα</string>
+    <string name="title_activity_keys_backup_setup">Δημιουργία αντιγράφων ασφαλείας κλειδιών</string>
+    <string name="title_activity_keys_backup_restore">Χρησιμοποιήστε το αντίγραφο ασφαλείας κλειδιών</string>
+    <string name="title_activity_verify_device">Επαλήθευση συνεδρίας</string>
+
+    <string name="keys_backup_is_not_finished_please_wait">Το αντίγραφο ασφαλείας κλειδιών δεν έχει ολοκληρωθεί, παρακαλώ περιμένετε…</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Θα χάσετε τα κρυπτογραφημένα μηνύματά σας εάν αποσυνδεθείτε τώρα</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Δημιουργία αντίγραφου κλειδιού ασφαλείας σε εξέλιξη. Εάν αποσυνδεθείτε τώρα, θα χάσετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας.</string>
+    <string name="sign_out_bottom_sheet_dont_want_secure_messages">Δεν θέλω τα κρυπτογραφημένα μηνύματά μου</string>
+    <string name="sign_out_bottom_sheet_backing_up_keys">Δημιουργία αντιγράφων ασφαλείας κλειδιών…</string>
+    <string name="keys_backup_activate">Χρησιμοποιήστε το αντιγραφο κλειδιού ασφαλείας</string>
+    <string name="are_you_sure">Είστε σίγουρος;</string>
+    <string name="backup">Δημιουργία αντίγραφου ασφαλείας</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Θα χάσετε την πρόσβαση στα κρυπτογραφημένα μηνύματά σας, εκτός εάν δημιουργήσετε αντίγραφα ασφαλείας των κλειδιών σας πριν αποσυνδεθείτε.</string>
+    <string name="redact">Αφαίρεση</string>
+    <string name="download">Κατεβάστε</string>
+    <string name="share">Διαμοιρασμός</string>
+    <string name="clear">Καθαρισμός</string>
+    <string name="revoke">Ανάκληση</string>
+    <string name="disconnect">Αποσύνδεση</string>
+    <string name="pause_video">Παύση</string>
+    </resources>

From 577f0e0d9a59f4320614961066645e1fa260638b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 29 Sep 2020 11:38:19 +0200
Subject: [PATCH 021/278] Create a script to help getting public information
 form any homeserver

---
 CHANGES.md       |  2 +-
 tools/hs_diag.py | 69 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100755 tools/hs_diag.py

diff --git a/CHANGES.md b/CHANGES.md
index 813450fd0c..e5a46891d7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,7 @@ Build 🧱:
  -
 
 Other changes:
- -
+ - Create a script to help getting public information form any homeserver
 
 Changes in Element 1.0.8 (2020-09-25)
 ===================================================
diff --git a/tools/hs_diag.py b/tools/hs_diag.py
new file mode 100755
index 0000000000..ded10a562d
--- /dev/null
+++ b/tools/hs_diag.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+#  Copyright (c) 2020 New Vector Ltd
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import argparse
+import os
+
+### Arguments
+
+parser = argparse.ArgumentParser(description='Get some information about a homeserver.')
+parser.add_argument('-s',
+                    '--homeserver',
+                    required=True,
+                    help="homeserver URL")
+parser.add_argument('-v',
+                    '--verbose',
+                    help="increase output verbosity.",
+                    action="store_true")
+
+args = parser.parse_args()
+
+if args.verbose:
+    print("Argument:")
+    print(args)
+
+baseUrl = args.homeserver
+
+if not baseUrl.startswith("http"):
+    baseUrl = "https://" + baseUrl
+
+if not baseUrl.endswith("/"):
+    baseUrl = baseUrl + "/"
+
+print("Get information from " + baseUrl)
+
+items = [
+    # [Title, URL, True for GET request and False for POST request]
+    ["Well-known", baseUrl + ".well-known/matrix/client", True]
+    , ["Version", baseUrl + "_matrix/client/versions", True]
+    , ["Login flow", baseUrl + "_matrix/client/r0/login", True]
+    , ["Registration flow", baseUrl + "_matrix/client/r0/register", False]
+    # Useless , ["Username availability", baseUrl + "_matrix/client/r0/register/available?username=benoit", True]
+    # Useless , ["Public rooms", baseUrl + "_matrix/client/r0/publicRooms?limit=1", True]
+    # Useless , ["Profile", baseUrl + "_matrix/client/r0/profile/@benoit.marty:matrix.org", True]
+    # Need token , ["Capability", baseUrl + "_matrix/client/r0/capabilities", True]
+    # Need token , ["Media config", baseUrl + "_matrix/media/r0/config", True]
+    # Need token , ["Turn", baseUrl + "_matrix/client/r0/voip/turnServer", True]
+]
+
+for item in items:
+    print("====================================================================================================")
+    print("# " + item[0] + " (" + item[1] + ")")
+    print("====================================================================================================")
+    if item[2]:
+        os.system("curl -s -X GET '" + item[1] + "' | python -m json.tool")
+    else:
+        os.system("curl -s -X POST --data $'{}' '" + item[1] + "' | python -m json.tool")

From bc2c345e215dfeca0725db923c6e23fc9b9e920a Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 25 Sep 2020 08:58:48 +0200
Subject: [PATCH 022/278] First automated UI tests

---
 .../crypto/OutgoingGossipingRequestManager.kt |   2 +-
 .../crypto/store/db/RealmCryptoStore.kt       |   4 +
 vector/build.gradle                           |  27 +-
 .../java/im/vector/app/ExpressoExt.kt         | 205 +++++++++++++
 .../java/im/vector/app/RegistrationTest.kt    | 120 ++++++++
 .../java/im/vector/app/SleepViewAction.java   |  49 ++++
 .../java/im/vector/app/TestMatrixCallback.kt  |  48 ++++
 .../im/vector/app/VerificationTestBase.kt     | 225 +++++++++++++++
 .../app/VerifySessionInteractiveTest.kt       | 272 ++++++++++++++++++
 .../vector/app/VerifySessionPassphraseTest.kt | 161 +++++++++++
 .../app/features/popup/PopupAlertManager.kt   |   8 +-
 11 files changed, 1114 insertions(+), 7 deletions(-)
 create mode 100644 vector/src/androidTest/java/im/vector/app/ExpressoExt.kt
 create mode 100644 vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
 create mode 100644 vector/src/androidTest/java/im/vector/app/SleepViewAction.java
 create mode 100644 vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
 create mode 100644 vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
 create mode 100644 vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
 create mode 100644 vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
index 030560b77f..d1aeed7da1 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
@@ -126,7 +126,7 @@ internal class OutgoingGossipingRequestManager @Inject constructor(
      * @param request the request
      */
     private fun sendOutgoingGossipingRequest(request: OutgoingGossipingRequest) {
-        Timber.v("## CRYPTO - GOSSIP sendOutgoingRoomKeyRequest() : Requesting keys $request")
+        Timber.v("## CRYPTO - GOSSIP sendOutgoingGossipingRequest() : Requesting keys $request")
 
         val params = SendGossipRequestWorker.Params(
                 sessionId = sessionId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 4f3f06beac..24de3cfe63 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -372,6 +372,7 @@ internal class RealmCryptoStore @Inject constructor(
     }
 
     override fun storePrivateKeysInfo(msk: String?, usk: String?, ssk: String?) {
+        Timber.v("## CRYPTO | *** storePrivateKeysInfo ${msk != null} ")
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<CryptoMetadataEntity>().findFirst()?.apply {
                 xSignMasterPrivateKey = msk
@@ -407,6 +408,7 @@ internal class RealmCryptoStore @Inject constructor(
     }
 
     override fun storeMSKPrivateKey(msk: String?) {
+        Timber.v("## CRYPTO | *** storeMSKPrivateKey ${msk != null} ")
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<CryptoMetadataEntity>().findFirst()?.apply {
                 xSignMasterPrivateKey = msk
@@ -415,6 +417,7 @@ internal class RealmCryptoStore @Inject constructor(
     }
 
     override fun storeSSKPrivateKey(ssk: String?) {
+        Timber.v("## CRYPTO | *** storeSSKPrivateKey ${ssk != null} ")
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<CryptoMetadataEntity>().findFirst()?.apply {
                 xSignSelfSignedPrivateKey = ssk
@@ -423,6 +426,7 @@ internal class RealmCryptoStore @Inject constructor(
     }
 
     override fun storeUSKPrivateKey(usk: String?) {
+        Timber.v("## CRYPTO | *** storeUSKPrivateKey ${usk != null} ")
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<CryptoMetadataEntity>().findFirst()?.apply {
                 xSignUserPrivateKey = usk
diff --git a/vector/build.gradle b/vector/build.gradle
index 0c7985b45d..f9e485a0f9 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -172,6 +172,22 @@ android {
                 output.versionCodeOverride = variant.versionCode * 10 + baseAbiVersionCode
             }
         }
+
+
+        // The following argument makes the Android Test Orchestrator run its
+        // "pm clear" command after each test invocation. This command ensures
+        // that the app's state is completely cleared between tests.
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+
+    }
+
+
+    testOptions {
+        // Disables animations during instrumented tests you run from the command line…
+        // This property does not affect tests that you run using Android Studio.”
+        animationsDisabled = true
+
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
 
     signingConfigs {
@@ -428,11 +444,12 @@ dependencies {
     // Activate when you want to check for leaks, from time to time.
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
 
-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
     androidTestImplementation 'org.amshove.kluent:kluent-android:1.44'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     // Plant Timber tree for test
diff --git a/vector/src/androidTest/java/im/vector/app/ExpressoExt.kt b/vector/src/androidTest/java/im/vector/app/ExpressoExt.kt
new file mode 100644
index 0000000000..5bd42bda39
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ExpressoExt.kt
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import android.app.Activity
+import android.view.View
+import androidx.lifecycle.Observer
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.IdlingResource
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.util.HumanReadables
+import androidx.test.espresso.util.TreeIterables
+import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.runner.lifecycle.ActivityLifecycleCallback
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
+import androidx.test.runner.lifecycle.Stage
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers
+import org.hamcrest.StringDescription
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.sync.SyncState
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
+import java.util.concurrent.TimeoutException
+
+object EspressoHelper {
+    fun getCurrentActivity(): Activity? {
+        var currentActivity: Activity? = null
+        getInstrumentation().runOnMainSync { run { currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0) } }
+        return currentActivity
+    }
+}
+
+fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10000, waitForDisplayed: Boolean = true): ViewAction {
+    return object : ViewAction {
+        override fun getConstraints(): Matcher<View> {
+            return Matchers.any(View::class.java)
+        }
+
+        override fun getDescription(): String {
+            val matcherDescription = StringDescription()
+            viewMatcher.describeTo(matcherDescription)
+            return "wait for a specific view <$matcherDescription> to be ${if (waitForDisplayed) "displayed" else "not displayed during $timeout millis."}"
+        }
+
+        override fun perform(uiController: UiController, view: View) {
+            System.out.println("*** waitForView 1 $view")
+            uiController.loopMainThreadUntilIdle()
+            val startTime = System.currentTimeMillis()
+            val endTime = startTime + timeout
+            val visibleMatcher = isDisplayed()
+
+            do {
+                System.out.println("*** waitForView loop $view end:$endTime currrent:${System.currentTimeMillis()}")
+                val viewVisible = TreeIterables.breadthFirstViewTraversal(view)
+                        .any { viewMatcher.matches(it) && visibleMatcher.matches(it) }
+
+                System.out.println("*** waitForView loop viewVisible:$viewVisible")
+                if (viewVisible == waitForDisplayed) return
+                System.out.println("*** waitForView loop loopMainThreadForAtLeast...")
+                uiController.loopMainThreadForAtLeast(50)
+                System.out.println("*** waitForView loop ...loopMainThreadForAtLeast")
+            } while (System.currentTimeMillis() < endTime)
+
+            System.out.println("*** waitForView timeout $view")
+            // Timeout happens.
+            throw PerformException.Builder()
+                    .withActionDescription(this.description)
+                    .withViewDescription(HumanReadables.describe(view))
+                    .withCause(TimeoutException())
+                    .build()
+        }
+    }
+}
+
+fun initialSyncIdlingResource(session: Session): IdlingResource {
+    val res = object : IdlingResource, Observer<SyncState> {
+        private var callback: IdlingResource.ResourceCallback? = null
+
+        override fun getName() = "InitialSyncIdlingResource for ${session.myUserId}"
+
+        override fun isIdleNow(): Boolean {
+            val isIdle = session.hasAlreadySynced()
+            return isIdle
+        }
+
+        override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+            this.callback = callback
+        }
+
+        override fun onChanged(t: SyncState?) {
+            val isIdle = session.hasAlreadySynced()
+            if (isIdle) {
+                callback?.onTransitionToIdle()
+                session.getSyncStateLive().removeObserver(this)
+            }
+        }
+    }
+
+    runOnUiThread {
+        session.getSyncStateLive().observeForever(res)
+    }
+
+    return res
+}
+
+fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
+    val res = object : IdlingResource, ActivityLifecycleCallback {
+        private var callback: IdlingResource.ResourceCallback? = null
+
+        var hasResumed = false
+        private var currentActivity : Activity? = null
+
+        val uniqTS = System.currentTimeMillis()
+        override fun getName() = "activityIdlingResource_${activityClass.name}_$uniqTS"
+
+        override fun isIdleNow(): Boolean {
+            val currentActivity = currentActivity ?: ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
+
+            val isIdle = hasResumed || currentActivity?.javaClass?.let { activityClass.isAssignableFrom(it) } ?: false
+            System.out.println("*** [$name] isIdleNow activityIdlingResource $currentActivity  isIdle:$isIdle")
+            return isIdle
+        }
+
+        override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+            System.out.println("*** [$name]  registerIdleTransitionCallback $callback")
+            this.callback = callback
+            // if (hasResumed) callback?.onTransitionToIdle()
+        }
+
+        override fun onActivityLifecycleChanged(activity: Activity?, stage: Stage?) {
+            System.out.println("*** [$name]  onActivityLifecycleChanged $activity  $stage")
+            currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
+            val isIdle = currentActivity?.javaClass?.let { activityClass.isAssignableFrom(it) } ?: false
+            System.out.println("*** [$name]  onActivityLifecycleChanged $currentActivity  isIdle:$isIdle")
+            if (isIdle) {
+                hasResumed = true
+                System.out.println("*** [$name]  onActivityLifecycleChanged callback: $callback")
+                callback?.onTransitionToIdle()
+                ActivityLifecycleMonitorRegistry.getInstance().removeLifecycleCallback(this)
+            }
+        }
+    }
+    ActivityLifecycleMonitorRegistry.getInstance().addLifecycleCallback(res)
+    return res
+}
+
+fun withIdlingResource(idlingResource: IdlingResource, block: (() -> Unit)) {
+    System.out.println("*** withIdlingResource register")
+    IdlingRegistry.getInstance().register(idlingResource)
+    block.invoke()
+    System.out.println("*** withIdlingResource unregister")
+    IdlingRegistry.getInstance().unregister(idlingResource)
+}
+
+fun allSecretsKnownIdling(session: Session): IdlingResource {
+    val res = object : IdlingResource, Observer<Optional<PrivateKeysInfo>> {
+        private var callback: IdlingResource.ResourceCallback? = null
+
+        var privateKeysInfo: PrivateKeysInfo? = session.cryptoService().crossSigningService().getCrossSigningPrivateKeys()
+        override fun getName() = "AllSecretsKnownIdling_${session.myUserId}"
+
+        override fun isIdleNow(): Boolean {
+            System.out.println("*** [$name]/isIdleNow  allSecretsKnownIdling ${privateKeysInfo?.allKnown()}")
+            return privateKeysInfo?.allKnown() == true
+        }
+
+        override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+            this.callback = callback
+        }
+
+        override fun onChanged(t: Optional<PrivateKeysInfo>?) {
+            System.out.println("*** [$name]  allSecretsKnownIdling ${t?.getOrNull()}")
+            privateKeysInfo = t?.getOrNull()
+            if (t?.getOrNull()?.allKnown() == true) {
+                session.cryptoService().crossSigningService().getLiveCrossSigningPrivateKeys().removeObserver(this)
+                callback?.onTransitionToIdle()
+            }
+        }
+    }
+
+    runOnUiThread {
+        session.cryptoService().crossSigningService().getLiveCrossSigningPrivateKeys().observeForever(res)
+    }
+
+    return res
+}
diff --git a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
new file mode 100644
index 0000000000..016d25da78
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import im.vector.app.features.MainActivity
+import im.vector.app.features.home.HomeActivity
+import org.hamcrest.CoreMatchers.not
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class RegistrationTest {
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Test
+    fun simpleRegister() {
+        val userId: String = "UiAutoTest_${System.currentTimeMillis()}"
+        val password: String = "password"
+        val homeServerUrl: String = "http://10.0.2.2:8080"
+
+        // Check splashcreen is there
+        onView(withId(R.id.loginSplashSubmit))
+                .check(matches(isDisplayed()))
+                .check(matches(withText(R.string.login_splash_submit)))
+
+        // Click on get started
+        onView(withId(R.id.loginSplashSubmit))
+                .perform(click())
+
+        // Check that home server options are showned
+        onView(withId(R.id.loginServerTitle))
+                .check(matches(isDisplayed()))
+                .check(matches(withText(R.string.login_server_title)))
+
+        // Chose custom server
+        onView(withId(R.id.loginServerChoiceOther))
+                .perform(click())
+
+        // Enter local synapse
+        onView((withId(R.id.loginServerUrlFormHomeServerUrl)))
+                .perform(typeText(homeServerUrl))
+
+        // Click on continue
+        onView(withId(R.id.loginServerUrlFormSubmit))
+                .check(matches(isEnabled()))
+                .perform(closeSoftKeyboard(), click())
+
+        // Click on the signup button
+        onView(withId(R.id.loginSignupSigninSubmit))
+                .check(matches(isDisplayed()))
+                .perform(click())
+
+        // Ensure password flow supported
+        onView(withId(R.id.loginField))
+                .check(matches(isDisplayed()))
+        onView(withId(R.id.passwordField))
+                .check(matches(isDisplayed()))
+
+        // Ensure user id
+        onView((withId(R.id.loginField)))
+                .perform(typeText(userId))
+
+        // Ensure login button not yet enabled
+        onView(withId(R.id.loginSubmit))
+                .check(matches(not(isEnabled())))
+
+        // Ensure password
+        onView((withId(R.id.passwordField)))
+                .perform(typeText(password))
+
+        // Submit
+        onView(withId(R.id.loginSubmit))
+                .check(matches(isEnabled()))
+                .perform(closeSoftKeyboard(), click())
+
+        withIdlingResource(activityIdlingResource(HomeActivity::class.java)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+        }
+
+        val activity = EspressoHelper.getCurrentActivity()!!
+        val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
+
+        // Wait for initial sync and check room list is there
+        withIdlingResource(initialSyncIdlingResource(uiSession)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+        }
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/SleepViewAction.java b/vector/src/androidTest/java/im/vector/app/SleepViewAction.java
new file mode 100644
index 0000000000..8623f24756
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/SleepViewAction.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app;
+
+import android.view.View;
+
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+
+import org.hamcrest.Matcher;
+
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+
+public class SleepViewAction {
+
+    public static ViewAction sleep(final long millis) {
+        return new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "Wait for at least " + millis + " millis";
+            }
+
+            @Override
+            public void perform(final UiController uiController, final View view) {
+                uiController.loopMainThreadUntilIdle();
+                uiController.loopMainThreadForAtLeast(millis);
+            }
+        };
+    }
+}
\ No newline at end of file
diff --git a/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt b/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
new file mode 100644
index 0000000000..2e254d48ef
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import androidx.annotation.CallSuper
+import junit.framework.TestCase.fail
+import org.matrix.android.sdk.api.MatrixCallback
+import timber.log.Timber
+import java.util.concurrent.CountDownLatch
+
+/**
+ * Simple implementation of MatrixCallback, which count down the CountDownLatch on each API callback
+ * @param onlySuccessful true to fail if an error occurs. This is the default behavior
+ * @param <T>
+ */
+open class TestMatrixCallback<T>(private val countDownLatch: CountDownLatch,
+                                 private val onlySuccessful: Boolean = true) : MatrixCallback<T> {
+
+    @CallSuper
+    override fun onSuccess(data: T) {
+        countDownLatch.countDown()
+    }
+
+    @CallSuper
+    override fun onFailure(failure: Throwable) {
+        Timber.e(failure, "TestApiCallback")
+
+        if (onlySuccessful) {
+            fail("onFailure " + failure.localizedMessage)
+        }
+
+        countDownLatch.countDown()
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
new file mode 100644
index 0000000000..015f561920
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import android.net.Uri
+import androidx.lifecycle.Observer
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.hamcrest.CoreMatchers
+import org.junit.Assert
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.LoginFlowResult
+import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.sync.SyncState
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+abstract class VerificationTestBase {
+
+    val password = "password"
+    val homeServerUrl: String = "http://10.0.2.2:8080"
+
+    fun doLogin(homeServerUrl: String, userId: String, password: String) {
+        Espresso.onView(ViewMatchers.withId(R.id.loginSplashSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+                .check(ViewAssertions.matches(ViewMatchers.withText(R.string.login_splash_submit)))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginSplashSubmit))
+                .perform(ViewActions.click())
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginServerTitle))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+                .check(ViewAssertions.matches(ViewMatchers.withText(R.string.login_server_title)))
+
+        // Chose custom server
+        Espresso.onView(ViewMatchers.withId(R.id.loginServerChoiceOther))
+                .perform(ViewActions.click())
+
+        // Enter local synapse
+        Espresso.onView((ViewMatchers.withId(R.id.loginServerUrlFormHomeServerUrl)))
+                .perform(ViewActions.typeText(homeServerUrl))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginServerUrlFormSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isEnabled()))
+                .perform(ViewActions.closeSoftKeyboard(), ViewActions.click())
+
+        // Click on the signin button
+        Espresso.onView(ViewMatchers.withId(R.id.loginSignupSigninSignIn))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+                .perform(ViewActions.click())
+
+        // Ensure password flow supported
+        Espresso.onView(ViewMatchers.withId(R.id.loginField))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(ViewMatchers.withId(R.id.passwordField))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView((ViewMatchers.withId(R.id.loginField)))
+                .perform(ViewActions.typeText(userId))
+        Espresso.onView(ViewMatchers.withId(R.id.loginSubmit))
+                .check(ViewAssertions.matches(CoreMatchers.not(ViewMatchers.isEnabled())))
+
+        Espresso.onView((ViewMatchers.withId(R.id.passwordField)))
+                .perform(ViewActions.typeText(password))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isEnabled()))
+                .perform(ViewActions.closeSoftKeyboard(), ViewActions.click())
+    }
+
+    private fun createAccount(userId: String = "UiAutoTest", password: String = "password", homeServerUrl: String = "http://10.0.2.2:8080") {
+        Espresso.onView(ViewMatchers.withId(R.id.loginSplashSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+                .check(ViewAssertions.matches(ViewMatchers.withText(R.string.login_splash_submit)))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginSplashSubmit))
+                .perform(ViewActions.click())
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginServerTitle))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+                .check(ViewAssertions.matches(ViewMatchers.withText(R.string.login_server_title)))
+
+        // Chose custom server
+        Espresso.onView(ViewMatchers.withId(R.id.loginServerChoiceOther))
+                .perform(ViewActions.click())
+
+        // Enter local synapse
+        Espresso.onView((ViewMatchers.withId(R.id.loginServerUrlFormHomeServerUrl)))
+                .perform(ViewActions.typeText(homeServerUrl))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginServerUrlFormSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isEnabled()))
+                .perform(ViewActions.closeSoftKeyboard(), ViewActions.click())
+
+        // Click on the signup button
+        Espresso.onView(ViewMatchers.withId(R.id.loginSignupSigninSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+                .perform(ViewActions.click())
+
+        // Ensure password flow supported
+        Espresso.onView(ViewMatchers.withId(R.id.loginField))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+        Espresso.onView(ViewMatchers.withId(R.id.passwordField))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
+        Espresso.onView((ViewMatchers.withId(R.id.loginField)))
+                .perform(ViewActions.typeText(userId))
+        Espresso.onView(ViewMatchers.withId(R.id.loginSubmit))
+                .check(ViewAssertions.matches(CoreMatchers.not(ViewMatchers.isEnabled())))
+
+        Espresso.onView((ViewMatchers.withId(R.id.passwordField)))
+                .perform(ViewActions.typeText(password))
+
+        Espresso.onView(ViewMatchers.withId(R.id.loginSubmit))
+                .check(ViewAssertions.matches(ViewMatchers.isEnabled()))
+                .perform(ViewActions.closeSoftKeyboard(), ViewActions.click())
+
+        Espresso.onView(ViewMatchers.withId(R.id.homeDrawerFragmentContainer))
+                .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+
+    fun createAccountAndSync(matrix: Matrix, userName: String,
+                                     password: String,
+                                     withInitialSync: Boolean): Session {
+        val hs = createHomeServerConfig()
+
+        doSync<LoginFlowResult> {
+            matrix.authenticationService()
+                    .getLoginFlow(hs, it)
+        }
+
+        doSync<RegistrationResult> {
+            matrix.authenticationService()
+                    .getRegistrationWizard()
+                    .createAccount(userName, password, null, it)
+        }
+
+        // Preform dummy step
+        val registrationResult = doSync<RegistrationResult> {
+            matrix.authenticationService()
+                    .getRegistrationWizard()
+                    .dummy(it)
+        }
+
+        Assert.assertTrue(registrationResult is RegistrationResult.Success)
+        val session = (registrationResult as RegistrationResult.Success).session
+        if (withInitialSync) {
+            syncSession(session)
+        }
+
+        return session
+    }
+
+    fun createHomeServerConfig(): HomeServerConnectionConfig {
+        return HomeServerConnectionConfig.Builder()
+                .withHomeServerUri(Uri.parse(homeServerUrl))
+                .build()
+    }
+
+    // Transform a method with a MatrixCallback to a synchronous method
+    inline fun <reified T> doSync(block: (MatrixCallback<T>) -> Unit): T {
+        val lock = CountDownLatch(1)
+        var result: T? = null
+
+        val callback = object : TestMatrixCallback<T>(lock) {
+            override fun onSuccess(data: T) {
+                result = data
+                super.onSuccess(data)
+            }
+        }
+
+        block.invoke(callback)
+
+        lock.await(20_000, TimeUnit.MILLISECONDS)
+
+        Assert.assertNotNull(result)
+        return result!!
+    }
+
+    fun syncSession(session: Session) {
+        val lock = CountDownLatch(1)
+
+        GlobalScope.launch(Dispatchers.Main) { session.open() }
+
+        session.startSync(true)
+
+        val syncLiveData = runBlocking(Dispatchers.Main) {
+            session.getSyncStateLive()
+        }
+        val syncObserver = object : Observer<SyncState> {
+            override fun onChanged(t: SyncState?) {
+                if (session.hasAlreadySynced()) {
+                    lock.countDown()
+                    syncLiveData.removeObserver(this)
+                }
+            }
+        }
+        GlobalScope.launch(Dispatchers.Main) { syncLiveData.observeForever(syncObserver) }
+
+        lock.await(20_000, TimeUnit.MILLISECONDS)
+    }
+}
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
new file mode 100644
index 0000000000..d218b6ef7e
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.IdlingResource
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.features.MainActivity
+import im.vector.app.features.home.HomeActivity
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction
+import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class VerifySessionInteractiveTest : VerificationTestBase() {
+
+    var existingSession: Session? = null
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Before
+    fun createSessionWithCrossSigning() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val matrix = Matrix.getInstance(context)
+        val userName = "foobar_${System.currentTimeMillis()}"
+        existingSession = createAccountAndSync(matrix, userName, password, true)
+        doSync<Unit> {
+            existingSession!!.cryptoService().crossSigningService()
+                    .initializeCrossSigning(UserPasswordAuth(
+                            user = existingSession!!.myUserId,
+                            password = "password"
+                    ), it)
+        }
+    }
+
+    @Test
+    fun checkVerifyPopup() {
+        val userId: String = existingSession!!.myUserId
+
+        doLogin(homeServerUrl, userId, password)
+
+        // Thread.sleep(6000)
+        withIdlingResource(activityIdlingResource(HomeActivity::class.java)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+                    .perform(closeSoftKeyboard())
+        }
+
+        val activity = EspressoHelper.getCurrentActivity()!!
+        val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
+
+        withIdlingResource(initialSyncIdlingResource(uiSession)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+        }
+
+        // THIS IS THE ONLY WAY I FOUND TO CLICK ON ALERTERS... :(
+        // Cannot wait for view because of alerter animation? ...
+        onView(isRoot())
+                .perform(waitForView(withId(com.tapadoo.alerter.R.id.llAlertBackground)))
+//        Thread.sleep(1000)
+//        onView(withId(com.tapadoo.alerter.R.id.llAlertBackground))
+//                .perform(click())
+        Thread.sleep(1000)
+        val popup = activity.findViewById<View>(com.tapadoo.alerter.R.id.llAlertBackground)
+        activity.runOnUiThread {
+            popup.performClick()
+        }
+
+        onView(isRoot())
+                .perform(waitForView(withId(R.id.bottomSheetFragmentContainer)))
+//                .check()
+//        onView(withId(R.id.bottomSheetFragmentContainer))
+//                .check(matches(isDisplayed()))
+
+//        onView(isRoot()).perform(SleepViewAction.sleep(2000))
+
+        onView(withText(R.string.use_latest_app))
+                .check(matches(isDisplayed()))
+
+        // 4S is not setup so passphrase option should be hidden
+        onView(withId(R.id.bottomSheetFragmentContainer))
+                .check(matches(not(hasDescendant(withText(R.string.verification_cannot_access_other_session)))))
+
+        val request = existingSession!!.cryptoService().verificationService().requestKeyVerification(
+                listOf(VerificationMethod.SAS, VerificationMethod.QR_CODE_SCAN, VerificationMethod.QR_CODE_SHOW),
+                existingSession!!.myUserId,
+                listOf(uiSession.sessionParams.deviceId!!)
+        )
+
+        val transactionId = request.transactionId!!
+        val sasReadyIdle = verificationStateIdleResource(transactionId, VerificationTxState.ShortCodeReady, uiSession)
+        val otherSessionSasReadyIdle = verificationStateIdleResource(transactionId, VerificationTxState.ShortCodeReady, existingSession!!)
+
+        onView(isRoot()).perform(SleepViewAction.sleep(1000))
+
+        // Assert QR code option is there and available
+        onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                .check(matches(hasDescendant(withText(R.string.verification_scan_their_code))))
+
+        onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                .check(matches(hasDescendant(withId(R.id.itemVerificationQrCodeImage))))
+
+        onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                .perform(
+                        actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(R.string.verification_scan_emoji_title)),
+                                click()
+                        )
+                )
+
+        val firstSessionTr = existingSession!!.cryptoService().verificationService().getExistingTransaction(
+                existingSession!!.myUserId,
+                transactionId
+        ) as SasVerificationTransaction
+
+        IdlingRegistry.getInstance().register(sasReadyIdle)
+        IdlingRegistry.getInstance().register(otherSessionSasReadyIdle)
+        onView(isRoot()).perform(SleepViewAction.sleep(300))
+        // will only execute when Idle is ready
+        val expectedEmojis = firstSessionTr.getEmojiCodeRepresentation()
+        val targets = listOf(R.id.emoji0, R.id.emoji1, R.id.emoji2, R.id.emoji3, R.id.emoji4, R.id.emoji5, R.id.emoji6)
+        targets.forEachIndexed { index, res ->
+            onView(withId(res))
+                    .check(
+                            matches(hasDescendant(withText(expectedEmojis[index].nameResId)))
+                    )
+        }
+
+        IdlingRegistry.getInstance().unregister(sasReadyIdle)
+        IdlingRegistry.getInstance().unregister(otherSessionSasReadyIdle)
+
+        val verificationSuccessIdle =
+                verificationStateIdleResource(transactionId, VerificationTxState.Verified, uiSession)
+
+        // CLICK ON THEY MATCH
+
+        onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                .perform(
+                        actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(R.string.verification_sas_match)),
+                                click()
+                        )
+                )
+
+        firstSessionTr.userHasVerifiedShortCode()
+
+        onView(isRoot()).perform(SleepViewAction.sleep(1000))
+
+        withIdlingResource(verificationSuccessIdle) {
+            onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                    .check(
+                            matches(hasDescendant(withText(R.string.verification_conclusion_ok_self_notice)))
+                    )
+        }
+
+        // Wait a bit before done (to delay a bit sending of secrets to let other have time
+        // to mark as verified :/
+        Thread.sleep(5_000)
+        // Click on done
+        onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                .perform(
+                        actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(R.string.done)),
+                                click()
+                        )
+                )
+
+        // Wait until local secrets are known (gossip)
+        withIdlingResource(allSecretsKnownIdling(uiSession)) {
+            onView(withId(R.id.groupToolbarAvatarImageView))
+                    .perform(click())
+        }
+    }
+
+    fun signout() {
+        onView((withId(R.id.groupToolbarAvatarImageView)))
+                .perform(click())
+
+        onView((withId(R.id.homeDrawerHeaderSettingsView)))
+                .perform(click())
+
+        onView(withText("General"))
+                .perform(click())
+    }
+
+    fun verificationStateIdleResource(transactionId: String, checkForState: VerificationTxState, session: Session): IdlingResource {
+        val idle = object : IdlingResource, VerificationService.Listener {
+            private var callback: IdlingResource.ResourceCallback? = null
+
+            private var currentState: VerificationTxState? = null
+
+            override fun getName() = "verificationSuccessIdle"
+
+            override fun isIdleNow(): Boolean {
+                return currentState == checkForState
+            }
+
+            override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
+                this.callback = callback
+            }
+
+            fun update(state: VerificationTxState) {
+                currentState = state
+                if (state == checkForState) {
+                    session.cryptoService().verificationService().removeListener(this)
+                    callback?.onTransitionToIdle()
+                }
+            }
+
+            /**
+             * Called when a transaction is created, either by the user or initiated by the other user.
+             */
+            override fun transactionCreated(tx: VerificationTransaction) {
+                if (tx.transactionId == transactionId) update(tx.state)
+            }
+
+            /**
+             * Called when a transaction is updated. You may be interested to track the state of the VerificationTransaction.
+             */
+            override fun transactionUpdated(tx: VerificationTransaction) {
+                if (tx.transactionId == transactionId) update(tx.state)
+            }
+        }
+
+        session.cryptoService().verificationService().addListener(idle)
+        return idle
+    }
+
+    object UITestVerificationUtils
+}
diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
new file mode 100644
index 0000000000..5405c086eb
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.MainActivity
+import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
+import im.vector.app.features.crypto.recover.BootstrapCrossSigningTask
+import im.vector.app.features.crypto.recover.Params
+import im.vector.app.features.home.HomeActivity
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class VerifySessionPassphraseTest : VerificationTestBase() {
+
+    var existingSession: Session? = null
+    val passphrase = "person woman camera tv"
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Before
+    fun createSessionWithCrossSigningAnd4S() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val matrix = Matrix.getInstance(context)
+        val userName = "foobar_${System.currentTimeMillis()}"
+        existingSession = createAccountAndSync(matrix, userName, password, true)
+        doSync<Unit> {
+            existingSession!!.cryptoService().crossSigningService()
+                    .initializeCrossSigning(UserPasswordAuth(
+                            user = existingSession!!.myUserId,
+                            password = "password"
+                    ), it)
+        }
+
+        val task = BootstrapCrossSigningTask(existingSession!!, StringProvider(context.resources))
+
+        runBlocking {
+            task.execute(Params(
+                    userPasswordAuth = UserPasswordAuth(password = password),
+                    passphrase = passphrase
+            ))
+        }
+    }
+
+    @Test
+    fun checkVerifyWithPassphrase() {
+        val userId: String = existingSession!!.myUserId
+
+        doLogin(homeServerUrl, userId, password)
+
+        // Thread.sleep(6000)
+        withIdlingResource(activityIdlingResource(HomeActivity::class.java)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+                    .perform(closeSoftKeyboard())
+        }
+
+        val activity = EspressoHelper.getCurrentActivity()!!
+        val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
+
+        withIdlingResource(initialSyncIdlingResource(uiSession)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+        }
+
+        // THIS IS THE ONLY WAY I FOUND TO CLICK ON ALERTERS... :(
+        // Cannot wait for view because of alerter animation? ...
+        Thread.sleep(6000)
+        val popup = activity.findViewById<View>(com.tapadoo.alerter.R.id.llAlertBackground)
+        activity.runOnUiThread {
+            popup.performClick()
+        }
+
+        onView(withId(R.id.bottomSheetFragmentContainer))
+                .check(matches(isDisplayed()))
+
+        onView(isRoot()).perform(SleepViewAction.sleep(2000))
+
+        onView(withText(R.string.use_latest_app))
+                .check(matches(isDisplayed()))
+
+        // 4S is not setup so passphrase option should be hidden
+        onView(withId(R.id.bottomSheetFragmentContainer))
+                .check(matches(hasDescendant(withText(R.string.verification_cannot_access_other_session))))
+
+        onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                .perform(
+                        actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(R.string.verification_cannot_access_other_session)),
+                                click()
+                        )
+                )
+
+        withIdlingResource(activityIdlingResource(SharedSecureStorageActivity::class.java)) {
+            onView(withId(R.id.ssss__root)).check(matches(isDisplayed()))
+        }
+
+        onView((withId(R.id.ssss_passphrase_enter_edittext)))
+                .perform(typeText(passphrase))
+
+        onView((withId(R.id.ssss_passphrase_submit)))
+                .perform(click())
+
+        System.out.println("*** passphrase 1")
+
+        withIdlingResource(activityIdlingResource(HomeActivity::class.java)) {
+            System.out.println("*** passphrase 1.1")
+            onView(withId(R.id.bottomSheetVerificationRecyclerView))
+                    .check(
+                            matches(hasDescendant(withText(R.string.verification_conclusion_ok_self_notice)))
+                    )
+        }
+
+        System.out.println("*** passphrase 2")
+        // check that all secrets are known?
+        assert(uiSession.cryptoService().crossSigningService().canCrossSign())
+        assert(uiSession.cryptoService().crossSigningService().allPrivateKeysKnown())
+
+        Thread.sleep(10_000)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 593527448b..814a7ca16e 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -20,6 +20,7 @@ import android.app.Activity
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
+import android.provider.Settings
 import android.view.View
 import android.widget.ImageView
 import com.tapadoo.alerter.Alerter
@@ -172,6 +173,10 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
     private fun showAlert(alert: VectorAlert, activity: Activity, animate: Boolean = true) {
         clearLightStatusBar()
 
+        val systemAnimationDurationDisabled = Settings.Global.getFloat(
+                activity.contentResolver,
+                Settings.Global.ANIMATOR_DURATION_SCALE, 1f) == 0f
+
         alert.weakCurrentActivity = WeakReference(activity)
         val alerter = if (alert is VerificationVectorAlert) Alerter.create(activity, R.layout.alerter_verification_layout)
         else Alerter.create(activity)
@@ -187,7 +192,7 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
                     }
                 }
                 .apply {
-                    if (!animate) {
+                    if (systemAnimationDurationDisabled || !animate) {
                         setEnterAnimation(R.anim.anim_alerter_no_anim)
                     }
 
@@ -237,6 +242,7 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
                         setBackgroundColorRes(alert.colorRes ?: R.color.notification_accent_color)
                     }
                 }
+                .enableIconPulse(!systemAnimationDurationDisabled)
                 .show()
     }
 

From 6ac401db9b23addfae1bda704f02c6cab2995970 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 25 Sep 2020 09:34:13 +0200
Subject: [PATCH 023/278] Doc + change log

---
 CHANGES.md       |  1 +
 docs/ui-tests.md | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 docs/ui-tests.md

diff --git a/CHANGES.md b/CHANGES.md
index 25da8f0108..e5542996ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -49,6 +49,7 @@ SDK API changes ⚠️:
 
 Other changes:
  - Add an advanced action to reset an account data entry
+ - Added registration/verification automated UI tests
 
 Changes in Element 1.0.7 (2020-09-17)
 ===================================================
diff --git a/docs/ui-tests.md b/docs/ui-tests.md
new file mode 100644
index 0000000000..9757481991
--- /dev/null
+++ b/docs/ui-tests.md
@@ -0,0 +1,87 @@
+# Automate user interface tests
+
+Element Android ensures that some fundamental flows are properly working by running automated user interface tests.
+Ui tests are using the android [Espresso](https://developer.android.com/training/testing/espresso) library.
+
+Tests can be run on a real device, or on a virtual device (such as the emulator in Android Studio).
+
+Currently the test are covering a small set of application flows:
+	- Registration
+	- Self verification via emoji
+	- Self verification via passphrase
+
+## Prerequisites:
+
+Out of the box, the tests use one of the homeservers (located at http://localhost:8080) of the "Demo Federation of Homeservers" (https://github.com/matrix-org/synapse#running-a-demo-federation-of-synapses).
+
+You first need to follow instructions to set up Synapse in development mode at https://github.com/matrix-org/synapse#synapse-development. If you have already installed all dependencies, the steps are:
+
+```
+$ git clone https://github.com/matrix-org/synapse.git
+$ cd synapse
+$ virtualenv -p python3 env
+$ source env/bin/activate
+(env) $ python -m pip install --no-use-pep517 -e .`
+```
+
+Every time you want to launch these test homeservers, type:
+
+```
+$ virtualenv -p python3 env
+$ source env/bin/activate
+(env) $ demo/start.sh --no-rate-limit`
+```
+
+**Emulator/Device set up**
+
+When running the test via android studio on a device, you have to disable system animations in order for the test to work properly.
+
+First, ensure developer mode is enabled:
+
+- To enable developer options, tap the **Build Number** option 7 times. You can find this option in one of the following locations, depending on your Android version:
+
+	-   Android 9 (API level 28) and higher: **Settings > About Phone > Build Number**
+	-   Android 8.0.0 (API level 26) and Android 8.1.0 (API level 26): **Settings > System > About Phone > Build Number**
+	-   Android 7.1 (API level 25) and lower: **Settings > About Phone > Build Number**
+
+On your device, under **Settings > Developer options**, disable the following 3 settings:
+
+-   Window animation scale
+-   Transition animation scale
+-   Animator duration scale
+
+
+## Recipes
+
+We added some specific Espresso IdlingResources, and other utilities for matrix related tests
+
+### Wait for initial sync
+
+````
+// Wait for initial sync and check room list is there
+withIdlingResource(initialSyncIdlingResource(uiSession)) {
+  onView(withId(R.id.roomListContainer))
+            .check(matches(isDisplayed()))
+}
+````
+
+### Accessing current activity
+
+````
+    val activity = EspressoHelper.getCurrentActivity()!!
+    val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
+````
+
+### Interact with other session
+
+It's possible to create a session via the SDK, and then use this session to interact with the one that the emulator is using (to check verifications for example)
+
+````
+@Before
+fun initAccount() {
+  val context = InstrumentationRegistry.getInstrumentation().targetContext
+  val matrix = Matrix.getInstance(context)
+  val userName = "foobar_${System.currentTimeMillis()}"
+  existingSession = createAccountAndSync(matrix, userName, password, true)
+}
+`````

From f79784bc8c2bb91a6cad0b199bf0c9eec4f884e4 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 25 Sep 2020 09:45:34 +0200
Subject: [PATCH 024/278] Stabilisation

Hide keyboard before entering text
---
 vector/src/androidTest/java/im/vector/app/RegistrationTest.kt   | 2 +-
 .../src/androidTest/java/im/vector/app/VerificationTestBase.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
index 016d25da78..a290aeec80 100644
--- a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
@@ -96,7 +96,7 @@ class RegistrationTest {
 
         // Ensure password
         onView((withId(R.id.passwordField)))
-                .perform(typeText(password))
+                .perform(closeSoftKeyboard(), typeText(password))
 
         // Submit
         onView(withId(R.id.loginSubmit))
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
index 015f561920..20d0053a9f 100644
--- a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
@@ -84,7 +84,7 @@ abstract class VerificationTestBase {
                 .check(ViewAssertions.matches(CoreMatchers.not(ViewMatchers.isEnabled())))
 
         Espresso.onView((ViewMatchers.withId(R.id.passwordField)))
-                .perform(ViewActions.typeText(password))
+                .perform(ViewActions.closeSoftKeyboard(), ViewActions.typeText(password))
 
         Espresso.onView(ViewMatchers.withId(R.id.loginSubmit))
                 .check(ViewAssertions.matches(ViewMatchers.isEnabled()))

From b14d22550bd161594407ff06826ce8371a1dd075 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 29 Sep 2020 15:12:25 +0200
Subject: [PATCH 025/278] PR Review Cleanup and Add command line to run the UI
 tests

---
 CHANGES.md                                    |  3 +-
 docs/ui-tests.md                              | 40 ++++++++++++++-----
 .../android/sdk/common/CommonTestHelper.kt    |  2 +-
 .../crypto/store/db/RealmCryptoStore.kt       |  2 +-
 vector/build.gradle                           | 22 +++++-----
 .../app/{ExpressoExt.kt => EspressoExt.kt}    | 36 +++++++++--------
 .../java/im/vector/app/RegistrationTest.kt    |  4 +-
 .../im/vector/app/VerificationTestBase.kt     |  2 +-
 .../im/vector/app/core/utils/SystemUtils.kt   |  4 ++
 .../app/features/popup/PopupAlertManager.kt   | 10 ++---
 10 files changed, 75 insertions(+), 50 deletions(-)
 rename vector/src/androidTest/java/im/vector/app/{ExpressoExt.kt => EspressoExt.kt} (82%)

diff --git a/CHANGES.md b/CHANGES.md
index e5542996ff..efbab5bd27 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,7 @@ Build 🧱:
  -
 
 Other changes:
- -
+ - Added registration/verification automated UI tests
 
 Changes in Element 1.0.8 (2020-09-25)
 ===================================================
@@ -49,7 +49,6 @@ SDK API changes ⚠️:
 
 Other changes:
  - Add an advanced action to reset an account data entry
- - Added registration/verification automated UI tests
 
 Changes in Element 1.0.7 (2020-09-17)
 ===================================================
diff --git a/docs/ui-tests.md b/docs/ui-tests.md
index 9757481991..ff01da0b31 100644
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@@ -16,20 +16,20 @@ Out of the box, the tests use one of the homeservers (located at http://localhos
 
 You first need to follow instructions to set up Synapse in development mode at https://github.com/matrix-org/synapse#synapse-development. If you have already installed all dependencies, the steps are:
 
-```
+```shell script
 $ git clone https://github.com/matrix-org/synapse.git
 $ cd synapse
 $ virtualenv -p python3 env
 $ source env/bin/activate
-(env) $ python -m pip install --no-use-pep517 -e .`
+(env) $ python -m pip install --no-use-pep517 -e .
 ```
 
 Every time you want to launch these test homeservers, type:
 
-```
+```shell script
 $ virtualenv -p python3 env
 $ source env/bin/activate
-(env) $ demo/start.sh --no-rate-limit`
+(env) $ demo/start.sh --no-rate-limit
 ```
 
 **Emulator/Device set up**
@@ -50,33 +50,53 @@ On your device, under **Settings > Developer options**, disable the following 3
 -   Transition animation scale
 -   Animator duration scale
 
+## Run the tests
 
+Once Synapse is running, and an emulator is running, you can run the UI tests.
+
+### From the source code
+
+Click on the green arrow in front of each test. Clicking on the arrow in front of the test class, or from the package directory does not always work (Tests not found issue).
+
+### From command line
+
+````shell script
+./gradlew vector:connectedGplayDebugAndroidTest
+````
+
+To run all the tests from the `vector` module.
+
+In case of trouble, you can try to uninstall the previous installed test APK first with this command:
+
+```shell script
+adb uninstall im.vector.app.debug.test
+```
 ## Recipes
 
 We added some specific Espresso IdlingResources, and other utilities for matrix related tests
 
 ### Wait for initial sync
 
-````
+```kotlin
 // Wait for initial sync and check room list is there
 withIdlingResource(initialSyncIdlingResource(uiSession)) {
   onView(withId(R.id.roomListContainer))
             .check(matches(isDisplayed()))
 }
-````
+```
 
 ### Accessing current activity
 
-````
+```kotlin
     val activity = EspressoHelper.getCurrentActivity()!!
     val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
-````
+```
 
 ### Interact with other session
 
 It's possible to create a session via the SDK, and then use this session to interact with the one that the emulator is using (to check verifications for example)
 
-````
+```kotlin
 @Before
 fun initAccount() {
   val context = InstrumentationRegistry.getInstrumentation().targetContext
@@ -84,4 +104,4 @@ fun initAccount() {
   val userName = "foobar_${System.currentTimeMillis()}"
   existingSession = createAccountAndSync(matrix, userName, password, true)
 }
-`````
+```
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index fdbfa57b5c..84e76cbe52 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -218,7 +218,7 @@ class CommonTestHelper(context: Context) {
                     .createAccount(userName, password, null, it)
         }
 
-        // Preform dummy step
+        // Perform dummy step
         val registrationResult = doSync<RegistrationResult> {
             matrix.authenticationService
                     .getRegistrationWizard()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 24de3cfe63..df71ef9eba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -372,7 +372,7 @@ internal class RealmCryptoStore @Inject constructor(
     }
 
     override fun storePrivateKeysInfo(msk: String?, usk: String?, ssk: String?) {
-        Timber.v("## CRYPTO | *** storePrivateKeysInfo ${msk != null} ")
+        Timber.v("## CRYPTO | *** storePrivateKeysInfo ${msk != null}, ${usk != null}, ${ssk != null}")
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<CryptoMetadataEntity>().findFirst()?.apply {
                 xSignMasterPrivateKey = msk
diff --git a/vector/build.gradle b/vector/build.gradle
index f9e485a0f9..9191ce640c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -173,15 +173,12 @@ android {
             }
         }
 
-
         // The following argument makes the Android Test Orchestrator run its
         // "pm clear" command after each test invocation. This command ensures
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
-
     }
 
-
     testOptions {
         // Disables animations during instrumented tests you run from the command line…
         // This property does not affect tests that you run using Android Studio.”
@@ -297,6 +294,11 @@ dependencies {
     def arch_version = '2.1.0'
     def lifecycle_version = '2.2.0'
 
+    // Tests
+    def kluent_version = '1.44'
+    def androidxTest_version = '1.3.0'
+    def espresso_version = '3.3.0'
+
     implementation project(":matrix-sdk-android")
     implementation project(":matrix-sdk-android-rx")
     implementation project(":diff-match-patch")
@@ -437,20 +439,20 @@ dependencies {
 
     // TESTS
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.amshove.kluent:kluent-android:1.44'
+    testImplementation "org.amshove.kluent:kluent-android:$kluent_version"
     // Plant Timber tree for test
     testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
     // Activate when you want to check for leaks, from time to time.
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
 
-    androidTestImplementation 'androidx.test:core:1.3.0'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation "androidx.test:core:$androidxTest_version"
+    androidTestImplementation "androidx.test:runner:$androidxTest_version"
+    androidTestImplementation "androidx.test:rules:$androidxTest_version"
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
-    androidTestImplementation 'org.amshove.kluent:kluent-android:1.44'
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
+    androidTestImplementation "org.amshove.kluent:kluent-android:$kluent_version"
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
diff --git a/vector/src/androidTest/java/im/vector/app/ExpressoExt.kt b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
similarity index 82%
rename from vector/src/androidTest/java/im/vector/app/ExpressoExt.kt
rename to vector/src/androidTest/java/im/vector/app/EspressoExt.kt
index 5bd42bda39..d247d88caa 100644
--- a/vector/src/androidTest/java/im/vector/app/ExpressoExt.kt
+++ b/vector/src/androidTest/java/im/vector/app/EspressoExt.kt
@@ -44,12 +44,14 @@ import java.util.concurrent.TimeoutException
 object EspressoHelper {
     fun getCurrentActivity(): Activity? {
         var currentActivity: Activity? = null
-        getInstrumentation().runOnMainSync { run { currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0) } }
+        getInstrumentation().runOnMainSync {
+            currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
+        }
         return currentActivity
     }
 }
 
-fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10000, waitForDisplayed: Boolean = true): ViewAction {
+fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10_000, waitForDisplayed: Boolean = true): ViewAction {
     return object : ViewAction {
         override fun getConstraints(): Matcher<View> {
             return Matchers.any(View::class.java)
@@ -62,25 +64,25 @@ fun waitForView(viewMatcher: Matcher<View>, timeout: Long = 10000, waitForDispla
         }
 
         override fun perform(uiController: UiController, view: View) {
-            System.out.println("*** waitForView 1 $view")
+            println("*** waitForView 1 $view")
             uiController.loopMainThreadUntilIdle()
             val startTime = System.currentTimeMillis()
             val endTime = startTime + timeout
             val visibleMatcher = isDisplayed()
 
             do {
-                System.out.println("*** waitForView loop $view end:$endTime currrent:${System.currentTimeMillis()}")
+                println("*** waitForView loop $view end:$endTime current:${System.currentTimeMillis()}")
                 val viewVisible = TreeIterables.breadthFirstViewTraversal(view)
                         .any { viewMatcher.matches(it) && visibleMatcher.matches(it) }
 
-                System.out.println("*** waitForView loop viewVisible:$viewVisible")
+                println("*** waitForView loop viewVisible:$viewVisible")
                 if (viewVisible == waitForDisplayed) return
-                System.out.println("*** waitForView loop loopMainThreadForAtLeast...")
+                println("*** waitForView loop loopMainThreadForAtLeast...")
                 uiController.loopMainThreadForAtLeast(50)
-                System.out.println("*** waitForView loop ...loopMainThreadForAtLeast")
+                println("*** waitForView loop ...loopMainThreadForAtLeast")
             } while (System.currentTimeMillis() < endTime)
 
-            System.out.println("*** waitForView timeout $view")
+            println("*** waitForView timeout $view")
             // Timeout happens.
             throw PerformException.Builder()
                     .withActionDescription(this.description)
@@ -136,24 +138,24 @@ fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
             val currentActivity = currentActivity ?: ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
 
             val isIdle = hasResumed || currentActivity?.javaClass?.let { activityClass.isAssignableFrom(it) } ?: false
-            System.out.println("*** [$name] isIdleNow activityIdlingResource $currentActivity  isIdle:$isIdle")
+            println("*** [$name] isIdleNow activityIdlingResource $currentActivity  isIdle:$isIdle")
             return isIdle
         }
 
         override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback?) {
-            System.out.println("*** [$name]  registerIdleTransitionCallback $callback")
+            println("*** [$name]  registerIdleTransitionCallback $callback")
             this.callback = callback
             // if (hasResumed) callback?.onTransitionToIdle()
         }
 
         override fun onActivityLifecycleChanged(activity: Activity?, stage: Stage?) {
-            System.out.println("*** [$name]  onActivityLifecycleChanged $activity  $stage")
+            println("*** [$name]  onActivityLifecycleChanged $activity  $stage")
             currentActivity = ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED).elementAtOrNull(0)
             val isIdle = currentActivity?.javaClass?.let { activityClass.isAssignableFrom(it) } ?: false
-            System.out.println("*** [$name]  onActivityLifecycleChanged $currentActivity  isIdle:$isIdle")
+            println("*** [$name]  onActivityLifecycleChanged $currentActivity  isIdle:$isIdle")
             if (isIdle) {
                 hasResumed = true
-                System.out.println("*** [$name]  onActivityLifecycleChanged callback: $callback")
+                println("*** [$name]  onActivityLifecycleChanged callback: $callback")
                 callback?.onTransitionToIdle()
                 ActivityLifecycleMonitorRegistry.getInstance().removeLifecycleCallback(this)
             }
@@ -164,10 +166,10 @@ fun activityIdlingResource(activityClass: Class<*>): IdlingResource {
 }
 
 fun withIdlingResource(idlingResource: IdlingResource, block: (() -> Unit)) {
-    System.out.println("*** withIdlingResource register")
+    println("*** withIdlingResource register")
     IdlingRegistry.getInstance().register(idlingResource)
     block.invoke()
-    System.out.println("*** withIdlingResource unregister")
+    println("*** withIdlingResource unregister")
     IdlingRegistry.getInstance().unregister(idlingResource)
 }
 
@@ -179,7 +181,7 @@ fun allSecretsKnownIdling(session: Session): IdlingResource {
         override fun getName() = "AllSecretsKnownIdling_${session.myUserId}"
 
         override fun isIdleNow(): Boolean {
-            System.out.println("*** [$name]/isIdleNow  allSecretsKnownIdling ${privateKeysInfo?.allKnown()}")
+            println("*** [$name]/isIdleNow  allSecretsKnownIdling ${privateKeysInfo?.allKnown()}")
             return privateKeysInfo?.allKnown() == true
         }
 
@@ -188,7 +190,7 @@ fun allSecretsKnownIdling(session: Session): IdlingResource {
         }
 
         override fun onChanged(t: Optional<PrivateKeysInfo>?) {
-            System.out.println("*** [$name]  allSecretsKnownIdling ${t?.getOrNull()}")
+            println("*** [$name]  allSecretsKnownIdling ${t?.getOrNull()}")
             privateKeysInfo = t?.getOrNull()
             if (t?.getOrNull()?.allKnown() == true) {
                 session.cryptoService().crossSigningService().getLiveCrossSigningPrivateKeys().removeObserver(this)
diff --git a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
index a290aeec80..b88356db59 100644
--- a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt
@@ -48,7 +48,7 @@ class RegistrationTest {
         val password: String = "password"
         val homeServerUrl: String = "http://10.0.2.2:8080"
 
-        // Check splashcreen is there
+        // Check splashscreen is there
         onView(withId(R.id.loginSplashSubmit))
                 .check(matches(isDisplayed()))
                 .check(matches(withText(R.string.login_splash_submit)))
@@ -57,7 +57,7 @@ class RegistrationTest {
         onView(withId(R.id.loginSplashSubmit))
                 .perform(click())
 
-        // Check that home server options are showned
+        // Check that home server options are shown
         onView(withId(R.id.loginServerTitle))
                 .check(matches(isDisplayed()))
                 .check(matches(withText(R.string.login_server_title)))
diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
index 20d0053a9f..2a1b6d802f 100644
--- a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt
@@ -158,7 +158,7 @@ abstract class VerificationTestBase {
                     .createAccount(userName, password, null, it)
         }
 
-        // Preform dummy step
+        // Perform dummy step
         val registrationResult = doSync<RegistrationResult> {
             matrix.authenticationService()
                     .getRegistrationWizard()
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 0e722da34a..c1253e76d3 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -55,6 +55,10 @@ fun isAirplaneModeOn(context: Context): Boolean {
     return Settings.Global.getInt(context.contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) != 0
 }
 
+fun isAnimationDisabled(context: Context): Boolean {
+    return Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f) == 0f
+}
+
 /**
  * display the system dialog for granting this permission. If previously granted, the
  * system will not show it (so you should call this method).
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 814a7ca16e..59386ffff0 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -20,7 +20,6 @@ import android.app.Activity
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.provider.Settings
 import android.view.View
 import android.widget.ImageView
 import com.tapadoo.alerter.Alerter
@@ -28,6 +27,7 @@ import com.tapadoo.alerter.OnHideAlertListener
 import dagger.Lazy
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.utils.isAnimationDisabled
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.themes.ThemeUtils
@@ -173,9 +173,7 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
     private fun showAlert(alert: VectorAlert, activity: Activity, animate: Boolean = true) {
         clearLightStatusBar()
 
-        val systemAnimationDurationDisabled = Settings.Global.getFloat(
-                activity.contentResolver,
-                Settings.Global.ANIMATOR_DURATION_SCALE, 1f) == 0f
+        val noAnimation = !animate || isAnimationDisabled(activity)
 
         alert.weakCurrentActivity = WeakReference(activity)
         val alerter = if (alert is VerificationVectorAlert) Alerter.create(activity, R.layout.alerter_verification_layout)
@@ -192,7 +190,7 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
                     }
                 }
                 .apply {
-                    if (systemAnimationDurationDisabled || !animate) {
+                    if (noAnimation) {
                         setEnterAnimation(R.anim.anim_alerter_no_anim)
                     }
 
@@ -242,7 +240,7 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
                         setBackgroundColorRes(alert.colorRes ?: R.color.notification_accent_color)
                     }
                 }
-                .enableIconPulse(!systemAnimationDurationDisabled)
+                .enableIconPulse(!noAnimation)
                 .show()
     }
 

From 3f5b1083f3cf26ae250e5d8710bc04888f237500 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Thu, 24 Sep 2020 11:26:08 +0200
Subject: [PATCH 026/278] Timeline: add a prefetch backward item

---
 .../detail/timeline/TimelineEventController.kt    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index be59128c26..a04057882e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -116,6 +116,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private var unreadState: UnreadState = UnreadState.Unknown
     private var positionOfReadMarker: Int? = null
     private var eventIdToHighlight: String? = null
+    private var previousModelsSize = 0
 
     var callback: Callback? = null
     var timeline: Timeline? = null
@@ -191,6 +192,20 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                 models.add(position, readMarker)
             }
         }
+        val shouldAdd = timeline?.hasMoreToLoad(Timeline.Direction.BACKWARDS) ?: false
+        if (shouldAdd) {
+            val indexOfPrefetchBackward = (previousModelsSize - 1)
+                    .coerceAtLeast(0)
+                    .coerceAtMost(models.size - 1)
+
+            val loadingItem = LoadingItem_()
+                    .id("prefetch_backward_loading${System.currentTimeMillis()}")
+                    .showLoader(false)
+                    .setVisibilityStateChangedListener(Timeline.Direction.BACKWARDS)
+
+            models.add(indexOfPrefetchBackward, loadingItem)
+        }
+        previousModelsSize = models.size
     }
 
     fun update(viewState: RoomDetailViewState) {

From 8bc0afa75e5cd601650b8ac60bafc608a5de421f Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Thu, 24 Sep 2020 11:29:07 +0200
Subject: [PATCH 027/278] Timeline: add glide preloading

---
 vector/build.gradle                            |  1 +
 .../home/room/detail/RoomDetailFragment.kt     | 17 ++++++++++++++++-
 .../app/features/media/ImageContentRenderer.kt | 18 +++++++++---------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 0c7985b45d..30ca90e1d8 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -326,6 +326,7 @@ dependencies {
     implementation 'com.jakewharton.rxbinding3:rxbinding-material:3.0.0'
 
     implementation("com.airbnb.android:epoxy:$epoxy_version")
+    implementation "com.airbnb.android:epoxy-glide-preloading:$epoxy_version"
     kapt "com.airbnb.android:epoxy-processor:$epoxy_version"
     implementation "com.airbnb.android:epoxy-paging:$epoxy_version"
     implementation 'com.airbnb.android:mvrx:1.3.0'
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 7c3ac6011e..d03e6bad1e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -53,6 +53,8 @@ import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.OnModelBuildFinishedListener
+import com.airbnb.epoxy.addGlidePreloader
+import com.airbnb.epoxy.glidePreloader
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -75,9 +77,11 @@ import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.extensions.showKeyboard
 import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.ui.model.Size
 import im.vector.app.core.ui.views.ActiveCallView
 import im.vector.app.core.ui.views.ActiveCallViewHolder
 import im.vector.app.core.ui.views.ActiveConferenceView
@@ -218,7 +222,8 @@ class RoomDetailFragment @Inject constructor(
         private val colorProvider: ColorProvider,
         private val notificationUtils: NotificationUtils,
         private val webRtcPeerConnectionManager: WebRtcPeerConnectionManager,
-        private val matrixItemColorProvider: MatrixItemColorProvider
+        private val matrixItemColorProvider: MatrixItemColorProvider,
+        private val imageContentRenderer: ImageContentRenderer
 ) :
         VectorBaseFragment(),
         TimelineEventController.Callback,
@@ -921,6 +926,16 @@ class RoomDetailFragment @Inject constructor(
             val touchHelper = ItemTouchHelper(swipeCallback)
             touchHelper.attachToRecyclerView(recyclerView)
         }
+        recyclerView.addGlidePreloader(
+                epoxyController = timelineEventController,
+                requestManager = GlideApp.with(this),
+                preloader = glidePreloader { requestManager, epoxyModel: MessageImageVideoItem, _ ->
+                    imageContentRenderer.createGlideRequest(
+                            epoxyModel.mediaData,
+                            ImageContentRenderer.Mode.THUMBNAIL,
+                            requestManager as GlideRequests
+                    )
+                })
     }
 
     private fun updateJumpToReadMarkerViewVisibility() {
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index 0336e2d03c..d6ab24bfbd 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -33,6 +33,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.glide.GlideRequest
+import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.ui.model.Size
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.isLocalFile
@@ -206,12 +207,14 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
                 .into(imageView)
     }
 
-    private fun createGlideRequest(data: Data, mode: Mode, imageView: ImageView, size: Size): GlideRequest<Drawable> {
+    fun createGlideRequest(data: Data, mode: Mode, imageView: ImageView, size: Size): GlideRequest<Drawable> {
+        return createGlideRequest(data, mode, GlideApp.with(imageView), size)
+    }
+
+    fun createGlideRequest(data: Data, mode: Mode, glideRequests: GlideRequests, size: Size = processSize(data, mode)): GlideRequest<Drawable> {
         return if (data.elementToDecrypt != null) {
             // Encrypted image
-            GlideApp
-                    .with(imageView)
-                    .load(data)
+            glideRequests.load(data)
         } else {
             // Clear image
             val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
@@ -223,15 +226,12 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
             // Fallback to base url
                     ?: data.url.takeIf { it?.startsWith("content://") == true }
 
-            GlideApp
-                    .with(imageView)
+           glideRequests
                     .load(resolvedUrl)
                     .apply {
                         if (mode == Mode.THUMBNAIL) {
                             error(
-                                    GlideApp
-                                            .with(imageView)
-                                            .load(resolveUrl(data))
+                                   glideRequests.load(resolveUrl(data))
                             )
                         }
                     }

From 11a47041618fb251fa1c43e2ac01621717729df5 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Thu, 24 Sep 2020 17:48:42 +0200
Subject: [PATCH 028/278] Clean files and update CHANGES

---
 CHANGES.md                                      |  1 +
 .../home/room/detail/RoomDetailFragment.kt      |  1 -
 .../detail/timeline/TimelineEventController.kt  | 17 ++++++++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 23bc0427e9..9971ee6d65 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Features ✨:
 
 Improvements 🙌:
  - PIN code: request PIN code if phone has been locked
+ - Small optimisation of scrolling experience in timeline
 
 Bugfix 🐛:
  - Fix Splash layout on small screens
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index d03e6bad1e..e7140f06f4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -81,7 +81,6 @@ import im.vector.app.core.glide.GlideRequests
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
-import im.vector.app.core.ui.model.Size
 import im.vector.app.core.ui.views.ActiveCallView
 import im.vector.app.core.ui.views.ActiveCallViewHolder
 import im.vector.app.core.ui.views.ActiveConferenceView
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index a04057882e..c266337520 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -56,6 +56,8 @@ import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
+private const val DEFAULT_PREFETCH_THRESHOLD = 30
+
 class TimelineEventController @Inject constructor(private val dateFormatter: VectorDateFormatter,
                                                   private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
                                                   private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
@@ -192,11 +194,11 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                 models.add(position, readMarker)
             }
         }
-        val shouldAdd = timeline?.hasMoreToLoad(Timeline.Direction.BACKWARDS) ?: false
-        if (shouldAdd) {
+        val shouldAddBackwardPrefetch = timeline?.hasMoreToLoad(Timeline.Direction.BACKWARDS) ?: false
+        if (shouldAddBackwardPrefetch) {
             val indexOfPrefetchBackward = (previousModelsSize - 1)
+                    .coerceAtMost(models.size - DEFAULT_PREFETCH_THRESHOLD)
                     .coerceAtLeast(0)
-                    .coerceAtMost(models.size - 1)
 
             val loadingItem = LoadingItem_()
                     .id("prefetch_backward_loading${System.currentTimeMillis()}")
@@ -205,6 +207,15 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
 
             models.add(indexOfPrefetchBackward, loadingItem)
         }
+        val shouldAddForwardPrefetch = timeline?.hasMoreToLoad(Timeline.Direction.FORWARDS) ?: false
+        if (shouldAddForwardPrefetch) {
+            val indexOfPrefetchForward = DEFAULT_PREFETCH_THRESHOLD.coerceAtMost(models.size - 1)
+            val loadingItem = LoadingItem_()
+                    .id("prefetch_forward_loading${System.currentTimeMillis()}")
+                    .showLoader(false)
+                    .setVisibilityStateChangedListener(Timeline.Direction.FORWARDS)
+            models.add(indexOfPrefetchForward, loadingItem)
+        }
         previousModelsSize = models.size
     }
 

From 2def7f3910c505931e97eab36ac43bb2f0152692 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 29 Sep 2020 16:10:54 +0200
Subject: [PATCH 029/278] PR Review

---
 CHANGES.md                                                     | 2 +-
 .../home/room/detail/timeline/TimelineEventController.kt       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9971ee6d65..a6f8982a27 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,7 +6,7 @@ Features ✨:
 
 Improvements 🙌:
  - PIN code: request PIN code if phone has been locked
- - Small optimisation of scrolling experience in timeline
+ - Small optimisation of scrolling experience in timeline (#2114)
 
 Bugfix 🐛:
  - Fix Splash layout on small screens
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index c266337520..56de0f7829 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -381,9 +381,6 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         return shouldAdd
     }
 
-    /**
-     * Return true if added
-     */
     private fun LoadingItem_.setVisibilityStateChangedListener(direction: Timeline.Direction): LoadingItem_ {
         return onVisibilityStateChanged { _, _, visibilityState ->
             if (visibilityState == VisibilityState.VISIBLE) {

From 0bb75eed1fae04e1be317bcd52aa1cc6ada90a7b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 29 Sep 2020 16:41:55 +0200
Subject: [PATCH 030/278] Finish what has been started on #1376: use
 Intent.ACTION_GET_CONTENT instead of Intent.ACTION_OPEN_DOCUMENT for other
 pickers

---
 CHANGES.md                                                      | 2 +-
 .../src/main/java/im/vector/lib/multipicker/AudioPicker.kt      | 2 +-
 .../src/main/java/im/vector/lib/multipicker/FilePicker.kt       | 2 +-
 .../src/main/java/im/vector/lib/multipicker/VideoPicker.kt      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 56f22bd4a9..488bc5ca32 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,7 +9,7 @@ Improvements 🙌:
  - Small optimisation of scrolling experience in timeline (#2114)
 
 Bugfix 🐛:
- - Improve support for image selection with intent changes (#1376)
+ - Improve support for image/audio/video/file selection with intent changes (#1376)
  - Fix Splash layout on small screens
 
 Translations 🗣:
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
index 17c01bc8e3..c51084dd39 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -84,7 +84,7 @@ class AudioPicker(override val requestCode: Int) : Picker<MultiPickerAudioType>(
     }
 
     override fun createIntent(): Intent {
-        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+        return Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
             type = "audio/*"
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
index 296685886d..d5718b9951 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -64,7 +64,7 @@ class FilePicker(override val requestCode: Int) : Picker<MultiPickerFileType>(re
     }
 
     override fun createIntent(): Intent {
-        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+        return Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
             type = "*/*"
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
index 7127e9defd..965c8e08e0 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -93,7 +93,7 @@ class VideoPicker(override val requestCode: Int) : Picker<MultiPickerVideoType>(
     }
 
     override fun createIntent(): Intent {
-        return Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+        return Intent(Intent.ACTION_GET_CONTENT).apply {
             addCategory(Intent.CATEGORY_OPENABLE)
             putExtra(Intent.EXTRA_ALLOW_MULTIPLE, !single)
             type = "video/*"

From c20517599ed111e76d92d14980894a9820f2d055 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 29 Sep 2020 17:04:45 +0200
Subject: [PATCH 031/278] Add option to reset 4S if lost pass/key

---
 .../im/vector/app/core/di/FragmentModule.kt   |   6 +
 .../VectorBaseBottomSheetDialogFragment.kt    |  19 +++
 .../core/ui/views/BottomSheetActionButton.kt  |   8 ++
 .../crypto/quads/SharedSecureStorageAction.kt |   3 +
 .../quads/SharedSecureStorageActivity.kt      |  38 ++++--
 .../quads/SharedSecureStorageViewModel.kt     |  84 ++++++++++---
 .../quads/SharedSecuredStorageKeyFragment.kt  |   6 +-
 .../SharedSecuredStoragePassphraseFragment.kt |   4 +
 .../SharedSecuredStorageResetAllFragment.kt   |  69 +++++++++++
 .../crypto/recover/BootstrapBottomSheet.kt    |  25 ++--
 .../recover/BootstrapCrossSigningTask.kt      |  35 ++++--
 .../recover/BootstrapSharedViewModel.kt       |  94 +++++++-------
 .../crypto/recover/BootstrapViewEvents.kt     |   2 +-
 .../app/features/crypto/recover/SetupMode.kt  |  50 ++++++++
 .../crypto/verification/VerificationAction.kt |   1 +
 .../verification/VerificationBottomSheet.kt   |  24 +++-
 .../VerificationBottomSheetViewModel.kt       |  14 ++-
 .../features/navigation/DefaultNavigator.kt   |  17 ++-
 .../app/features/navigation/Navigator.kt      |   4 +
 .../devices/DeviceListBottomSheet.kt          |  12 +-
 .../devices/DeviceListBottomSheetViewModel.kt |  21 ++--
 .../VectorSettingsSecurityPrivacyFragment.kt  |   5 +-
 .../SignOutBottomSheetDialogFragment.kt       |   3 +-
 .../layout/fragment_ssss_access_from_key.xml  |  26 +++-
 .../fragment_ssss_access_from_passphrase.xml  |  21 +++-
 .../res/layout/fragment_ssss_reset_all.xml    | 116 ++++++++++++++++++
 vector/src/main/res/values/attrs.xml          |   1 +
 vector/src/main/res/values/strings.xml        |  10 ++
 28 files changed, 595 insertions(+), 123 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/crypto/recover/SetupMode.kt
 create mode 100644 vector/src/main/res/layout/fragment_ssss_reset_all.xml

diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 75f61a7b01..86d59b630b 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -27,6 +27,7 @@ import im.vector.app.features.contactsbook.ContactsBookFragment
 import im.vector.app.features.crypto.keysbackup.settings.KeysBackupSettingsFragment
 import im.vector.app.features.crypto.quads.SharedSecuredStorageKeyFragment
 import im.vector.app.features.crypto.quads.SharedSecuredStoragePassphraseFragment
+import im.vector.app.features.crypto.quads.SharedSecuredStorageResetAllFragment
 import im.vector.app.features.crypto.recover.BootstrapAccountPasswordFragment
 import im.vector.app.features.crypto.recover.BootstrapConclusionFragment
 import im.vector.app.features.crypto.recover.BootstrapConfirmPassphraseFragment
@@ -530,6 +531,11 @@ interface FragmentModule {
     @FragmentKey(SharedSecuredStorageKeyFragment::class)
     fun bindSharedSecuredStorageKeyFragment(fragment: SharedSecuredStorageKeyFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(SharedSecuredStorageResetAllFragment::class)
+    fun bindSharedSecuredStorageResetAllFragment(fragment: SharedSecuredStorageResetAllFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(SetIdentityServerFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 9ed5c5c455..761bb7227c 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -17,6 +17,7 @@ package im.vector.app.core.platform
 
 import android.app.Dialog
 import android.content.Context
+import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -86,6 +87,24 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
 
     open val showExpanded = false
 
+    interface ResultListener {
+        fun onBottomSheetResult(resultCode: Int, data: Any?)
+
+        companion object {
+            const val RESULT_OK = 1
+            const val RESULT_CANCEL = 0
+        }
+    }
+
+    var resultListener : ResultListener? = null
+    var bottomSheetResult: Int = ResultListener.RESULT_OK
+    var bottomSheetResultData: Any? = null
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        resultListener?.onBottomSheetResult(bottomSheetResult, bottomSheetResultData)
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(getLayoutResId(), container, false)
         unBinder = ButterKnife.bind(this, view)
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index 0259898ee3..d418822b7f 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -24,6 +24,7 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -107,6 +108,12 @@ class BottomSheetActionButton @JvmOverloads constructor(
             leftIconImageView.imageTintList = value?.let { ColorStateList.valueOf(value) }
         }
 
+    var titleTextColor: Int? = null
+        set(value) {
+            field = value
+            value?.let { actionTextView.setTextColor(it) }
+        }
+
     init {
         inflate(context, R.layout.item_verification_action, this)
         ButterKnife.bind(this)
@@ -120,6 +127,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
             rightIcon = getDrawable(R.styleable.BottomSheetActionButton_rightIcon)
 
             tint = getColor(R.styleable.BottomSheetActionButton_tint, ThemeUtils.getColor(context, android.R.attr.textColor))
+            titleTextColor = getColor(R.styleable.BottomSheetActionButton_titleTextColor, ContextCompat.getColor(context, R.color.riotx_accent))
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt
index b47b7dc3a9..30a7ab3cc0 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageAction.kt
@@ -28,6 +28,8 @@ sealed class SharedSecureStorageAction : VectorViewModelAction {
     object Cancel : SharedSecureStorageAction()
     data class SubmitPassphrase(val passphrase: String) : SharedSecureStorageAction()
     data class SubmitKey(val recoveryKey: String) : SharedSecureStorageAction()
+    object ForgotResetAll : SharedSecureStorageAction()
+    object DoResetAll : SharedSecureStorageAction()
 }
 
 sealed class SharedSecureStorageViewEvent : VectorViewEvents {
@@ -40,4 +42,5 @@ sealed class SharedSecureStorageViewEvent : VectorViewEvents {
     object ShowModalLoading : SharedSecureStorageViewEvent()
     object HideModalLoading : SharedSecureStorageViewEvent()
     data class UpdateLoadingState(val waitingData: WaitingViewData) : SharedSecureStorageViewEvent()
+    object ShowResetBottomSheet : SharedSecureStorageViewEvent()
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index bca7a63470..0cc28609c9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -31,12 +31,14 @@ import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.crypto.recover.SetupMode
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.activity.*
 import javax.inject.Inject
 import kotlin.reflect.KClass
 
-class SharedSecureStorageActivity : SimpleFragmentActivity() {
+class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSheetDialogFragment.ResultListener {
 
     @Parcelize
     data class Args(
@@ -69,18 +71,22 @@ class SharedSecureStorageActivity : SimpleFragmentActivity() {
 
     private fun renderState(state: SharedSecureStorageViewState) {
         if (!state.ready) return
-        val fragment = if (state.hasPassphrase) {
-            if (state.useKey) SharedSecuredStorageKeyFragment::class else SharedSecuredStoragePassphraseFragment::class
-        } else SharedSecuredStorageKeyFragment::class
+        val fragment =
+                when (state.step) {
+                    SharedSecureStorageViewState.Step.EnterPassphrase -> SharedSecuredStoragePassphraseFragment::class
+                    SharedSecureStorageViewState.Step.EnterKey        -> SharedSecuredStorageKeyFragment::class
+                    SharedSecureStorageViewState.Step.ResetAll        -> SharedSecuredStorageResetAllFragment::class
+                }
+
         showFragment(fragment, Bundle())
     }
 
     private fun observeViewEvents(it: SharedSecureStorageViewEvent?) {
         when (it) {
-            is SharedSecureStorageViewEvent.Dismiss            -> {
+            is SharedSecureStorageViewEvent.Dismiss              -> {
                 finish()
             }
-            is SharedSecureStorageViewEvent.Error              -> {
+            is SharedSecureStorageViewEvent.Error                -> {
                 AlertDialog.Builder(this)
                         .setTitle(getString(R.string.dialog_title_error))
                         .setMessage(it.message)
@@ -92,21 +98,24 @@ class SharedSecureStorageActivity : SimpleFragmentActivity() {
                         }
                         .show()
             }
-            is SharedSecureStorageViewEvent.ShowModalLoading   -> {
+            is SharedSecureStorageViewEvent.ShowModalLoading     -> {
                 showWaitingView()
             }
-            is SharedSecureStorageViewEvent.HideModalLoading   -> {
+            is SharedSecureStorageViewEvent.HideModalLoading     -> {
                 hideWaitingView()
             }
-            is SharedSecureStorageViewEvent.UpdateLoadingState -> {
+            is SharedSecureStorageViewEvent.UpdateLoadingState   -> {
                 updateWaitingView(it.waitingData)
             }
-            is SharedSecureStorageViewEvent.FinishSuccess      -> {
+            is SharedSecureStorageViewEvent.FinishSuccess        -> {
                 val dataResult = Intent()
                 dataResult.putExtra(EXTRA_DATA_RESULT, it.cypherResult)
                 setResult(Activity.RESULT_OK, dataResult)
                 finish()
             }
+            is SharedSecureStorageViewEvent.ShowResetBottomSheet -> {
+                navigator.open4SSetup(this, SetupMode.HARD_RESET, this)
+            }
         }
     }
 
@@ -124,6 +133,7 @@ class SharedSecureStorageActivity : SimpleFragmentActivity() {
 
     companion object {
         const val EXTRA_DATA_RESULT = "EXTRA_DATA_RESULT"
+        const val EXTRA_DATA_RESET = "EXTRA_DATA_RESET"
         const val DEFAULT_RESULT_KEYSTORE_ALIAS = "SharedSecureStorageActivity"
 
         fun newIntent(context: Context,
@@ -140,4 +150,12 @@ class SharedSecureStorageActivity : SimpleFragmentActivity() {
             }
         }
     }
+
+    override fun onBottomSheetResult(resultCode: Int, data: Any?) {
+        if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK) {
+            // the 4S has been reset
+            setResult(Activity.RESULT_OK, Intent().apply { putExtra(EXTRA_DATA_RESET, true) })
+            finish()
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
index 5bc87dfce7..951ff4ede6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageViewModel.kt
@@ -33,6 +33,9 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.WaitingViewData
 import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.listeners.ProgressListener
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.securestorage.IntegrityResult
@@ -40,19 +43,26 @@ import org.matrix.android.sdk.api.session.securestorage.KeyInfoResult
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
 import org.matrix.android.sdk.internal.crypto.crosssigning.toBase64NoPadding
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.io.ByteArrayOutputStream
 
 data class SharedSecureStorageViewState(
         val ready: Boolean = false,
         val hasPassphrase: Boolean = true,
-        val useKey: Boolean = false,
         val passphraseVisible: Boolean = false,
-        val checkingSSSSAction: Async<Unit> = Uninitialized
-) : MvRxState
+        val checkingSSSSAction: Async<Unit> = Uninitialized,
+        val step: Step = Step.EnterPassphrase,
+        val activeDeviceCount: Int = 0,
+        val showResetAllAction: Boolean = false,
+        val userId: String = ""
+) : MvRxState {
+    enum class Step {
+        EnterPassphrase,
+        EnterKey,
+        ResetAll
+    }
+}
 
 class SharedSecureStorageViewModel @AssistedInject constructor(
         @Assisted initialState: SharedSecureStorageViewState,
@@ -67,6 +77,10 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
     }
 
     init {
+
+        setState {
+            copy(userId = session.myUserId)
+        }
         val isValid = session.sharedSecretStorageService.checkShouldBeAbleToAccessSecrets(args.requestedSecrets, args.keyId) is IntegrityResult.Success
         if (!isValid) {
             _viewEvents.post(
@@ -86,20 +100,30 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
             if (info.content.passphrase != null) {
                 setState {
                     copy(
-                            ready = true,
                             hasPassphrase = true,
-                            useKey = false
+                            ready = true,
+                            step = SharedSecureStorageViewState.Step.EnterPassphrase
                     )
                 }
             } else {
                 setState {
                     copy(
+                            hasPassphrase = false,
                             ready = true,
-                            hasPassphrase = false
+                            step = SharedSecureStorageViewState.Step.EnterKey
                     )
                 }
             }
         }
+
+        session.rx()
+                .liveUserCryptoDevices(session.myUserId)
+                .distinctUntilChanged()
+                .execute {
+                    copy(
+                            activeDeviceCount = it.invoke()?.size ?: 0
+                    )
+                }
     }
 
     override fun handle(action: SharedSecureStorageAction) = withState {
@@ -110,27 +134,52 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
             SharedSecureStorageAction.UseKey                      -> handleUseKey()
             is SharedSecureStorageAction.SubmitKey                -> handleSubmitKey(action)
             SharedSecureStorageAction.Back                        -> handleBack()
+            SharedSecureStorageAction.ForgotResetAll              -> handleResetAll()
+            SharedSecureStorageAction.DoResetAll                  -> handleDoResetAll()
         }.exhaustive
     }
 
+    private fun handleDoResetAll() {
+        _viewEvents.post(SharedSecureStorageViewEvent.ShowResetBottomSheet)
+    }
+
+    private fun handleResetAll() {
+        setState {
+            copy(
+                    step = SharedSecureStorageViewState.Step.ResetAll
+            )
+        }
+    }
+
     private fun handleUseKey() {
         setState {
             copy(
-                    useKey = true
+                    step = SharedSecureStorageViewState.Step.EnterKey
             )
         }
     }
 
     private fun handleBack() = withState { state ->
         if (state.checkingSSSSAction is Loading) return@withState // ignore
-        if (state.hasPassphrase && state.useKey) {
-            setState {
-                copy(
-                        useKey = false
-                )
+        when (state.step) {
+            SharedSecureStorageViewState.Step.EnterKey -> {
+                setState {
+                    copy(
+                            step = SharedSecureStorageViewState.Step.EnterPassphrase
+                    )
+                }
+            }
+            SharedSecureStorageViewState.Step.ResetAll -> {
+                setState {
+                    copy(
+                            step = if (state.hasPassphrase) SharedSecureStorageViewState.Step.EnterPassphrase
+                            else SharedSecureStorageViewState.Step.EnterKey
+                    )
+                }
+            }
+            else                                       -> {
+                _viewEvents.post(SharedSecureStorageViewEvent.Dismiss)
             }
-        } else {
-            _viewEvents.post(SharedSecureStorageViewEvent.Dismiss)
         }
     }
 
@@ -158,6 +207,7 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
                 val keySpec = RawBytesKeySpec.fromRecoveryKey(recoveryKey) ?: return@launch Unit.also {
                     _viewEvents.post(SharedSecureStorageViewEvent.KeyInlineError(stringProvider.getString(R.string.bootstrap_invalid_recovery_key)))
                     _viewEvents.post(SharedSecureStorageViewEvent.HideModalLoading)
+                    setState { copy(checkingSSSSAction = Fail(IllegalArgumentException(stringProvider.getString(R.string.bootstrap_invalid_recovery_key)))) }
                 }
 
                 withContext(Dispatchers.IO) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
index ee47a4d8e9..366c979155 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
@@ -27,9 +27,9 @@ import com.jakewharton.rxbinding3.widget.textChanges
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startImportTextFromFileIntent
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_ssss_access_from_key.*
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -63,6 +63,10 @@ class SharedSecuredStorageKeyFragment @Inject constructor() : VectorBaseFragment
 
         ssss_key_use_file.debouncedClicks { startImportTextFromFileIntent(this, IMPORT_FILE_REQ) }
 
+        ssss_key_reset.clickableView.debouncedClicks {
+            sharedViewModel.handle(SharedSecureStorageAction.ForgotResetAll)
+        }
+
         sharedViewModel.observeViewEvents {
             when (it) {
                 is SharedSecureStorageViewEvent.KeyInlineError -> {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
index 09e67948d0..97047fbc65 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStoragePassphraseFragment.kt
@@ -74,6 +74,10 @@ class SharedSecuredStoragePassphraseFragment @Inject constructor(
                 }
                 .disposeOnDestroyView()
 
+        ssss_passphrase_reset.clickableView.debouncedClicks {
+            sharedViewModel.handle(SharedSecureStorageAction.ForgotResetAll)
+        }
+
         sharedViewModel.observeViewEvents {
             when (it) {
                 is SharedSecureStorageViewEvent.InlineError -> {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
new file mode 100644
index 0000000000..314abda38c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.crypto.quads
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
+import kotlinx.android.synthetic.main.fragment_ssss_reset_all.*
+import javax.inject.Inject
+
+class SharedSecuredStorageResetAllFragment @Inject constructor(
+        private val stringProvider: StringProvider
+) : VectorBaseFragment() {
+
+    override fun getLayoutResId() = R.layout.fragment_ssss_reset_all
+
+    val sharedViewModel: SharedSecureStorageViewModel by activityViewModel()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        ssss_reset_button_reset.debouncedClicks {
+            sharedViewModel.handle(SharedSecureStorageAction.DoResetAll)
+        }
+
+        ssss_reset_button_cancel.debouncedClicks {
+            sharedViewModel.handle(SharedSecureStorageAction.Back)
+        }
+
+        ssss_reset_other_devices.debouncedClicks {
+            withState(sharedViewModel) {
+                DeviceListBottomSheet.newInstance(it.userId, false).show(childFragmentManager, "DEV_LIST")
+            }
+        }
+
+        sharedViewModel.subscribe(this) {
+            if (it.activeDeviceCount == 0) {
+                ssss_reset_other_devices.isVisible = false
+            } else {
+                ssss_reset_other_devices.isVisible = true
+                ssss_reset_other_devices.text = stringProvider.getQuantityString(
+                        R.plurals.secure_backup_reset_devices_you_can_verify,
+                        it.activeDeviceCount,
+                        it.activeDeviceCount
+                )
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 1b9beabe9c..5b5b4e1931 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -45,8 +45,10 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @Parcelize
     data class Args(
-            val initCrossSigningOnly: Boolean,
-            val forceReset4S: Boolean
+//            val initCrossSigningOnly: Boolean,
+            val setUpMode: SetupMode = SetupMode.NORMAL
+//            val forceReset4S: Boolean,
+//            val resetAllUnknownSecrets: Boolean
     ) : Parcelable
 
     override val showExpanded = true
@@ -66,7 +68,10 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
         super.onViewCreated(view, savedInstanceState)
         viewModel.observeViewEvents { event ->
             when (event) {
-                is BootstrapViewEvents.Dismiss       -> dismiss()
+                is BootstrapViewEvents.Dismiss       -> {
+                    bottomSheetResult = if (event.success) ResultListener.RESULT_OK else ResultListener.RESULT_CANCEL
+                    dismiss()
+                }
                 is BootstrapViewEvents.ModalError    -> {
                     AlertDialog.Builder(requireActivity())
                             .setTitle(R.string.dialog_title_error)
@@ -90,6 +95,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
                 .setMessage(R.string.bootstrap_cancel_text)
                 .setPositiveButton(R.string._continue, null)
                 .setNegativeButton(R.string.skip) { _, _ ->
+                    bottomSheetResult = ResultListener.RESULT_CANCEL
                     dismiss()
                 }
                 .show()
@@ -181,16 +187,15 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
         const val EXTRA_ARGS = "EXTRA_ARGS"
 
-        fun show(fragmentManager: FragmentManager, initCrossSigningOnly: Boolean, forceReset4S: Boolean) {
-            BootstrapBottomSheet().apply {
+        fun show(fragmentManager: FragmentManager, mode: SetupMode): BootstrapBottomSheet {
+            return BootstrapBottomSheet().apply {
                 isCancelable = false
                 arguments = Bundle().apply {
-                    this.putParcelable(EXTRA_ARGS, Args(
-                            initCrossSigningOnly,
-                            forceReset4S
-                    ))
+                    this.putParcelable(EXTRA_ARGS, Args(setUpMode = mode))
                 }
-            }.show(fragmentManager, "BootstrapBottomSheet")
+            }.also {
+                it.show(fragmentManager, "BootstrapBottomSheet")
+            }
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index 5da788583e..05e9a836f6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -69,10 +69,12 @@ interface BootstrapProgressListener {
 
 data class Params(
         val userPasswordAuth: UserPasswordAuth? = null,
-        val initOnlyCrossSigning: Boolean = false,
+//        val initOnlyCrossSigning: Boolean = false,
         val progressListener: BootstrapProgressListener? = null,
         val passphrase: String?,
-        val keySpec: SsssKeySpec? = null
+        val keySpec: SsssKeySpec? = null,
+//        val resetAllIfNeeded: Boolean = false,
+        val setupMode: SetupMode
 )
 
 // TODO Rename to CreateServerRecovery
@@ -84,9 +86,13 @@ class BootstrapCrossSigningTask @Inject constructor(
     override suspend fun execute(params: Params): BootstrapResult {
         val crossSigningService = session.cryptoService().crossSigningService()
 
-        Timber.d("## BootstrapCrossSigningTask: initXSOnly:${params.initOnlyCrossSigning} Starting...")
+        Timber.d("## BootstrapCrossSigningTask: mode:${params.setupMode} Starting...")
         // Ensure cross-signing is initialized. Due to migration it is maybe not always correctly initialized
-        if (!crossSigningService.isCrossSigningInitialized()) {
+
+        val shouldSetCrossSigning = !crossSigningService.isCrossSigningInitialized()
+                || (params.setupMode == SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET && !crossSigningService.allPrivateKeysKnown())
+                || (params.setupMode == SetupMode.HARD_RESET)
+        if (shouldSetCrossSigning) {
             Timber.d("## BootstrapCrossSigningTask: Cross signing not enabled, so initialize")
             params.progressListener?.onProgress(
                     WaitingViewData(
@@ -99,7 +105,7 @@ class BootstrapCrossSigningTask @Inject constructor(
                 awaitCallback<Unit> {
                     crossSigningService.initializeCrossSigning(params.userPasswordAuth, it)
                 }
-                if (params.initOnlyCrossSigning) {
+                if (params.setupMode == SetupMode.CROSS_SIGNING_ONLY) {
                     return BootstrapResult.SuccessCrossSigningOnly
                 }
             } catch (failure: Throwable) {
@@ -107,7 +113,7 @@ class BootstrapCrossSigningTask @Inject constructor(
             }
         } else {
             Timber.d("## BootstrapCrossSigningTask: Cross signing already setup, go to 4S setup")
-            if (params.initOnlyCrossSigning) {
+            if (params.setupMode == SetupMode.CROSS_SIGNING_ONLY) {
                 // not sure how this can happen??
                 return handleInitializeXSigningError(IllegalArgumentException("Cross signing already setup"))
             }
@@ -236,7 +242,13 @@ class BootstrapCrossSigningTask @Inject constructor(
             val serverVersion = awaitCallback<KeysVersionResult?> {
                 session.cryptoService().keysBackupService().getCurrentVersion(it)
             }
-            if (serverVersion == null) {
+
+            val knownMegolmSecret = session.cryptoService().keysBackupService().getKeyBackupRecoveryKeyInfo()
+            val isMegolmBackupSecretKnown = knownMegolmSecret != null && knownMegolmSecret.version == serverVersion?.version
+            val shouldCreateKeyBackup = serverVersion == null
+                    || (params.setupMode == SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET && !isMegolmBackupSecretKnown)
+                    || (params.setupMode == SetupMode.HARD_RESET)
+            if (shouldCreateKeyBackup) {
                 Timber.d("## BootstrapCrossSigningTask: Creating 4S - Create megolm backup")
                 val creationInfo = awaitCallback<MegolmBackupCreationInfo> {
                     session.cryptoService().keysBackupService().prepareKeysBackupVersion(null, null, it)
@@ -260,16 +272,15 @@ class BootstrapCrossSigningTask @Inject constructor(
             } else {
                 Timber.d("## BootstrapCrossSigningTask: Creating 4S - Existing megolm backup found")
                 // ensure we store existing backup secret if we have it!
-                val knownSecret = session.cryptoService().keysBackupService().getKeyBackupRecoveryKeyInfo()
-                if (knownSecret != null && knownSecret.version == serverVersion.version) {
+                if (isMegolmBackupSecretKnown) {
                     // check it matches
                     val isValid = awaitCallback<Boolean> {
-                        session.cryptoService().keysBackupService().isValidRecoveryKeyForCurrentVersion(knownSecret.recoveryKey, it)
+                        session.cryptoService().keysBackupService().isValidRecoveryKeyForCurrentVersion(knownMegolmSecret!!.recoveryKey, it)
                     }
                     if (isValid) {
                         Timber.d("## BootstrapCrossSigningTask: Creating 4S - Megolm key valid and known")
                         awaitCallback<Unit> {
-                            extractCurveKeyFromRecoveryKey(knownSecret.recoveryKey)?.toBase64NoPadding()?.let { secret ->
+                            extractCurveKeyFromRecoveryKey(knownMegolmSecret!!.recoveryKey)?.toBase64NoPadding()?.let { secret ->
                                 ssssService.storeSecret(
                                         KEYBACKUP_SECRET_SSSS_NAME,
                                         secret,
@@ -286,7 +297,7 @@ class BootstrapCrossSigningTask @Inject constructor(
             Timber.e("## BootstrapCrossSigningTask: Failed to init keybackup")
         }
 
-        Timber.d("## BootstrapCrossSigningTask: initXSOnly:${params.initOnlyCrossSigning} Finished")
+        Timber.d("## BootstrapCrossSigningTask: mode:${params.setupMode} Finished")
         return BootstrapResult.Success(keyInfo)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index 32b4771286..7f3f7c0667 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -34,6 +34,8 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.WaitingViewData
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.login.ReAuthHelper
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.securestorage.RawBytesKeySpec
@@ -41,8 +43,6 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionR
 import org.matrix.android.sdk.internal.crypto.keysbackup.util.extractCurveKeyFromRecoveryKey
 import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import java.io.OutputStream
 
 class BootstrapSharedViewModel @AssistedInject constructor(
@@ -69,46 +69,52 @@ class BootstrapSharedViewModel @AssistedInject constructor(
 
     init {
 
-        if (args.forceReset4S) {
-            setState {
-                copy(step = BootstrapStep.FirstForm(keyBackUpExist = false, reset = true))
-            }
-        } else if (args.initCrossSigningOnly) {
-            // Go straight to account password
-            setState {
-                copy(step = BootstrapStep.AccountPassword(false))
-            }
-        } else {
-            // need to check if user have an existing keybackup
-            setState {
-                copy(step = BootstrapStep.CheckingMigration)
-            }
-
-            // We need to check if there is an existing backup
-            viewModelScope.launch(Dispatchers.IO) {
-                val version = awaitCallback<KeysVersionResult?> {
-                    session.cryptoService().keysBackupService().getCurrentVersion(it)
+        when (args.setUpMode) {
+            SetupMode.PASSPHRASE_RESET,
+            SetupMode.PASSPHRASE_AND_NEEDED_SECRETS_RESET,
+            SetupMode.HARD_RESET         -> {
+                setState {
+                    copy(step = BootstrapStep.FirstForm(keyBackUpExist = false, reset = true))
                 }
-                if (version == null) {
-                    // we just resume plain bootstrap
-                    doesKeyBackupExist = false
-                    setState {
-                        copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
+            }
+            SetupMode.CROSS_SIGNING_ONLY -> {
+                // Go straight to account password
+                setState {
+                    copy(step = BootstrapStep.AccountPassword(false))
+                }
+            }
+            SetupMode.NORMAL             -> {
+                // need to check if user have an existing keybackup
+                setState {
+                    copy(step = BootstrapStep.CheckingMigration)
+                }
+
+                // We need to check if there is an existing backup
+                viewModelScope.launch(Dispatchers.IO) {
+                    val version = awaitCallback<KeysVersionResult?> {
+                        session.cryptoService().keysBackupService().getCurrentVersion(it)
                     }
-                } else {
-                    // we need to get existing backup passphrase/key and convert to SSSS
-                    val keyVersion = awaitCallback<KeysVersionResult?> {
-                        session.cryptoService().keysBackupService().getVersion(version.version ?: "", it)
-                    }
-                    if (keyVersion == null) {
-                        // strange case... just finish?
-                        _viewEvents.post(BootstrapViewEvents.Dismiss)
-                    } else {
-                        doesKeyBackupExist = true
-                        isBackupCreatedFromPassphrase = keyVersion.getAuthDataAsMegolmBackupAuthData()?.privateKeySalt != null
+                    if (version == null) {
+                        // we just resume plain bootstrap
+                        doesKeyBackupExist = false
                         setState {
                             copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
                         }
+                    } else {
+                        // we need to get existing backup passphrase/key and convert to SSSS
+                        val keyVersion = awaitCallback<KeysVersionResult?> {
+                            session.cryptoService().keysBackupService().getVersion(version.version ?: "", it)
+                        }
+                        if (keyVersion == null) {
+                            // strange case... just finish?
+                            _viewEvents.post(BootstrapViewEvents.Dismiss(false))
+                        } else {
+                            doesKeyBackupExist = true
+                            isBackupCreatedFromPassphrase = keyVersion.getAuthDataAsMegolmBackupAuthData()?.privateKeySalt != null
+                            setState {
+                                copy(step = BootstrapStep.FirstForm(keyBackUpExist = doesKeyBackupExist))
+                            }
+                        }
                     }
                 }
             }
@@ -234,7 +240,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                 }
             }
             BootstrapActions.Completed                           -> {
-                _viewEvents.post(BootstrapViewEvents.Dismiss)
+                _viewEvents.post(BootstrapViewEvents.Dismiss(true))
             }
             BootstrapActions.GoToCompleted                       -> {
                 setState {
@@ -395,16 +401,16 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             bootstrapTask.invoke(this,
                     Params(
                             userPasswordAuth = userPasswordAuth,
-                            initOnlyCrossSigning = args.initCrossSigningOnly,
                             progressListener = progressListener,
                             passphrase = state.passphrase,
-                            keySpec = state.migrationRecoveryKey?.let { extractCurveKeyFromRecoveryKey(it)?.let { RawBytesKeySpec(it) } }
+                            keySpec = state.migrationRecoveryKey?.let { extractCurveKeyFromRecoveryKey(it)?.let { RawBytesKeySpec(it) } },
+                            setupMode = args.setUpMode
                     )
             ) { bootstrapResult ->
                 when (bootstrapResult) {
-                    is BootstrapResult.SuccessCrossSigningOnly                 -> {
+                    is BootstrapResult.SuccessCrossSigningOnly -> {
                         // TPD
-                        _viewEvents.post(BootstrapViewEvents.Dismiss)
+                        _viewEvents.post(BootstrapViewEvents.Dismiss(true))
                     }
                     is BootstrapResult.Success                 -> {
                         setState {
@@ -428,7 +434,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                     }
                     is BootstrapResult.UnsupportedAuthFlow     -> {
                         _viewEvents.post(BootstrapViewEvents.ModalError(stringProvider.getString(R.string.auth_flow_not_supported)))
-                        _viewEvents.post(BootstrapViewEvents.Dismiss)
+                        _viewEvents.post(BootstrapViewEvents.Dismiss(false))
                     }
                     is BootstrapResult.InvalidPasswordError    -> {
                         // it's a bad password
@@ -558,7 +564,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
         override fun create(viewModelContext: ViewModelContext, state: BootstrapViewState): BootstrapSharedViewModel? {
             val fragment: BootstrapBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
             val args: BootstrapBottomSheet.Args = fragment.arguments?.getParcelable(BootstrapBottomSheet.EXTRA_ARGS)
-                    ?: BootstrapBottomSheet.Args(initCrossSigningOnly = true, forceReset4S = false)
+                    ?: BootstrapBottomSheet.Args(SetupMode.CROSS_SIGNING_ONLY)
             return fragment.bootstrapViewModelFactory.create(state, args)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
index 58bc64a9ad..be523a0ce3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.crypto.recover
 import im.vector.app.core.platform.VectorViewEvents
 
 sealed class BootstrapViewEvents : VectorViewEvents {
-    object Dismiss : BootstrapViewEvents()
+    data class Dismiss(val success: Boolean) : BootstrapViewEvents()
     data class ModalError(val error: String) : BootstrapViewEvents()
     object RecoveryKeySaved: BootstrapViewEvents()
     data class SkipBootstrap(val genKeyOption: Boolean = true): BootstrapViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/SetupMode.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/SetupMode.kt
new file mode 100644
index 0000000000..0879490e79
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/SetupMode.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.crypto.recover
+
+enum class SetupMode {
+
+    /**
+     * Only setup cross signing, no 4S or megolm backup
+     */
+    CROSS_SIGNING_ONLY,
+
+    /**
+     * Normal setup mode.
+     */
+    NORMAL,
+
+    /**
+     * Only reset the 4S passphrase/key, but do not touch
+     * to existing cross-signing or megolm backup
+     * It take the local known secrets and put them in 4S
+     */
+    PASSPHRASE_RESET,
+
+    /**
+     * Resets the passphrase/key, and all missing secrets
+     * are re-created. Meaning that if cross signing is setup and the secrets
+     * keys are not known, cross signing will be reset (if secret is known we just keep same cross signing)
+     * Same apply to megolm
+     */
+    PASSPHRASE_AND_NEEDED_SECRETS_RESET,
+
+    /**
+     * Resets the passphrase/key, cross signing and megolm backup
+     */
+    HARD_RESET
+}
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
index 1c6ea413cb..d0fd825ebb 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
@@ -31,4 +31,5 @@ sealed class VerificationAction : VectorViewModelAction {
     object SkipVerification : VerificationAction()
     object VerifyFromPassphrase : VerificationAction()
     data class GotResultFromSsss(val cypherData: String, val alias: String) : VerificationAction()
+    object SecuredStorageHasBeenReseted : VerificationAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index f979539f2e..c170809b51 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -48,6 +48,7 @@ import im.vector.app.features.crypto.verification.qrconfirmation.VerificationQrS
 import im.vector.app.features.crypto.verification.request.VerificationRequestFragment
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.settings.VectorSettingsActivity
+import kotlinx.android.parcel.Parcelize
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
@@ -55,7 +56,6 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_S
 import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
 import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
-import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.reflect.KClass
@@ -76,6 +76,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @Inject
     lateinit var verificationViewModelFactory: VerificationBottomSheetViewModel.Factory
+
     @Inject
     lateinit var avatarRenderer: AvatarRenderer
 
@@ -146,8 +147,13 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK && requestCode == SECRET_REQUEST_CODE) {
-            data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)?.let {
-                viewModel.handle(VerificationAction.GotResultFromSsss(it, SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS))
+            val result = data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)
+            val reseted = data?.getBooleanExtra(SharedSecureStorageActivity.EXTRA_DATA_RESET, false) ?: false
+            if (result != null) {
+                viewModel.handle(VerificationAction.GotResultFromSsss(result, SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS))
+            } else if (reseted) {
+                // all have been reset, so we are verified?
+                viewModel.handle(VerificationAction.SecuredStorageHasBeenReseted)
             }
         }
         super.onActivityResult(requestCode, resultCode, data)
@@ -182,6 +188,17 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
             }
         }
 
+        if (state.quadsHasBeenReseted) {
+            showFragment(VerificationConclusionFragment::class, Bundle().apply {
+                putParcelable(MvRx.KEY_ARG, VerificationConclusionFragment.Args(
+                        isSuccessFull = true,
+                        isMe = true,
+                        cancelReason = null
+                ))
+            })
+            return@withState
+        }
+
         if (state.userThinkItsNotHim) {
             otherUserNameText.text = getString(R.string.dialog_title_warning)
             showFragment(VerificationNotMeFragment::class, Bundle())
@@ -356,6 +373,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
                 }
             }
         }
+
         fun forSelfVerification(session: Session, outgoingRequest: String): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
                 arguments = Bundle().apply {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index a4ce9bd38d..1638450725 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -31,6 +31,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import kotlinx.coroutines.Dispatchers
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
@@ -74,7 +75,8 @@ data class VerificationBottomSheetViewState(
         val currentDeviceCanCrossSign: Boolean = false,
         val userWantsToCancel: Boolean = false,
         val userThinkItsNotHim: Boolean = false,
-        val quadSContainsSecrets: Boolean = true
+        val quadSContainsSecrets: Boolean = true,
+        val quadsHasBeenReseted: Boolean = false
 ) : MvRxState
 
 class VerificationBottomSheetViewModel @AssistedInject constructor(
@@ -349,6 +351,14 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
             is VerificationAction.GotResultFromSsss            -> {
                 handleSecretBackFromSSSS(action)
             }
+            VerificationAction.SecuredStorageHasBeenReseted    -> {
+                if (session.cryptoService().crossSigningService().allPrivateKeysKnown()) {
+                    setState {
+                        copy(quadsHasBeenReseted = true)
+                    }
+                }
+                Unit
+            }
         }.exhaustive
     }
 
@@ -393,7 +403,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
     }
 
     private fun tentativeRestoreBackup(res: Map<String, String>?) {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.IO) {
             try {
                 val secret = res?.get(KEYBACKUP_SECRET_SSSS_NAME) ?: return@launch Unit.also {
                     Timber.v("## Keybackup secret not restored from SSSS")
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 5de8796c06..66dd9544b4 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -30,6 +30,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.utils.toast
 import im.vector.app.features.call.conference.JitsiCallViewModel
 import im.vector.app.features.call.conference.VectorJitsiActivity
@@ -37,6 +38,7 @@ import im.vector.app.features.createdirect.CreateDirectRoomActivity
 import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
 import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import im.vector.app.features.crypto.recover.BootstrapBottomSheet
+import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.crypto.verification.SupportedVerificationMethodsProvider
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.debug.DebugMenuActivity
@@ -153,7 +155,10 @@ class DefaultNavigator @Inject constructor(
 
     override fun upgradeSessionSecurity(context: Context, initCrossSigningOnly: Boolean) {
         if (context is VectorBaseActivity) {
-            BootstrapBottomSheet.show(context.supportFragmentManager, initCrossSigningOnly, false)
+            BootstrapBottomSheet.show(
+                    context.supportFragmentManager,
+                    if (initCrossSigningOnly) SetupMode.CROSS_SIGNING_ONLY else SetupMode.NORMAL
+            )
         }
     }
 
@@ -226,13 +231,21 @@ class DefaultNavigator @Inject constructor(
         // if cross signing is enabled we should propose full 4S
         sessionHolder.getSafeActiveSession()?.let { session ->
             if (session.cryptoService().crossSigningService().canCrossSign() && context is VectorBaseActivity) {
-                BootstrapBottomSheet.show(context.supportFragmentManager, initCrossSigningOnly = false, forceReset4S = false)
+                BootstrapBottomSheet.show(context.supportFragmentManager, SetupMode.NORMAL)
             } else {
                 context.startActivity(KeysBackupSetupActivity.intent(context, showManualExport))
             }
         }
     }
 
+    override  fun open4SSetup(context: Context, setupMode: SetupMode, listener: VectorBaseBottomSheetDialogFragment.ResultListener?) {
+        if (context is VectorBaseActivity) {
+            BootstrapBottomSheet.show(context.supportFragmentManager, setupMode).also {
+                it.resultListener = listener
+            }
+        }
+    }
+
     override fun openKeysBackupManager(context: Context) {
         context.startActivity(KeysBackupManageActivity.intent(context))
     }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index ed710a124f..3f255f72ef 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -21,6 +21,8 @@ import android.content.Context
 import android.view.View
 import androidx.core.util.Pair
 import androidx.fragment.app.Fragment
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.pin.PinActivity
@@ -71,6 +73,8 @@ interface Navigator {
 
     fun openKeysBackupSetup(context: Context, showManualExport: Boolean)
 
+    fun open4SSetup(context: Context, setupMode: SetupMode, listener: VectorBaseBottomSheetDialogFragment.ResultListener?)
+
     fun openKeysBackupManager(context: Context)
 
     fun openGroupDetail(groupId: String, context: Context, buildTask: Boolean = false)
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index a8c6842c08..9ba1c59983 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.roommemberprofile.devices
 
 import android.content.DialogInterface
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.KeyEvent
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.MvRx
@@ -29,6 +30,7 @@ import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
+import kotlinx.android.parcel.Parcelize
 import javax.inject.Inject
 import kotlin.reflect.KClass
 
@@ -104,10 +106,16 @@ class DeviceListBottomSheet : VectorBaseBottomSheetDialogFragment() {
         }
     }
 
+    @Parcelize
+    data class Args(
+            val userId: String,
+            val allowDeviceAction: Boolean
+    ) : Parcelable
+
     companion object {
-        fun newInstance(userId: String): DeviceListBottomSheet {
+        fun newInstance(userId: String, allowDeviceAction: Boolean = true): DeviceListBottomSheet {
             val args = Bundle()
-            args.putString(MvRx.KEY_ARG, userId)
+            args.putParcelable(MvRx.KEY_ARG, Args(userId, allowDeviceAction))
             return DeviceListBottomSheet().apply { arguments = args }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
index db97399f1b..28af45797e 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
@@ -22,6 +22,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
+import com.airbnb.mvrx.args
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.di.HasScreenInjector
@@ -44,24 +45,24 @@ data class DeviceListViewState(
 ) : MvRxState
 
 class DeviceListBottomSheetViewModel @AssistedInject constructor(@Assisted private val initialState: DeviceListViewState,
-                                                                 @Assisted private val userId: String,
+                                                                 @Assisted private val args: DeviceListBottomSheet.Args,
                                                                  private val session: Session)
     : VectorViewModel<DeviceListViewState, DeviceListAction, DeviceListBottomSheetViewEvents>(initialState) {
 
     @AssistedInject.Factory
     interface Factory {
-        fun create(initialState: DeviceListViewState, userId: String): DeviceListBottomSheetViewModel
+        fun create(initialState: DeviceListViewState, args: DeviceListBottomSheet.Args): DeviceListBottomSheetViewModel
     }
 
     init {
-        session.rx().liveUserCryptoDevices(userId)
+        session.rx().liveUserCryptoDevices(args.userId)
                 .execute {
                     copy(cryptoDevices = it).also {
                         refreshSelectedId()
                     }
                 }
 
-        session.rx().liveCrossSigningInfo(userId)
+        session.rx().liveCrossSigningInfo(args.userId)
                 .execute {
                     copy(memberCrossSigningKey = it.invoke()?.getOrNull())
                 }
@@ -88,6 +89,7 @@ class DeviceListBottomSheetViewModel @AssistedInject constructor(@Assisted priva
     }
 
     private fun selectDevice(action: DeviceListAction.SelectDevice) {
+        if (!args.allowDeviceAction) return
         setState {
             copy(selectedDevice = action.device)
         }
@@ -100,8 +102,9 @@ class DeviceListBottomSheetViewModel @AssistedInject constructor(@Assisted priva
     }
 
     private fun manuallyVerify(action: DeviceListAction.ManuallyVerify) {
-        session.cryptoService().verificationService().beginKeyVerification(VerificationMethod.SAS, userId, action.deviceId, null)?.let { txID ->
-            _viewEvents.post(DeviceListBottomSheetViewEvents.Verify(userId, txID))
+        if (!args.allowDeviceAction) return
+        session.cryptoService().verificationService().beginKeyVerification(VerificationMethod.SAS, args.userId, action.deviceId, null)?.let { txID ->
+            _viewEvents.post(DeviceListBottomSheetViewEvents.Verify(args.userId, txID))
         }
     }
 
@@ -109,12 +112,12 @@ class DeviceListBottomSheetViewModel @AssistedInject constructor(@Assisted priva
         @JvmStatic
         override fun create(viewModelContext: ViewModelContext, state: DeviceListViewState): DeviceListBottomSheetViewModel? {
             val fragment: DeviceListBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
-            val userId = viewModelContext.args<String>()
-            return fragment.viewModelFactory.create(state, userId)
+            val args = viewModelContext.args<DeviceListBottomSheet.Args>()
+            return fragment.viewModelFactory.create(state, args)
         }
 
         override fun initialState(viewModelContext: ViewModelContext): DeviceListViewState? {
-            val userId = viewModelContext.args<String>()
+            val userId = viewModelContext.args<DeviceListBottomSheet.Args>().userId
             val session = (viewModelContext.activity as HasScreenInjector).injector().activeSessionHolder().getActiveSession()
             return session.getUser(userId)?.toMatrixItem()?.let {
                 DeviceListViewState(
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 44cef8f974..b0ec7426a7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -53,6 +53,7 @@ import im.vector.app.features.crypto.keys.KeysExporter
 import im.vector.app.features.crypto.keys.KeysImporter
 import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivity
 import im.vector.app.features.crypto.recover.BootstrapBottomSheet
+import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinCodeStore
@@ -193,7 +194,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                     secureBackupCategory.isVisible = true
                     secureBackupPreference.title = getString(R.string.settings_secure_backup_setup)
                     secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                        BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = false)
+                        BootstrapBottomSheet.show(parentFragmentManager, SetupMode.NORMAL)
                         true
                     }
                 } else {
@@ -212,7 +213,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                         secureBackupCategory.isVisible = true
                         secureBackupPreference.title = getString(R.string.settings_secure_backup_reset)
                         secureBackupPreference.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                            BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = true)
+                            BootstrapBottomSheet.show(parentFragmentManager, SetupMode.PASSPHRASE_RESET)
                             true
                         }
                     } else if (!info.megolmSecretKnown) {
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index c17c1a1cf8..ac4d495a8c 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -44,6 +44,7 @@ import im.vector.app.core.extensions.queryExportKeys
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import im.vector.app.features.crypto.recover.BootstrapBottomSheet
+import im.vector.app.features.crypto.recover.SetupMode
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -121,7 +122,7 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
         super.onActivityCreated(savedInstanceState)
 
         setupRecoveryButton.action = {
-            BootstrapBottomSheet.show(parentFragmentManager, initCrossSigningOnly = false, forceReset4S = false)
+            BootstrapBottomSheet.show(parentFragmentManager, SetupMode.NORMAL)
         }
 
         exitAnywayButton.action = {
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index b6bdb2586a..bbe9282cc1 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -15,11 +15,11 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
+            android:src="@drawable/ic_security_key_24dp"
             android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_key"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key"
-            android:src="@drawable/ic_security_key_24dp" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key" />
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
@@ -56,8 +56,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
             app:errorEnabled="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -97,16 +97,32 @@
             tools:ignore="MissingConstraints" />
 
         <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/ssss_key_flow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:layout_marginBottom="@dimen/layout_vertical_margin_big"
             app:constraint_referenced_ids="ssss_key_use_file,ssss_key_submit"
             app:flow_horizontalStyle="spread_inside"
             app:flow_wrapMode="chain"
+            app:layout_constraintBottom_toTopOf="@+id/ssss_key_reset"
+            app:layout_constraintTop_toBottomOf="@+id/ssss_key_enter_til"
+            app:layout_goneMarginBottom="@dimen/layout_vertical_margin_big" />
+
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/ssss_key_reset"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="32dp"
+            app:actionTitle="@string/bad_passphrase_key_reset_all_action"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_key_enter_til" />
+            app:layout_constraintTop_toBottomOf="@id/ssss_key_flow"
+            app:leftIcon="@drawable/ic_alert_triangle"
+            app:tint="@color/vector_error_color"
+            app:titleTextColor="?riotx_text_secondary" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index e5482f0ec7..09bd823257 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -109,16 +109,33 @@
             tools:ignore="MissingConstraints" />
 
         <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/ssss_passphrase_flow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
-            android:layout_marginBottom="@dimen/layout_vertical_margin_big"
             app:constraint_referenced_ids="ssss_passphrase_use_key,ssss_passphrase_submit"
             app:flow_horizontalStyle="spread_inside"
             app:flow_wrapMode="chain"
+            app:layout_constraintBottom_toTopOf="@+id/ssss_passphrase_reset"
+            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til"
+            app:layout_goneMarginBottom="32dp" />
+
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/ssss_passphrase_reset"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="32dp"
+            android:clickable="true"
+            android:focusable="true"
+            app:actionTitle="@string/bad_passphrase_key_reset_all_action"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ssss_passphrase_enter_til" />
+            app:layout_constraintTop_toBottomOf="@id/ssss_passphrase_flow"
+            app:leftIcon="@drawable/ic_alert_triangle"
+            app:tint="@color/vector_error_color"
+            app:titleTextColor="?riotx_text_secondary" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
new file mode 100644
index 0000000000..6caef9fe66
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/ssss__root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/reset_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:drawableStart="@drawable/ic_alert_triangle"
+            android:drawablePadding="8dp"
+            android:drawableTint="?riot_primary_text_color"
+            android:text="@string/secure_backup_reset_all"
+            android:textColor="?riotx_text_primary"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:tint="?riot_primary_text_color"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/ssss_reset_all_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/secure_backup_reset_all_no_other_devices"
+            android:textColor="?riotx_text_primary"
+            app:layout_constraintBottom_toTopOf="@id/ssss_reset_other_devices"
+            app:layout_constraintTop_toBottomOf="@id/reset_title" />
+
+
+        <TextView
+            android:id="@+id/ssss_reset_other_devices"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:drawableLeft="@drawable/ic_smartphone"
+            android:drawablePadding="8dp"
+            app:layout_constraintTop_toBottomOf="@id/ssss_reset_all_description"
+            tools:text="Show 2 devices you can verify with now" />
+
+        <TextView
+            android:id="@+id/ssss_reset_text3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/secure_backup_reset_if_you_reset_all"
+            android:textColor="@color/riotx_destructive_accent"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            android:tint="?riot_primary_text_color"
+            app:layout_constraintStart_toStartOf="parent"
+
+            app:layout_constraintTop_toBottomOf="@id/ssss_reset_other_devices" />
+
+        <TextView
+            android:id="@+id/ssss_reset_text4"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:text="@string/secure_backup_reset_no_history"
+            android:textColor="?riotx_text_primary"
+            android:textSize="15sp"
+            app:layout_constraintTop_toBottomOf="@id/ssss_reset_text3" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/ssss_reset_button_cancel"
+            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/cancel"
+            tools:ignore="MissingConstraints" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/ssss_reset_button_reset"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/reset"
+            tools:ignore="MissingConstraints" />
+
+        <androidx.constraintlayout.helper.widget.Flow
+            android:id="@+id/ssss_passphrase_flow"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
+            android:layout_marginBottom="16dp"
+            app:constraint_referenced_ids="ssss_reset_button_cancel, ssss_reset_button_reset"
+            app:flow_horizontalStyle="spread_inside"
+            app:flow_wrapMode="chain"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/ssss_reset_text4" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 8c71fb26b2..bf393b779a 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -52,6 +52,7 @@
 
     <declare-styleable name="BottomSheetActionButton">
         <attr name="tint" format="color" />
+        <attr name="titleTextColor" format="color" />
         <attr name="actionTitle" format="string" />
         <attr name="actionDescription" format="string" />
         <attr name="leftIcon" format="reference" />
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a5d9bae0ae..3233fb2b22 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -78,6 +78,7 @@
     <string name="play_video">Play</string>
     <string name="pause_video">Pause</string>
     <string name="dismiss">Dismiss</string>
+    <string name="reset">Reset</string>
 
 
     <!-- First param will be replace by the value of ongoing_conference_call_voice, and second one by the value of ongoing_conference_call_video -->
@@ -2434,6 +2435,15 @@
     <string name="enter_secret_storage_input_key">Select your Recovery Key, or input it manually by typing it or pasting from your clipboard</string>
     <string name="keys_backup_recovery_key_error_decrypt">Backup could not be decrypted with this Recovery Key: please verify that you entered the correct Recovery Key.</string>
     <string name="failed_to_access_secure_storage">Failed to access secure storage</string>
+    <string name="bad_passphrase_key_reset_all_action">Forgot or lost all recovery options? Reset everything</string>
+    <string name="secure_backup_reset_all">Reset everything</string>
+    <string name="secure_backup_reset_all_no_other_devices">Only do this if you have no other device you can verify this device with.</string>
+    <string name="secure_backup_reset_if_you_reset_all">If you reset everything</string>
+    <string name="secure_backup_reset_no_history">You will restart with no history, no messages, trusted devices or trusted users</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Show the device you can verify with now</item>
+        <item quantity="other">Show %d devices you can verify with now</item>
+    </plurals>
 
     <string name="unencrypted">Unencrypted</string>
     <string name="encrypted_unverified">Encrypted by an unverified device</string>

From 9f26d015ba0092912b12d0eb4d761b884db7c72b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 29 Sep 2020 17:07:56 +0200
Subject: [PATCH 032/278] Update change log

Fixes #2052
---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 56f22bd4a9..d7fd9f6598 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,7 @@ Features ✨:
 Improvements 🙌:
  - PIN code: request PIN code if phone has been locked
  - Small optimisation of scrolling experience in timeline (#2114)
+ - Allow user to reset cross signing if he has no way to recover (#2052)
 
 Bugfix 🐛:
  - Improve support for image selection with intent changes (#1376)

From 1e3bdd6a2eb264f03f9eeddecc22a883dae45b65 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 29 Sep 2020 18:00:15 +0200
Subject: [PATCH 033/278] Fix test

---
 .../java/im/vector/app/VerifySessionPassphraseTest.kt         | 4 +++-
 vector/src/main/res/layout/fragment_ssss_reset_all.xml        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
index 5405c086eb..f8c2a89ea8 100644
--- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt
@@ -38,6 +38,7 @@ import im.vector.app.features.MainActivity
 import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
 import im.vector.app.features.crypto.recover.BootstrapCrossSigningTask
 import im.vector.app.features.crypto.recover.Params
+import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.home.HomeActivity
 import kotlinx.coroutines.runBlocking
 import org.junit.Before
@@ -77,7 +78,8 @@ class VerifySessionPassphraseTest : VerificationTestBase() {
         runBlocking {
             task.execute(Params(
                     userPasswordAuth = UserPasswordAuth(password = password),
-                    passphrase = passphrase
+                    passphrase = passphrase,
+                    setupMode = SetupMode.NORMAL
             ))
         }
     }
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index 6caef9fe66..a1851f3728 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -48,7 +48,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
-            android:drawableLeft="@drawable/ic_smartphone"
+            android:drawableStart="@drawable/ic_smartphone"
             android:drawablePadding="8dp"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_all_description"
             tools:text="Show 2 devices you can verify with now" />

From 24fcb3f58f3866cd259c48feae9eec09698d2063 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 11:18:51 +0300
Subject: [PATCH 034/278] Differentiate wordings for direct rooms.

---
 .../src/main/res/values/strings.xml           |  22 +++
 .../home/room/detail/RoomDetailFragment.kt    |  12 +-
 .../timeline/factory/EncryptionItemFactory.kt |  11 +-
 .../factory/MergedHeaderItemFactory.kt        |  18 +-
 .../timeline/format/NoticeEventFormatter.kt   | 183 ++++++++++++------
 .../detail/timeline/item/BasedMergedItem.kt   |   3 +-
 .../timeline/item/MergedRoomCreationItem.kt   |  18 +-
 vector/src/main/res/values/strings.xml        |   7 +
 8 files changed, 206 insertions(+), 68 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index f64ec9926e..70a7461fe9 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -10,13 +10,19 @@
     <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
     <string name="notice_room_created">%1$s created the room</string>
     <string name="notice_room_created_by_you">You created the room</string>
+    <string name="notice_direct_room_created">%1$s joined</string>
+    <string name="notice_direct_room_created_by_you">You joined</string>
     <string name="notice_room_invite">%1$s invited %2$s</string>
     <string name="notice_room_invite_by_you">You invited %1$s</string>
     <string name="notice_room_invite_you">%1$s invited you</string>
     <string name="notice_room_join">%1$s joined the room</string>
     <string name="notice_room_join_by_you">You joined the room</string>
+    <string name="notice_direct_room_join">%1$s joined</string>
+    <string name="notice_direct_room_join_by_you">You joined</string>
     <string name="notice_room_leave">%1$s left the room</string>
     <string name="notice_room_leave_by_you">You left the room</string>
+    <string name="notice_direct_room_leave">%1$s left the room</string>
+    <string name="notice_direct_room_leave_by_you">You left the room</string>
     <string name="notice_room_reject">%1$s rejected the invitation</string>
     <string name="notice_room_reject_by_you">You rejected the invitation</string>
     <string name="notice_room_kick">%1$s kicked %2$s</string>
@@ -53,6 +59,8 @@
     <string name="notice_ended_call_by_you">You ended the call.</string>
     <string name="notice_made_future_room_visibility">%1$s made future room history visible to %2$s</string>
     <string name="notice_made_future_room_visibility_by_you">You made future room history visible to %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s made future messages visible to %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">You made future messages visible to %1$s</string>
     <string name="notice_room_visibility_invited">all room members, from the point they are invited.</string>
     <string name="notice_room_visibility_joined">all room members, from the point they joined.</string>
     <string name="notice_room_visibility_shared">all room members.</string>
@@ -62,6 +70,8 @@
     <string name="notice_end_to_end_by_you">You turned on end-to-end encryption (%1$s)</string>
     <string name="notice_room_update">%s upgraded this room.</string>
     <string name="notice_room_update_by_you">You upgraded this room.</string>
+    <string name="notice_direct_room_update">%s upgraded here.</string>
+    <string name="notice_direct_room_update_by_you">You upgraded here.</string>
 
     <string name="notice_requested_voip_conference">%1$s requested a VoIP conference</string>
     <string name="notice_requested_voip_conference_by_you">You requested a VoIP conference</string>
@@ -83,8 +93,12 @@
     <string name="notice_profile_change_redacted_by_you">You updated your profile %1$s</string>
     <string name="notice_room_third_party_invite">%1$s sent an invitation to %2$s to join the room</string>
     <string name="notice_room_third_party_invite_by_you">You sent an invitation to %1$s to join the room</string>
+    <string name="notice_direct_room_third_party_invite">%1$s invited %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">You invited %1$s</string>
     <string name="notice_room_third_party_revoked_invite">%1$s revoked the invitation for %2$s to join the room</string>
     <string name="notice_room_third_party_revoked_invite_by_you">You revoked the invitation for %1$s to join the room</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s revoked the invitation for %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">You revoked the invitation for %1$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s accepted the invitation for %2$s</string>
     <string name="notice_room_third_party_registered_invite_by_you">You accepted the invitation for %1$s</string>
 
@@ -171,8 +185,12 @@
     <string name="notice_room_invite_you_with_reason">%1$s invited you. Reason: %2$s</string>
     <string name="notice_room_join_with_reason">%1$s joined the room. Reason: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">You joined the room. Reason: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s joined. Reason: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">You joined. Reason: %1$s</string>
     <string name="notice_room_leave_with_reason">%1$s left the room. Reason: %2$s</string>
     <string name="notice_room_leave_with_reason_by_you">You left the room. Reason: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s left. Reason: %2$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">You left. Reason: %1$s</string>
     <string name="notice_room_reject_with_reason">%1$s rejected the invitation. Reason: %2$s</string>
     <string name="notice_room_reject_with_reason_by_you">You rejected the invitation. Reason: %1$s</string>
     <string name="notice_room_kick_with_reason">%1$s kicked %2$s. Reason: %3$s</string>
@@ -220,8 +238,12 @@
 
     <string name="notice_room_guest_access_can_join">"%1$s has allowed guests to join the room."</string>
     <string name="notice_room_guest_access_can_join_by_you">"You have allowed guests to join the room."</string>
+    <string name="notice_direct_room_guest_access_can_join">"%1$s has allowed guests to join here."</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">"You have allowed guests to join here."</string>
     <string name="notice_room_guest_access_forbidden">"%1$s has prevented guests from joining the room."</string>
     <string name="notice_room_guest_access_forbidden_by_you">"You have prevented guests from joining the room."</string>
+    <string name="notice_direct_room_guest_access_forbidden">"%1$s has prevented guests from joining the room."</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">"You have prevented guests from joining the room."</string>
 
     <string name="notice_end_to_end_ok">%1$s turned on end-to-end encryption.</string>
     <string name="notice_end_to_end_ok_by_you">You turned on end-to-end encryption.</string>
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index e7140f06f4..b31af30609 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -704,7 +704,11 @@ class RoomDetailFragment @Inject constructor(
                     //                            safeStartCall(it, isVideoCall)
                     //                        }
                 } else if (!state.isAllowedToStartWebRTCCall) {
-                    showDialogWithMessage(getString(R.string.no_permissions_to_start_webrtc_call))
+                    if (session.getRoom(state.roomId)?.roomSummary()?.isDirect == true) {
+                        showDialogWithMessage(getString(R.string.no_permissions_to_start_webrtc_call_in_direct_room))
+                    } else {
+                        showDialogWithMessage(getString(R.string.no_permissions_to_start_webrtc_call))
+                    }
                 } else {
                     safeStartCall(isVideoCall)
                 }
@@ -714,7 +718,11 @@ class RoomDetailFragment @Inject constructor(
                 // can you add widgets??
                 if (!state.isAllowedToManageWidgets) {
                     // You do not have permission to start a conference call in this room
-                    showDialogWithMessage(getString(R.string.no_permissions_to_start_conf_call))
+                    if (session.getRoom(state.roomId)?.roomSummary()?.isDirect == true) {
+                        showDialogWithMessage(getString(R.string.no_permissions_to_start_conf_call_in_direct_room))
+                    } else {
+                        showDialogWithMessage(getString(R.string.no_permissions_to_start_conf_call))
+                    }
                 } else {
                     if (state.activeRoomWidgets()?.filter { it.type == WidgetType.Jitsi }?.any() == true) {
                         // A conference is already in progress!
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 5374b4792a..2ed88cbae9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -25,6 +25,8 @@ import im.vector.app.features.home.room.detail.timeline.helper.MessageInformatio
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
 import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem
 import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
@@ -36,7 +38,8 @@ class EncryptionItemFactory @Inject constructor(
         private val messageColorProvider: MessageColorProvider,
         private val stringProvider: StringProvider,
         private val informationDataFactory: MessageInformationDataFactory,
-        private val avatarSizeProvider: AvatarSizeProvider) {
+        private val avatarSizeProvider: AvatarSizeProvider,
+        private val session: Session) {
 
     fun create(event: TimelineEvent,
                highlight: Boolean,
@@ -51,7 +54,11 @@ class EncryptionItemFactory @Inject constructor(
         val shield: StatusTileTimelineItem.ShieldUIState
         if (isSafeAlgorithm) {
             title = stringProvider.getString(R.string.encryption_enabled)
-            description = stringProvider.getString(R.string.encryption_enabled_tile_description)
+            description = if (session.getRoomSummary(event.root.roomId ?: "")?.isDirect.orFalse()) {
+                stringProvider.getString(R.string.direct_room_encryption_enabled_tile_description)
+            } else {
+                stringProvider.getString(R.string.encryption_enabled_tile_description)
+            }
             shield = StatusTileTimelineItem.ShieldUIState.BLACK
         } else {
             title = stringProvider.getString(R.string.encryption_not_enabled)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 0ba3b4d47e..41a961dee0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -33,6 +33,7 @@ import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationI
 import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem
 import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem_
 import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
@@ -78,6 +79,12 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         }
     }
 
+    private fun isDirectRoom(roomId: String?): Boolean {
+        return roomId?.let {
+            activeSessionHolder.getSafeActiveSession()?.getRoom(roomId)?.roomSummary()?.isDirect
+        }.orFalse()
+    }
+
     private fun buildMembershipEventsMergedSummary(currentPosition: Int,
                                                    items: List<TimelineEvent>,
                                                    event: TimelineEvent,
@@ -100,7 +107,8 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                         avatarUrl = mergedEvent.senderInfo.avatarUrl,
                         memberName = mergedEvent.senderInfo.disambiguatedDisplayName,
                         localId = mergedEvent.localId,
-                        eventId = mergedEvent.root.eventId ?: ""
+                        eventId = mergedEvent.root.eventId ?: "",
+                        isDirectRoom = isDirectRoom(mergedEvent.root.roomId)
                 )
                 mergedData.add(data)
             }
@@ -157,7 +165,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                                       items: List<TimelineEvent>,
                                       event: TimelineEvent,
                                       eventIdToHighlight: String?,
-                                      // requestModelBuild: () -> Unit,
+            // requestModelBuild: () -> Unit,
                                       callback: TimelineEventController.Callback?): MergedUTDItem_? {
         Timber.v("## MERGE: buildUTDMergedSummary from position $currentPosition")
         var prevEvent = items.prevOrNull(currentPosition)
@@ -187,7 +195,8 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                             avatarUrl = senderAvatar,
                             memberName = senderName,
                             localId = mergedEvent.localId,
-                            eventId = mergedEvent.root.eventId ?: ""
+                            eventId = mergedEvent.root.eventId ?: "",
+                            isDirectRoom = isDirectRoom(mergedEvent.root.roomId)
                     )
                     mergedData.add(data)
                 }
@@ -247,7 +256,8 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                                 avatarUrl = mergedEvent.senderInfo.avatarUrl,
                                 memberName = mergedEvent.senderInfo.disambiguatedDisplayName,
                                 localId = mergedEvent.localId,
-                                eventId = mergedEvent.root.eventId ?: ""
+                                eventId = mergedEvent.root.eventId ?: "",
+                                isDirectRoom = isDirectRoom(mergedEvent.root.roomId)
                         )
                         mergedData.add(data)
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 9a4729abee..64d0fdd127 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.format
 
+import androidx.annotation.StringRes
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
@@ -56,6 +57,27 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
+    private fun isDirectRoom(roomId: String?): Boolean {
+        return roomId?.let {
+            activeSessionDataSource.currentValue?.orNull()?.getRoom(roomId)?.roomSummary()?.isDirect
+        }.orFalse()
+    }
+
+    private fun chooseResourceByRoomType(event: Event,
+                                         @StringRes directRoomResId: Int,
+                                         @StringRes directRoomByUserResId: Int,
+                                         @StringRes publicRoomResId: Int,
+                                         @StringRes publicRoomByUserResId: Int,
+                                         userResArgs: Any? = null,
+                                         vararg thirdPartyResArgs: Any?
+    ): String {
+        return if (isDirectRoom(event.roomId)) {
+            if (event.isSentByCurrentUser()) sp.getString(directRoomByUserResId, userResArgs) else sp.getString(directRoomResId, *thirdPartyResArgs)
+        } else {
+            if (event.isSentByCurrentUser()) sp.getString(publicRoomByUserResId, userResArgs) else sp.getString(publicRoomResId, *thirdPartyResArgs)
+        }
+    }
+
     fun format(timelineEvent: TimelineEvent): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {
             EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
@@ -179,11 +201,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return event.getClearContent().toModel<RoomCreateContent>()
                 ?.takeIf { it.creator.isNullOrBlank().not() }
                 ?.let {
-                    if (event.isSentByCurrentUser()) {
-                        sp.getString(R.string.notice_room_created_by_you)
-                    } else {
-                        sp.getString(R.string.notice_room_created, it.creator)
-                    }
+                    chooseResourceByRoomType(
+                            event = event,
+                            directRoomResId = R.string.notice_room_created_by_you,
+                            directRoomByUserResId = R.string.notice_direct_room_created_by_you,
+                            publicRoomResId = R.string.notice_room_created,
+                            publicRoomByUserResId = R.string.notice_room_created_by_you,
+                            thirdPartyResArgs = *arrayOf(it.creator)
+                    )
                 }
     }
 
@@ -205,11 +230,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
     }
 
     private fun formatRoomTombstoneEvent(event: Event, senderName: String?): CharSequence? {
-        return if (event.isSentByCurrentUser()) {
-            sp.getString(R.string.notice_room_update_by_you)
-        } else {
-            sp.getString(R.string.notice_room_update, senderName)
-        }
+        return chooseResourceByRoomType(
+                event = event,
+                directRoomResId = R.string.notice_direct_room_update,
+                directRoomByUserResId = R.string.notice_direct_room_update_by_you,
+                publicRoomResId = R.string.notice_room_update,
+                publicRoomByUserResId = R.string.notice_room_update_by_you,
+                thirdPartyResArgs = *arrayOf(senderName)
+        )
     }
 
     private fun formatRoomTopicEvent(event: Event, senderName: String?): CharSequence? {
@@ -250,11 +278,15 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val formattedVisibility = roomHistoryVisibilityFormatter.format(historyVisibility)
-        return if (event.isSentByCurrentUser()) {
-            sp.getString(R.string.notice_made_future_room_visibility_by_you, formattedVisibility)
-        } else {
-            sp.getString(R.string.notice_made_future_room_visibility, senderName, formattedVisibility)
-        }
+        return  chooseResourceByRoomType(
+                event = event,
+                directRoomResId = R.string.notice_made_future_direct_room_visibility,
+                directRoomByUserResId = R.string.notice_made_future_direct_room_visibility_by_you,
+                publicRoomResId = R.string.notice_made_future_room_visibility,
+                publicRoomByUserResId = R.string.notice_made_future_room_visibility_by_you,
+                userResArgs = formattedVisibility,
+                thirdPartyResArgs = *arrayOf(senderName, formattedVisibility)
+        )
     }
 
     private fun formatRoomThirdPartyInvite(event: Event, senderName: String?): CharSequence? {
@@ -264,19 +296,27 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return when {
             prevContent != null -> {
                 // Revoke case
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_room_third_party_revoked_invite_by_you, prevContent.displayName)
-                } else {
-                    sp.getString(R.string.notice_room_third_party_revoked_invite, senderName, prevContent.displayName)
-                }
+                chooseResourceByRoomType(
+                        event = event,
+                        directRoomResId = R.string.notice_direct_room_third_party_revoked_invite,
+                        directRoomByUserResId = R.string.notice_direct_room_third_party_revoked_invite_by_you,
+                        publicRoomResId = R.string.notice_room_third_party_revoked_invite,
+                        publicRoomByUserResId = R.string.notice_room_third_party_revoked_invite_by_you,
+                        userResArgs = prevContent.displayName,
+                        thirdPartyResArgs = *arrayOf(senderName, prevContent.displayName)
+                )
             }
             content != null     -> {
                 // Invitation case
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_room_third_party_invite_by_you, content.displayName)
-                } else {
-                    sp.getString(R.string.notice_room_third_party_invite, senderName, content.displayName)
-                }
+                chooseResourceByRoomType(
+                        event = event,
+                        directRoomResId = R.string.notice_direct_room_third_party_invite,
+                        directRoomByUserResId = R.string.notice_direct_room_third_party_invite_by_you,
+                        publicRoomResId = R.string.notice_room_third_party_invite,
+                        publicRoomByUserResId = R.string.notice_room_third_party_invite_by_you,
+                        userResArgs = content.displayName,
+                        thirdPartyResArgs = *arrayOf(senderName, content.displayName)
+                )
             }
             else                -> null
         }
@@ -391,17 +431,23 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val eventContent: RoomGuestAccessContent? = event.getClearContent().toModel()
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_room_guest_access_can_join_by_you)
-                } else {
-                    sp.getString(R.string.notice_room_guest_access_can_join, senderName)
-                }
+                chooseResourceByRoomType(
+                        event = event,
+                        directRoomResId = R.string.notice_direct_room_guest_access_can_join,
+                        directRoomByUserResId = R.string.notice_direct_room_guest_access_can_join_by_you,
+                        publicRoomResId = R.string.notice_room_guest_access_can_join,
+                        publicRoomByUserResId = R.string.notice_room_guest_access_can_join_by_you,
+                        thirdPartyResArgs = *arrayOf(senderName)
+                )
             GuestAccess.Forbidden ->
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.notice_room_guest_access_forbidden_by_you)
-                } else {
-                    sp.getString(R.string.notice_room_guest_access_forbidden, senderName)
-                }
+                chooseResourceByRoomType(
+                        event = event,
+                        directRoomResId = R.string.notice_direct_room_guest_access_forbidden,
+                        directRoomByUserResId = R.string.notice_direct_room_guest_access_forbidden_by_you,
+                        publicRoomResId = R.string.notice_room_guest_access_forbidden,
+                        publicRoomByUserResId = R.string.notice_room_guest_access_forbidden_by_you,
+                        thirdPartyResArgs = *arrayOf(senderName)
+                )
             else                  -> null
         }
     }
@@ -524,14 +570,25 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                 }
             }
             Membership.JOIN   ->
-                if (event.isSentByCurrentUser()) {
-                    eventContent.safeReason?.let { reason ->
-                        sp.getString(R.string.notice_room_join_with_reason_by_you, reason)
-                    } ?: sp.getString(R.string.notice_room_join_by_you)
-                } else {
-                    eventContent.safeReason?.let { reason ->
-                        sp.getString(R.string.notice_room_join_with_reason, senderDisplayName, reason)
-                    } ?: sp.getString(R.string.notice_room_join, senderDisplayName)
+                eventContent.safeReason?.let { reason ->
+                    chooseResourceByRoomType(
+                            event = event,
+                            directRoomResId = R.string.notice_direct_room_join_with_reason,
+                            directRoomByUserResId = R.string.notice_direct_room_join_with_reason_by_you,
+                            publicRoomResId = R.string.notice_room_join_with_reason,
+                            publicRoomByUserResId = R.string.notice_room_join_with_reason_by_you,
+                            userResArgs = reason,
+                            thirdPartyResArgs = *arrayOf(senderDisplayName, reason)
+                    )
+                } ?: run {
+                    chooseResourceByRoomType(
+                            event = event,
+                            directRoomResId = R.string.notice_direct_room_join,
+                            directRoomByUserResId = R.string.notice_direct_room_join_by_you,
+                            publicRoomResId = R.string.notice_room_join,
+                            publicRoomByUserResId = R.string.notice_room_join_by_you,
+                            thirdPartyResArgs = *arrayOf(senderDisplayName)
+                    )
                 }
             Membership.LEAVE  ->
                 // 2 cases here: this member may have left voluntarily or they may have been "left" by someone else ie. kicked
@@ -548,14 +605,25 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                                 } ?: sp.getString(R.string.notice_room_reject, senderDisplayName)
                             }
                         else              ->
-                            if (event.isSentByCurrentUser()) {
-                                eventContent.safeReason?.let { reason ->
-                                    sp.getString(R.string.notice_room_leave_with_reason_by_you, reason)
-                                } ?: sp.getString(R.string.notice_room_leave_by_you)
-                            } else {
-                                eventContent.safeReason?.let { reason ->
-                                    sp.getString(R.string.notice_room_leave_with_reason, senderDisplayName, reason)
-                                } ?: sp.getString(R.string.notice_room_leave, senderDisplayName)
+                            eventContent.safeReason?.let { reason ->
+                                chooseResourceByRoomType(
+                                        event = event,
+                                        directRoomResId = R.string.notice_direct_room_leave_with_reason,
+                                        directRoomByUserResId = R.string.notice_direct_room_leave_with_reason_by_you,
+                                        publicRoomResId = R.string.notice_room_leave_with_reason,
+                                        publicRoomByUserResId = R.string.notice_room_leave_with_reason_by_you,
+                                        userResArgs = reason,
+                                        thirdPartyResArgs = *arrayOf(senderDisplayName, reason)
+                                )
+                            } ?: run {
+                                chooseResourceByRoomType(
+                                        event = event,
+                                        directRoomResId = R.string.notice_direct_room_leave,
+                                        directRoomByUserResId = R.string.notice_direct_room_leave_by_you,
+                                        publicRoomResId = R.string.notice_room_leave,
+                                        publicRoomByUserResId = R.string.notice_room_leave_by_you,
+                                        thirdPartyResArgs = *arrayOf(senderDisplayName)
+                                )
                             }
                     }
                 } else {
@@ -622,11 +690,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val content = event.getClearContent().toModel<RoomJoinRulesContent>() ?: return null
         return when (content.joinRules) {
             RoomJoinRules.INVITE ->
-                if (event.isSentByCurrentUser()) {
-                    sp.getString(R.string.room_join_rules_invite_by_you)
-                } else {
-                    sp.getString(R.string.room_join_rules_invite, senderName)
-                }
+                chooseResourceByRoomType(
+                        event = event,
+                        directRoomResId = R.string.direct_room_join_rules_invite,
+                        directRoomByUserResId = R.string.direct_room_join_rules_invite_by_you,
+                        publicRoomResId = R.string.room_join_rules_invite,
+                        publicRoomByUserResId = R.string.room_join_rules_invite_by_you,
+                        thirdPartyResArgs = *arrayOf(senderName)
+                )
             RoomJoinRules.PUBLIC ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(R.string.room_join_rules_public_by_you)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
index d9dcc98ed1..1f8ad3df1b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BasedMergedItem.kt
@@ -62,7 +62,8 @@ abstract class BasedMergedItem<H : BasedMergedItem.Holder> : BaseEventItem<H>()
             val eventId: String,
             val userId: String,
             val memberName: String,
-            val avatarUrl: String?
+            val avatarUrl: String?,
+            val isDirectRoom: Boolean
     )
 
     fun Data.toMatrixItem() = MatrixItem.UserItem(userId, memberName, avatarUrl)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
index dad5f99eeb..1896a812fc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
@@ -48,9 +48,17 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
 
             val createdFromCurrentUser = data?.userId == attributes.currentUserId
             val summary = if (createdFromCurrentUser) {
-                holder.expandView.resources.getString(R.string.room_created_summary_item_by_you)
+                if (data?.isDirectRoom == true) {
+                    holder.expandView.resources.getString(R.string.direct_room_created_summary_item_by_you)
+                } else {
+                    holder.expandView.resources.getString(R.string.room_created_summary_item_by_you)
+                }
             } else {
-                holder.expandView.resources.getString(R.string.room_created_summary_item, data?.memberName ?: data?.userId ?: "")
+                if (data?.isDirectRoom == true) {
+                    holder.expandView.resources.getString(R.string.direct_room_created_summary_item, data.memberName)
+                } else {
+                    holder.expandView.resources.getString(R.string.room_created_summary_item, data?.memberName ?: data?.userId ?: "")
+                }
             }
             holder.summaryView.text = summary
             holder.summaryView.visibility = View.VISIBLE
@@ -69,7 +77,11 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
                 }
                 if (attributes.isEncryptionAlgorithmSecure) {
                     holder.e2eTitleTextView.text = holder.expandView.resources.getString(R.string.encryption_enabled)
-                    holder.e2eTitleDescriptionView.text = holder.expandView.resources.getString(R.string.encryption_enabled_tile_description)
+                    holder.e2eTitleDescriptionView.text = if (data?.isDirectRoom == true) {
+                        holder.expandView.resources.getString(R.string.direct_room_encryption_enabled_tile_description)
+                    } else {
+                        holder.expandView.resources.getString(R.string.encryption_enabled_tile_description)
+                    }
                     holder.e2eTitleDescriptionView.textAlignment = View.TEXT_ALIGNMENT_CENTER
                     holder.e2eTitleTextView.setCompoundDrawablesWithIntrinsicBounds(
                             ContextCompat.getDrawable(holder.view.context, R.drawable.ic_shield_black),
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index a5d9bae0ae..887e78d102 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -89,7 +89,9 @@
     <string name="missing_permissions_error">"Due to missing permissions, this action is not possible.</string>
     <string name="missing_permissions_to_start_conf_call">You need permission to invite to start a conference in this room</string>
     <string name="no_permissions_to_start_conf_call">You do not have permission to start a conference call in this room</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">You do not have permission to start a conference call</string>
     <string name="no_permissions_to_start_webrtc_call">You do not have permission to start a call in this room</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">You do not have permission to start a call</string>
     <string name="conference_call_in_progress">A conference is already in progress!</string>
     <string name="video_meeting">Start video meeting</string>
     <string name="audio_meeting">Start audio meeting</string>
@@ -1881,6 +1883,8 @@
     <string name="room_join_rules_public_by_you">You made the room public to whoever knows the link.</string>
     <string name="room_join_rules_invite">%1$s made the room invite only.</string>
     <string name="room_join_rules_invite_by_you">You made the room invite only.</string>
+    <string name="direct_room_join_rules_invite">%1$s made this invite only.</string>
+    <string name="direct_room_join_rules_invite_by_you">You made this invite only.</string>
     <string name="timeline_unread_messages">Unread messages</string>
 
     <string name="login_splash_title">It\'s your conversation. Own it.</string>
@@ -2355,11 +2359,14 @@
 
     <string name="encryption_enabled">Encryption enabled</string>
     <string name="encryption_enabled_tile_description">Messages in this room are end-to-end encrypted. Learn more &amp; verify users in their profile.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Messages in this room are end-to-end encrypted.</string>
     <string name="encryption_not_enabled">Encryption not enabled</string>
     <string name="encryption_unknown_algorithm_tile_description">The encryption used by this room is not supported</string>
 
     <string name="room_created_summary_item">%s created and configured the room.</string>
     <string name="room_created_summary_item_by_you">You created and configured the room.</string>
+    <string name="direct_room_created_summary_item">%s joined.</string>
+    <string name="direct_room_created_summary_item_by_you">You joined.</string>
 
     <string name="qr_code_scanned_self_verif_notice">Almost there! Is the other device showing the same shield?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Almost there! Waiting for confirmation…</string>

From 3a9e6fa97fbbfa034889ec25fd8645fa7992ed10 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 11:21:07 +0300
Subject: [PATCH 035/278] Changelog added.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index fd076e27ea..1a01d46964 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -59,6 +59,7 @@ Changes in Element 1.0.7 (2020-09-17)
 Improvements 🙌:
  - Handle date formatting properly (show time am/pm if needed, display year when needed)
  - Improve F-Droid Notification (#2055)
+ - Wording differentiation for direct rooms (#2176)
 
 Bugfix 🐛:
  - Clear the notification when the event is read elsewhere (#1822)

From 2a96b2c68e9a142587a237f2d721c08bd993a352 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 11:35:02 +0300
Subject: [PATCH 036/278] Differentiate wordings for the room profile screen.

---
 .../features/roomprofile/RoomProfileController.kt    | 12 +++++++++---
 vector/src/main/res/values/strings.xml               |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 815478b46b..13efaf0d10 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -57,7 +57,7 @@ class RoomProfileController @Inject constructor(
         // Security
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_security))
         val learnMoreSubtitle = if (roomSummary.isEncrypted) {
-            R.string.room_profile_encrypted_subtitle
+            if (roomSummary.isDirect) R.string.direct_room_profile_encrypted_subtitle else R.string.room_profile_encrypted_subtitle
         } else {
             R.string.room_profile_not_encrypted_subtitle
         }
@@ -71,7 +71,10 @@ class RoomProfileController @Inject constructor(
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
         buildProfileAction(
                 id = "settings",
-                title = stringProvider.getString(R.string.room_profile_section_more_settings),
+                title = if (roomSummary.isDirect)
+                    stringProvider.getString(R.string.direct_room_profile_section_more_settings)
+                else
+                    stringProvider.getString(R.string.room_profile_section_more_settings),
                 dividerColor = dividerColor,
                 icon = R.drawable.ic_room_profile_settings,
                 action = { callback?.onSettingsClicked() }
@@ -112,7 +115,10 @@ class RoomProfileController @Inject constructor(
         )
         buildProfileAction(
                 id = "leave",
-                title = stringProvider.getString(R.string.room_profile_section_more_leave),
+                title = if (roomSummary.isDirect)
+                    stringProvider.getString(R.string.direct_room_profile_section_more_leave)
+                else
+                    stringProvider.getString(R.string.room_profile_section_more_leave),
                 dividerColor = dividerColor,
                 divider = false,
                 destructive = true,
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 887e78d102..d71195bf13 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2118,11 +2118,13 @@
     <string name="verification_request_alert_description">For extra security, verify %s by checking a one-time code on both your devices.\n\nFor maximum security, do this in person.</string>
     <string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string>
     <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
+    <string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="room_profile_section_security">Security</string>
     <string name="room_profile_section_security_learn_more">Learn more</string>
     <string name="room_profile_section_more">More</string>
     <string name="room_profile_section_admin">Admin Actions</string>
     <string name="room_profile_section_more_settings">Room settings</string>
+    <string name="direct_room_profile_section_more_settings">Settings</string>
     <string name="room_profile_section_more_notifications">Notifications</string>
     <plurals name="room_profile_section_more_member_list">
         <item quantity="one">"One person"</item>
@@ -2130,6 +2132,7 @@
     </plurals>
     <string name="room_profile_section_more_uploads">Uploads</string>
     <string name="room_profile_section_more_leave">Leave Room</string>
+    <string name="direct_room_profile_section_more_leave">Leave</string>
     <string name="room_profile_leaving_room">"Leaving the room…"</string>
 
     <string name="room_member_power_level_admins">Admins</string>

From 07976988d9dad7eb4ad50d63ca2636363910f63e Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 11:37:17 +0300
Subject: [PATCH 037/278] Use RoomSummary to check if the room is direct.

---
 .../home/room/detail/timeline/format/NoticeEventFormatter.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 64d0fdd127..4b95fd4436 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -59,7 +59,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun isDirectRoom(roomId: String?): Boolean {
         return roomId?.let {
-            activeSessionDataSource.currentValue?.orNull()?.getRoom(roomId)?.roomSummary()?.isDirect
+            activeSessionDataSource.currentValue?.orNull()?.getRoomSummary(roomId)?.isDirect
         }.orFalse()
     }
 

From 5d18a7cc829426aae44e592e5e1cb3e5a181864f Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 12:27:06 +0300
Subject: [PATCH 038/278] Lint fixes.

---
 .../features/roomprofile/RoomProfileController.kt  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 13efaf0d10..2c71a11136 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -71,10 +71,11 @@ class RoomProfileController @Inject constructor(
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
         buildProfileAction(
                 id = "settings",
-                title = if (roomSummary.isDirect)
+                title = if (roomSummary.isDirect) {
                     stringProvider.getString(R.string.direct_room_profile_section_more_settings)
-                else
-                    stringProvider.getString(R.string.room_profile_section_more_settings),
+                } else {
+                    stringProvider.getString(R.string.room_profile_section_more_settings)
+                },
                 dividerColor = dividerColor,
                 icon = R.drawable.ic_room_profile_settings,
                 action = { callback?.onSettingsClicked() }
@@ -115,10 +116,11 @@ class RoomProfileController @Inject constructor(
         )
         buildProfileAction(
                 id = "leave",
-                title = if (roomSummary.isDirect)
+                title = if (roomSummary.isDirect) {
                     stringProvider.getString(R.string.direct_room_profile_section_more_leave)
-                else
-                    stringProvider.getString(R.string.room_profile_section_more_leave),
+                } else {
+                    stringProvider.getString(R.string.room_profile_section_more_leave)
+                },
                 dividerColor = dividerColor,
                 divider = false,
                 destructive = true,

From d225fb7df02f285ce65512abdb9b10c7c9c730ef Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 10:08:26 +0200
Subject: [PATCH 039/278] Update Changelog

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1a01d46964..9348717fb5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Features ✨:
  -
 
 Improvements 🙌:
+ - Wording differentiation for direct rooms (#2176)
  - PIN code: request PIN code if phone has been locked
  - Small optimisation of scrolling experience in timeline (#2114)
 
@@ -59,7 +60,6 @@ Changes in Element 1.0.7 (2020-09-17)
 Improvements 🙌:
  - Handle date formatting properly (show time am/pm if needed, display year when needed)
  - Improve F-Droid Notification (#2055)
- - Wording differentiation for direct rooms (#2176)
 
 Bugfix 🐛:
  - Clear the notification when the event is read elsewhere (#1822)

From 2908a5d3455a958fe93a159c6110d26d43852d8d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 30 Sep 2020 10:13:59 +0200
Subject: [PATCH 040/278] Added first ui bootstrap test

---
 vector/build.gradle                           |   1 +
 .../im/vector/app/SecurityBootstrapTest.kt    | 181 ++++++++++++++++++
 2 files changed, 182 insertions(+)
 create mode 100644 vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt

diff --git a/vector/build.gradle b/vector/build.gradle
index 222c0c5cb3..87c8696b02 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -453,6 +453,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$espresso_version"
     androidTestImplementation "org.amshove.kluent:kluent-android:$kluent_version"
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     // Plant Timber tree for test
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
new file mode 100644
index 0000000000..a71af59edf
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import android.app.Activity
+import android.app.Instrumentation.ActivityResult
+import android.content.Intent
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.pressBack
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.isInternal
+import androidx.test.espresso.matcher.RootMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.features.MainActivity
+import im.vector.app.features.crypto.recover.SetupMode
+import im.vector.app.features.home.HomeActivity
+import org.hamcrest.CoreMatchers.not
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.session.Session
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class SecurityBootstrapTest : VerificationTestBase() {
+
+    var existingSession: Session? = null
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Before
+    fun createSessionWithCrossSigning() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        val matrix = Matrix.getInstance(context)
+        val userName = "foobar_${System.currentTimeMillis()}"
+        existingSession = createAccountAndSync(matrix, userName, password, true)
+        stubAllExternalIntents()
+    }
+
+    private fun stubAllExternalIntents() {
+        // By default Espresso Intents does not stub any Intents. Stubbing needs to be setup before
+        // every test run. In this case all external Intents will be blocked.
+        Intents.init()
+        intending(not(isInternal())).respondWith(ActivityResult(Activity.RESULT_OK, null))
+    }
+
+    @Test
+    fun testBasicBootstrap() {
+        val userId: String = existingSession!!.myUserId
+
+        doLogin(homeServerUrl, userId, password)
+
+        // Thread.sleep(6000)
+        withIdlingResource(activityIdlingResource(HomeActivity::class.java)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+                    .perform(closeSoftKeyboard())
+        }
+
+        val activity = EspressoHelper.getCurrentActivity()!!
+        val uiSession = (activity as HomeActivity).activeSessionHolder.getActiveSession()
+
+        withIdlingResource(initialSyncIdlingResource(uiSession)) {
+            onView(withId(R.id.roomListContainer))
+                    .check(matches(isDisplayed()))
+        }
+
+        activity.navigator.open4SSetup(activity, SetupMode.NORMAL, null)
+
+        Thread.sleep(1000)
+
+        onView(withId(R.id.bootstrapSetupSecureUseSecurityKey))
+                .check(matches(isDisplayed()))
+
+        onView(withId(R.id.bootstrapSetupSecureUseSecurityPassphrase))
+                .check(matches(isDisplayed()))
+                .perform(click())
+
+        onView(isRoot())
+                .perform(waitForView(withText(R.string.bootstrap_info_text_2)))
+
+        // test back
+        onView(isRoot()).perform(pressBack())
+
+
+        Thread.sleep(1000)
+
+        onView(withId(R.id.bootstrapSetupSecureUseSecurityKey))
+                .check(matches(isDisplayed()))
+
+        onView(withId(R.id.bootstrapSetupSecureUseSecurityPassphrase))
+                .check(matches(isDisplayed()))
+                .perform(click())
+
+        onView(isRoot())
+                .perform(waitForView(withText(R.string.bootstrap_info_text_2)))
+
+        onView(withId(R.id.ssss_passphrase_enter_edittext))
+                .perform(typeText("person woman man camera tv"))
+
+        onView(withId(R.id.bootstrapSubmit))
+                .perform(closeSoftKeyboard(), click())
+
+        // test bad pass
+        onView(withId(R.id.ssss_passphrase_enter_edittext))
+                .perform(typeText("person woman man cmera tv"))
+
+        onView(withId(R.id.bootstrapSubmit))
+                .perform(closeSoftKeyboard(), click())
+
+        onView(withText(R.string.passphrase_passphrase_does_not_match)).check(matches(isDisplayed()))
+
+        onView(withId(R.id.ssss_passphrase_enter_edittext))
+                .perform(replaceText("person woman man camera tv"))
+
+
+        onView(withId(R.id.bootstrapSubmit))
+                .perform(closeSoftKeyboard(), click())
+
+        onView(withId(R.id.bottomSheetScrollView))
+                .perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))
+
+
+
+        intending(hasAction(Intent.ACTION_SEND)).respondWith(ActivityResult(Activity.RESULT_OK, null))
+
+        onView(withId(R.id.recoveryCopy))
+                .perform(click())
+
+        Thread.sleep(1000)
+
+        // Dismiss dialog
+        onView(withText(R.string.ok)).inRoot(RootMatchers.isDialog()).perform(click())
+
+
+        onView(withId(R.id.bottomSheetScrollView))
+                .perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))
+
+        onView(withText(R.string._continue)).perform(click())
+
+        // Assert that all is configured
+        assert(uiSession.cryptoService().crossSigningService().isCrossSigningInitialized())
+        assert(uiSession.cryptoService().crossSigningService().canCrossSign())
+        assert(uiSession.cryptoService().crossSigningService().allPrivateKeysKnown())
+        assert(uiSession.cryptoService().keysBackupService().isEnabled)
+        assert(uiSession.cryptoService().keysBackupService().currentBackupVersion != null)
+        assert(uiSession.sharedSecretStorageService.isRecoverySetup())
+        assert(uiSession.sharedSecretStorageService.isMegolmKeyInBackup())
+    }
+}

From 3642ca5b4a1a6943ca5bcc77c2b7ec8e85f5ba3d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 30 Sep 2020 11:05:06 +0200
Subject: [PATCH 041/278] cleaning

---
 tools/check/forbidden_strings_in_code.txt                    | 2 +-
 .../androidTest/java/im/vector/app/SecurityBootstrapTest.kt  | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 3ced7de7e2..1d3aaa9f69 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -164,7 +164,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===78
+enum class===80
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3
diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index a71af59edf..3bf17aa043 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -113,7 +113,6 @@ class SecurityBootstrapTest : VerificationTestBase() {
         // test back
         onView(isRoot()).perform(pressBack())
 
-
         Thread.sleep(1000)
 
         onView(withId(R.id.bootstrapSetupSecureUseSecurityKey))
@@ -144,15 +143,12 @@ class SecurityBootstrapTest : VerificationTestBase() {
         onView(withId(R.id.ssss_passphrase_enter_edittext))
                 .perform(replaceText("person woman man camera tv"))
 
-
         onView(withId(R.id.bootstrapSubmit))
                 .perform(closeSoftKeyboard(), click())
 
         onView(withId(R.id.bottomSheetScrollView))
                 .perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))
 
-
-
         intending(hasAction(Intent.ACTION_SEND)).respondWith(ActivityResult(Activity.RESULT_OK, null))
 
         onView(withId(R.id.recoveryCopy))
@@ -163,7 +159,6 @@ class SecurityBootstrapTest : VerificationTestBase() {
         // Dismiss dialog
         onView(withText(R.string.ok)).inRoot(RootMatchers.isDialog()).perform(click())
 
-
         onView(withId(R.id.bottomSheetScrollView))
                 .perform(waitForView(withText(R.string.bottom_sheet_save_your_recovery_key_content)))
 

From b5311aa3df8a483b4ab71d14b05b692181c902fe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 11:42:07 +0200
Subject: [PATCH 042/278] Simple code

---
 .../timeline/format/NoticeEventFormatter.kt   | 188 ++++++------------
 1 file changed, 66 insertions(+), 122 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 4b95fd4436..baa00ef3e5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.home.room.detail.timeline.format
 
-import androidx.annotation.StringRes
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
@@ -57,26 +56,9 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
-    private fun isDirectRoom(roomId: String?): Boolean {
-        return roomId?.let {
-            activeSessionDataSource.currentValue?.orNull()?.getRoomSummary(roomId)?.isDirect
-        }.orFalse()
-    }
-
-    private fun chooseResourceByRoomType(event: Event,
-                                         @StringRes directRoomResId: Int,
-                                         @StringRes directRoomByUserResId: Int,
-                                         @StringRes publicRoomResId: Int,
-                                         @StringRes publicRoomByUserResId: Int,
-                                         userResArgs: Any? = null,
-                                         vararg thirdPartyResArgs: Any?
-    ): String {
-        return if (isDirectRoom(event.roomId)) {
-            if (event.isSentByCurrentUser()) sp.getString(directRoomByUserResId, userResArgs) else sp.getString(directRoomResId, *thirdPartyResArgs)
-        } else {
-            if (event.isSentByCurrentUser()) sp.getString(publicRoomByUserResId, userResArgs) else sp.getString(publicRoomResId, *thirdPartyResArgs)
-        }
-    }
+    private fun Event.isDm() = roomId?.let {
+        activeSessionDataSource.currentValue?.orNull()?.getRoomSummary(it)?.isDirect
+    }.orFalse()
 
     fun format(timelineEvent: TimelineEvent): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {
@@ -201,14 +183,10 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return event.getClearContent().toModel<RoomCreateContent>()
                 ?.takeIf { it.creator.isNullOrBlank().not() }
                 ?.let {
-                    chooseResourceByRoomType(
-                            event = event,
-                            directRoomResId = R.string.notice_room_created_by_you,
-                            directRoomByUserResId = R.string.notice_direct_room_created_by_you,
-                            publicRoomResId = R.string.notice_room_created,
-                            publicRoomByUserResId = R.string.notice_room_created_by_you,
-                            thirdPartyResArgs = *arrayOf(it.creator)
-                    )
+                    if (event.isSentByCurrentUser())
+                        sp.getString(if (event.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
+                    else
+                        sp.getString(if (event.isDm()) R.string.notice_room_created_by_you else R.string.notice_room_created, it.creator)
                 }
     }
 
@@ -230,14 +208,10 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
     }
 
     private fun formatRoomTombstoneEvent(event: Event, senderName: String?): CharSequence? {
-        return chooseResourceByRoomType(
-                event = event,
-                directRoomResId = R.string.notice_direct_room_update,
-                directRoomByUserResId = R.string.notice_direct_room_update_by_you,
-                publicRoomResId = R.string.notice_room_update,
-                publicRoomByUserResId = R.string.notice_room_update_by_you,
-                thirdPartyResArgs = *arrayOf(senderName)
-        )
+        return if (event.isSentByCurrentUser())
+            sp.getString(if (event.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
+        else
+            sp.getString(if (event.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
     }
 
     private fun formatRoomTopicEvent(event: Event, senderName: String?): CharSequence? {
@@ -278,15 +252,12 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val formattedVisibility = roomHistoryVisibilityFormatter.format(historyVisibility)
-        return  chooseResourceByRoomType(
-                event = event,
-                directRoomResId = R.string.notice_made_future_direct_room_visibility,
-                directRoomByUserResId = R.string.notice_made_future_direct_room_visibility_by_you,
-                publicRoomResId = R.string.notice_made_future_room_visibility,
-                publicRoomByUserResId = R.string.notice_made_future_room_visibility_by_you,
-                userResArgs = formattedVisibility,
-                thirdPartyResArgs = *arrayOf(senderName, formattedVisibility)
-        )
+        return if (event.isSentByCurrentUser())
+            sp.getString(if (event.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
+                    formattedVisibility)
+        else
+            sp.getString(if (event.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
+                    senderName, formattedVisibility)
     }
 
     private fun formatRoomThirdPartyInvite(event: Event, senderName: String?): CharSequence? {
@@ -296,27 +267,21 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return when {
             prevContent != null -> {
                 // Revoke case
-                chooseResourceByRoomType(
-                        event = event,
-                        directRoomResId = R.string.notice_direct_room_third_party_revoked_invite,
-                        directRoomByUserResId = R.string.notice_direct_room_third_party_revoked_invite_by_you,
-                        publicRoomResId = R.string.notice_room_third_party_revoked_invite,
-                        publicRoomByUserResId = R.string.notice_room_third_party_revoked_invite_by_you,
-                        userResArgs = prevContent.displayName,
-                        thirdPartyResArgs = *arrayOf(senderName, prevContent.displayName)
-                )
+                if (event.isSentByCurrentUser())
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite_by_you else R.string.notice_room_third_party_revoked_invite_by_you,
+                            prevContent.displayName)
+                else
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
+                            senderName, prevContent.displayName)
             }
             content != null     -> {
                 // Invitation case
-                chooseResourceByRoomType(
-                        event = event,
-                        directRoomResId = R.string.notice_direct_room_third_party_invite,
-                        directRoomByUserResId = R.string.notice_direct_room_third_party_invite_by_you,
-                        publicRoomResId = R.string.notice_room_third_party_invite,
-                        publicRoomByUserResId = R.string.notice_room_third_party_invite_by_you,
-                        userResArgs = content.displayName,
-                        thirdPartyResArgs = *arrayOf(senderName, content.displayName)
-                )
+                if (event.isSentByCurrentUser())
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
+                            content.displayName)
+                else
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
+                            senderName, content.displayName)
             }
             else                -> null
         }
@@ -431,23 +396,17 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val eventContent: RoomGuestAccessContent? = event.getClearContent().toModel()
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
-                chooseResourceByRoomType(
-                        event = event,
-                        directRoomResId = R.string.notice_direct_room_guest_access_can_join,
-                        directRoomByUserResId = R.string.notice_direct_room_guest_access_can_join_by_you,
-                        publicRoomResId = R.string.notice_room_guest_access_can_join,
-                        publicRoomByUserResId = R.string.notice_room_guest_access_can_join_by_you,
-                        thirdPartyResArgs = *arrayOf(senderName)
-                )
+                if (event.isSentByCurrentUser())
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you)
+                else
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
+                            senderName)
             GuestAccess.Forbidden ->
-                chooseResourceByRoomType(
-                        event = event,
-                        directRoomResId = R.string.notice_direct_room_guest_access_forbidden,
-                        directRoomByUserResId = R.string.notice_direct_room_guest_access_forbidden_by_you,
-                        publicRoomResId = R.string.notice_room_guest_access_forbidden,
-                        publicRoomByUserResId = R.string.notice_room_guest_access_forbidden_by_you,
-                        thirdPartyResArgs = *arrayOf(senderName)
-                )
+                if (event.isSentByCurrentUser())
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you)
+                else
+                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
+                            senderName)
             else                  -> null
         }
     }
@@ -571,24 +530,18 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
             }
             Membership.JOIN   ->
                 eventContent.safeReason?.let { reason ->
-                    chooseResourceByRoomType(
-                            event = event,
-                            directRoomResId = R.string.notice_direct_room_join_with_reason,
-                            directRoomByUserResId = R.string.notice_direct_room_join_with_reason_by_you,
-                            publicRoomResId = R.string.notice_room_join_with_reason,
-                            publicRoomByUserResId = R.string.notice_room_join_with_reason_by_you,
-                            userResArgs = reason,
-                            thirdPartyResArgs = *arrayOf(senderDisplayName, reason)
-                    )
+                    if (event.isSentByCurrentUser())
+                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
+                                reason)
+                    else
+                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
+                                senderDisplayName, reason)
                 } ?: run {
-                    chooseResourceByRoomType(
-                            event = event,
-                            directRoomResId = R.string.notice_direct_room_join,
-                            directRoomByUserResId = R.string.notice_direct_room_join_by_you,
-                            publicRoomResId = R.string.notice_room_join,
-                            publicRoomByUserResId = R.string.notice_room_join_by_you,
-                            thirdPartyResArgs = *arrayOf(senderDisplayName)
-                    )
+                    if (event.isSentByCurrentUser())
+                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
+                    else
+                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
+                                senderDisplayName)
                 }
             Membership.LEAVE  ->
                 // 2 cases here: this member may have left voluntarily or they may have been "left" by someone else ie. kicked
@@ -606,24 +559,18 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                             }
                         else              ->
                             eventContent.safeReason?.let { reason ->
-                                chooseResourceByRoomType(
-                                        event = event,
-                                        directRoomResId = R.string.notice_direct_room_leave_with_reason,
-                                        directRoomByUserResId = R.string.notice_direct_room_leave_with_reason_by_you,
-                                        publicRoomResId = R.string.notice_room_leave_with_reason,
-                                        publicRoomByUserResId = R.string.notice_room_leave_with_reason_by_you,
-                                        userResArgs = reason,
-                                        thirdPartyResArgs = *arrayOf(senderDisplayName, reason)
-                                )
+                                if (event.isSentByCurrentUser())
+                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason_by_you else R.string.notice_room_leave_with_reason_by_you,
+                                            reason)
+                                else
+                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
+                                            senderDisplayName, reason)
                             } ?: run {
-                                chooseResourceByRoomType(
-                                        event = event,
-                                        directRoomResId = R.string.notice_direct_room_leave,
-                                        directRoomByUserResId = R.string.notice_direct_room_leave_by_you,
-                                        publicRoomResId = R.string.notice_room_leave,
-                                        publicRoomByUserResId = R.string.notice_room_leave_by_you,
-                                        thirdPartyResArgs = *arrayOf(senderDisplayName)
-                                )
+                                if (event.isSentByCurrentUser())
+                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
+                                else
+                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
+                                            senderDisplayName)
                             }
                     }
                 } else {
@@ -690,14 +637,11 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val content = event.getClearContent().toModel<RoomJoinRulesContent>() ?: return null
         return when (content.joinRules) {
             RoomJoinRules.INVITE ->
-                chooseResourceByRoomType(
-                        event = event,
-                        directRoomResId = R.string.direct_room_join_rules_invite,
-                        directRoomByUserResId = R.string.direct_room_join_rules_invite_by_you,
-                        publicRoomResId = R.string.room_join_rules_invite,
-                        publicRoomByUserResId = R.string.room_join_rules_invite_by_you,
-                        thirdPartyResArgs = *arrayOf(senderName)
-                )
+                if (event.isSentByCurrentUser())
+                    sp.getString(if (event.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
+                else
+                    sp.getString(if (event.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
+                            senderName)
             RoomJoinRules.PUBLIC ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(R.string.room_join_rules_public_by_you)

From 2f054cd438579bb6c66c4a5117e5298b08f5a086 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 11:45:21 +0200
Subject: [PATCH 043/278] Fix mistake

---
 .../home/room/detail/timeline/format/NoticeEventFormatter.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index baa00ef3e5..866058c8ba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -186,7 +186,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                     if (event.isSentByCurrentUser())
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
                     else
-                        sp.getString(if (event.isDm()) R.string.notice_room_created_by_you else R.string.notice_room_created, it.creator)
+                        sp.getString(if (event.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
                 }
     }
 

From 14162ecaa0ef94565abf1f0772b2a938a9a275b8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 11:47:37 +0200
Subject: [PATCH 044/278] Add missing case

---
 .../im/vector/app/features/roomprofile/RoomProfileController.kt | 2 +-
 vector/src/main/res/values/strings.xml                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 2c71a11136..0d88563be9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -59,7 +59,7 @@ class RoomProfileController @Inject constructor(
         val learnMoreSubtitle = if (roomSummary.isEncrypted) {
             if (roomSummary.isDirect) R.string.direct_room_profile_encrypted_subtitle else R.string.room_profile_encrypted_subtitle
         } else {
-            R.string.room_profile_not_encrypted_subtitle
+            if (roomSummary.isDirect) R.string.direct_room_profile_not_encrypted_subtitle else R.string.room_profile_not_encrypted_subtitle
         }
         genericFooterItem {
             id("e2e info")
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d71195bf13..68d42e8356 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2117,6 +2117,7 @@
     <string name="verification_request_waiting_for">Waiting for %s…</string>
     <string name="verification_request_alert_description">For extra security, verify %s by checking a one-time code on both your devices.\n\nFor maximum security, do this in person.</string>
     <string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Messages here are not end-to-end encrypted.</string>
     <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="room_profile_section_security">Security</string>

From 07446d2d41d0d16d578bfa1b160df77bece5ee16 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 11:50:07 +0200
Subject: [PATCH 045/278] Embedded if

---
 .../roomprofile/RoomProfileController.kt       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 0d88563be9..ccfbf6d4fa 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -18,7 +18,6 @@
 package im.vector.app.features.roomprofile
 
 import com.airbnb.epoxy.TypedEpoxyController
-import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import im.vector.app.R
 import im.vector.app.core.epoxy.profiles.buildProfileAction
 import im.vector.app.core.epoxy.profiles.buildProfileSection
@@ -26,6 +25,7 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.features.settings.VectorPreferences
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import javax.inject.Inject
 
 class RoomProfileController @Inject constructor(
@@ -71,11 +71,11 @@ class RoomProfileController @Inject constructor(
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
         buildProfileAction(
                 id = "settings",
-                title = if (roomSummary.isDirect) {
-                    stringProvider.getString(R.string.direct_room_profile_section_more_settings)
+                title = stringProvider.getString(if (roomSummary.isDirect) {
+                    R.string.direct_room_profile_section_more_settings
                 } else {
-                    stringProvider.getString(R.string.room_profile_section_more_settings)
-                },
+                    R.string.room_profile_section_more_settings
+                }),
                 dividerColor = dividerColor,
                 icon = R.drawable.ic_room_profile_settings,
                 action = { callback?.onSettingsClicked() }
@@ -116,11 +116,11 @@ class RoomProfileController @Inject constructor(
         )
         buildProfileAction(
                 id = "leave",
-                title = if (roomSummary.isDirect) {
-                    stringProvider.getString(R.string.direct_room_profile_section_more_leave)
+                title = stringProvider.getString(if (roomSummary.isDirect) {
+                    R.string.direct_room_profile_section_more_leave
                 } else {
-                    stringProvider.getString(R.string.room_profile_section_more_leave)
-                },
+                    R.string.room_profile_section_more_leave
+                }),
                 dividerColor = dividerColor,
                 divider = false,
                 destructive = true,

From 84202adc5b3a85aa2418e51d580b5f318ad84ea5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 11:54:23 +0200
Subject: [PATCH 046/278] Add braces to multiline if else

---
 .../timeline/format/NoticeEventFormatter.kt   | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 866058c8ba..84cb1d7817 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -183,10 +183,11 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return event.getClearContent().toModel<RoomCreateContent>()
                 ?.takeIf { it.creator.isNullOrBlank().not() }
                 ?.let {
-                    if (event.isSentByCurrentUser())
+                    if (event.isSentByCurrentUser()) {
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
-                    else
+                    } else {
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
+                    }
                 }
     }
 
@@ -208,10 +209,11 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
     }
 
     private fun formatRoomTombstoneEvent(event: Event, senderName: String?): CharSequence? {
-        return if (event.isSentByCurrentUser())
+        return if (event.isSentByCurrentUser()) {
             sp.getString(if (event.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
-        else
+        } else {
             sp.getString(if (event.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
+        }
     }
 
     private fun formatRoomTopicEvent(event: Event, senderName: String?): CharSequence? {
@@ -252,12 +254,13 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val formattedVisibility = roomHistoryVisibilityFormatter.format(historyVisibility)
-        return if (event.isSentByCurrentUser())
+        return if (event.isSentByCurrentUser()) {
             sp.getString(if (event.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
                     formattedVisibility)
-        else
+        } else {
             sp.getString(if (event.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
                     senderName, formattedVisibility)
+        }
     }
 
     private fun formatRoomThirdPartyInvite(event: Event, senderName: String?): CharSequence? {
@@ -267,21 +270,23 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return when {
             prevContent != null -> {
                 // Revoke case
-                if (event.isSentByCurrentUser())
+                if (event.isSentByCurrentUser()) {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite_by_you else R.string.notice_room_third_party_revoked_invite_by_you,
                             prevContent.displayName)
-                else
+                } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
                             senderName, prevContent.displayName)
+                }
             }
             content != null     -> {
                 // Invitation case
-                if (event.isSentByCurrentUser())
+                if (event.isSentByCurrentUser()) {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
                             content.displayName)
-                else
+                } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
                             senderName, content.displayName)
+                }
             }
             else                -> null
         }
@@ -396,17 +401,19 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val eventContent: RoomGuestAccessContent? = event.getClearContent().toModel()
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
-                if (event.isSentByCurrentUser())
+                if (event.isSentByCurrentUser()) {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you)
-                else
+                } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
                             senderName)
+                }
             GuestAccess.Forbidden ->
-                if (event.isSentByCurrentUser())
+                if (event.isSentByCurrentUser()) {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you)
-                else
+                } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
                             senderName)
+                }
             else                  -> null
         }
     }
@@ -530,18 +537,20 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
             }
             Membership.JOIN   ->
                 eventContent.safeReason?.let { reason ->
-                    if (event.isSentByCurrentUser())
+                    if (event.isSentByCurrentUser()) {
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
                                 reason)
-                    else
+                    } else {
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
                                 senderDisplayName, reason)
+                    }
                 } ?: run {
-                    if (event.isSentByCurrentUser())
+                    if (event.isSentByCurrentUser()) {
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
-                    else
+                    } else {
                         sp.getString(if (event.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
                                 senderDisplayName)
+                    }
                 }
             Membership.LEAVE  ->
                 // 2 cases here: this member may have left voluntarily or they may have been "left" by someone else ie. kicked
@@ -559,18 +568,20 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                             }
                         else              ->
                             eventContent.safeReason?.let { reason ->
-                                if (event.isSentByCurrentUser())
+                                if (event.isSentByCurrentUser()) {
                                     sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason_by_you else R.string.notice_room_leave_with_reason_by_you,
                                             reason)
-                                else
+                                } else {
                                     sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
                                             senderDisplayName, reason)
+                                }
                             } ?: run {
-                                if (event.isSentByCurrentUser())
+                                if (event.isSentByCurrentUser()) {
                                     sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
-                                else
+                                } else {
                                     sp.getString(if (event.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
                                             senderDisplayName)
+                                }
                             }
                     }
                 } else {
@@ -637,11 +648,12 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val content = event.getClearContent().toModel<RoomJoinRulesContent>() ?: return null
         return when (content.joinRules) {
             RoomJoinRules.INVITE ->
-                if (event.isSentByCurrentUser())
+                if (event.isSentByCurrentUser()) {
                     sp.getString(if (event.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
-                else
+                } else {
                     sp.getString(if (event.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
                             senderName)
+                }
             RoomJoinRules.PUBLIC ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(R.string.room_join_rules_public_by_you)

From 1986de36a697c01aabcac4bc409956dd79880ef6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 12:12:44 +0200
Subject: [PATCH 047/278] Better wording for DM creation (note: this event is
 hidden in the timeline by default)

---
 matrix-sdk-android/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index 70a7461fe9..3f75b715f6 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -10,8 +10,8 @@
     <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
     <string name="notice_room_created">%1$s created the room</string>
     <string name="notice_room_created_by_you">You created the room</string>
-    <string name="notice_direct_room_created">%1$s joined</string>
-    <string name="notice_direct_room_created_by_you">You joined</string>
+    <string name="notice_direct_room_created">%1$s created the discussion</string>
+    <string name="notice_direct_room_created_by_you">You created the discussion</string>
     <string name="notice_room_invite">%1$s invited %2$s</string>
     <string name="notice_room_invite_by_you">You invited %1$s</string>
     <string name="notice_room_invite_you">%1$s invited you</string>

From 42a3a64b0d596e3765222eeb02685a279ece3435 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 12:26:25 +0200
Subject: [PATCH 048/278] Better way to get direct state of the room (using
 view state)

---
 .../home/room/detail/RoomDetailFragment.kt    | 24 +++++++++++--------
 .../home/room/detail/RoomDetailViewState.kt   |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index b31af30609..3b4795b965 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -704,11 +704,13 @@ class RoomDetailFragment @Inject constructor(
                     //                            safeStartCall(it, isVideoCall)
                     //                        }
                 } else if (!state.isAllowedToStartWebRTCCall) {
-                    if (session.getRoom(state.roomId)?.roomSummary()?.isDirect == true) {
-                        showDialogWithMessage(getString(R.string.no_permissions_to_start_webrtc_call_in_direct_room))
-                    } else {
-                        showDialogWithMessage(getString(R.string.no_permissions_to_start_webrtc_call))
-                    }
+                    showDialogWithMessage(getString(
+                            if (state.isDm()) {
+                                R.string.no_permissions_to_start_webrtc_call_in_direct_room
+                            } else {
+                                R.string.no_permissions_to_start_webrtc_call
+                            })
+                    )
                 } else {
                     safeStartCall(isVideoCall)
                 }
@@ -718,11 +720,13 @@ class RoomDetailFragment @Inject constructor(
                 // can you add widgets??
                 if (!state.isAllowedToManageWidgets) {
                     // You do not have permission to start a conference call in this room
-                    if (session.getRoom(state.roomId)?.roomSummary()?.isDirect == true) {
-                        showDialogWithMessage(getString(R.string.no_permissions_to_start_conf_call_in_direct_room))
-                    } else {
-                        showDialogWithMessage(getString(R.string.no_permissions_to_start_conf_call))
-                    }
+                    showDialogWithMessage(getString(
+                            if (state.isDm()) {
+                                R.string.no_permissions_to_start_conf_call_in_direct_room
+                            } else {
+                                R.string.no_permissions_to_start_conf_call
+                            }
+                    ))
                 } else {
                     if (state.activeRoomWidgets()?.filter { it.type == WidgetType.Jitsi }?.any() == true) {
                         // A conference is already in progress!
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 16a7379b6a..36acc35148 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -77,4 +77,6 @@ data class RoomDetailViewState(
             // Also highlight the target event, if any
             highlightedEventId = args.eventId
     )
+
+    fun isDm() = asyncRoomSummary()?.isDirect == true
 }

From f58829130a4526d084d0a6ad3af3b8744438aa82 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 12:30:21 +0200
Subject: [PATCH 049/278] More cleanup

---
 .../detail/timeline/factory/EncryptionItemFactory.kt | 12 +++++++-----
 .../detail/timeline/factory/TimelineItemFactory.kt   |  4 +---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 2ed88cbae9..4f2c8ea63a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -54,11 +54,13 @@ class EncryptionItemFactory @Inject constructor(
         val shield: StatusTileTimelineItem.ShieldUIState
         if (isSafeAlgorithm) {
             title = stringProvider.getString(R.string.encryption_enabled)
-            description = if (session.getRoomSummary(event.root.roomId ?: "")?.isDirect.orFalse()) {
-                stringProvider.getString(R.string.direct_room_encryption_enabled_tile_description)
-            } else {
-                stringProvider.getString(R.string.encryption_enabled_tile_description)
-            }
+            description = stringProvider.getString(
+                    if (session.getRoomSummary(event.root.roomId ?: "")?.isDirect.orFalse()) {
+                        R.string.direct_room_encryption_enabled_tile_description
+                    } else {
+                        R.string.encryption_enabled_tile_description
+                    }
+            )
             shield = StatusTileTimelineItem.ShieldUIState.BLACK
         } else {
             title = stringProvider.getString(R.string.encryption_not_enabled)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 1f99efd08e..a2e01e63cd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -64,9 +64,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.STATE_ROOM_POWER_LEVELS,
                 EventType.REACTION,
                 EventType.REDACTION                     -> noticeItemFactory.create(event, highlight, callback)
-                EventType.STATE_ROOM_ENCRYPTION         -> {
-                    encryptionItemFactory.create(event, highlight, callback)
-                }
+                EventType.STATE_ROOM_ENCRYPTION         -> encryptionItemFactory.create(event, highlight, callback)
                 // State room create
                 EventType.STATE_ROOM_CREATE             -> roomCreateItemFactory.create(event, callback)
                 // Crypto

From c5459cdde4b537e3df54b0a9472e085b83b4e9eb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 12:39:36 +0200
Subject: [PATCH 050/278] Use RoomSummaryHolder if available

---
 .../timeline/factory/MergedHeaderItemFactory.kt   | 14 ++++++--------
 .../timeline/format/NoticeEventFormatter.kt       | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 41a961dee0..08f93b23cd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -22,6 +22,7 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MergedTimelineEventVisibilityStateChangedListener
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import im.vector.app.features.home.room.detail.timeline.helper.canBeMerged
 import im.vector.app.features.home.room.detail.timeline.helper.isRoomConfiguration
 import im.vector.app.features.home.room.detail.timeline.helper.prevSameTypeEvents
@@ -46,6 +47,7 @@ import javax.inject.Inject
 class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
                                                   private val avatarRenderer: AvatarRenderer,
                                                   private val avatarSizeProvider: AvatarSizeProvider,
+                                                  private val roomSummaryHolder: RoomSummaryHolder,
                                                   private val vectorPreferences: VectorPreferences) {
 
     private val collapsedEventIds = linkedSetOf<Long>()
@@ -79,11 +81,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         }
     }
 
-    private fun isDirectRoom(roomId: String?): Boolean {
-        return roomId?.let {
-            activeSessionHolder.getSafeActiveSession()?.getRoom(roomId)?.roomSummary()?.isDirect
-        }.orFalse()
-    }
+    private fun isDirectRoom() = roomSummaryHolder.roomSummary?.isDirect.orFalse()
 
     private fun buildMembershipEventsMergedSummary(currentPosition: Int,
                                                    items: List<TimelineEvent>,
@@ -108,7 +106,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                         memberName = mergedEvent.senderInfo.disambiguatedDisplayName,
                         localId = mergedEvent.localId,
                         eventId = mergedEvent.root.eventId ?: "",
-                        isDirectRoom = isDirectRoom(mergedEvent.root.roomId)
+                        isDirectRoom = isDirectRoom()
                 )
                 mergedData.add(data)
             }
@@ -196,7 +194,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                             memberName = senderName,
                             localId = mergedEvent.localId,
                             eventId = mergedEvent.root.eventId ?: "",
-                            isDirectRoom = isDirectRoom(mergedEvent.root.roomId)
+                            isDirectRoom = isDirectRoom()
                     )
                     mergedData.add(data)
                 }
@@ -257,7 +255,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                                 memberName = mergedEvent.senderInfo.disambiguatedDisplayName,
                                 localId = mergedEvent.localId,
                                 eventId = mergedEvent.root.eventId ?: "",
-                                isDirectRoom = isDirectRoom(mergedEvent.root.roomId)
+                                isDirectRoom = isDirectRoom()
                         )
                         mergedData.add(data)
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 84cb1d7817..34b4cac5b4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.home.room.detail.timeline.format
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -49,6 +50,7 @@ import javax.inject.Inject
 
 class NoticeEventFormatter @Inject constructor(private val activeSessionDataSource: ActiveSessionDataSource,
                                                private val roomHistoryVisibilityFormatter: RoomHistoryVisibilityFormatter,
+                                               private val roomSummaryHolder: RoomSummaryHolder,
                                                private val sp: StringProvider) {
 
     private val currentUserId: String?
@@ -56,9 +58,16 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
-    private fun Event.isDm() = roomId?.let {
-        activeSessionDataSource.currentValue?.orNull()?.getRoomSummary(it)?.isDirect
-    }.orFalse()
+    private fun Event.isDm(): Boolean {
+        return roomSummaryHolder.roomSummary?.isDirect
+                ?: run {
+                    // RoomSummaryHolder does not have any RoomSummary (not in the timeline)
+                    roomId?.let {
+                        activeSessionDataSource.currentValue?.orNull()?.getRoomSummary(it)?.isDirect
+                    }
+                }
+                        .orFalse()
+    }
 
     fun format(timelineEvent: TimelineEvent): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {

From 5e2f65ab7abdd15e734bf2f87b797c085e2ed0ba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 12:46:28 +0200
Subject: [PATCH 051/278] Split long lines

---
 .../timeline/format/NoticeEventFormatter.kt   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 34b4cac5b4..45567196f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -280,7 +280,12 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
             prevContent != null -> {
                 // Revoke case
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite_by_you else R.string.notice_room_third_party_revoked_invite_by_you,
+                    sp.getString(
+                            if (event.isDm()) {
+                                R.string.notice_direct_room_third_party_revoked_invite_by_you
+                            } else {
+                                R.string.notice_room_third_party_revoked_invite_by_you
+                            },
                             prevContent.displayName)
                 } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
@@ -411,14 +416,18 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you)
+                    sp.getString(
+                            if (event.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
+                    )
                 } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
                             senderName)
                 }
             GuestAccess.Forbidden ->
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you)
+                    sp.getString(
+                            if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
+                    )
                 } else {
                     sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
                             senderName)
@@ -578,8 +587,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                         else              ->
                             eventContent.safeReason?.let { reason ->
                                 if (event.isSentByCurrentUser()) {
-                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason_by_you else R.string.notice_room_leave_with_reason_by_you,
-                                            reason)
+                                    sp.getString(
+                                            if (event.isDm()) {
+                                                R.string.notice_direct_room_leave_with_reason_by_you
+                                            } else {
+                                                R.string.notice_room_leave_with_reason_by_you
+                                            },
+                                            reason
+                                    )
                                 } else {
                                     sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
                                             senderDisplayName, reason)

From 6f29d380473494f0148889849c2d6c7d3dfcaacb Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
Date: Tue, 29 Sep 2020 17:14:41 +0000
Subject: [PATCH 052/278] Translated using Weblate (Greek)

Currently translated at 15.1% (283 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/el/
---
 vector/src/main/res/values-el/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 945ea8029c..14580a49f8 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -362,4 +362,5 @@
     <string name="revoke">Ανάκληση</string>
     <string name="disconnect">Αποσύνδεση</string>
     <string name="pause_video">Παύση</string>
+    <string name="room_participants_header_direct_chats">Прямі повідомлення</string>
     </resources>

From 29f8c18b09737b26779c004e178d6a1000674214 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Tue, 29 Sep 2020 13:00:13 +0000
Subject: [PATCH 053/278] Translated using Weblate (Kabyle)

Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/kab/
---
 matrix-sdk-android/src/main/res/values-kab/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/res/values-kab/strings.xml b/matrix-sdk-android/src/main/res/values-kab/strings.xml
index 0d1cad6550..ec498256f2 100644
--- a/matrix-sdk-android/src/main/res/values-kab/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-kab/strings.xml
@@ -201,7 +201,7 @@
         <item quantity="other">Tekkseḍ %2$s am tansiwin i texxamt-a.</item>
     </plurals>
 
-    <string name="notice_room_aliases_added_and_removed">%1$s yerna %2$s terniḍ tekkseḍ %3s am tansiwin i texxamt-a.</string>
+    <string name="notice_room_aliases_added_and_removed">%1$s yerna %2$s terniḍ tekkseḍ %3$s am tansiwin i texxamt-a.</string>
     <string name="notice_room_aliases_added_and_removed_by_you">Terniḍ %1$s terniḍ tekkseḍ %2$s am tansiwin i texxamt-a.</string>
 
     <string name="notice_room_canonical_alias_set">%1$s isbadu %2$s am tansa tagejdant i texxamt-a.</string>

From d744dea46ef6aa9549d66a4e043a0515df017f6c Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
Date: Tue, 29 Sep 2020 17:16:32 +0000
Subject: [PATCH 054/278] Translated using Weblate (Ukrainian)

Currently translated at 41.4% (775 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/uk/
---
 vector/src/main/res/values-uk/strings.xml | 60 ++++++++++++++++-------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 7ed1791908..ce34bf8ddb 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -772,7 +772,7 @@
         <item quantity="one">%d зміна  членства</item>
         <item quantity="few">%d зміни членства</item>
         <item quantity="many">%d змін членства</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="list_members">Список учасників</string>
@@ -797,13 +797,13 @@
         <item quantity="one">%d активний участник</item>
         <item quantity="few">%d активних участника</item>
         <item quantity="many">%d активних участників</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участників</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="room_participants_ban_prompt_msg">Ви впевнені, що хочете забанити цього користувача в цьому чаті?</string>
 
@@ -811,7 +811,7 @@
         <item quantity="one">%d нове повідомлення</item>
         <item quantity="few">%d нових повідомленя</item>
         <item quantity="many">%d нових повідомлень</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="settings_notification_privacy_reduced">Обмежена конфіденційність</string>
@@ -863,25 +863,25 @@
         <item quantity="one">%d сек.</item>
         <item quantity="few">%d сек.</item>
         <item quantity="many">%d сек.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_m">
         <item quantity="one">%d хв.</item>
         <item quantity="few">%d хв.</item>
         <item quantity="many">%d хв.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%d год.</item>
         <item quantity="few">%d год.</item>
         <item quantity="many">%d год.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d день</item>
         <item quantity="few">%d днів</item>
         <item quantity="many">%d дні</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="room_participants_now">Зараз %1$s</string>
@@ -897,19 +897,19 @@
         <item quantity="one">%d обрано</item>
         <item quantity="few">"%d  обрано"</item>
         <item quantity="many">"%d  обрано"</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d кімната</item>
         <item quantity="few">%d кімнати</item>
         <item quantity="many">%d кімнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s кімнату знайдено для %2$s</item>
         <item quantity="few">%1$s кімнати знайдено для %2$s</item>
         <item quantity="many">%1$s кімнат знайдено для %2$s</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="room_sliding_menu_version_x">Версія %s</string>
     <string name="settings_notification_privacy_nosecure_message_content">• Сповіщення містять <b>метадані та дані повідомлення</b></string>
@@ -938,19 +938,19 @@
         <item quantity="one">%d непрочитане сповіщення</item>
         <item quantity="few">%d непрочитані сповіщення</item>
         <item quantity="many">%d непрочитаних сповіщень</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитане сповіщення</item>
         <item quantity="few">%d непрочитані сповіщення</item>
         <item quantity="many">%d непрочитаних сповіщень</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d кімната</item>
         <item quantity="few">%d кімнати</item>
         <item quantity="many">%d кімнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s у %2$s</string>
 
@@ -958,7 +958,7 @@
         <item quantity="one">%d активний віджет</item>
         <item quantity="few">%d активні віджети</item>
         <item quantity="many">%d активних віджетів</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <string name="widget_integration_missing_parameter">Пропущено обов’язковий параметр.</string>
@@ -1004,14 +1004,14 @@
         <item quantity="one">%d учасник</item>
         <item quantity="few">%d учасника</item>
         <item quantity="many">%d учасників</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d кімната</item>
         <item quantity="few">%d кімнати</item>
         <item quantity="many">%d кімнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="group_no_long_description">Адміністратор спільноти не вказав для неї детальної інформації.</string>
 
@@ -1110,4 +1110,28 @@
     <string name="auth_accept_policies">Будь ласка, ознайомтесь та прийміть правила цього серверу:</string>
 
     <string name="action_mark_room_read">Позначити як прочитане</string>
-</resources>
+<string name="resources_script">Cyrl</string>
+
+    <string name="notification_sync_init">Запуск сервісу</string>
+    <string name="title_activity_keys_backup_setup">Резервна копія ключа</string>
+    <string name="title_activity_keys_backup_restore">Використати резервну копію ключа</string>
+    <string name="room_list_people_empty_body">Тут буде список Ваших прямих чатів</string>
+    <string name="event_redacted">Повідомлення видалено</string>
+    <string name="fab_menu_create_chat">Прямі чати</string>
+
+    <string name="bottom_action_people_x">Прямі чати</string>
+
+    <string name="room_filtering_footer_create_new_direct_message">Відправити нове пряме повідомлення</string>
+    <string name="command_description_shrug">Додає ¯\\_(ツ)_/¯ перед текстовим повідомленням</string>
+
+    <string name="rendering_event_error_type_of_message_not_handled">Element не підтримує повідомлення типу \'%1$s\'</string>
+    <string name="command_description_rainbow">Відправляє повідомлення розмальоване веселково</string>
+    <string name="settings_category_composer">Редактор повідомлень</string>
+
+    <string name="command_description_plain">Відправляє повідомлення як текст без інтерпретації його як Markdown</string>
+
+    <string name="room_message_placeholder">Повідомлення…</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">Ви не маєте доступу до цього повідомлення</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Очікуємо повідомлення, це може тривати певний час</string>
+    </resources>

From b6bbe19316dbc1996be983070acb23ce24a5a1e2 Mon Sep 17 00:00:00 2001
From: Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
Date: Tue, 29 Sep 2020 17:20:22 +0000
Subject: [PATCH 055/278] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.riot.im/projects/element-android/element-store/uk/
---
 vector/src/main/play/listings/uk/full_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/play/listings/uk/full_description.txt b/vector/src/main/play/listings/uk/full_description.txt
index ca6b4c2ae1..64247581d2 100644
--- a/vector/src/main/play/listings/uk/full_description.txt
+++ b/vector/src/main/play/listings/uk/full_description.txt
@@ -13,7 +13,7 @@ Element здатен забезпечити усе це завдяки тому,
 
 Element надає вам повний контроль, дозволяючи обирати з-поміж надавачів послуг, що обслуговують сервери з вашими бесідами. Ви вільні обрати будь-який спосіб розміщення прямо з застосунку Element:
 
-1. Отримати безкоштовний обліковий запис на загальнодоступному сервері matrix.org
+1. Отримати безкоштовний обліковий запис на загальнодоступному сервері matrix.org, який обслуговують розробники Matrix, чи на одному з тисяч публічних серверів, які обслуговують волонтери
 2. Розмістити свій обліковий запис на власному сервері
 3. Зареєструватись на індивідуальному сервері, просто підписавшись на послуги платформи Element Matrix Services
 

From 7f26dbe260f624a0779cf4000dc7494c775cdcea Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 30 Sep 2020 15:19:23 +0200
Subject: [PATCH 056/278] Fix compil issue

---
 .../action/MessageActionsViewModel.kt         |   2 +-
 .../timeline/factory/MessageItemFactory.kt    |   6 +-
 .../timeline/factory/NoticeItemFactory.kt     |   4 +-
 .../timeline/factory/RoomCreateItemFactory.kt |   4 +-
 .../timeline/factory/TimelineItemFactory.kt   |   6 +-
 .../factory/VerificationItemFactory.kt        |   4 +-
 .../format/DisplayableEventFormatter.kt       |   5 +-
 .../timeline/format/NoticeEventFormatter.kt   | 108 ++++++++----------
 .../home/room/list/RoomSummaryItemFactory.kt  |   2 +-
 .../notifications/NotifiableEventResolver.kt  |   6 +-
 10 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index a49b74c243..8a25e5fc93 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -190,7 +190,7 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
             EventType.CALL_CANDIDATES,
             EventType.CALL_HANGUP,
             EventType.CALL_ANSWER -> {
-                noticeEventFormatter.format(timelineEvent)
+                noticeEventFormatter.format(timelineEvent, room?.roomSummary())
             }
             else                  -> null
         } ?: ""
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 97bc693f26..1e809d9ab5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -38,6 +38,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadSt
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageBlockCodeItem
@@ -101,6 +102,7 @@ class MessageItemFactory @Inject constructor(
         private val messageItemAttributesFactory: MessageItemAttributesFactory,
         private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
         private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
+        private val roomSummaryHolder: RoomSummaryHolder,
         private val defaultItemFactory: DefaultItemFactory,
         private val noticeItemFactory: NoticeItemFactory,
         private val avatarSizeProvider: AvatarSizeProvider,
@@ -130,7 +132,7 @@ class MessageItemFactory @Inject constructor(
                 || event.isEncrypted() && event.root.content.toModel<EncryptedEventContent>()?.relatesTo?.type == RelationType.REPLACE
         ) {
             // This is an edit event, we should display it when debugging as a notice event
-            return noticeItemFactory.create(event, highlight, callback)
+            return noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
         }
         val attributes = messageItemAttributesFactory.create(messageContent, informationData, callback)
 
@@ -146,7 +148,7 @@ class MessageItemFactory @Inject constructor(
             is MessageAudioContent               -> buildAudioMessageItem(messageContent, informationData, highlight, attributes)
             is MessageVerificationRequestContent -> buildVerificationRequestMessageItem(messageContent, informationData, highlight, callback, attributes)
             is MessageOptionsContent             -> buildOptionsMessageItem(messageContent, informationData, highlight, callback, attributes)
-            is MessagePollResponseContent        -> noticeItemFactory.create(event, highlight, callback)
+            is MessagePollResponseContent        -> noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
             else                                 -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
index cd8c682f39..ec065543f5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/NoticeItemFactory.kt
@@ -24,6 +24,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvide
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.item.NoticeItem
 import im.vector.app.features.home.room.detail.timeline.item.NoticeItem_
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import javax.inject.Inject
 
@@ -34,8 +35,9 @@ class NoticeItemFactory @Inject constructor(private val eventFormatter: NoticeEv
 
     fun create(event: TimelineEvent,
                highlight: Boolean,
+               roomSummary: RoomSummary?,
                callback: TimelineEventController.Callback?): NoticeItem? {
-        val formattedText = eventFormatter.format(event) ?: return null
+        val formattedText = eventFormatter.format(event, roomSummary) ?: return null
         val informationData = informationDataFactory.create(event, null)
         val attributes = NoticeItem.Attributes(
                 avatarRenderer = avatarRenderer,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
index 31adbdb8a6..25b5fd718b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/RoomCreateItemFactory.kt
@@ -21,6 +21,7 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import im.vector.app.features.home.room.detail.timeline.item.RoomCreateItem_
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.Session
@@ -32,6 +33,7 @@ import javax.inject.Inject
 class RoomCreateItemFactory @Inject constructor(private val stringProvider: StringProvider,
                                                 private val userPreferencesProvider: UserPreferencesProvider,
                                                 private val session: Session,
+                                                private val roomSummaryHolder: RoomSummaryHolder,
                                                 private val noticeItemFactory: NoticeItemFactory) {
 
     fun create(event: TimelineEvent, callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
@@ -52,7 +54,7 @@ class RoomCreateItemFactory @Inject constructor(private val stringProvider: Stri
 
     private fun defaultRendering(event: TimelineEvent, callback: TimelineEventController.Callback?): VectorEpoxyModel<*>? {
         return if (userPreferencesProvider.shouldShowHiddenEvents()) {
-            noticeItemFactory.create(event, false, callback)
+            noticeItemFactory.create(event, false, roomSummaryHolder.roomSummary, callback)
         } else {
             null
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index a2e01e63cd..40286678c8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -20,6 +20,7 @@ import im.vector.app.core.epoxy.EmptyItem_
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import timber.log.Timber
@@ -31,6 +32,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                                               private val defaultItemFactory: DefaultItemFactory,
                                               private val encryptionItemFactory: EncryptionItemFactory,
                                               private val roomCreateItemFactory: RoomCreateItemFactory,
+                                              private val roomSummaryHolder: RoomSummaryHolder,
                                               private val verificationConclusionItemFactory: VerificationItemFactory,
                                               private val userPreferencesProvider: UserPreferencesProvider) {
 
@@ -63,7 +65,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.CALL_ANSWER,
                 EventType.STATE_ROOM_POWER_LEVELS,
                 EventType.REACTION,
-                EventType.REDACTION                     -> noticeItemFactory.create(event, highlight, callback)
+                EventType.REDACTION                     -> noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
                 EventType.STATE_ROOM_ENCRYPTION         -> encryptionItemFactory.create(event, highlight, callback)
                 // State room create
                 EventType.STATE_ROOM_CREATE             -> roomCreateItemFactory.create(event, callback)
@@ -85,7 +87,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                     // TODO These are not filtered out by timeline when encrypted
                     // For now manually ignore
                     if (userPreferencesProvider.shouldShowHiddenEvents()) {
-                        noticeItemFactory.create(event, highlight, callback)
+                        noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
                     } else {
                         null
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
index 0b623d78f1..59daf5a0a0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VerificationItemFactory.kt
@@ -24,6 +24,7 @@ import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.MessageInformationDataFactory
 import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttributesFactory
+import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem
 import im.vector.app.features.home.room.detail.timeline.item.StatusTileTimelineItem_
 import org.matrix.android.sdk.api.session.Session
@@ -50,6 +51,7 @@ class VerificationItemFactory @Inject constructor(
         private val avatarSizeProvider: AvatarSizeProvider,
         private val noticeItemFactory: NoticeItemFactory,
         private val userPreferencesProvider: UserPreferencesProvider,
+        private val roomSummaryHolder: RoomSummaryHolder,
         private val stringProvider: StringProvider,
         private val session: Session
 ) {
@@ -151,7 +153,7 @@ class VerificationItemFactory @Inject constructor(
                                   highlight: Boolean,
                                   callback: TimelineEventController.Callback?
     ): VectorEpoxyModel<*>? {
-        if (userPreferencesProvider.shouldShowHiddenEvents()) return noticeItemFactory.create(event, highlight, callback)
+        if (userPreferencesProvider.shouldShowHiddenEvents()) return noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
         return null
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
index cb9f583a2a..78d9a49c9c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -23,6 +23,7 @@ import im.vector.app.core.resources.StringProvider
 import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.message.MessageOptionsContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_BUTTONS
@@ -40,7 +41,7 @@ class DisplayableEventFormatter @Inject constructor(
         private val noticeEventFormatter: NoticeEventFormatter
 ) {
 
-    fun format(timelineEvent: TimelineEvent, appendAuthor: Boolean): CharSequence {
+    fun format(timelineEvent: TimelineEvent, appendAuthor: Boolean, roomSummary: RoomSummary?): CharSequence {
         if (timelineEvent.root.isRedacted()) {
             return noticeEventFormatter.formatRedactedEvent(timelineEvent.root)
         }
@@ -130,7 +131,7 @@ class DisplayableEventFormatter @Inject constructor(
             }
             else                      -> {
                 return span {
-                    text = noticeEventFormatter.format(timelineEvent) ?: ""
+                    text = noticeEventFormatter.format(timelineEvent, roomSummary) ?: ""
                     textStyle = "italic"
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 45567196f9..1d20bc3ad5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.home.room.detail.timeline.format
 import im.vector.app.ActiveSessionDataSource
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.home.room.detail.timeline.helper.RoomSummaryHolder
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -36,6 +35,7 @@ import org.matrix.android.sdk.api.session.room.model.RoomJoinRules
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
 import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.RoomNameContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
 import org.matrix.android.sdk.api.session.room.model.RoomTopicContent
 import org.matrix.android.sdk.api.session.room.model.call.CallInviteContent
@@ -50,7 +50,6 @@ import javax.inject.Inject
 
 class NoticeEventFormatter @Inject constructor(private val activeSessionDataSource: ActiveSessionDataSource,
                                                private val roomHistoryVisibilityFormatter: RoomHistoryVisibilityFormatter,
-                                               private val roomSummaryHolder: RoomSummaryHolder,
                                                private val sp: StringProvider) {
 
     private val currentUserId: String?
@@ -58,34 +57,25 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
-    private fun Event.isDm(): Boolean {
-        return roomSummaryHolder.roomSummary?.isDirect
-                ?: run {
-                    // RoomSummaryHolder does not have any RoomSummary (not in the timeline)
-                    roomId?.let {
-                        activeSessionDataSource.currentValue?.orNull()?.getRoomSummary(it)?.isDirect
-                    }
-                }
-                        .orFalse()
-    }
+    private fun RoomSummary?.isDm()  = this?.isDirect.orFalse()
 
-    fun format(timelineEvent: TimelineEvent): CharSequence? {
+    fun format(timelineEvent: TimelineEvent, roomSummary: RoomSummary?): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root)
+            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
+            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root, roomSummary)
             EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary )
             EventType.STATE_ROOM_ALIASES            -> formatRoomAliasesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_CANONICAL_ALIAS    -> formatRoomCanonicalAliasEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_GUEST_ACCESS       -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
+            EventType.STATE_ROOM_GUEST_ACCESS       -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
             EventType.STATE_ROOM_ENCRYPTION         -> formatRoomEncryptionEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_WIDGET,
             EventType.STATE_ROOM_WIDGET_LEGACY      -> formatWidgetEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
+            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
             EventType.STATE_ROOM_POWER_LEVELS       -> formatRoomPowerLevels(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.CALL_INVITE,
             EventType.CALL_CANDIDATES,
@@ -164,19 +154,19 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    fun format(event: Event, senderName: String?): CharSequence? {
+    fun format(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
         return when (val type = event.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName)
+            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName, roomSummary)
             EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(event, senderName)
             EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(event, senderName)
             EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(event, senderName)
-            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName)
-            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName)
+            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName, roomSummary)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName, roomSummary)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName, roomSummary)
             EventType.CALL_INVITE,
             EventType.CALL_HANGUP,
             EventType.CALL_ANSWER                   -> formatCallEvent(type, event, senderName)
-            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(event, senderName)
+            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(event, senderName, roomSummary)
             else                                    -> {
                 Timber.v("Type $type not handled by this formatter")
                 null
@@ -188,14 +178,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return "{ \"type\": ${event.getClearType()} }"
     }
 
-    private fun formatRoomCreateEvent(event: Event): CharSequence? {
+    private fun formatRoomCreateEvent(event: Event, roomSummary: RoomSummary?): CharSequence? {
         return event.getClearContent().toModel<RoomCreateContent>()
                 ?.takeIf { it.creator.isNullOrBlank().not() }
                 ?.let {
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (event.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
+                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
                     } else {
-                        sp.getString(if (event.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
+                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
                     }
                 }
     }
@@ -217,11 +207,11 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatRoomTombstoneEvent(event: Event, senderName: String?): CharSequence? {
+    private fun formatRoomTombstoneEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (event.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
+            sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
         } else {
-            sp.getString(if (event.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
+            sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
         }
     }
 
@@ -259,20 +249,20 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?): CharSequence? {
+    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
         val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val formattedVisibility = roomHistoryVisibilityFormatter.format(historyVisibility)
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (event.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
+            sp.getString(if (roomSummary.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
                     formattedVisibility)
         } else {
-            sp.getString(if (event.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
+            sp.getString(if (roomSummary.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
                     senderName, formattedVisibility)
         }
     }
 
-    private fun formatRoomThirdPartyInvite(event: Event, senderName: String?): CharSequence? {
+    private fun formatRoomThirdPartyInvite(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
         val content = event.getClearContent().toModel<RoomThirdPartyInviteContent>()
         val prevContent = event.resolvedPrevContent()?.toModel<RoomThirdPartyInviteContent>()
 
@@ -281,24 +271,24 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                 // Revoke case
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (event.isDm()) {
+                            if (roomSummary.isDm()) {
                                 R.string.notice_direct_room_third_party_revoked_invite_by_you
                             } else {
                                 R.string.notice_room_third_party_revoked_invite_by_you
                             },
                             prevContent.displayName)
                 } else {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
+                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
                             senderName, prevContent.displayName)
                 }
             }
             content != null     -> {
                 // Invitation case
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
+                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
                             content.displayName)
                 } else {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
+                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
                             senderName, content.displayName)
                 }
             }
@@ -347,13 +337,13 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatRoomMemberEvent(event: Event, senderName: String?): String? {
+    private fun formatRoomMemberEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): String? {
         val eventContent: RoomMemberContent? = event.getClearContent().toModel()
         val prevEventContent: RoomMemberContent? = event.resolvedPrevContent().toModel()
         val isMembershipEvent = prevEventContent?.membership != eventContent?.membership
                 || eventContent?.membership == Membership.LEAVE
         return if (isMembershipEvent) {
-            buildMembershipNotice(event, senderName, eventContent, prevEventContent)
+            buildMembershipNotice(event, senderName, eventContent, prevEventContent, roomSummary)
         } else {
             buildProfileNotice(event, senderName, eventContent, prevEventContent)
         }
@@ -411,25 +401,25 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                 }
     }
 
-    private fun formatRoomGuestAccessEvent(event: Event, senderName: String?): String? {
+    private fun formatRoomGuestAccessEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): String? {
         val eventContent: RoomGuestAccessContent? = event.getClearContent().toModel()
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (event.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
+                            if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
                     )
                 } else {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
+                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
                             senderName)
                 }
             GuestAccess.Forbidden ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
+                            if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
                     )
                 } else {
-                    sp.getString(if (event.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
+                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
                             senderName)
                 }
             else                  -> null
@@ -506,7 +496,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return displayText.toString()
     }
 
-    private fun buildMembershipNotice(event: Event, senderName: String?, eventContent: RoomMemberContent?, prevEventContent: RoomMemberContent?): String? {
+    private fun buildMembershipNotice(event: Event, senderName: String?, eventContent: RoomMemberContent?, prevEventContent: RoomMemberContent?, roomSummary: RoomSummary?): String? {
         val senderDisplayName = senderName ?: event.senderId ?: ""
         val targetDisplayName = eventContent?.displayName ?: prevEventContent?.displayName ?: event.stateKey ?: ""
         return when (eventContent?.membership) {
@@ -556,17 +546,17 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
             Membership.JOIN   ->
                 eventContent.safeReason?.let { reason ->
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
+                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
                                 reason)
                     } else {
-                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
+                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
                                 senderDisplayName, reason)
                     }
                 } ?: run {
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
+                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
                     } else {
-                        sp.getString(if (event.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
+                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
                                 senderDisplayName)
                     }
                 }
@@ -588,7 +578,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                             eventContent.safeReason?.let { reason ->
                                 if (event.isSentByCurrentUser()) {
                                     sp.getString(
-                                            if (event.isDm()) {
+                                            if (roomSummary.isDm()) {
                                                 R.string.notice_direct_room_leave_with_reason_by_you
                                             } else {
                                                 R.string.notice_room_leave_with_reason_by_you
@@ -596,14 +586,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                                             reason
                                     )
                                 } else {
-                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
+                                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
                                             senderDisplayName, reason)
                                 }
                             } ?: run {
                                 if (event.isSentByCurrentUser()) {
-                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
+                                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
                                 } else {
-                                    sp.getString(if (event.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
+                                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
                                             senderDisplayName)
                                 }
                             }
@@ -668,14 +658,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatJoinRulesEvent(event: Event, senderName: String?): CharSequence? {
+    private fun formatJoinRulesEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
         val content = event.getClearContent().toModel<RoomJoinRulesContent>() ?: return null
         return when (content.joinRules) {
             RoomJoinRules.INVITE ->
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (event.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
+                    sp.getString(if (roomSummary.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
                 } else {
-                    sp.getString(if (event.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
+                    sp.getString(if (roomSummary.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
                             senderName)
                 }
             RoomJoinRules.PUBLIC ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
index 06cb0172d0..7bb9940ec4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
@@ -86,7 +86,7 @@ class RoomSummaryItemFactory @Inject constructor(private val displayableEventFor
         var latestEventTime: CharSequence = ""
         val latestEvent = roomSummary.latestPreviewableEvent
         if (latestEvent != null) {
-            latestFormattedEvent = displayableEventFormatter.format(latestEvent, roomSummary.isDirect.not())
+            latestFormattedEvent = displayableEventFormatter.format(latestEvent, roomSummary.isDirect.not(), roomSummary)
             latestEventTime = dateFormatter.format(latestEvent.root.originServerTs, DateFormatKind.ROOM_LIST)
         }
         val typingMessage = typingHelper.getTypingMessage(roomSummary.typingUsers)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index 649dbd89f9..0740295191 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -91,7 +91,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
         if (room == null) {
             Timber.e("## Unable to resolve room for eventId [$event]")
             // Ok room is not known in store, but we can still display something
-            val body = displayableEventFormatter.format(event, false)
+            val body = displayableEventFormatter.format(event, false, null)
             val roomName = stringProvider.getString(R.string.notification_unknown_room_name)
             val senderDisplayName = event.senderInfo.disambiguatedDisplayName
 
@@ -124,7 +124,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
                 }
             }
 
-            val body = displayableEventFormatter.format(event, false).toString()
+            val body = displayableEventFormatter.format(event, false, room.roomSummary()).toString()
             val roomName = room.roomSummary()?.displayName ?: ""
             val senderDisplayName = event.senderInfo.disambiguatedDisplayName
 
@@ -165,7 +165,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
         val roomId = event.roomId ?: return null
         val dName = event.senderId?.let { session.getUser(it)?.displayName }
         if (Membership.INVITE == content.membership) {
-            val body = noticeEventFormatter.format(event, dName)
+            val body = noticeEventFormatter.format(event, dName, session.getRoomSummary(roomId))
                     ?: stringProvider.getString(R.string.notification_new_invitation)
             return InviteNotifiableEvent(
                     session.myUserId,

From 108a31eca338ffe975a490053df95d6cc3096550 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 15:31:33 +0200
Subject: [PATCH 057/278] Avoid long lines

---
 .../timeline/format/NoticeEventFormatter.kt   | 99 ++++++++++---------
 1 file changed, 52 insertions(+), 47 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 1d20bc3ad5..e26472feb0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -59,23 +59,24 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun RoomSummary?.isDm()  = this?.isDirect.orFalse()
 
-    fun format(timelineEvent: TimelineEvent, roomSummary: RoomSummary?): CharSequence? {
+    fun format(timelineEvent: TimelineEvent, rs: RoomSummary?): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
-            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root, roomSummary)
+            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+            EventType.STATE_ROOM_CREATE             -> formatRoomCreateEvent(timelineEvent.root, rs)
             EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary )
+            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
             EventType.STATE_ROOM_ALIASES            -> formatRoomAliasesEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_CANONICAL_ALIAS    -> formatRoomCanonicalAliasEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
-            EventType.STATE_ROOM_GUEST_ACCESS       -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY ->
+                formatRoomHistoryVisibilityEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
+            EventType.STATE_ROOM_GUEST_ACCESS       -> formatRoomGuestAccessEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
             EventType.STATE_ROOM_ENCRYPTION         -> formatRoomEncryptionEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.STATE_ROOM_WIDGET,
             EventType.STATE_ROOM_WIDGET_LEGACY      -> formatWidgetEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
-            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, roomSummary)
+            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName, rs)
             EventType.STATE_ROOM_POWER_LEVELS       -> formatRoomPowerLevels(timelineEvent.root, timelineEvent.senderInfo.disambiguatedDisplayName)
             EventType.CALL_INVITE,
             EventType.CALL_CANDIDATES,
@@ -154,19 +155,19 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    fun format(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
+    fun format(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
         return when (val type = event.getClearType()) {
-            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName, roomSummary)
+            EventType.STATE_ROOM_JOIN_RULES         -> formatJoinRulesEvent(event, senderName, rs)
             EventType.STATE_ROOM_NAME               -> formatRoomNameEvent(event, senderName)
             EventType.STATE_ROOM_TOPIC              -> formatRoomTopicEvent(event, senderName)
             EventType.STATE_ROOM_AVATAR             -> formatRoomAvatarEvent(event, senderName)
-            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName, roomSummary)
-            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName, roomSummary)
-            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName, roomSummary)
+            EventType.STATE_ROOM_MEMBER             -> formatRoomMemberEvent(event, senderName, rs)
+            EventType.STATE_ROOM_THIRD_PARTY_INVITE -> formatRoomThirdPartyInvite(event, senderName, rs)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> formatRoomHistoryVisibilityEvent(event, senderName, rs)
             EventType.CALL_INVITE,
             EventType.CALL_HANGUP,
             EventType.CALL_ANSWER                   -> formatCallEvent(type, event, senderName)
-            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(event, senderName, roomSummary)
+            EventType.STATE_ROOM_TOMBSTONE          -> formatRoomTombstoneEvent(event, senderName, rs)
             else                                    -> {
                 Timber.v("Type $type not handled by this formatter")
                 null
@@ -178,14 +179,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return "{ \"type\": ${event.getClearType()} }"
     }
 
-    private fun formatRoomCreateEvent(event: Event, roomSummary: RoomSummary?): CharSequence? {
+    private fun formatRoomCreateEvent(event: Event, rs: RoomSummary?): CharSequence? {
         return event.getClearContent().toModel<RoomCreateContent>()
                 ?.takeIf { it.creator.isNullOrBlank().not() }
                 ?.let {
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
+                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_created_by_you else R.string.notice_room_created_by_you)
                     } else {
-                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
+                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_created else R.string.notice_room_created, it.creator)
                     }
                 }
     }
@@ -207,11 +208,11 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatRoomTombstoneEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
+    private fun formatRoomTombstoneEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
+            sp.getString(if (rs.isDm()) R.string.notice_direct_room_update_by_you else R.string.notice_room_update_by_you)
         } else {
-            sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
+            sp.getString(if (rs.isDm()) R.string.notice_direct_room_update else R.string.notice_room_update, senderName)
         }
     }
 
@@ -249,20 +250,20 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
+    private fun formatRoomHistoryVisibilityEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
         val historyVisibility = event.getClearContent().toModel<RoomHistoryVisibilityContent>()?.historyVisibility ?: return null
 
         val formattedVisibility = roomHistoryVisibilityFormatter.format(historyVisibility)
         return if (event.isSentByCurrentUser()) {
-            sp.getString(if (roomSummary.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
+            sp.getString(if (rs.isDm()) R.string.notice_made_future_direct_room_visibility_by_you else R.string.notice_made_future_room_visibility_by_you,
                     formattedVisibility)
         } else {
-            sp.getString(if (roomSummary.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
+            sp.getString(if (rs.isDm()) R.string.notice_made_future_direct_room_visibility else R.string.notice_made_future_room_visibility,
                     senderName, formattedVisibility)
         }
     }
 
-    private fun formatRoomThirdPartyInvite(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
+    private fun formatRoomThirdPartyInvite(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
         val content = event.getClearContent().toModel<RoomThirdPartyInviteContent>()
         val prevContent = event.resolvedPrevContent()?.toModel<RoomThirdPartyInviteContent>()
 
@@ -271,24 +272,24 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                 // Revoke case
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (roomSummary.isDm()) {
+                            if (rs.isDm()) {
                                 R.string.notice_direct_room_third_party_revoked_invite_by_you
                             } else {
                                 R.string.notice_room_third_party_revoked_invite_by_you
                             },
                             prevContent.displayName)
                 } else {
-                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
+                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_third_party_revoked_invite else R.string.notice_room_third_party_revoked_invite,
                             senderName, prevContent.displayName)
                 }
             }
             content != null     -> {
                 // Invitation case
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
+                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_third_party_invite_by_you else R.string.notice_room_third_party_invite_by_you,
                             content.displayName)
                 } else {
-                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
+                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_third_party_invite else R.string.notice_room_third_party_invite,
                             senderName, content.displayName)
                 }
             }
@@ -337,13 +338,13 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatRoomMemberEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): String? {
+    private fun formatRoomMemberEvent(event: Event, senderName: String?, rs: RoomSummary?): String? {
         val eventContent: RoomMemberContent? = event.getClearContent().toModel()
         val prevEventContent: RoomMemberContent? = event.resolvedPrevContent().toModel()
         val isMembershipEvent = prevEventContent?.membership != eventContent?.membership
                 || eventContent?.membership == Membership.LEAVE
         return if (isMembershipEvent) {
-            buildMembershipNotice(event, senderName, eventContent, prevEventContent, roomSummary)
+            buildMembershipNotice(event, senderName, eventContent, prevEventContent, rs)
         } else {
             buildProfileNotice(event, senderName, eventContent, prevEventContent)
         }
@@ -401,25 +402,25 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                 }
     }
 
-    private fun formatRoomGuestAccessEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): String? {
+    private fun formatRoomGuestAccessEvent(event: Event, senderName: String?, rs: RoomSummary?): String? {
         val eventContent: RoomGuestAccessContent? = event.getClearContent().toModel()
         return when (eventContent?.guestAccess) {
             GuestAccess.CanJoin   ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
+                            if (rs.isDm()) R.string.notice_direct_room_guest_access_can_join_by_you else R.string.notice_room_guest_access_can_join_by_you
                     )
                 } else {
-                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
+                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_guest_access_can_join else R.string.notice_room_guest_access_can_join,
                             senderName)
                 }
             GuestAccess.Forbidden ->
                 if (event.isSentByCurrentUser()) {
                     sp.getString(
-                            if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
+                            if (rs.isDm()) R.string.notice_direct_room_guest_access_forbidden_by_you else R.string.notice_room_guest_access_forbidden_by_you
                     )
                 } else {
-                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
+                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_guest_access_forbidden else R.string.notice_room_guest_access_forbidden,
                             senderName)
                 }
             else                  -> null
@@ -496,7 +497,11 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         return displayText.toString()
     }
 
-    private fun buildMembershipNotice(event: Event, senderName: String?, eventContent: RoomMemberContent?, prevEventContent: RoomMemberContent?, roomSummary: RoomSummary?): String? {
+    private fun buildMembershipNotice(event: Event,
+                                      senderName: String?,
+                                      eventContent: RoomMemberContent?,
+                                      prevEventContent: RoomMemberContent?,
+                                      rs: RoomSummary?): String? {
         val senderDisplayName = senderName ?: event.senderId ?: ""
         val targetDisplayName = eventContent?.displayName ?: prevEventContent?.displayName ?: event.stateKey ?: ""
         return when (eventContent?.membership) {
@@ -546,17 +551,17 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
             Membership.JOIN   ->
                 eventContent.safeReason?.let { reason ->
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
+                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join_with_reason_by_you else R.string.notice_room_join_with_reason_by_you,
                                 reason)
                     } else {
-                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
+                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join_with_reason else R.string.notice_room_join_with_reason,
                                 senderDisplayName, reason)
                     }
                 } ?: run {
                     if (event.isSentByCurrentUser()) {
-                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
+                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join_by_you else R.string.notice_room_join_by_you)
                     } else {
-                        sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
+                        sp.getString(if (rs.isDm()) R.string.notice_direct_room_join else R.string.notice_room_join,
                                 senderDisplayName)
                     }
                 }
@@ -578,7 +583,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                             eventContent.safeReason?.let { reason ->
                                 if (event.isSentByCurrentUser()) {
                                     sp.getString(
-                                            if (roomSummary.isDm()) {
+                                            if (rs.isDm()) {
                                                 R.string.notice_direct_room_leave_with_reason_by_you
                                             } else {
                                                 R.string.notice_room_leave_with_reason_by_you
@@ -586,14 +591,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                                             reason
                                     )
                                 } else {
-                                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
+                                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_leave_with_reason else R.string.notice_room_leave_with_reason,
                                             senderDisplayName, reason)
                                 }
                             } ?: run {
                                 if (event.isSentByCurrentUser()) {
-                                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
+                                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_leave_by_you else R.string.notice_room_leave_by_you)
                                 } else {
-                                    sp.getString(if (roomSummary.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
+                                    sp.getString(if (rs.isDm()) R.string.notice_direct_room_leave else R.string.notice_room_leave,
                                             senderDisplayName)
                                 }
                             }
@@ -658,14 +663,14 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         }
     }
 
-    private fun formatJoinRulesEvent(event: Event, senderName: String?, roomSummary: RoomSummary?): CharSequence? {
+    private fun formatJoinRulesEvent(event: Event, senderName: String?, rs: RoomSummary?): CharSequence? {
         val content = event.getClearContent().toModel<RoomJoinRulesContent>() ?: return null
         return when (content.joinRules) {
             RoomJoinRules.INVITE ->
                 if (event.isSentByCurrentUser()) {
-                    sp.getString(if (roomSummary.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
+                    sp.getString(if (rs.isDm()) R.string.direct_room_join_rules_invite_by_you else R.string.room_join_rules_invite_by_you)
                 } else {
-                    sp.getString(if (roomSummary.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
+                    sp.getString(if (rs.isDm()) R.string.direct_room_join_rules_invite else R.string.room_join_rules_invite,
                             senderName)
                 }
             RoomJoinRules.PUBLIC ->

From a4e163885d8f352c161c2e33564bee3e51a53467 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Wed, 30 Sep 2020 16:17:28 +0200
Subject: [PATCH 058/278] Better rotation support

---
 .../core/platform/VectorBaseBottomSheetDialogFragment.kt   | 2 +-
 .../features/crypto/quads/SharedSecureStorageActivity.kt   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 761bb7227c..9f4924ebb2 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -97,7 +97,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
     }
 
     var resultListener : ResultListener? = null
-    var bottomSheetResult: Int = ResultListener.RESULT_OK
+    var bottomSheetResult: Int = ResultListener.RESULT_CANCEL
     var bottomSheetResultData: Any? = null
 
     override fun onDismiss(dialog: DialogInterface) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 0cc28609c9..6f7ea1fd46 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -119,6 +119,13 @@ class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSh
         }
     }
 
+    override fun onAttachFragment(fragment: Fragment) {
+        super.onAttachFragment(fragment)
+        if (fragment is VectorBaseBottomSheetDialogFragment) {
+            fragment.resultListener = this
+        }
+    }
+
     private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
         if (supportFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
             supportFragmentManager.commitTransaction {

From 18950a6b46fbd71962a08a483065e04d90fbcb62 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 16:36:17 +0200
Subject: [PATCH 059/278] Some cleanup

---
 .../SharedSecuredStorageResetAllFragment.kt   | 24 +++++++------------
 .../crypto/recover/BootstrapBottomSheet.kt    |  3 ---
 .../recover/BootstrapCrossSigningTask.kt      |  2 --
 .../verification/VerificationBottomSheet.kt   |  2 +-
 .../VerificationBottomSheetViewModel.kt       |  4 ++--
 .../res/layout/fragment_ssss_reset_all.xml    | 13 ++++++----
 6 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
index 314abda38c..d7db779230 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageResetAllFragment.kt
@@ -18,19 +18,16 @@ package im.vector.app.features.crypto.quads
 
 import android.os.Bundle
 import android.view.View
-import androidx.core.view.isVisible
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
+import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
 import kotlinx.android.synthetic.main.fragment_ssss_reset_all.*
 import javax.inject.Inject
 
-class SharedSecuredStorageResetAllFragment @Inject constructor(
-        private val stringProvider: StringProvider
-) : VectorBaseFragment() {
+class SharedSecuredStorageResetAllFragment @Inject constructor() : VectorBaseFragment() {
 
     override fun getLayoutResId() = R.layout.fragment_ssss_reset_all
 
@@ -53,17 +50,12 @@ class SharedSecuredStorageResetAllFragment @Inject constructor(
             }
         }
 
-        sharedViewModel.subscribe(this) {
-            if (it.activeDeviceCount == 0) {
-                ssss_reset_other_devices.isVisible = false
-            } else {
-                ssss_reset_other_devices.isVisible = true
-                ssss_reset_other_devices.text = stringProvider.getQuantityString(
-                        R.plurals.secure_backup_reset_devices_you_can_verify,
-                        it.activeDeviceCount,
-                        it.activeDeviceCount
-                )
-            }
+        sharedViewModel.subscribe(this) { state ->
+            ssss_reset_other_devices.setTextOrHide(
+                    state.activeDeviceCount
+                            .takeIf { it > 0 }
+                            ?.let { resources.getQuantityString(R.plurals.secure_backup_reset_devices_you_can_verify, it, it) }
+            )
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
index 5b5b4e1931..e6260b6e7e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapBottomSheet.kt
@@ -45,10 +45,7 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     @Parcelize
     data class Args(
-//            val initCrossSigningOnly: Boolean,
             val setUpMode: SetupMode = SetupMode.NORMAL
-//            val forceReset4S: Boolean,
-//            val resetAllUnknownSecrets: Boolean
     ) : Parcelable
 
     override val showExpanded = true
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index 05e9a836f6..4dc2b92751 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -69,11 +69,9 @@ interface BootstrapProgressListener {
 
 data class Params(
         val userPasswordAuth: UserPasswordAuth? = null,
-//        val initOnlyCrossSigning: Boolean = false,
         val progressListener: BootstrapProgressListener? = null,
         val passphrase: String?,
         val keySpec: SsssKeySpec? = null,
-//        val resetAllIfNeeded: Boolean = false,
         val setupMode: SetupMode
 )
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index c170809b51..03c988115c 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -188,7 +188,7 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
             }
         }
 
-        if (state.quadsHasBeenReseted) {
+        if (state.quadSHasBeenReset) {
             showFragment(VerificationConclusionFragment::class, Bundle().apply {
                 putParcelable(MvRx.KEY_ARG, VerificationConclusionFragment.Args(
                         isSuccessFull = true,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 1638450725..a7f47b1172 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -76,7 +76,7 @@ data class VerificationBottomSheetViewState(
         val userWantsToCancel: Boolean = false,
         val userThinkItsNotHim: Boolean = false,
         val quadSContainsSecrets: Boolean = true,
-        val quadsHasBeenReseted: Boolean = false
+        val quadSHasBeenReset: Boolean = false
 ) : MvRxState
 
 class VerificationBottomSheetViewModel @AssistedInject constructor(
@@ -354,7 +354,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
             VerificationAction.SecuredStorageHasBeenReseted    -> {
                 if (session.cryptoService().crossSigningService().allPrivateKeysKnown()) {
                     setState {
-                        copy(quadsHasBeenReseted = true)
+                        copy(quadSHasBeenReset = true)
                     }
                 }
                 Unit
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index a1851f3728..a3b2984bce 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -44,14 +44,18 @@
         <TextView
             android:id="@+id/ssss_reset_other_devices"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="48dp"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:drawableStart="@drawable/ic_smartphone"
             android:drawablePadding="8dp"
+            android:gravity="center_vertical"
+            android:textSize="17sp"
+            android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_all_description"
-            tools:text="Show 2 devices you can verify with now" />
+            tools:text="Show 2 devices you can verify with now"
+            tools:visibility="visible" />
 
         <TextView
             android:id="@+id/ssss_reset_text3"
@@ -65,7 +69,6 @@
             android:textStyle="bold"
             android:tint="?riot_primary_text_color"
             app:layout_constraintStart_toStartOf="parent"
-
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_other_devices" />
 
         <TextView
@@ -83,7 +86,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/ssss_reset_button_cancel"
-            style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/cancel"

From ee56307ccc81af8b45f76692ad75f29a031189b3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 16:47:34 +0200
Subject: [PATCH 060/278] No warning when cancelling the Reset of 4s

---
 .../features/crypto/recover/BootstrapSharedViewModel.kt   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index 7f3f7c0667..a3955d561e 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -528,7 +528,13 @@ class BootstrapSharedViewModel @AssistedInject constructor(
             }
             BootstrapStep.CheckingMigration                  -> Unit
             is BootstrapStep.FirstForm                       -> {
-                _viewEvents.post(BootstrapViewEvents.SkipBootstrap())
+                _viewEvents.post(
+                        when (args.setUpMode) {
+                            SetupMode.CROSS_SIGNING_ONLY,
+                            SetupMode.NORMAL              -> BootstrapViewEvents.SkipBootstrap()
+                            else                          -> BootstrapViewEvents.Dismiss(success = false)
+                        }
+                )
             }
             is BootstrapStep.GetBackupSecretForMigration     -> {
                 setState {

From 482bb51640ceea8fffbe8a7b1504df7614ef0fe5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 17:50:36 +0200
Subject: [PATCH 061/278] More cleanup

---
 .../androidTest/java/im/vector/app/SecurityBootstrapTest.kt | 2 +-
 .../features/crypto/quads/SharedSecureStorageActivity.kt    | 2 +-
 .../app/features/crypto/verification/VerificationAction.kt  | 2 +-
 .../features/crypto/verification/VerificationBottomSheet.kt | 6 +++---
 .../crypto/verification/VerificationBottomSheetViewModel.kt | 2 +-
 .../im/vector/app/features/navigation/DefaultNavigator.kt   | 6 ++----
 .../java/im/vector/app/features/navigation/Navigator.kt     | 3 +--
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
index 3bf17aa043..3ab8fe7dd9 100644
--- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt
@@ -96,7 +96,7 @@ class SecurityBootstrapTest : VerificationTestBase() {
                     .check(matches(isDisplayed()))
         }
 
-        activity.navigator.open4SSetup(activity, SetupMode.NORMAL, null)
+        activity.navigator.open4SSetup(activity, SetupMode.NORMAL)
 
         Thread.sleep(1000)
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 6f7ea1fd46..42d000ecc3 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -114,7 +114,7 @@ class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSh
                 finish()
             }
             is SharedSecureStorageViewEvent.ShowResetBottomSheet -> {
-                navigator.open4SSetup(this, SetupMode.HARD_RESET, this)
+                navigator.open4SSetup(this, SetupMode.HARD_RESET)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
index d0fd825ebb..a32a9de97f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationAction.kt
@@ -31,5 +31,5 @@ sealed class VerificationAction : VectorViewModelAction {
     object SkipVerification : VerificationAction()
     object VerifyFromPassphrase : VerificationAction()
     data class GotResultFromSsss(val cypherData: String, val alias: String) : VerificationAction()
-    object SecuredStorageHasBeenReseted : VerificationAction()
+    object SecuredStorageHasBeenReset : VerificationAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index 03c988115c..c7ce4d6f01 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -148,12 +148,12 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK && requestCode == SECRET_REQUEST_CODE) {
             val result = data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)
-            val reseted = data?.getBooleanExtra(SharedSecureStorageActivity.EXTRA_DATA_RESET, false) ?: false
+            val reset = data?.getBooleanExtra(SharedSecureStorageActivity.EXTRA_DATA_RESET, false) ?: false
             if (result != null) {
                 viewModel.handle(VerificationAction.GotResultFromSsss(result, SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS))
-            } else if (reseted) {
+            } else if (reset) {
                 // all have been reset, so we are verified?
-                viewModel.handle(VerificationAction.SecuredStorageHasBeenReseted)
+                viewModel.handle(VerificationAction.SecuredStorageHasBeenReset)
             }
         }
         super.onActivityResult(requestCode, resultCode, data)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index a7f47b1172..3c00478ab0 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -351,7 +351,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
             is VerificationAction.GotResultFromSsss            -> {
                 handleSecretBackFromSSSS(action)
             }
-            VerificationAction.SecuredStorageHasBeenReseted    -> {
+            VerificationAction.SecuredStorageHasBeenReset      -> {
                 if (session.cryptoService().crossSigningService().allPrivateKeysKnown()) {
                     setState {
                         copy(quadSHasBeenReset = true)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 66dd9544b4..8a60e4a176 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -238,11 +238,9 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override  fun open4SSetup(context: Context, setupMode: SetupMode, listener: VectorBaseBottomSheetDialogFragment.ResultListener?) {
+    override fun open4SSetup(context: Context, setupMode: SetupMode) {
         if (context is VectorBaseActivity) {
-            BootstrapBottomSheet.show(context.supportFragmentManager, setupMode).also {
-                it.resultListener = listener
-            }
+            BootstrapBottomSheet.show(context.supportFragmentManager, setupMode)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 3f255f72ef..e92fea267f 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -21,7 +21,6 @@ import android.content.Context
 import android.view.View
 import androidx.core.util.Pair
 import androidx.fragment.app.Fragment
-import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.media.AttachmentData
@@ -73,7 +72,7 @@ interface Navigator {
 
     fun openKeysBackupSetup(context: Context, showManualExport: Boolean)
 
-    fun open4SSetup(context: Context, setupMode: SetupMode, listener: VectorBaseBottomSheetDialogFragment.ResultListener?)
+    fun open4SSetup(context: Context, setupMode: SetupMode)
 
     fun openKeysBackupManager(context: Context)
 

From 0a0330a48c746f2e312f4ae48b3399bb159b6070 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Tue, 29 Sep 2020 19:29:31 +0200
Subject: [PATCH 062/278] UTD : when reaching UTD and invite state event, stop
 back pagination

---
 .../timeline/TimelineEventController.kt       | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 56de0f7829..90074db773 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -50,6 +50,11 @@ import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
@@ -64,6 +69,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
                                                   private val timelineItemFactory: TimelineItemFactory,
                                                   private val timelineMediaSizeProvider: TimelineMediaSizeProvider,
                                                   private val mergedHeaderItemFactory: MergedHeaderItemFactory,
+                                                  private val session: Session,
                                                   @TimelineEventControllerHandler
                                                   private val backgroundHandler: Handler
 ) : EpoxyController(backgroundHandler, backgroundHandler), Timeline.Listener, EpoxyController.Interceptor {
@@ -115,6 +121,8 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private val modelCache = arrayListOf<CacheItemData?>()
     private var currentSnapshot: List<TimelineEvent> = emptyList()
     private var inSubmitList: Boolean = false
+    private var hasReachedInvite: Boolean = false
+    private var hasUTD: Boolean = false
     private var unreadState: UnreadState = UnreadState.Unknown
     private var positionOfReadMarker: Int? = null
     private var eventIdToHighlight: String? = null
@@ -267,7 +275,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
 
         val timelineModels = getModels()
         add(timelineModels)
-
+        if (hasReachedInvite && hasUTD) {
+            return
+        }
         // Avoid displaying two loaders if there is no elements between them
         val showBackwardsLoader = !showingForwardLoader || timelineModels.isNotEmpty()
         // We can hide the loader but still add the item to controller so it can trigger backwards pagination
@@ -327,6 +337,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     }
 
     private fun buildCacheItemsIfNeeded() = synchronized(modelCache) {
+        hasUTD = false
+        hasReachedInvite = false
+
         if (modelCache.isEmpty()) {
             return
         }
@@ -342,13 +355,21 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     private fun buildCacheItem(currentPosition: Int, items: List<TimelineEvent>): CacheItemData {
         val event = items[currentPosition]
         val nextEvent = items.nextOrNull(currentPosition)
-        val date = event.root.localDateTime()
-        val nextDate = nextEvent?.root?.localDateTime()
-        val addDaySeparator = date.toLocalDate() != nextDate?.toLocalDate()
+        if (hasReachedInvite && hasUTD) {
+            return CacheItemData(event.localId, event.root.eventId, null, null, null)
+        }
+        updateUTDStates(event, nextEvent)
         val eventModel = timelineItemFactory.create(event, nextEvent, eventIdToHighlight, callback).also {
             it.id(event.localId)
             it.setOnVisibilityStateChanged(TimelineEventVisibilityStateChangedListener(callback, event))
         }
+        val addDaySeparator = if (hasReachedInvite && hasUTD) {
+            true
+        } else {
+            val date = event.root.localDateTime()
+            val nextDate = nextEvent?.root?.localDateTime()
+            date.toLocalDate() != nextDate?.toLocalDate()
+        }
         val mergedHeaderModel = mergedHeaderItemFactory.create(event,
                 nextEvent = nextEvent,
                 items = items,
@@ -372,6 +393,24 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         }
     }
 
+    private fun updateUTDStates(event: TimelineEvent, nextEvent: TimelineEvent?) {
+        if (event.root.type == EventType.STATE_ROOM_MEMBER
+                && event.root.stateKey == session.myUserId) {
+            val content = event.root.content.toModel<RoomMemberContent>()
+            if (content?.membership == Membership.INVITE) {
+                hasReachedInvite = true
+            } else if (content?.membership == Membership.JOIN) {
+                val prevContent = event.root.resolvedPrevContent().toModel<RoomMemberContent>()
+                if (prevContent?.membership?.isActive() == false) {
+                    hasReachedInvite = true
+                }
+            }
+        }
+        if (nextEvent?.root?.getClearType() == EventType.ENCRYPTED) {
+            hasUTD = true
+        }
+    }
+
     /**
      * Return true if added
      */

From f0272fd2831bd9a411d1d83ce1dc2e0e5e4cc129 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 30 Sep 2020 15:23:46 +0200
Subject: [PATCH 063/278] UTD pagination: clean up and add developer settings
 to enable complete history

---
 .../timeline/TimelineEventController.kt       |   5 +
 .../factory/MergedHeaderItemFactory.kt        |  89 +-----------
 .../detail/timeline/item/MergedUTDItem.kt     | 127 ------------------
 .../features/settings/VectorPreferences.kt    |   6 +-
 vector/src/main/res/values/strings.xml        |   1 +
 .../xml/vector_settings_advanced_settings.xml |   6 +
 .../src/main/res/xml/vector_settings_labs.xml |   7 -
 7 files changed, 17 insertions(+), 224 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
index 90074db773..bddc7fa126 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
@@ -50,6 +50,7 @@ import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.item.TimelineReadMarkerItem_
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -64,6 +65,7 @@ import javax.inject.Inject
 private const val DEFAULT_PREFETCH_THRESHOLD = 30
 
 class TimelineEventController @Inject constructor(private val dateFormatter: VectorDateFormatter,
+                                                  private val vectorPreferences: VectorPreferences,
                                                   private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
                                                   private val contentDownloadStateTrackerBinder: ContentDownloadStateTrackerBinder,
                                                   private val timelineItemFactory: TimelineItemFactory,
@@ -394,6 +396,9 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     }
 
     private fun updateUTDStates(event: TimelineEvent, nextEvent: TimelineEvent?) {
+        if (vectorPreferences.labShowCompleteHistoryInEncryptedRoom()) {
+            return
+        }
         if (event.root.type == EventType.STATE_ROOM_MEMBER
                 && event.root.stateKey == session.myUserId) {
             val content = event.root.content.toModel<RoomMemberContent>()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 08f93b23cd..35db7fe469 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -31,9 +31,6 @@ import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEve
 import im.vector.app.features.home.room.detail.timeline.item.MergedMembershipEventsItem_
 import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem
 import im.vector.app.features.home.room.detail.timeline.item.MergedRoomCreationItem_
-import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem
-import im.vector.app.features.home.room.detail.timeline.item.MergedUTDItem_
-import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -41,14 +38,12 @@ import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
-import timber.log.Timber
 import javax.inject.Inject
 
 class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
                                                   private val avatarRenderer: AvatarRenderer,
                                                   private val avatarSizeProvider: AvatarSizeProvider,
-                                                  private val roomSummaryHolder: RoomSummaryHolder,
-                                                  private val vectorPreferences: VectorPreferences) {
+                                                  private val roomSummaryHolder: RoomSummaryHolder) {
 
     private val collapsedEventIds = linkedSetOf<Long>()
     private val mergeItemCollapseStates = HashMap<Long, Boolean>()
@@ -66,10 +61,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
                callback: TimelineEventController.Callback?,
                requestModelBuild: () -> Unit)
             : BasedMergedItem<*>? {
-        return if (shouldMergedAsCannotDecryptGroup(event, nextEvent)) {
-            Timber.v("## MERGE: Candidate for merge, top event ${event.eventId}")
-            buildUTDMergedSummary(currentPosition, items, event, eventIdToHighlight, /*requestModelBuild,*/ callback)
-        } else if (nextEvent?.root?.getClearType() == EventType.STATE_ROOM_CREATE
+        return if (nextEvent?.root?.getClearType() == EventType.STATE_ROOM_CREATE
                 && event.isRoomConfiguration(nextEvent.root.getClearContent()?.toModel<RoomCreateContent>()?.creator)) {
             // It's the first item before room.create
             // Collapse all room configuration events
@@ -144,83 +136,6 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         }
     }
 
-    // Event should be UTD
-    // Next event should not
-    private fun shouldMergedAsCannotDecryptGroup(event: TimelineEvent, nextEvent: TimelineEvent?): Boolean {
-        if (!vectorPreferences.mergeUTDinTimeline()) return false
-        // if event is not UTD return false
-        if (!isEventUTD(event)) return false
-        // At this point event cannot be decrypted
-        // Let's check if older event is not UTD
-        return nextEvent == null || !isEventUTD(event)
-    }
-
-    private fun isEventUTD(event: TimelineEvent): Boolean {
-        return event.root.getClearType() == EventType.ENCRYPTED && !event.root.isRedacted()
-    }
-
-    private fun buildUTDMergedSummary(currentPosition: Int,
-                                      items: List<TimelineEvent>,
-                                      event: TimelineEvent,
-                                      eventIdToHighlight: String?,
-            // requestModelBuild: () -> Unit,
-                                      callback: TimelineEventController.Callback?): MergedUTDItem_? {
-        Timber.v("## MERGE: buildUTDMergedSummary from position $currentPosition")
-        var prevEvent = items.prevOrNull(currentPosition)
-        var tmpPos = currentPosition - 1
-        val mergedEvents = ArrayList<TimelineEvent>().also { it.add(event) }
-
-        while (prevEvent != null && isEventUTD(prevEvent)) {
-            mergedEvents.add(prevEvent)
-            tmpPos--
-            prevEvent = if (tmpPos >= 0) items[tmpPos] else null
-        }
-
-        Timber.v("## MERGE: buildUTDMergedSummary merge group size ${mergedEvents.size}")
-        if (mergedEvents.size < 3) return null
-
-        var highlighted = false
-        val mergedData = ArrayList<BasedMergedItem.Data>(mergedEvents.size)
-        mergedEvents.reversed()
-                .forEach { mergedEvent ->
-                    if (!highlighted && mergedEvent.root.eventId == eventIdToHighlight) {
-                        highlighted = true
-                    }
-                    val senderAvatar = mergedEvent.senderInfo.avatarUrl
-                    val senderName = mergedEvent.senderInfo.disambiguatedDisplayName
-                    val data = BasedMergedItem.Data(
-                            userId = mergedEvent.root.senderId ?: "",
-                            avatarUrl = senderAvatar,
-                            memberName = senderName,
-                            localId = mergedEvent.localId,
-                            eventId = mergedEvent.root.eventId ?: "",
-                            isDirectRoom = isDirectRoom()
-                    )
-                    mergedData.add(data)
-                }
-        val mergedEventIds = mergedEvents.map { it.localId }
-
-        collapsedEventIds.addAll(mergedEventIds)
-
-        val mergeId = mergedEventIds.joinToString(separator = "_") { it.toString() }
-
-        val attributes = MergedUTDItem.Attributes(
-                isCollapsed = true,
-                mergeData = mergedData,
-                avatarRenderer = avatarRenderer,
-                onCollapsedStateChanged = {}
-        )
-        return MergedUTDItem_()
-                .id(mergeId)
-                .big(mergedEventIds.size > 5)
-                .leftGuideline(avatarSizeProvider.leftGuideline)
-                .highlighted(highlighted)
-                .attributes(attributes)
-                .also {
-                    it.setOnVisibilityStateChanged(MergedTimelineEventVisibilityStateChangedListener(callback, mergedEvents))
-                }
-    }
-
     private fun buildRoomCreationMergedSummary(currentPosition: Int,
                                                items: List<TimelineEvent>,
                                                event: TimelineEvent,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt
deleted file mode 100644
index 9c72d53641..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedUTDItem.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.home.room.detail.timeline.item
-
-import android.util.TypedValue
-import android.view.ViewGroup
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import com.airbnb.epoxy.EpoxyAttribute
-import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
-import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
-
-@EpoxyModelClass(layout = R.layout.item_timeline_event_base_noinfo)
-abstract class MergedUTDItem : BasedMergedItem<MergedUTDItem.Holder>() {
-
-    @EpoxyAttribute
-    override lateinit var attributes: Attributes
-
-    @EpoxyAttribute
-    var big: Boolean? = false
-
-    override fun getViewType() = STUB_ID
-
-    override fun bind(holder: Holder) {
-        super.bind(holder)
-
-        holder.mergedTile.updateLayoutParams<RelativeLayout.LayoutParams> {
-            this.marginEnd = leftGuideline
-            if (big == true) {
-                this.height = TypedValue.applyDimension(
-                        TypedValue.COMPLEX_UNIT_DIP,
-                        800f,
-                        holder.view.context.resources.displayMetrics
-                ).toInt()
-            } else {
-                this.height = LinearLayout.LayoutParams.WRAP_CONTENT
-            }
-        }
-
-//        if (attributes.isCollapsed) {
-//            // Take the oldest data
-//            val data = distinctMergeData.lastOrNull()
-//
-//            val summary = holder.expandView.resources.getString(R.string.room_created_summary_item,
-//                    data?.memberName ?: data?.userId ?: "")
-//            holder.summaryView.text = summary
-//            holder.summaryView.visibility = View.VISIBLE
-//            holder.avatarView.visibility = View.VISIBLE
-//            if (data != null) {
-//                holder.avatarView.visibility = View.VISIBLE
-//                attributes.avatarRenderer.render(data.toMatrixItem(), holder.avatarView)
-//            } else {
-//                holder.avatarView.visibility = View.GONE
-//            }
-//
-//            if (attributes.hasEncryptionEvent) {
-//                holder.encryptionTile.isVisible = true
-//                holder.encryptionTile.updateLayoutParams<RelativeLayout.LayoutParams> {
-//                    this.marginEnd = leftGuideline
-//                }
-//                if (attributes.isEncryptionAlgorithmSecure) {
-//                    holder.e2eTitleTextView.text = holder.expandView.resources.getString(R.string.encryption_enabled)
-//                    holder.e2eTitleDescriptionView.text = holder.expandView.resources.getString(R.string.encryption_enabled_tile_description)
-//                    holder.e2eTitleDescriptionView.textAlignment = View.TEXT_ALIGNMENT_CENTER
-//                    holder.e2eTitleTextView.setCompoundDrawablesWithIntrinsicBounds(
-//                            ContextCompat.getDrawable(holder.view.context, R.drawable.ic_shield_black),
-//                            null, null, null
-//                    )
-//                } else {
-//                    holder.e2eTitleTextView.text = holder.expandView.resources.getString(R.string.encryption_not_enabled)
-//                    holder.e2eTitleDescriptionView.text = holder.expandView.resources.getString(R.string.encryption_unknown_algorithm_tile_description)
-//                    holder.e2eTitleTextView.setCompoundDrawablesWithIntrinsicBounds(
-//                            ContextCompat.getDrawable(holder.view.context, R.drawable.ic_shield_warning),
-//                            null, null, null
-//                    )
-//                }
-//            } else {
-//                holder.encryptionTile.isVisible = false
-//            }
-//        } else {
-//            holder.avatarView.visibility = View.INVISIBLE
-//            holder.summaryView.visibility = View.GONE
-//            holder.encryptionTile.isGone = true
-//        }
-        // No read receipt for this item
-        holder.readReceiptsView.isVisible = false
-    }
-
-    class Holder : BasedMergedItem.Holder(STUB_ID) {
-        //        val summaryView by bind<TextView>(R.id.itemNoticeTextView)
-//        val avatarView by bind<ImageView>(R.id.itemNoticeAvatarView)
-        val mergedTile by bind<ViewGroup>(R.id.mergedUTDTile)
-//
-//        val e2eTitleTextView by bind<TextView>(R.id.itemVerificationDoneTitleTextView)
-//        val e2eTitleDescriptionView by bind<TextView>(R.id.itemVerificationDoneDetailTextView)
-    }
-
-    companion object {
-        private const val STUB_ID = R.id.messageContentMergedUTDStub
-    }
-
-    data class Attributes(
-            override val isCollapsed: Boolean,
-            override val mergeData: List<Data>,
-            override val avatarRenderer: AvatarRenderer,
-            override val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback? = null,
-            override val onCollapsedStateChanged: (Boolean) -> Unit
-    ) : BasedMergedItem.Attributes
-}
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 9ccb8d7031..abe16e7e90 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -153,7 +153,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         private const val SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY = "SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY"
 
         // SETTINGS_LABS_HIDE_TECHNICAL_E2E_ERRORS
-        private const val SETTINGS_LABS_MERGE_E2E_ERRORS = "SETTINGS_LABS_MERGE_E2E_ERRORS"
+        private const val SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM = "SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM"
         const val SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB = "SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
 
         // analytics
@@ -285,8 +285,8 @@ class VectorPreferences @Inject constructor(private val context: Context) {
         return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY, true)
     }
 
-    fun mergeUTDinTimeline(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_MERGE_E2E_ERRORS, false)
+    fun labShowCompleteHistoryInEncryptedRoom(): Boolean {
+        return defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM, false)
     }
 
     fun labAllowedExtendedLogging(): Boolean {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 68d42e8356..a29959e90e 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1710,6 +1710,7 @@
     <string name="send_suggestion_failed">The suggestion failed to be sent (%s)</string>
 
     <string name="settings_labs_show_hidden_events_in_timeline">Show hidden events in timeline</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">"Show complete history in encrypted rooms"</string>
 
     <string name="bottom_action_people_x">Direct Messages</string>
 
diff --git a/vector/src/main/res/xml/vector_settings_advanced_settings.xml b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
index 6d8de815d8..e136ed0f80 100644
--- a/vector/src/main/res/xml/vector_settings_advanced_settings.xml
+++ b/vector/src/main/res/xml/vector_settings_advanced_settings.xml
@@ -16,6 +16,12 @@
             android:key="SETTINGS_LABS_SHOW_HIDDEN_EVENTS_PREFERENCE_KEY"
             android:title="@string/settings_labs_show_hidden_events_in_timeline" />
 
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
+            android:key="SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM"
+            android:title="@string/settings_labs_show_complete_history_in_encrypted_room" />
+
         <im.vector.app.core.preference.VectorSwitchPreference
             android:defaultValue="false"
             android:dependency="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index 736a0b90c3..fef5a2fe9d 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -39,13 +39,6 @@
         android:key="SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         android:title="@string/labs_swipe_to_reply_in_timeline" />
 
-
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_LABS_MERGE_E2E_ERRORS"
-        android:title="@string/labs_merge_e2e_in_timeline" />
-
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"

From 881ebff015fea1e808068928f69080c621ccaff9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 18:11:30 +0200
Subject: [PATCH 064/278] Changelog and small improvement

---
 CHANGES.md                                                      | 2 +-
 .../java/im/vector/app/features/settings/VectorPreferences.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 9348717fb5..a5b9e43142 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes in Element 1.0.9 (2020-XX-XX)
 ===================================================
 
 Features ✨:
- -
+ - Hide encrypted history (before user is invited). Can be shown if wanted in developer settings
 
 Improvements 🙌:
  - Wording differentiation for direct rooms (#2176)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index abe16e7e90..5e9d8d1ac0 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -286,7 +286,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     }
 
     fun labShowCompleteHistoryInEncryptedRoom(): Boolean {
-        return defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM, false)
+        return developerMode() && defaultPrefs.getBoolean(SETTINGS_LABS_SHOW_COMPLETE_HISTORY_IN_ENCRYPTED_ROOM, false)
     }
 
     fun labAllowedExtendedLogging(): Boolean {

From 37d6a9b722b366905ad8fb443e9f4a83b46049f8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 30 Sep 2020 18:20:42 +0200
Subject: [PATCH 065/278] ktlint

---
 .../java/im/vector/app/features/navigation/DefaultNavigator.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 8a60e4a176..3a8d302fc7 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -30,7 +30,6 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
 import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.utils.toast
 import im.vector.app.features.call.conference.JitsiCallViewModel
 import im.vector.app.features.call.conference.VectorJitsiActivity

From 39532fc2aa65881fdf40521b0cd0a5f8fde2af1b Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Thu, 1 Oct 2020 00:53:05 +0000
Subject: [PATCH 066/278] Update Gradle Wrapper from 5.6.4 to 6.6.1.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 55190 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 +-
 gradlew                                  |  53 ++++++++++++++---------
 gradlew.bat                              |  43 ++++++++++--------
 4 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd051603d91cc39de6cb000dd98fe6b02..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 26193
zcmZ6yQ+S|Vu&o>0wrv|7+qP{xU&pp>+fK)}ZKK1EI!T}Z?6uCtKF>3+>b7Q$8a3;k
z=?&n+bKs5iponRd%jI35ARxHlARx>siR4%*il7((1uK)8y@{J!oa(gW@(&Eb<xUUQ
z^3Z1qpVS{lGB$RDT#=9(Nk5nvR6T+=<Zno`rf{W>VLvhOxk#E0z~5*_n$Tfk4BT1W
zh~4H^yI$w!jrIW$@8~{|r_Pqh9?;*1{Rs-h$o?FVSot<3yKX_cH33Wqgy&Ugow#--
zd$AFKpvAm7vspRndDP5Y*{X$rg0EvCe9(Ow>lBeyGY!V@xQpXomHjCWwMA-rDRPSv
zY@gq7;|J=t%N|R7799odG(V`K@OXpjH2q11r=-sp<?^cLD5gp;r3|dvF1@zyXxLXZ
zjW3O8(r|cd)xV|CV7lKosH(-`?DeTmD$SdKYxERzACa{x*ARg}4=f|(_F?x;G>t+w
zmn<n}DF~^80$YGm`JX02Q|KPBTY7FL<$op54tJuIxdU7K3TcRoXpD_squut0AzU^B
zm~XmlExhb&FE<xgE#&C;5lc-VUR_(=_K4O)$H39!Ti2O453%I>g+yzxXW&2lk&G)N
z-h)16N@V9eFCNeZrbSiuE44@1#kS@h5wqX)wgpxfDiThLBx=5wyP_q&uT8OO)g!i}
z`ony65!)LBh`yjIhNFW{%5vZka3CNsFd!fxA|N)P3^l}%ARrX~g&6-g&ji4>8oCzF
zKSH<7MutdMx~SkLQ5g_)<~Gen%{ZC`NJdbH)-9$<(ppE)OUsf4+q=3xf!CmpZ`c>g
z4Ys!B49{{P<@lMuM@Gi9cVK3-W&h8s0rx+luP@f0C2um4An0s{!;rApVwtHdlxBE$
zQ}-fiEaWDdk_Z{*`eS}<XNdsjcyBBUmbw0*hD$H8sG@Rxn6tqUG@2?KStqF(0XL=p
zMwFpHg$TTf%EnYo2?-LDiOg6aC`ov6s0Eb86h~JcYpZKk25xYLyPB6G`y1LMJ;Haa
z#sR{%#_mZ=+7emEd7DHCjmhei-5BQV+NfXLg;%;qbCNn^PbSlr?jUe*+0)+MJaqfa
zJMB7!)Hh?@o#nx?efYv7R>)9~03LOH#dsT^&c)G^Img%Th&3)4?O4Wq0Y&WfVC|VC
zaAQwCL*mCoU593J>8NRWao@R|t#I*_etEAkj;Pnx3Px?Zvdq$zVwkChuPxdoUTJ_f
z91pe6B-4rYiTj&D4-yF14*5BofspUDM3g|`#ZB$#P?p~-U9+h+Tp`mR<C^wMu%xcj
z6wTe0t10`OKHf3Q0=A=)Pp(@>xh*=&=&T*z2q>oXsGC%dWpshF`TNHT@_F>BTVa9G
zFHYaGE;{c#SSHF=YdV#s&=@2HPVty<YDkmE4Rd)>?i1KRKnHMZOfiniPe%}^B8HFW
z*b<D~=`kA2Vw4K<Vy-Ro^cN;8`n6H9j>JMvi!j9I(^KSPI$-KTx8V>{A<!OM&Uq=z
zK=66t7;2^8w1W_*s!9rj`Qd&?n}O7ztzq~FD`D;o2TU=wc}-oHs}tHyfzzTDAF%r?
z*3sz(t8S}mKmtYwa*#%cc2}joOYGqqXT|++{e#AY`gM35G3p4QCwh?khe5%24?oLq
zFeB^_B7=$V$%hx{=~$kH8UUNec5TGd8=E{yT?)B$gC*-`C93?q)v<>^SDH?XXHk2r
zl3KMvKg}3t6q5GEn_a9c#&WLtG*Z+HlGMW<(x+DV$pO_9MbEmMd(|gjX$n1RcRRtv
zDT~=Ns?nTUr{?a8bL%J`yhpBI_HJ=#J82CYL&{%*ODAh3aQ7C!&9@kuw2vTv^C5Jv
zw{IBtth8_1lePLj%=eb2<|{r*Tr*eZc-3zAmND82-Y2(LCRJAYureb+>#gbkwS;}t
z*dnlaO#wXPiqx378QPITyhU~VJF;i9bY&O>9`a<{Z=?tck-b5V=Ao(5iSinj^|JG0
z^Mei%8;vfT5yjl03`{X#`7o70WDu59Odv`qB&Kd4C_bQnCkPF-Z;JgZ^g{2~-?;k+
z9+d0E@fT(gQ5tY0OC?v8n)9lJ>xx!1rO|MAC<Odw{=saQeAD?Bf8WQ`4VeX5lk}#P
zlJgpQYqdx3nhjbf`d~?21kA5i{$qZw7mNP@#8O3mzVsBTU6i^pi|j@qJr@-O^2CzI
zBS<u;esa5@P)7HOF7A^fqVAMp|6t^C;TQMJ^piVgfy5i2i(i<PYM)y~E;c(+pq#?z
zQ3QH(PL36F3q$)f<kH6ZWqMhQ#T##7KPX4?kHSL}LnFmK6}vKV_sR>zpKq&HkF1K{
zFMRybn|7SN@1S0)$Tgnp%zhGmU0>jDj(qPx9cd6`;(p;9lq7up`hoX{FkphHyA0DN
z5*0_8Cr`bKX4N+FM+NK)D;S+<e98_<w+l6t6|I2lITTznaXAPwIu57+#0$hY49}$b
zPCt**CAj&~otIkJKadnVs0YL{a55Qw2oR7B=>PQe|0pN`4GS%9VQJ!F@1AmvLj;s*
z?5g2wVEo&)=YpSxQkAAjZU5QM2_ajp*;-oX5M*sllctPP$Cq)!W#4miWC{L-|8byZ
z^iiy&Xyktx3$vQ_qG0ub{r0Drov-9Lg!p(omOcL5a7e1+=Q3+nuHS2}-`t&-(97AN
zF!4V4J;ELv>Nxx#>p@srsIrMn3PoV;Fg0q~y9pFFHz~V?YR;q*bQp&<k@G$|ipDTL
zH!J8PbHYSD`Uz?bL7#<X4#lO{Rp$+X&}W{xVp@oqm#pvPDGc(k;%O?=q>>(1D%FPs
zC*IM^c|*^YFd>8K!*CNjO?IyyVo0Oj58J=V+HZAg4EGQ_44<Wu;IN?8fFIzQbr$M^
z4;l}?$ufmO_Mtr5O6@RkDdH2R|CABBPAuoW!|Y-o4bT%>PdzlAt7maXilOhlg5a01
zY;<L+6GLiHhv3cKid!%G7b#gLlWN;8IuK%OVIALNp<-$+bJp-Ek?$#y*w2wP9UDKD
zi(p7M34#!ZoP%2|F<(|FVhD7e8pqS|PZ`%kXP}mZD)(}YVcX(TQ)qehVfHe>8K$cR
z`?@05v}ykdXcpLFzwCu_^1Ix5oA^_#4P!q~iRGZaX}VfO>ocM-TIR_OVK|WIk=>*a
zeNESLpfO2pCzrnXhvy4zVJJ|)bs@SBYiq&LgqV+kKtj0biu*n~3>Ls(AQ(f9*~_s)
zl-KPHr3GJJdZbJ9z~4gno4QuCR6$+sXgnW-SR$UwdY>J(?y@<A-)VoK5I*zof{(H<
zid)D}1EY$sFM)LrL08qYGGM$T%&@xcHyc3>VzOw-!z29BZMAa@*>cOMvu0j;NRm&a
zA?dwChkQuKL|!${FHs;*>8zcvo{*&C&2uo)%+*>dx4mwK>fGN+2G`s+E+?FoDMB>o
zeEk&R)YUb-)hB0btx0ZnL88NiU<4a4`*dXC&pJay_*!BvzV5L3egZfJ^3pQHC8zFj
z6=tLQ9h+!XzlAle1MVUJR85LGy?b&&${lv)c!u?eR_HV5VGs~FMZC*XTEE>nWMNC4
zB-UE7S$o)*022^2SpSi8XR351W?e8S@6i^nRhZK21FxbQo=r|Xn3;a2gqkA9jC)ti
z1U4zFR*N)5@{VZmvX8drmAd;H`V9VYPp)`CJ<24J3+oWFOOh|D+JrBTtRrT-UNiS+
z(J%rlp)E0cuK~b2h31^v%*?vFF%$`yaX*844h@8tiqzpL`V|45>?UdyCevybaaT+l
zdZ{j2LANKlT=)%J%zpa;hj+KHasV#AP+j%_aV7mNFYy(I_e39m$ld%;hB{CR3NVHM
zs?_7ryClg9%EdjJGu<C;Rx@uTeRa|>)cCVf%af}^xD1`=ey;xTSwvKswhL}f-h0rN
zx$a-|8ICEr+~Tj<Xo)^U=F%lrS^VBBS{=8ub`hvp5FOF?6-uC96=pUNnotWr`}KdD
zw#9D68;1Xk`2Z9M2*>|Q4jJ&D%Al!W{4)^8UYCecR(m4n1Xox7yTqZ!IweY}ynJI3
zMz}L%pqst|R9anw=H*@%l{5QYAlsH-?qK4IOT|U_%?X}+&3)yyoEsv22Yx~r!!S#D
zFHjffGZQ^)k^dxFhZ09Hl^#$)1$%|<JRNXgx{K_LF@csO=p0{F0R_y+ew*os!XtZE
z!-A@Ti6Us2RhMTUBVZctqlE~TQe%d9M^@9ib;WUxYA3EQnY&0mhvph4Bc|QKOZIft
zTTWtgKG)q&=62OvmuDv`>>4LpawxEh+VJLRz_6n%#;LPdOiZ?-?QopPOR@$pf0U=M
zotnQ+LX;pV(2mBcz5(Tq6mtI6^{nnb0ZCeqdc2jimiO)`7S5L5d*s~AL(wwRx^y_)
zh#GRJ6CxyPN*6Zaw(!3)H6nkpJ5EKdx44c~YYcFRRlLrSK}q>QJLrKU+@6Erj&$a;
zqseNY2DlS-f#nv2LUG7?M@oSa$z=|r!z!Vove26#Jt4%MY5?-5EAFbS6yguDs?gCE
z(vc>HKlF#duyAd`Ef7JyP%dBGd}$B5LM>{YZJ8-rOT-4~#18)T(~5~b<g!U!XMLGE
zFEWgza`RHk-G|*GIO%Tg>G7eBFL@D*sXp~E2b)#Kj-6#_;rKFTcZ5;~q>XBa%9qtn
zh|*NK&npj)_X0e@`Q)Duq;*G(ix)9}{FJ(tBr%|Zl{%`3vm<3;ZTao!@JCy!w$Hd$
zeTsHc-QO?{AjJ$$xyVeeiaa(mIS{g>H~RWDd^7NrcuhG+n6;;IOM;Pnv9AXK%*F>l
zh;aH=_~cR-sWJe&{k3#sLEJ9Q;xpFrzQ!1IA($)K6A(HHJ78{YNzs2fS9t(^@rq2;
z%#zYDCmxz&BIxr`?~%}btlSLY*nUOqSIu}@IIZ6m+uae;rw{n@(ccR5i+I!DYr1e1
za(MOzHzGaa-+2Qi4lE{yhB?MQdUJSqM$cf$?F?6pb~QsYC}kb`SX9W4V`o%%*{zQJ
z64`;gk{^o`6(Of^2y<*)?pbt(p*cCs&QLrs354H|(M+Bl84yFLM>{4$a^t<&uOd2(
zDhK}WqM`tq3_L~#0nsJ_0U`b0qJjbbXWp&Th4scC_XtdYXp(dG5kaH82(=)@Kwe1p
zNKUs;DyER`6;Dj1)k)SGNDhTGJscIq$m5B>ort=n@wBIQ$t`!x`S0)~<-(*&Y|AE0
z)a`OzqP|LRKT9XHDk!b@B{%*<z#{n}+Pd8E5xSYh?X>6j6c1Qx`5psOT1Mo>jGwg;
zn#*@S7dQbm1brRiPk)Qw!Na~6#2i1!S>M_ZKFrd-N5lZxeU;03j1M<tjU^-R3+Brn
zq7SgIH0y8O#;-W*?=`WWOFy`;JW=4Ti0=a$nX%~3?_&Bn!Stg*{Ar%<D<;CQ6wtWX
zA9-?E{OqybL!AY@F95mc0-_J*52wXXC0_M^Kgx)GFQhn1SgK}-wniu|D85%vG@NOB
z1fC_B)HZKT!Zf50Tt#TLHcFhsBH9-_)YtA$WEa(|^cnLxMOEvD3^QkA#9OpE<iype
zv&)KgsPGDgrZEkR9%Yel&vorXwW@lz#HfAZrUKKPRDJ3S_W*>7M?Pf4N8dDV?~ChR
zl~dm^ZdlcjsW>`r+GpIb96^EutTZQ7HZJ;Ji9<b&z3NA<w2qoyvD3VvF#}P*nkfgm
z{qjf0wAV`io++=&UM&WDtxmDS0C`;&BJSGw%zSw~nR3p*v8aNWEw5SV51Ca`9}I3Q
zY{`@L)=OLi6Tk`N<<7}os-We_t+jTC0!j_EAJXeH(Je3M$|f<~%gfKYYof2(J+$TH
z5=PSP=rO77OgjD<@1?clmqa2tTski{jaKB}`}>;!9fm+SDzseGRa8}V!>`vLfEA5<
z^)ZQgMs(z0cl=&{{#-n$H4i7s&F>pR0-jaEn=80*K7h4_Idl}?F4O-j&+iq}!q|0u
zW>KXn0n?zIbBoRPGAVPB&EzsF)TGUQQbxPlc&8)*U!LeW9DyE}^H`oU%IDjfiRxVP
zcZm6`!=m@f-tdayub+@lecT1jHj$I7CX&YH9$FlZ&!uBZ_-j7{`7B}n<(LR^mFlUm
zdPXw&F#ypd4Z0KNnbu6!n+YwuuibHJChS6JgbF%iJ2%OW%yroEX{36{1($2+bB-&K
zC0J1^1xfhaH|c}lg(Z}>?KcTy2vs7B<ftZisx^t2v^cEEo*cg~s_FD&AT9*3xzJ3}
zV(gmvLR_{Rk9-l}Rb_^^_-%P~;$R9C<6<LMXaL?lq|t{J?_Z>`wT%jT2_Co)Dt-(~
z$*7abZzyD0vyDjXl<Fkb_lP&T=}w;5aI}u0VJeM@MbG7%mx;JSW*gv(F2nMhyvKuD
z(X46)jv;-t{7KEIP-4X6?lKs*=_i&U51%rWRS7sDn)dPky0<X)8ty^Ekm(52-x7x+
z+<+OC@>Msm7MuDfEld>A6c;^VEn_#?$SSettv}`*0^ICen24YL)KM7sp>Adr36Z)i
zLZ)C~O4l-Gf7j-`wbz!yKgf7>5oT>A5&2stuDEVk(Mb*S$E|S5S*`6RXM&8_DcsVv
zCK2jHYi|Stkg<Y#WEa~1=;n1}#=zB6`T+XxM9H!Ik2t$*H48e~9in9Z8M!|ux-)G-
zkq_17JK_d&sn@U)G!NU$&X3UWS0O?bGqF668BwUGgKS&^RA7lj@Y#+~UEI~pp^ygF
z<`hq@9oe&jj$GNZly>aGR5<bzvzmv(X*7R`V?}|9#!DtFKrRXtEka+4#1R#zN&?7g
z(Nzwh7<#WvRwNXz9g@VwPj~^b`9C1W?D<ipVNTF;v^u4Z4ZEXFvCt<samxopea{PO
zMKubBq&R+`Cys#&R6d{(uU_c*%9hAICy#kOvfQ)lwceun#!3g;fb&0+G6J#_!c^JE
zc>AN&9NqFZaeIZ_hgv4iEeNG!)WAE2;tZty`kUh#rx0T{i<$L(<XDM7xwHDQ-&^b$
ztI6v*?wPtcWV23HsDn60yq&#ku#F0mx3Ak}T#G=>pl}iOmk&Jn&`s#jtF66@s#y-I
zrs`Ym7<%r)TW;h`wil?x%EZp6y^@4kv#)JSw#ajW_F1RVu}r@b$DP>2UqH&8hkfa)
zgPn~tP`HoQzMD8L-$()v073u!X)Q$4`&f7(NRb`EPA>$p&-63+XPOTAUl+O`CVMBv
zUrQ*z96r#y(>OjwsSPUDv!=|yZT$0zP51zJCqSw3{3pOd>*?-nTsY6nx@rVd9r#ph
z^8SY>H;-e8C;6+TlQz|S9$*y4dPkmczn4<R(|mT9y@&V=U<Hq)OQ$SxE)z~u!+|T5
z4C7ml-aG%%$!``a$-Jx)Cp<&E_@)wwK!lZp^uwHCfeBRic>KLYdPZkMB5YQKCyx1k
zJU4XSsE4Vem=3%L+>&Z1KHvXd;|(^h;3Q!f2m$|_<7NAaA#5;^0T^^w!jQ4QL;le}
z*zsm?=EF;Xc)4tMRH8y4kh-rGShhn)F}9Mo8($sHHs?z!aFY1UepV8{ZGt?)QusJ7
zzf~$ngGIL`3tXTAjsF%C+r97MR_g|>aA)^c*OI<*yVs|9XU79XL4qJI26Uk7Ijv3x
zoINaggyd9a%t_q%0Ph8Ql54a^ty-n_TBVQcb?WVteFYzbIN`|xuv|=$?1TOt2d7n0
zl5X7BBE4qHiyuUa#im|F_P^ddNQq;Qd~V)7b~RAGgIK3?C-mhqFa+JRkpBJJtsb?Y
z62_+%!ETHm0%1<yN_k{3T2N4(y7@luUGPZ`za<EX)ZS|=1b!+_RbtqBz>mb%*fmFd
z-(YSD22!E5B|nk@2o@GOO91cOjR9JiitxXy-!;sEW|(do8;%0P&eP`;44pK7O*MhX
zdl<j}w#08~pY&^eGL~UY6Z*`F1aJEUC~uKcUMCUs!5Pv{<dyk2()Q}c_)(0IwR^rO
zfCR#cwo~ro15;NC9Wf>fBHfc!vIi~q{+{~Yhf~U<eqJ27xq`e;%<lnU5w7VBbfV#b
zu$tN$H>R<D+}}7|@U)vx;7)FybepVDHbdnSZol&*kYG10&^1>iRcY@<lzq3nhRK4r
z?_Co(4>Pkc?o3SCkQQg}E+y{>J{{cN^5EY^KdbZj0eL(u#c~39>G3r3`=a|y(g9VG
ze}!4C?0rHYoy*G-LX{VUGPp;XC>s6yOH$*fi2M)v$zDQ~Z-5?Et!K&4XKhzSA@f~#
z2D4gmA=DNBUoxh8<y>%ui`)gXJ{mzO;`Ka7Yro`3THr#>S{ih`Fm&Af_p<$IpA2`>
zcde1;fXK1=Y%7#s1`@e0{)Ze>eOIs%ZAx25fAtKS2&3m==&$*)WJQuNTkc$bqb}pE
z-|}i=Zhj)B^u#$9ue!%(%F|I3Z>Ea=V?a$?fMBd}<H*9_k9hd|ICeMw_TBpc%@SB>
ze1q9wcHuXQpXD!fBk-UaRsr3cun@5r2vH(J2asdupCZQXtO!W>%S8LAv!xe0kfu2n
zjW5_uuq+)vtGwrR=+l{QqF2kBE78!W(J}GR<%hyOSa^#KW2A9#7?v-EpG}|G-ghyn
z=?rspMd0U@OLxiB;Y?ZmX`qtu$BtOjBlV)!Sme@`-#+XmY|ZzS&1tu!IJe(QY_SR1
z0UV=l1SuTQ1Woeb)q8dM)^=&@D0MIY=odw=R}Ix1`s7uYSGi_ZR9?Ypz~{)8DQKuF
z;;$|^>WXy8;kVBCj)zk}goNWAo+T`+Eu^`)Rq5;Orj}=OtP(k(_`S?Ia*=lu&i(!Y
z6ky!UGfX<vXXlq&l{VXcKm?%C3sa`C0(qkUHfx)gT29gn-1WL5^rrC|7K%9-9X*tm
zlMijG@xzbG)LLuD&lOV|R#z7;+!PjF-vT9Sj@*2-K2kaA9=mM0hZZ>JmharkF3Z=N
zw|spi95hC)Z#|XX<D(x5)B4#8vdeQKIx;c@l*TZ1Gs^!Ilv6S<LfwsVtST*+118L+
z+=ewZ+Nyzu`zk70v;}D%X)#qcy`Ne0$>Fr~?^gLGr^%K#mG*CRRdI!@8olzM+?;<`
zmMBkcY<*15Y~<5?on)3RjW#`011xN|mi+U4bC%t&;oTcGP~j?Uw(l_<UVlq3D>ls=
z>}ftPt(>WqU$ooRt&WD#h(<Pi09%ya{n2~H9Tr=Cqe5@*4u+%!S>kUpTahm$0)a5J
z-Z=WZ(i=h)mcpDWFgE-@IdH`}B3S$|R`_jjI00_L3YJ|7a(6Hf0Ikg*&c>H}i8a<*
z^1^4vKTOgld+Y*{4;&xunXo&fUk)n(nZ7>(A~0v{k}!HW8=|4a&j(!xARx)<P>$|c
zhPVR@j{Nk&@@WnWOc#pdglpYbnqRa^G=aT%gEf}qea<hNFFp@?p?G-~&@g5a5e_q?
ze0fCtu=&6>-{5y=4?s%BNYdE!7oVS$dS-jq9^$`zdUjKX!{5-+8{58s{P6Lviq5&f
zzQ9h(E0*q;!DLs~tXi-I!aV7pA;bDB7h>Q7WQv&S-Bq<`n10M5tTIoGCSRX*<Ki@6
zoPxj28Ye)eoX9tc>XE}4<bt-ZV3;|7|Ad@H;PN3S^jWQpo|i%z*g+PC$Fa>X-yKG@
z*&4QX9KS>Qd^uW=HyX#d?b+Z|_#4p&jaPATz^QW<Xl!5w`X~SaObxeUZBT*fLl4?D
zUC)zRKmhCkn4pu!i8<O@josq@p03Il63{oV96zKQE8aa^4IYVXLltcJJ_&4^X}Xm$
z6!w1GL;fjr#B*kOw!DH~V2KIG4GqNTCJON*j-bT0rfpnBhW7;jvQ&x_<VD#|0dErI
z2!o&<yvlQzAbU;$9wBJoK{ZI4W8A)XAj&f?ZN~}-LR7genFbsJZ1|RTPi~deCis;<
z=n%_oDk~=a)MM}5O$79>2$6y|u52x5h~<_a*4PTBwZbROhRfpidY0V55XOH=QZt*L
z?wXbvb}pSCneNmv;npvM38FTjLG&fWle~TLgc1+1AD2J@-r>rMbW<j{FZe%NJ&RJ~
z3za`qaLj1ppp~(Zi&;W{{SJms4>HR(3<?E-yVH2qFJvfLzrZ8ofg-lDMn1ZE$NNI_
z{Q}7`l2kgG2+M6?mi~2w1QGd;`Ju5vBd{Y)$*ycfw~Pb%?4bf)VVNjcPXG%c^Iu}0
zyHh6TO(=qau1)+g)Xm$t!dsheMZ2H5^tt|n@9iy6+IAdPkEdkKb|<DxW>+UZ0jQw8
z5ZgwgvjLFKKD^9oT<5j>3@y0WOxmAzkAX#?$$^3yw3s8prBpU|GV=W*PJEt$__E@r
z`S<ZdLriy>tz2}qfA&J!S5F1Wi7fUqy*vAkIja!>mdAZeJkLWFEIi5V(C}TMXN&@V
zj#{qpaJwA^>(sLa%xI%rHzgljPs6aV<xcCqV7c9z%HVZpY5f#G{!G@1%^ZB_A*YE6
zYnTzIsXiYU`Ooy79OUtT+$Vyg33MM+z7~lsd4c$X+&qAk?Y98|T<EkB?SbxRNl$dw
zDh~zX$UjJJM3&c2=KuGxAmwfXuVn+L1`aOEjElPh76b$lD<zJc9q`5&$NYxQYpqx%
zD?-1u7Bc%mtrAKL6=O*XE8|S^1B}f1=V_}nv{#3zQ$jM2pd#gH=~mP-IzOSRVlyU5
zA5Y)w)$^Vh+W4e!PsMT?<mL2hQCA+f)3?@nA1;y4=OI0aW)vh`evv7AewFBG%gMbx
z?@rwTFC8647udYUJs<!%|9T7=*sF{-SL2Opcrz~d>0K4<r@kUPrmLSA!>sn;+ABIp
zuQB63*`WGhyF+hsmojX3a<7Z|dh7vbcsGv!>0JUB#7*nn5*_9p6AkHI6Wmdy%>ep)
z92}15`S_M@$U7q1>&W2ode_xEfne`?Ttb+ss&eG-$>$fH5bzVZdcs(H6oyFkfkhJ2
zUwY62^V&sX)S&ZfJmNGw;q5^Mk~pP+I3uP&`9a3N8m?f>3PXU5SD2nu=9@r>IfA+J
zjjX@)X!<QWxS@I@z5#aTYGZo|%SO1lp(5ZeY3_I4tyH(ytEa~u8jQH&Ma7@;&U^yv
ztEM__SL2X@6+n|ctNBl9pHV^uVvzFWOZ&@SdcCxt9#RF<bhDL_mY-8RU&Bw`<|<P&
z2HX~I_|!1`7x*{b*+AKvsFCEcdiSGDlRsDEN8##Au~!dY-Iys)42xFCW2#_sWaXR-
z9LASlE+v<-WypxQnrad3f(LV+S4|XgkCbopEbRW3D}cFFw<97-!<?DUk6ALOb;cmu
z401~@hnP{sdQD^<D(u_Lq+|@xQ8tAhM#;Ts(p_2HPwmVGD-I$%TTXOX!A<74-P?PV
zN;X?6C3I;=ZN1*2bNwkUv>vzOM-bidc2qIeh#Q>abJC@x<${icn`KprM)xE;qpkSS
z|JucpB7kj2oOa8B-r7Ruh=d?*aqcTYdc@#rq>#Q8xE5LNkn$PR`-Y6+D$~(X5QkUK
z3)eq)aPjpu>WI=wtB;d7loeZdCF`1Is64W#Ofa`qEBek>9wxW(>0(*7!kB?7Gwit4
z(Gg=8?0SZc;x|X>@MS+o^cebx=8&<8x2{&j1suO|vFF`5buf&7R|&Qg33jOwySf?<
zazki_QODaxRqIi;T}qOw`^~gsa_&6m>$vu7N(ae<BS&&Q$+J0Lec`<nOAVtZtr?S-
z9nxH^FNjx&4s$;+e*Ah<W{aS5yT^rVR&?7;uYm3JPt++q+<uD>zO#KJ>Q~BF13Rr)
z0$7K!w7&oXenjB`WX?|*Va<DV#Dt@Ync@erm8uFTTyaF<;d#tY(P8EXdPG(MiD48)
z8=jyFy0^CQ{euoLH-VX}<WnA^^FvSUIpx!|rJ`T-&j&dF9CwNAWy)e9TE>$7e`O34
zLtF`Fb~J02*(;X*%5<(50Y(ZST0aGf0h!-(n8&AzL*F`sMjW4*!1BEp?hbH}9S$7f
zO%LbIz}qGL&=^by4)<O6&EURE4qZOAibzODFeFlKhN!17Rf=FG-m;Xqc|@L9ycKU0
zsBg80CK%C-)NMu6bl>9Dd=%7S6^z|#^5wHVEB6bNV8dB3(#{<tzu^eE>y+03YSOj$
z1(#|0&|-U;@#j?3YNOn0BbCI6-El=66+Lt{i8c(al1Q8EO3eS}T^m!rrCJVdp@Zzq
zAiL<yswf>(E_PK2Ojap$H%gcM8Dvq220xmznRkY$W41^Al2d-gwOQ{Sffi;Tw#nfQ
z!8Ky6Fnp@zRJs|43%>a^AMi-vw|-SlWCSf+Wrc2Sko%DI7J60saN5_Sw>^miD=&7&
zN~fxsIWvtH-=lfmgMF6IcJ9%DsG#x2`>pAVb`On1v26P|ynUXy#+;Z5<mQ4h2X^Lf
zO36L`CC`{zoFHdbh=4}tqu+A)-XusEUZNc+wX`-xDYoZfP}qMmmyErE{bk!2ixkhd
z@Bu?ek6L=4daP6>sh_4inhVcjhBn8vLv@?^c7~MeNp3Oc8s!_1aYTuu4%I2R7#UhE
zeC1~&Ugb+8uBy5n-UPduT4!hS-A&I-y_EFkn`P7d>6W-+E(UwpwHWW~5!9Fl%rhU8
z4rN-lV^xZE9tstUT+<xDwM5QkKL}PlZGowDU1mUiRi@Rj_GLd)#5K{oq060w|5a*X
zd;^-(%bzvv_ehLM14=h+g${2iE)1+E82C&FK8e0aHA8-@bN(8y1-AJKzmj7@-2VKF
z!bAP-I5itVMd;aybFaUf;o%|X2a8G<2s^h#d%`D8<MgiV0xz<F!cKge`Pt;y4FOlR
zDwi>j$FGG_R`{nZSVEdIRh#XZ{{CF~w9=z~HC3Za?3cVIqLV7t-KNDDA(PuVk1EQP
z<CB=+Xsd!9L+rNr;B~DL4yE!4?><;!`;CMg(tjBc_oR_9o}$LsR%*(lK3;qJ$NpY>
zz2Q%SK2J9HPdVIxM|@u?$Ai{=N3RQx8WS(WUmi`K5tJ9V6@4gz0rWS$C?Nt0Z0;Dp
zN_9*dEh%Lz9X_yqMWoXnNtH!zgtATSXNv=2l;<=fNed&L!s?27>;+%8%xsZAJYAB>
z6*7-ODl4v5g<S&LOs{K@0dctUPW3p0v6hsTiMp)OS>{<l+TaaBut@!k%?tF`v=ob$
z;u)tF6aL_*C1)j9ys3y$qbo+R*+KaaYaH$bQxl^F;aI)!CTols*j9>=50{n>@`0v&
zL!{*eD0MShOB38PGu}00NWP}zz23BV?b-8LU7Sutt0p2PG4|hMlDSr~Ovdo_g{v;R
ziPuB~LwSn8jpVxkpS+hQSqS-OwkT{yq&tp9>Jy1O0r@%+1*(LwL13yrR6IKYRG!dJ
z5t>vF=!W<R-0`QCBM3#bTd+Sd<b%!>guGx>zusRaBza|PX_wgeTrm#&$9@d6;7K*6
z3e6;^pCyeEsw#~Bbf^@APG9i1S&_$v!%F-4<gvmE$fhy(*ABF8wpN>drg!~g!lGP{
z?>(t@{R9);;EhaY*k_PBL`Z*fk|?BYWDC)YXsX7k=SOzbM2c@%WY{Tj&s*u?F0^dq
z3*p4AojqtLL^ifH$GHBRj&%G|gRw}kkvKT^mqiZ^JjXwysjH#3$qGU*++|#Yukw`C
z9<vh%n5<sqihYSeaz#wBBIH`sBSZkQO19CUpg*fkrXVU!2$dEE@(WppyP~!{l;;(p
zbguR$23DQ-ZE_E5<N4>02-@ySHLM;e0%y&tyK0oqj2Qj>Fl+q~(%^o>dC+21Pf1y=
z9SBh)|AdSSszzwvjk$C@;k}$FRI3&YX1W~XYVK8jRjUo+ooRFNVsds}z|@6ejWB&H
zo{iQiz*G~Az7=mMsx-NwiJzMk=)7XcHKvoRulV<0mw!j(wZ}Np{EvkTM*{&N`#)<R
zWF{0q+s7Zn3-jN1^Eg8a=#sK1wsnrKy&Ll(UFfi=D60b+327)qY2FP|4rvSf^$kOi
zud+j(RNr-)Z-KT%*@nI7;@ICGc70BZnsriw*TgSs5&=$@+?%@$w5$d5-*aAHdw=_1
z|0>LVofk!b)(#1unSe7mChznn;^*XGaL302Sf!K%NvK1Sp(SkQr9Q5)QXLWZWWSAO
z=$Q}C%616O&ya9od*vm$4d-U_o}94_2TOV^deIt8leMP35r4xTw#k2VqZrON?~xqG
zd80S<b`iWDG0MMb=J(eTsPy&`u=a-JETa5AKJ}XN#@=HzORSSV5Zvk28u}~h4Zsis
zFoz+e{?d}@LNoZpCN|U*{_10VJIu?l!c>RHXo|9Lp+81ZSG7&FRaS8pQn)X}sTvE9
z8-2y&E;K{W@gb+OsLCsHxpuL%Q*$;yjJFmUTh_VCGv#Nao;^Fzmo4P6+GfOj1srPR
zsg<`)HXo#SG|j@XaGO@mRa?jd4EM7ECE3qIQ%*s#tLnCE-zC@}S*5I^><4LN)Jzvs
z7(Ovy+fmt|)3Vmq99k((g!1juobDEhgZk`E82CJ8+jRbGN@Cmc)iyuK&pOT6-u^~0
z?zVb&Q{|S|$`FExDI}z6!__sPe1qpFTF6w-Wr~OJY*`zQKHKz^TI+JLzcOfmL{)Kl
zJ5Oiy@1!;)n?)1Y0(T3g27L-^-p%(?3VBboNm_z;Qv__0l2J9;Z7)Y*yw&7QoN3rq
zqBZ*j|NbhQCiNUnQ@nIM@-fgMU0K1>HcT@Gms;}(PjPmb1ot;MCB9qyB&1@>L5;9_
z{`8ryhVDpDwIcp@l)FzNsW>FSt6C;QVyJ>5H~Ah!hu^|icE~1Z+HKCAyxZ-*5zAut
z$@jUliq9rz#UW27(F(*uio;<$`%+wYGOD&dRM0gct-U1syj0&lJ2Uo2%Wf>5W_007
z6|b14{7?m^KqM>Vwo6K|!bYtzJoo%?99+9;POxSx?M4v7<djyKF+mRik&YqeuBXdw
znq6lM_McY|ZNXTlveO>4^6m#O(70!z!t{^NnSa{CzL$VB8p^=*hcrsN=Y%vG=Y`xK
z;HDHPKG5@4AM9YIJ>-Y$kGX?|$WE@lrFjzy{2_S?@}s*(=Mb6lQ+hBV>zewlDzt$1
zjW@99Kp?Q{K+9Wx@c0dA3*K-1-X~Mcv{^=&HSruG_StDpNGhbh=ZF2Jbr1ciGMMs~
z5-fboEUpih8Ct1H?=VuWFkPjX({Vj%D_dwgUaZIg8`{muX_3W9@u$K6;Md_DT>en$
zz>>|KM}>lvlC_%Xrj~nX-p$Er3nje`^H}UaT1&9x!H1muqW%KVQWi7iX~L(xm}O|~
z#X+Z^p7)e&r;?wMZm3UN#ARz&eSB6w5T2aYZXTDbQsB?2PjNoZX_YZm@$&ei*e4@<
zA-cu+gUfi6DlKU&8_mLNOcm>F1jm)ZN#<ZHTh-!MXJE#4RXf3gzFU<e<eyZlbJ1qE
zYvU=lrTBI^kMIeA)s~~W?4np#MoYtgPD}Za^-MXd#WqLBVc6alp7))DcTZzRk1xH<
zC&nx*;wImWR;r|Cr()Cd8?q@z@oeFpgEPtMkL_Bo&s;V<X;Wn=lBjC371W`R3vH?L
z&k$B78jKkW$`z%3Ewp`&zIMe97llLcqV_k3RQ|PWD-Ubn630vXp%Z=$%-M=Lb8~>O
zzmg?7)MT_mL2tU;A-l)smN&w_S2{1pQ=5j1v$uP~ENtMAB$VcrcK=oTxtT$B+CQ@1
z&$A^a(@Ka)^h5oyrh0OJ9#gzHDSSme!!y-3XWzXi7nHjZG|r9HxX}HbNrSM@H~AmY
zl;6^9=(;b^Zt+UFk(}@*N9)52iLX64_U|w5ZFDiXM=}GaBCMv6LFw6*L_c{ieT5wU
zA*K3qh9dlg5ClEl8!d$LFUsxZkcrz%g_D<O23J2{?nUn6gh2j#|0BnWMUW{H6~MsY
z3rE~w7-#AVZ~UMJ{_prf13dH?N+mq>I7%&k#4`w>l747u8#01iJHoi4xrit81G*c;
zYb5(ZWKaogi(If@57k)E;!!8`<C;iZ2kL1~^f$3o7q=Q)rcu|=Yy_<M<(>@909<{p
z=s$mO)#Hn^uppRy@nfi*eXNEduoB3`4OXj`wMD-$aYLg5Z3?JcABCj9(eM9qE$;{i
zSr|+MQmg_su+tUt)(;V1Ix41MT9z{O4P?P%2=!FO2-SVFcG~_M0Mz^g>CJ1Y!FEQA
zHyFL{&h9x}E5uL`d#9o?MvjkrU*Wk$C8c(0X?SXAh`aoJc5Sh<Ggw;y^*4W38o@*%
zQ;6@Hl<=1Qgk!3YExyu0d-{*03z(>92J=H8jlQpnncsm)Idi-{nvpE5rUGUtD3?&^
zQA!Xp6!|>dyvmL-u7;{H{HUpYJ};Lq#^Xz%+mwJ?UNka<j5PU~_0EgcgS+14UxZ4?
zYUmwjXhqva5%S*v4t$E<aoBzG(8uG@JAT+*YS{e>*xdxQeq!<&L7B=xyjxRPN33hW
zC1xWWsfp0wh{Q7n;w8D<(WFFbCqeLtz;~2<gL<ySNFWIG0pleGIQrT7Q_n!2I9UE8
z!-V?<C0I#S@lUd+@MQhCAs(d6Qs8rv1E{12)?dyem*?gBfymAbS3BVcBJ9@#5S^Rh
z<zh7E0g+@^BE<R=5F2oe;@1~Pa-~Y3bqV1e>_rAf<{}UZ{%l{`lUH=;0FogcB@M+7
zsxE?(;|m`8I}S!ggq%wlmQTGYZHei386lY?Ua%`q$e#*X%Z4LVb0rqa@Ga5|!*P=i
z;_$=Yl*Yv=l4-5&pnFE#buT}@iT`i@WCJ0Y!XNCv9~b{YU7-Ji;v+M`05Xnl?k4v3
zV%8RBcK-vTq@@}tp^IRI@7r`3bnl8X29gx}%jwbS!DXY2;>g5ONief0+&gNAH#dGw
zIM#fVJ9RFI7cY*;F@LIzvA4+S$s%$n%+GA*z4G2|X6*_Cz$cjU5IMNZiG{YJGR?&O
zk8*mxXjgsC#2+%_ctD8CpSON`LoVB3lUDzceYa^FZDs;3fpU209hdF=4Xpn8npQIO
zT4$d=+uK%w3d1rD-_Gbke~nkY9ghyAuz=d7?)!HA-+za!Hf9Xf&!-R@Y$2&?k%^qR
z!mPql!wm6O7u)gvs+-r|tc+fJIw*NNz312HbK3vb>^z?k=mjd*=j5*gx7%q=HYW1#
zoHMT;s1<i@1T8Y}LJ+L0MJ@FrkTeL&gAd;@4|$>EH>@Hp-R^Ky`57IFot`W=QU^7t
z;cG_8#7O-tI?W}7uzG$bL)asLUI^n^6>`FE5#YIhLr~6dsRnqkSuAbXv<m7?H1C49
zlaW$69;HXA=mYE~WEMj|mPRmsUuj!ucNdeRqjxe6i-o(dZ|C%pn{?n%{Yy~EQ6EI;
zQ-Sq;Ae)ee=9re|=b)mY_9{e|-Q?rQ1|3rx@zVLmf1a1+RAgnkYlPLW=)$cXLL6l=
zPYHqX;rhwq5s%UtH320y#AKm@H(vQE9r%u++wUBGkpUo4iBS%e7d7EhY%oY}=8Dci
zu*n}G6<VUrt;loX7ZD4-H_o`>o%X4J)3@#~v?(nVQ@fLH9eXs5+tESnmjDP!C+z7&
zgB%)&-kK9JNw*s^M)Svlxj2@T5hHGyzeuRqzmV-4y+LEZM;2?M?z}vE>A&MAERIsq
zm_4|9w3ud?(4qh4YOqGMZUuapqlR)_{r~Rmi6@wI2?huV6C(%+$^RN?=>LzK(t-6?
zUtJZZZs|4gW{3)9u}6|7p*N8NGfhFEzyYIVKwP<!drXd<LEG<Tg*9lc!)&Xo)3yE2
zHXB?7*Huzj(`{|(>SfqE*wyvyV)q1W1qPNW{5$W@nxyc7dHeeo_II!6b;oV~QTROH
z?>ypP*BuTj<KZu88-V#-PK{(1cS$~}+?gP|Y6)ZVyp<%)Rr>gn=%_#dr<7zqu_<e5
z2JX>bNG;nr@%(;=gz%uHG^@hJC9(Y8zsRW2Mdqhmh&y(MjXqK7r9NtDPnW7M)|6ga
zFXNK8OX3g#+#{MHUMZg;Rl#(b4(aUFgL~{e(mh>VjfJ;IBCt1YSNfC-(vWuEB@zg|
z4$-M8c_segA*xMWN@hrW@O088avV-lcM^wJKwPS!jg%L+WS?9v^Jbr3r3dz@c)3~a
z(lWLU)+;!`UutHRX!~xk)CzIwvsd=u7`M;ZfDLi!AE=bb^%#a{gi$&>6hMv->X??m
zWus}kLsWWe57_RYo+$oKra~*tTXJ(r^mL;c@H@dxv$RMwBS3a0o7nZA<Z0)jrP~Bm
zoP1J6t&}?6Bk_pR=;?G4=$rE^^Jy5ngIA5sDfRh<68PhInxkJpI(@-#h&UCN7|lYM
zpp<(A(O{`}P|NxgHLk&Y3I9lDJ5utxd!}9RirrDy15hE);z*G%^7wOY*Us(O<7^=I
z)Lw_!w%x&L@7V1uH`|UV4;hDzpMj^LLcXW7YOj~%eQsM0>j8U+-Qk6^n2LK4ApdP$
z+_K!7X~{uVJ6EkZZJm&<A(+0n>!7O<XN$rPejAnV&0*5YKI=(tubn}Zq0x=lQv*dd
zrdu-P1JrMaGInufa_rtX#FQr|$<6*rs?=Ftv!qJNiR~;huW>zA28Ljb&yCQdq;A^e
z?`VDC`}TBGQeq6cLnieythuwOI3<rP)#%o2b+-`^qM^|oB;6xSBu@BuFWY*^?sw$Z
z(+G{kK8$lL@Y=hWl3TMhyKEbmeTIq%ljc$_fQ=+^e~+r;XX#>Dd$M}#X+kSHK?}`=
zO2TQqq_tFkr;cKIbix;x<@&AuHc*PNE{a)$vE)<wY&F*M&&tYvCM)IRnuT4S?i`y<
znK}Wd8HU>0$*F5HP0dP^Jdd`wdg%`T;q-y1O~&P9JR`&o<3>izFdsLFd_A^gxhlP9
zfMw(q%D9Geb&<4jX4_!;<dV&AkvPbSe<j$56=IShLS)HaP6xH8!4`c1*1A5%JzEC9
zSAY;KWay?E@!@xBT$(&N)#BO~^c{ZtAP3S7A#7%OTvD~B3|YKmdtAF<POM`XdtAff
zTM1r(&T#^(Lf=X&8DT&d)=suGh|YNeu;g32RPQZw>~84j7z`uPWvp#QwOuRSact(~
zHxk^QLiml7pvftjiW`h{jTnW4!0ll^@a$m~OeJ7@l$~VSU{Lok9<eGP(SSxzJ7-|X
zrrDH27eBFP8ozu1Q8KHDs{)zkGATY~%dYVwmfNpqmTTKyi#(_@M5YqYb6l++xDpb9
zm!`fYlBr%K*DmE<!sWh64I9PI3th*t1EG;wuD^qPv1dKNT8@@TmWcuxIk0wA=1^+n
zVcfp^Ic2|Zi+8KYrm%Gzm6|tNqw5<m6ph<n2h*!UA$))7C_y&QdWJ<$YSYDq8O4{|
z7`23J25UY-fQppUqSC{64RDqKr16w>>fEvUa%_X3ss?0O>_?HpgyOLDgdTWC@F|kX
z{Nyh7W(%uos@?Fml*tO=AWr%{xSW)`x=b&iMd|WYw~(qw^b2c{9t`LMLS`L$`S&2d
z@xJhw6h~hr3m>xTUDB^X3vfH?`fJfsgIL?(bZQMHDe4BnHwj1wlTDfd-U=hOlE!G5
z=4jW<)p0de_M9z2Sq7&b+P^XF+$nT1WA(p(BnuZkP=l_vi+dR<mYeEoA7u~jShy8J
zwfJCU3aGG}EGU=fbyzQwl`F2-F|{y%15`D=dlE|w>6Vj?7}Mf#uZY~_Vb^q<e6+*X
zT`an8AF;02l?V-()aM?+l6}fyo2s`)K2n3haLRo8<efm+WJQk6lWzu6L$j==PQaG*
z1Y*U5jb;pXUVC>Yp}i*VUR0DkWWVx+yKgMf`lZ*iUmj5*w1;n&;o_y=bEBfxf|UCQ
zN`Q7nAl||yUOy6if#xb*O8xpJUAJxpy-mRw_r)jeUc*zxyJQ?7Oim2#-XG<(_TJ*p
zZadNO<FBd73vZs&p<a<_eR$;S86syIjlX+;oNz+nJmD;?sq@cze||vZocS@s{hQ6G
z;z{Hi&NaagxA;NJ;~Nh!I2ZGenA<;al69+?i+GpJyDP@dV&YSp#Ghlt9D<Kdfgies
zWyg)DzG0!$+>QiBh9!HE&9U0oLrYu24nLj^@!Qc4k<1?(H)9-lx3CR!%dYhz>CCh{
zXX~&_^v-+UiSiPhf6amWLoY*8W03WEqRCMVHFZ!2%}Ko*#@#LZB>oz0eK^63xkix7
zwDdsknE^Zh`<|&-P_gY1_>*|$eVc{W>o&2Oda2yik7p4$<l@{h8R)uoi#{HG!1}qJ
zMrHXN))Ol?>s(_qHr$SSolZuwgWlAGg*Co<IS?Io%QP%$7LMJy_6<L@s|kjF+t2cR
zk<vyGsaa0i%_4{t5?%%dCzY(cjdneFddo&>uZ_Z(2OY%Jrtj<9IV?M3OuQ{iIf|~x
z+OCWNe~txonygr@9v+#y2&5<vs~SutF6aHR(Cb#L)ieanagL*V8AG`EB<x51Gt1K7
zUVh|BVQG1d0^1#-jEP{ik2lTsK>>OFY2d4Je)llU2N>-U1%Y2eMnxIhQRK&)ncRb`
zgHl%)N*40F(cQOsjH1!_2+(IRufIn`ayt8{pN|7Lhkrvs0;~Nj#xYzsd-GWHfDt9Q
zl8Vyz2bi+vw1PRM7>Qm}rKsit^9e~!XTE>x6PCX`P%9qh-2=mc`lps;{+O||%vRW`
zE3_)>o@j#9uE;_8JpA88Ozy*kur+)P@8{Tf!WB<XM>vd0`Z!Xf6%X)yzb2S%KAYzn
z?rQ+Pf5|}DAyI|U%KQ2!ejYIWOHAfU7xnVl>bq|aK#}@R`j^^tpV_Q%zE1JyOJ_&G
ztreXsq4K=^wES>~wCSJG2qCa~N&Kvo_ixMy3{ENcGYc!%lrXfJmz`lSHrZwJl6Z_=
zNUMIzH^pX5kKm`9OR}Egne*0~1*LE9@jft;w2EN+%=*AOq{7?Aw2aZAs-6c@dc$O6
zomi1GxZ^0H4Ca;nB7IApks9BRmBkfJb6#vB8+E-Z`eyEF)qU??AGEiYCp$>fwCY1s
zvv&_EhvL3@okqXsS;VzuTTz?q2YJc8MBR$F-jY59>8bS-6`H%J8fgf&Q&Rt#=M(_L
zAV7vpgL>ey?%X*2D14?^=Qk{@HMno<X;*iQRo%S}XKcgfBba#KDvqM?{k*-5yiZS^
z@=*PrV5q7W9^Z~a9PaoLMu}LD^LQ+<YU4#~Kb>vL&kHwCQ-v>A(8p8F)8y%R0?MD1
zBo;$)ZMMs$Soe+8MqZh+jAPj|t_y5veA>_UYumoK>5uaLdCKF)-GsmPJ(y(0n*P{i
zys<-v#V0j(cM>ICv&T<oB+8^XH7rSrE}?1U!n?@24Wwr$pwtOSFP%><nNTvo{^bLE
zg*xd%$<&@2gK+*mG^xm0H!03xk%M+uQhqWPvw3a)>EdeBw$~Ls1r0G?i3-TnPp`B$
zRxBck=XpH(i7~L^4z1umh!eEgtRz|5MoouBMTeJa>yFHNtlZxwu9=D3uMln^sN0{J
zKNjaga6V#rWdA)4t@RqaSN=$s^94t1i@Tz;o3$bJnF-4*olwZy9?s21?8%lzKwpZY
zc@lKhbN1Dm&eJGYR;}1jg9BD(H1sY)*D+lGBwrBd$h{P0$Ma@6$#ws<$_8ZR>gSwY
zJ*_vjPnewj++L(AbAwjtayY4c6W0(Yfh<l}8~ybKlpxEyvv_plZjoJ4Dnf)V!|5<t
z*FMfiQG3;lq@C2pnU6}`5Iq$5<73N)yl;Zr0(-DUW2SSsMdIyaeZVy$Jc;w{v4&1-
z9d+H0I=Ha`dOJqO&6+t4Eh$0t8MHe#lWAOwC?FB;WDfKW(iOBQUu#L|Pj7Vn*b~Bn
z;r~<ESBAy0G;PD;?!E+f*AOJQOK^9G;0_@y9^4k!;O-jS-JKAe;F{n;-aUEGInR^t
z$NTmCn5yo(`kI~D?wP9Tx<{N$@)w7%0Xn*&;C>R?bW5EmauaUURIxO?jIbEa=xA)5
zrlxc7qeYUm^|nc4@6e1Ao$yykN@x*-8@_p}bUmn)(DCP?ZdBqM!9$!YS;}i#&RQRw
z(jW5~!{0^E-Q9$IB+~P7snMnyzdv!?;G~ZzTHH=cwC`$t5MTFWEV&ukiLw=bpbLHs
z;w~&?-o?0Q9A!c%smUpND<kO{lTeS#pB&%{XI@!A)PR}5rt0G0q&YVFCE4NgJ5frq
z%DgAgm5me9EN3g$&9$)u(Z^7SP)n}Q`&NgppVQ^J4)NRX4>iYcO!w?lgLYc-F*c$*
zp`>mI6a?gQ6@$1t3Vr=8xxF>Le$ve~0~R{P9M>zk>p6Fii_@6eL)P^|pLMZ*cq8ZT
zRs@N6m7Nr?AjnqVjL8qbh)4=&>70@lIE_JpCQ5I-HSbWKD9&qFZB*W(g|vq}7n1SG
zxt2G^ExxnzcFez|*w~eP;&!werZX52sJ{5wlS^m*<=#_lSk{d<3k7<rkofwFzW(&H
zSOckYISwwC$i8Wd7e<z>imnI;A!m#?eq}DTrH*>+KD?X?&h@m?QK9Bhz5`T4>^h1F
zsFSSbI3%1+i}u`K76l5-HceoXiRtAR-ifN_vGYWZS~<h2t7Ozu(&7MG<oR`2&d%M7
zEM$~l&9qWoAnt}>?vVHMfMj!f;OPBfh8x`-l6FcwFKm-v^o^~0!Hfa%+63{M_!aGh
zVf9RWH;A5WgE-`#Z(^zBOfj9kH|dER6c@UO>GdG-%;`0~r0&heV$3h1hAh{9t7a2f
zoOe&3L|XVmfI~H4+?6SmQ5wVhtT4nIHVipER(0W4w80uT9+kOMZG^lt_1(_2AFPiN
zQuHmwW)(bUb?yS85C;Al>IeN`%vR0Aa_aG~72-XK3#%&2ycqhdc^?knE}sZ$gZwb_
z4Il6a-7R#8+Q`gI+hlj&D49gZC<-h6H15E%^oHW+v%IHB#+6>sc&or;fd|u2@Kuk2
zqV<Ya7qx+PRi{Q@4LSLBv)4>*-j@Nbm2ZIgh~9-xQQZ~nA86An7{JNxsTptK<hJ-h
zs)M5LX^K|aTuX**D;TcE?%_s8bI{Wr`fPJ<4#qswp@0|oN-d>PoK&blwV++LWv{gP
zysYMJMFRZ`3aTs5<13*|ci-%Yt>~ZzWECwI8=Grr-Jqd#TI-Gm)l6@@5S*xx&Q+Tj
z*llb&#HlwTK9VwRDT{mYIKFI}Q66VYJujH3eh9cv@QN`01Tekj<hm^DuR&13MEk5o
zzIgD&^eHp9hgkGbBXtoD3Ic-uY1@146|Py?zh<bAQ@~b;vI=9cgB;O*{=%W*mMGIg
zE70FfWs76CU(Bvr>g~Jz{b(M<mw6|JMArL))aO+VFJhp}R{9l#)K|B=a*lKb;f^=2
z1AXp*RYn_vBKvQ=ePMp^xqy`Wpml|1Nc7+jAMx)UfS(m%=GCLyJBgas0VEH<4zpMm
z0zQ?}7vR~so6_J~pB3+A4ab^p+bbg26!m!^7}lx*3q7yZBHd1~F+ys!tb-azfExx*
zqQV{0#$nRJ2FvdVNJDu;5Npb<+kDpjskghG2oxnhkW~mF{#uL8`UxVWe+3KMrMTd)
z!(!Zs!`_Ohy#nK?FD2alNY`_y0()R~F#_Ja;q!lly@@6>G4ew0e&Vovmhf&Maas#s
zJ3xw(y}%24W~f+{tQT=7TGW@*JG4>$P`iGArS?GN>xyQblbe(8C@lC3Rj9oCSs5P&
zqqIg!6b1E3ET99k#0SKRa^r&x8(QN)zGL>dV543>^OM+qK2G_7Z$c^uswYEU0y3<r
z1?Yl%Zs2@43?$sP<V|gT0-O_d&-0r6Y#o`|*ngE$ok#BeeDwo3I_MFAeM=Pf?3#M3
z)BW_uBB~VqQv)%-VnK@fc*HQYm`^q>_U_0z)1gLeFJ{8IW-_RpT`x>}pLXi24&E~Q
zej<a2=D03E0zFQvX)$AX|BYJ+0>vG+ObS{gx7NU|e9hyS_8ngTV)?}YTf8MGr1A_;
zR}3^PWz11xIFL#Jm{eO$L~z{;`mrPzkfbAAQLsTT90tG{{^^)rGUMpIm|>hi*F{h$
zA6#71A~Aa%G!LQ~5bYQJF;Lfc5>HASm_iTZ!9i!ajZh+!SRNM(JAYj45ZpT#<c738
zY)iz!D>4FIr@|7_KAVJmk8q$GUYZ@m-4kAw9e2~+llyKYuVa=-*)bRDM{Npg_oSmJ
zf27?tYA>Ct!dV|{1Kay<TL0(+Ho_+o#iAF{DnHV}djwF_?K}QY&nfGoFMwiD&=Mw%
zb_*I7I?mNw>ddiaajlw^n=Nma?4{awL?4(=IAho0=3cPy+o0MOat?UBd^v5Sgw0rF
zeV44FKMFnZbj%rG5W!w8ZH?ukP?Eo(m$r}M!P~qPjSzRl@Chhs5D$dLX*L2g#}He2
ze1epjf!-kS;CHm1<4)#qWECRfz<u9*OVjZ2w{@hZk1(`OH&`pSa8(2M%PugA-%AcG
zn<_5W6>yjsH9D3&oep@QTzTu%rY;Oi<h0S_a)#929&>}~a&^-be)0)hO|ebt<`Ld>
zitFSNYD~Vjo$|D0#vs>|cqu-r>SG-I5hHK!HsuUr+%?IiL)fg`vB^E=kY}z;N-}fA
zK-F6GYwSm*5nHAR2qMMeet7qlh#1IXA?;z61vCzv%Yv$+)Kq^vGIdtr{;As}dc^z0
zIqgKaal}w$EKNU4N!w3j{L7RFc7kwu(#8z3@8d-W3fXz?+%C?hvkjMHfIBq{ys>4b
zncycCgEw!A%S4jZpfWS-XrTlIEEN5N80YqNeFcqo_9g{yE!Mwg<%~Jg)%4<c<z;Xz
zXWb%2iF%9h90VNSGL3(5a#@x?7e7&=*x!K84jOg*2C6@nZ37_7$yL)uLuirC0pJ=1
zVUWtIT%QQ0P)0#?<t6^PCmfkA9?ZaN$vAvbdPe%dPW#nDhiKWAq6ko-F_!NI%p<+C
zhhBdfdFS|eS{j$D<?ZRycRUg3F`WYTtbiaQdrO1yHf>|4_jO77qqKcaUwRz9$#*tI
zLQRXc7-a|I)|28DZU~cIpA?_0pE7$G20=VM?5fG}e6}0v!TdW(ah!f{s(xH#GL<^B
z9a3x64X|6<(&!eO7iJCfnO>mh%aoW7>#>NktbW&C2x{GKREG78c%2~zM<@8@Yw-gb
zn%aBe&}lS318O6+z08?!54U>t^U~Fyu>$5=D$DXv9y@9D()THXBr#x|gbKD=wM{|v
zk4CSMI2grVEd=eziL2wl3ltkUf3LRDE_|mjGo^dc2p{3g64s6;^-yPyfMlTjNzsq`
z1vPo&pnKHO!&sQO%*q;FN480{;XNu<Kc<CdD|fG%fB2P`C1uBS-tv%_qoRo6lIlI3
zHbze09Bt{iNcHM8$uRpR)5^0_=Sv8qoyqJnLsY_2F@GwRK^n%NFH{=#-Mn5yNIBxs
zp`d7g2d3YS<A9Ph4?!dgctU3K#NL92dCN$=9?F>_=CV!cP>LC;iOZbf-E{_z^N=<5
zvl7`7=^XXc9yaneb7Hs2RW^rWTCI`z1-Q)xW6jTsEM4mYT*-D61b3fr&px!Ce{)Uo
z+<*FY`g#N4g#41=B)llVj;z?Lp%0c}yj0#3B`~?Tfd{c=W0}as)l3TD%X<)_Pc6}e
zwe+lJ2-=0;wFC!wY4*}x$Rg#KhNuV<3>MP}#!kr$Z`Cue;a<MU7G^U+WV^V?3u6nr
zGbJ=iaKbf0-(jkF)OZD1CuC%GNJ43dypzG~#}wuG>5>#_W8gNmzmmO^Y!Kt_f(45W
zg^%5AHwmPwTW_Z}_NK}50I(ZXRlcV#Tg$wF?R3}Mdw(^4_4UX0Rqxk<FDF-Dw`avH
zZvy>?$2GpUCNMJia5Tz5`CL}`S22h;+etQSB_`w}A7mS)esJ@#E%hsFvt|rQXtgWd
zlgu9{eida|@M=bmQ8bvA+n|05$vQT=3K3C(2u>AroHpa;zR0kz?kYQyq~0{OtA(q!
z)7V8+v&3U6#A%i~kZ8r|-lxvXtIow!y?nesQqF0UZhjzQS8da@sHT3}aj6~I*z5Bx
zV`P;{cZLIRQApsSN;9^LY7<!h=zt5&Vxmioi#f@V%wO(A-Uk<W-LEvqK8!Y}7ygJ)
z>3axDXreG?y_r1ez!26mH*_1Hl^oEe3pYKGy=|<S{o$mg)5u&{Qq-7dy8;LmqLH5v
zD6(`ctZRFreKK|!+dHyr6J!t}C;R1@tK_)1fF}HwVvI)=AK#t^#8Pf|7cy&BX0g-C
z-(geU`aM+WbK49yJ-=9}>48=tK_AuzjzJ?xZ44#tqgeNr0k8aZ-uevf1sWp^mM|_k
z))_U;gyQh<GqkOK7}S0$IxBHZnwB>>0`yKN`X>?*j+e|JQ6}Cc6_L%O_8{0xZjf=$
zLNJ1P?R0IJ(=SlVd{^bO-uk%d?2H`TLgJ;`;ysa{lBn#+9b7f-g*;K0>7hnD<>ox-
z7n{%EU1QkB@EwaE-S#c#9{W3jw;6uQ{bc5kSa?L$TkklZqn6;VzMPB(r=`zF5UpuO
zDx9KerivulEWiToRG<OyByA`$4(~18mvY3_Le&^0-1}mx)Ow_NKK9k-8;(SA-PpTi
z1b1yJ60P2qM|IV%uG+CaI5?mj*q>#AIM;hg%W%3FX0zN&Fk%R})%rIq9)oar0zj%O
zE+LuWs(4a7Oh*SxZaeUor}lhYDQ#tYr$Ty>ex*5HvA3z{LsA(i*T!lvnQrf^*%s?I
zGm=(7lv71+Wo5OuZck6DJC>Ft0&juuk0x0BHQU=HPRDl+*aXpU8w9)B<~G(qlyWu^
zE+fiet=0@$^A>72P6gK!juHy%9kkzG=DxI7B{+A*dFT1Myg;3<KJ<PQZa*Uki*|WI
zc|!s>K-*$`@`Jh!pYd){tTw87j%=(!!MJ_F>T_*<g9GvF7Nb_I<AT@F@eqzDS1rOi
zIL{wleJ(Bninq$lb6;6Ol#iw=pd9DKgoWUJjoXzO`41?*V|5F41pVG~pQBdveqrk5
zzMiBPTKD%r-3;PGgC@(<AlYtszNm6f@SEq7MW1`ss7yRHbL5u}mmYLU9K58z5Iapj
zgNjP!Pvw<Ly`t9ZtuQ+drS`U)s$irQ8>Sz}@pEOstYU*deJ)TEK}x?s9F*M@+mAhG
zifyCtE7cK96Tg>nDS>y&16y}#j@Gksr=1r%oz~6Uukp;JFFwRuut3ajL!&i=cUWXX
zE+UR6#B-I6bawD+IiF-D|5$EhFn5|4y$T%`L5$~0<7gd~Qo;=NQTZ$vicBgnFRq_<
zP=AWmC-XRatzcQ7JeL208T90tuI#f(F0Lw&#WL4?#4TwVaYdGo2#X{=h$>4lTX3FA
zh7zd>o&K&r-1wLMm6mf!XkR^=k>G>bt0y@%<aY@(YOEbC2x`Tiy@ix5*f<tGo+gWh
zOM^y?Io;)MG4Eoe&sw7cn2CUyiV2Nv%^VHH<f?r<z(XO!0imQ5UQkSxloY+z&{@l{
zG{d1v@B83$!D#RSb@K;?Evm#HX69M<LLwB1Ge2MQwaI^F;pRy)&#ahHvzZNCTeeU7
z0b|=vgr!^%#gwQ8>>uGTbc_nY`o15-5mnl5b8}O$6x6X##WlWZIiI7rMzmxLNrh)n
zFzL9(Z(y|19A{VR9fSI4meOU2Q!Zh3ew;od7+eYNAcQ&Idh?H@2H_UttWX#4t-JP_
z3+l+CBV<=mF4p*k3Br35Q43o@9zG$YcrH|WLGJKD+I@58RAGMf4jdzH9jWqdV}&ri
zAS|qSGybdP%fogFc3_JeC3ZEXGs@Q8v2{5$rL5<|SThx;ha|}kPXS}5P*(*d*=HA*
z_s6@FjePFK;deOZkTA(5ZlNvOP`KufU-5DOobquvCF|PL)eBy;Or+N|i`ql?Y_ty)
z=?hH#vxXZM(!50^3K@h&kQDsEN($yX04k1{jRB%txtN&SS+IDzm^e9ExUe{xxR}^m
zxIrWb$levQKGP9W?Pg=)3InmIU$Y9uLZimB{2&iuwCRH6)Cho`bEv@<)5PE^ZzK?d
zPz{T+GUj<0UM@=m99E6LSW+Y|vZ(CEMw7v@*b2?6q%T}fuU5B2keumb@nu?+^Q1$7
zsa_Ky_Dkm2c&20L8v(8le$UT8@Vd!0sky0UWyICRP$;oY39n2MZ}~#soS{sVz{YUI
zAOLr;+fx(Cw<w0FVi@3K@8wuv^H4!+vTMVVE}@wdOz{ea(bQL!EIMPf8j3o}(SfG@
zBR={I>aGbUO-n0}jwte(EVYrhl^iWNKAI-hSb>FEl?|qX;5qMv2Ab=rOd~Lw#z~}D
z^XD-q=cB?>Las6ub}i3YNg4Q!_96x;N;U#yWSwX}7gY7$T)vJpvoT~XwO1e{ad1^-
zdYws8lcL5FA2w>`%~uaeIdF~P747TYB^PS8_g{v~Y)W)l4OtIeEe%5zfk)<4bgWgV
zv7MO?D>$VI)2fmyHXG|rSkMV6<9m7S_8*aBhEOy16W}Im2P+huJHjI<XhTIqMOgL;
z3p73s4byX#$>hXvW<Wb@y=?$(1!DL$xCmaFz}Ev^-;VDvh^Ndgut&YY_O7zGh1_{5
z$oR`keOn^l2QE|6)a3_-FkX-@;6Cxtre=w#>lW&XzL!O12;Bme)#{qo2`Qb9hPrST
z*+%r#6QF(Xbj8m~hi$_8o|ZX6A0lSVEvLh;E^czQV$o_=c8{o$R8j-N0Wj`onsQzx
zdPJ%Fh>xUxvXYksj?FhK1>ZEOR=@e=!femqh<`4o__12Efo$^j110Dk3@dNTi#x|w
z{pY+$zXO)5V=KQdYpsT|AbB^o>38uSt_{`sD+H(?gP91C&-2fOP7SP!YjqBmnU7Y0
z?RKw7sgKD?S9Y+gpcW%Q59lL=Rp8eo*Q6cf-?-nw3U^;4on2VXw_TuR7e1d`3qToR
z#1~Nv-^{dlLfJe)tzRprHg!IWOU`9WYEE0@7~5f0+991Xhd}AomcZK6NvqR3p{z-W
zRyfR!N<x3a>L%?yq_BZmW`pGu^b1(gqt2kL?B3G6I^pw)^*7~`p{cryXNq|Xuv%oa
z9$?d?aG^VE-smOlwn#4?vF8%1=a+Q}+RJc2@`MZS3Q+222V8bWP@rEfM_{>Maz>hb
zJ?#Zd$TnXg)Ia({!=Ob)D&jms#+f?`6qMlaamF@70vgafc3D-&e2%HyZK<2(FOnr8
z--Iug^$mA@pRsHspI{hHLhubf(*=yTP*PhM!#vjsi0#%(Bud5QoPG}4BK5*0ypeG*
zT~gX*&)S;$a<WqY>$F&?{OM<oksl2Er%#+pW|y#N@|>YH!|`AW6CEl1l)je0av)j6
z1oBXsGN_GKe9%3HgyP$73(XGi+XN1O_n7u5dR{(cpeNBomSdEUZ>R~g<4TgkfM#>K
zk5oBv8c(^V+QezQ$&sf<Th;2DSwmihzAwE_uCqo@?r2)=Yk4UdU(MqdE9|qj5;5(#
zZ7tS1i<8T#!}nMeD;>(3C~g#UsW&-MD~~W(^gvxE%kIU?^sntX>6;bRnwQFKJF386
z^Vo*Hw8U|3v;~w;#gwd=QDKsG+|*YY1U*p4cJG2sru9B_9!yi{>4ER1kD6_Z%F>e*
zW@^#u6OI!V?#0h*6bS>%46x?im-8L1zC1`IG+&@w>shZ_`nb0{dewxKiOmhEtn3~l
z_JR-_n_Q(op7`m<Q1(rdj4-`mTCROV5zNBst03GX-0t{h78j}6w@7a#A%^aGpn!6Q
zmpKp?Xp*_rG8Fd~zj*t{N4Si;#2qd;8as~u$2;{4s2ncld!JUvv(!bLdU?xip%a;&
zH&ICHMjX@_o;9Xg#5`+mRl*Bbmaj73r$>Q!T&WFcI#N^oYr`)e`nkn-$#qb^OSkSh
z`BsWZ>Uhl)vfhU__{oU$tziTkFya%u=s6$2#qGO%54Sx&^+y*-6?lGMEWMXgB~2Ss
z++VY<CV6zNGE!D_c<tls9Qta>7vtP}^yh+8lx=8406nTbpv)F;&4h0Qd2TFG%To^|
ziGY|48+d7mY3GcYv&HMtbv!sqLN8Pa*QTXJRZW%aqExD*7M@(l%0~vAnD;w;b>yOT
z_p2|b;ik(U^yQ_iM4ohr(R5w_!mu_#iKWtRgC`*}@50`$*rwNjF<U{MAWRV_Q{;j5
z7;ppKF1{n{Jh(SAgpX-SaKSnfdKd+|;*e|FswzoNh}we5bku!90e<8z{}3lPg1aiY
zA+;?Ho1HIw&E*BfhBYcjHG7_V-A~sk?S|pPAiL@mc$H-JfskJEom|(pIzuY!TWNEG
zAhsJ!mO|+QEnP<;R~T&N4XPAld04JUmE=A`J*fx-sThO8CZ~mv&dq?YpQ=nj05Ggh
zMUge0NUEPIQo-;ZeHBHtjjbG)LtH>t{7xL7STPkjz$zmbUq&l0t?gSa%-KVT3GY6?
zk{9Ezm^Y2xR{BH0pR6BD8~stvmcAT(Z3(`$F_aAJG*0eCAy@j@LjADIoG_0*g{T&f
zDUs6-KLcmwjF6WzxoyVa&u0CMsG9Hs_dCB;d4{;&Iye`A?0cd*ISpBeNQ(t_j;8~o
z%>qFa+J~Mv5Ejc0-id-aX!&?XNoR?J1h;@d0nPW46%CS=_)M&*BXQ^jT<(^$fh1>b
zVG%MaPU6l4f~pmpKHo52Lig`pd+{B0aDfZ#0XFx$DYxt2Ja4aQK#xDKo1t_sL!x}X
z(d0vW%C|^MG4LkhNbFcpu{j%Jw;x2c%8G$F1EG;Zqa>G^^8tEyi4n#%09s}#;slk*
z5BGD)o1-OzPOwy*rpt_GBxgGrzbw8*ArM~nAigpkzCr#L_{rN_qBr07iO@*cFo3Sc
zpckz0kQfYcu&F+4i&vSXbyV4>$|6l+nV-TUe)LE$a_}tR9-1KyNM;>VYNEDhiJt}O
zZ8PK-_7MZ;$0brsj$Yd|<*!E4%^ERa-q0X2^P`o%6JN%=1lB->(@}B+#L0{TwOrki
zrf?do#n@nA(<6`hp>s4y7gcSV>gwLt^Hww#7*H+DTJW*1CEXIss=3bbau^DJ_bGhI
znjJTnH})i{*Rx3tU8QyU>=$atbXE%5j!8?qMEeNHMQ0LS%o?B<I_!yV{aD__AsJW3
z%2ZYOz`eS84n^pKfa;=gO*}`;@v)ND`{l<rGA=F6)JXD*1KnIu>mjnfUe5V?Xj&+5
zp2fY!_j;UE$*@b7wXe#?Yj!aqmTf{0nknj7+PcDKY4zaN4?%mo%nX%|Eqz>|82V4D
z{2xlk<=>3zkC9HFHj0+giyQKB<#->02~NqGsN2a+J_QrN`Tcs?*LOa#Ff>fIGZ-D?
zG}QIhnH)o|>a%eo|8%QsBT!}J=ww{}(<%K8DXxBaQu_&RYDW2)$LeB}bNJ5%d1TfB
z3*<a&&FR2G<m6n99vA(*O{oejP*|33mI8LgSK_6h5>||=3{|)42Lshgz3ur@BzaHu
zITsDB)x7fbQp<$qG+i}T?<I$C6+^Q1DVNCQ&GJ3v%Pci@YwFiM6rOs?3ZyeY_u;0{
z=-_PS*E&ta!XXEiNYxC>K`L+t2kJEh?{V8>c(B(oTM9~=+t7w`^?&>f0V$yC_Ou5&
zEqaqVpVm%FsKEWYEDCPMZIAZEZI4_-M&A^IJ9nl2+B(Ou^qF|9&SM^HZLxUbk^HUl
z1%=)V*4yk|_bz>0-(K_=+#K0EeGwK-L1gr;n(jiYWgIx&Vx0+a*dDGw&qN6eBKKrL
z5u9!DQdtSwep$ubg8f9J9f<gD07Vx<WKcPA4xD$gK~t+h;5q6_AxNb@ZY#paMN0v|
zm>T9X^pC5xrnw;q>SWFTr0YUOtf0YGE8#M=##f&Svwl}t5r2~SIi8VdlCf%It|-Z|
zxckB8_MXe815a15N?>x^f+<-Q<1F=1f#G1JRO-70qEOSYO`71BHjw{L<WyO^$;YyI
zSq!3~mRJi_`iH<<BaM&Z&nPvtB;^XOX_)n4@e^A|vi)h_XyIr5_bxsJN~EuQczhK1
z)2*4q3ICQaN>N*G&m`0^xyhZu75<@m61JWeI;?*Yp>oTvkmZfRGUxMAkX#oZ@xhP+
zQJGi&Old@MX7k+VpB|ue_jM&#O!aqetUY*$b8<UiaxE-#x~Dsa{0?5mm^^A9)WRoe
zEdIbc>l4J@nL(<!JVj~D@JTx3dy`mcl1dZ`Xj8V){#WV|OC0ao1Bh!e2*RGUDcAcK
zg6n(tqux8QY-VYzZDnaMVW0PZP4=N%d@XTH+QK@0#*)yhEi?n-82(VZNyzw6o;dwF
zb-@Titgy9S&Hjsi@`05%baebW^YJ}@%D|wCMxcAY^%=#s_K}W?_`1IrK?0vhdRMHj
zGp7BvxLZW5AWGTCLmd>K8ssIgL-`?4Yy=MF&=-au#{RX}R~UJjZ0^u{X^tG4Sg<R5
zgwBxi+LYnj{b_R$jb;7)wyS!ixbgr&w()=!E~4S-7IKpRl^aq)<LsnNyvSF&mE~X}
zr9hV`N@%Jc47eOa>)ln%9;F&bX_eQa8XNKZ_-@pZD4_2;QmXG;ee2+^vWfe=*G<F^
zL<ZsZtpe+6oRkMgjt?AwbZxRHg8cgQ7ee^g{po{FGd&>C%a0Z2SH+p5TUi-B<q)br
z#KyDDF3@bP;QqX39dMg(FTxQMXG2XL)Gf3v9Tk>SBmWqsa*5KB;MeDTDd2|<+SGFH
z{i&7cTNnAGDPvndVrTcut5NmIDVzX|)f$-h&T4URD3~!>yL3wvbSkV{$z3Y0*b$z5
zUD)c@&G1_$UnLY6R>-Bzq7{FNOH-h~Lt19a2H3yV<o#~`4Iei;s`In8c?C*@)ZnS%
z%ta}gXIvC^#qHgCIPDagN&n{O_%p3(Kj*NQGN);!jgIk7PBGata<u2y{XO**_rkyL
zer&VE^<FVP_-L5<LJ0Vfd_X&hH%kk7N~QwWEWp>(7w%%=J+a;hy~=9OYKiI^s_)8t
z!aL~_9jT{ihQUC3S{Ba3gSfvqV3t9?|8<9%X#V34o7vg?pRO>tb^=%*G)VOSetV&G
zh!4y@ObE33Z>D}oxBrxa04f-8JQW_~0}aIB(h*FsH#{cle;T6^e>Xxnslgn>1i(Mo
zs{cVj_5}e>NdEx;o4oq39)W-G&HiD8jQ+O~1vq^e6Zi**<{!W?tiOSX;G$7{@cl3`
zpp4?*s-J}TzYkq|gcy)c`MY|Rh#XSI2*_oCs3hQv5o+LnNH?IM82{+qf*As02J4S9
z0@Qhbn`e!Z0slzt`~&~?^=}XcD+c&+6chO0sTYt{?EjX6fO+A+frzO8ornS68o~$u
zvGDz0o4-zFhS=X$2w;gZc7U(eZ<SOI_4nEQ&pRY2D84`J=yiVs-;Se!7ZnJ>Ph*(C
zKVD+|0Y=gP8!Q9}HTx~HX_A7g#~A_1*1y$@aS1^D`@cm5u<FDs;J*<YNKaIM^mgI~
z_P3(>>p#f;R|w~yQV^iv{{IW;fQu%007>rPwFv=0zdIP+nhUHr$q0Do1rdqB`MuN-
z6%#x-NeqDc2zK@cf}bZv0m*(~(J2kU4d{1`z6&b2dx{Yt7z$CTz!=j6z&|2F{~Qiv
zUl2g|2?7!VgQgh)V-XOM9xU<^4ZJyx3H-ym{llg+`gg}{Gm-$@gx_M?3=i->Pq|P~
zLVw@~5`TlxW~BfZ8UKrqAptYYVuG#W|9f<uXa8<YjfecISw_HB?r&9bP6Pm3_*<+@
zA%L`Cf>-8<0no+2tIE=_!Hn~afTz;GRa9`uJU`&10^Boi2oR|TQ!J<e|CoaQI5eL+
zh#4hhMq&rd_k(qt>A}d0jDW3ih)4<k-xG-mc3UI{z)geW7A*lQGhm~BfxoT+@ZT8<
z(&1l$yMIbSK*b!`Xo(73KS8Yc*Oc{7DF}F;`}gwy-xHX!JRHPdfP&(MY)6o}Q+)m}
G?SBA$$wig`

delta 22560
zcmZ6yV|Snp6Rev_CbpeS>||owwr$(IC$^nTY}=UFwr$(k&w1DRviDm38@j8ns_LHt
zOQ`{?rTGD0zG}7t1`Yyp1`Ps2mzZaaktp{A4WKu+F?4p0R?}8TRY&`ZNjEXT12+~3
zj0j{$p$~6bQmbv0>iYGA?uU)YI>IPXl$_bz=z#P!ruQdg_fwI)ZiO#&WA)nN@>k?n
zB%kGT`ltX(Kn3kmI`jL*`tzml)4{d*KYnlr7=FsIy?}rpGGiXnL!#hat%W;G)s$&{
zsz99#4HQv<0YrmQ+mipe(48CPk%@_E6y-@@XB0TNc^&2cklescOq33!9gMrQQ5#vx
zI=+W`ueXPO$d<op-6Rc1PypN%5~sOF2zM`%6e%Wlp=5`^Ty>P;?W&b!I`{osy<~#L
z(A4=+{uS0<7k$!(YC&Jz#EKlFuFFHfC@}ww-=%XT_ZDE=fu5>o=F&gb-oEc-{+CDx
zSv$lyyl4XdGdr8jwIXe*J;o4y*f-p;gaMnJ@cC{wi&%7JT`XPjR#>l2I%)jM%s52u
z`=R_w;mLE|=@ra<Zh<B_stS_>dcQk(aPy&0r+8NaE0xk(exSC5sF?yKZ}1h)9Z<gn
z71j?7=vSA?cAx*kwtQkkeXhle!?bqwwzCL$a7R{u?O^s=RZgrE>ZRu!xv#fgQ4<x5
zFK;l?2#(Tgx~tf@y?Lb2DzzpP)?y55P<2Xas*uZu<y4%hmZCDO*n^5G=LlWKezNUH
z4P5ic@9V+Gc2`ZK9IaJZp{#fj0BFT`MoLQ^6jdD&pQ%jG(v$S_lQf4D+Aq2ybyRqI
zgvYdRWWuydm2Qdnj83-D^tHQ%8!KM0aufzZ9}<gocLT)HbM`Fa?6WY=Jm)nq+I)-m
zoPF~4q<us!J`2SH3&oU$Tf$JrzT+cmZs8ZbnJ;t}ouW~;DUtdIB|EGz0G4q#)<o)S
zr%Bzz3`7}NA1n3gY0D7wFj$Di9*t@k#I>E<F$1Z=mKV9gC*J;@?@nE~_m*?vcEL<>
z_)#~yCN`;+Cd{Maur-nTTQ8Ytc1-W`>h#t8bfU@Z6esXY6dEV?_u9QXrF&60o<=Q?
zmb8v#*HCR1=7in}C}LY<fDA%h*m|OdONRo+?XV)o0j+a5qwh^A-Y2*t(RN5we-C_@
zOLlGfc<^>$$*>9B0AEWXn|*zS*0xTv+hRrp?mXK!wf)VefZ<z@<+VIAL0eR1p|h0{
zPFx#83Ri@{%1XzPzSxAgttj0@h@&F%bYtRi=;yUva=fgh`)NcRFr4kivqhRq(=04S
zC$Jv31aTsE&^(2Cn#d!tZFY+Zib@i<Wc-j)Oi^I&VF7=kzIM^$s6~?Pz%Msb{sx03
z5|F)6g+)xqWCm79kr;&-U1>Ocfg0pAM;PanH;dE9DpG$QXMLg}e4N&ZKt{h<%S<o2
zh~pL=yuW*5H+MA#1m|zA;ygu(?jef>SkSY`TzlIO6#YZ;rk(H;MhujYyG!8qm(zNu
zeEHGmh}8cu%OCBh(`QI4&~MwPm5UnxfzIFSb!WsLg^Y+aOsVvfROlb>TqA7!Ao$+_
zX|zL@s*)Qfe+)kPee^jl<&r*r@8l^x5=s6QXBhHvthiY^pkVnOar7kN^cnW|k?G`b
zx%iVzW%Ez-F>0adQ;L&Gc=6{dLje9ZJ-!4rk69_!<wP8h;51$iI>G8BlAv^V$5>=<
zSD!%gqU89Sr#DZhk$=YuKXf_w^E6p)W?s4sI)Me0SE^Qi?hCFL!^NVoAP*Pyr-p^B
zJreWfY%h-jY6r4cNLmy-7WWOq=`8CL*Zv2P7!7p`KYVyqh6@S;BJ&djgynzRvKtCI
zk$M>mNLJRBM-@clZJ@K!ZPrk?6+I9Z*vNN_)Sq2Qi^D-lw31Lj>7SpGTVoxUW6sig
zi<OxX(GRlNL%b2kzD^2&XAyliG(XyMp5k@4J6gWJ=KrxVYz&E-=DK6FG^7J_k6>p+
z6g-HQGVzoWXu9DR_s8CNa0ox-*4z;9>=+Ij;Qu!mM?0Qj(5eA#eB0jDL9&3`jjA|M
zF+v^N+zK<<MksS8wvxXQlHk4B)NB`~5vp2UWaOYfRHtwl)}j^gdoV)fF}K=-4n<J>
z)=ar{C-`C@{-CL-0hBDHtbGPo<XS=%cO;m}Oyl7``S}A3(I_u)H#Z@=0}l3Uq_2Vu
zm~U!QH%a4$9NDoMYc7v?oO#IRlS7X}#I%%27~;&vBFEKYhn1bbUQbbAyK1BSl`H*`
z$#KNgLmJ7ZrkimErhJeWEe;p_-60cl5niVpo*pmDY~nQ#HvDMNus&y$YS=d+Dk*eE
z-(Rnf{l@}*=uzp*CTw>UX@_5lxy0B65E^$1tY9tTNSAnfy<`%$lL)`8PrrExV`G%B
z847+ysh#*G$nZz*M->ZLR25#&n-nfA_FL?80HGta86PhQk4_P5IIWZK9Zf`r&J`re
zb>{)mP^aTGpU4?5JzmeN6Y()J{0haYyvvsi$~)Lx8;K=oG2>#YpH#)-^I*t3`xwEG
zx9*86u43;-T;313>IW(91uufs-JJ}7QzZaIK^p8Q3<wAm6bJ~2AP8$SPi7AS2*_Xj
z#9U+wAWIY4M`u{`8<@N5E?J!4eQfKlm%GqdvgD4z9}h>B?lu`us7yW>bKB#Ql%HFx
z&^^4=UYC**mVz%L3o2lloGlbs7ogf{d>o5jBma3O;P0fIdq}A;rErB|q4mt)5b9P`
zC2_9LVt<rrf7J2K-0-^5qW1>(C+lwM*V6tn5OC6KUa``Vm$9sJe_s9y&-%`Z`VV`+
zezyhQhcE1xA4S;q;5GOyoS!}`kn8cKzzU!ZAbiyMGhn?W{z}=G4}{vC4)7q*SDDvW
zn#{?3iTt${`%h(3AN!^L?aLKude=VSMcYS|6;Kzo1nl<+175^G68!<TTQ8){TLwR%
z6nOj-UITGk^U`AV!Tm)NW`3JP{w1yWrG5FpD*Bq?Uqj>jCC>U?k@2lO$*yuAV%1%i
zVNaE1mm$>fCMr|*yJ!wcAL;#8Q~BdV>JP0^X|^Q0q$-jw3QG}Jn6**5lCeY;@nX7?
z{TLINJQfPfn3JaAm{ij_wXhm){ZJB6OJxnOX+HM$E5sy_3RkvG^b$9ZynZxETefX7
zX|mXc@z71VIb$xDZN*HYfJhd!f+pT!W2!YvijzvPbXry~n=|f-JSzwjx2da;rWE&r
zb8Fta{CHy~@5@5n9&xpOdL8q!xiu@zBGSu_ma$G=VLn}^kcWF0e)YD|SgHZYZLazE
zEb*OZ@t||8Xh$4ZEp=!u=sLW!+aLNiE!rVRSpE}70%jl)6&2yI>RhfJ)fTmy7sGvx
zzU}FualhI1Trz@@<EpL%?=7{9XjpbI0b200G4roOmP$Ey%H7|fwUVL@KFGvWl-oky
zrItTg+>lo>WJX(lg5v!sIJ9hlFQe&tT+ebkUO|HEW?j&HVm6NB#t(1OE6QUs@ynOE
z%b^7h@dwXD#y6l}iCTH^AR)t-{is`$c`240b-ymW@tjr${_<%IVo(M3@nRO1;^Oo#
z>yd_B<xWb-MK|=YHSWdrm}EHFI>PW?Op3vZv9T0uu{0G;gUN)XXPpQjr)GPqMc$J)
zUNF^|aj^H+IZ+*S+zQPtcQ|L~(_6i%qn0VhdF2mHky-}#A>rktV=6P4j&PPJA^*rN
z^^CJ7XYaWwXVjNzLVM4-lrBR<G;wTvKn!e6BB;N%Myyp+A&;*~a1=<XQY)m(cn7G0
zJA2J<xvUk;<9kQUqcZ~Z`kHB%QWNqxb4C&sM7AL|>?WZ^+-3G-1nv-<X$JeC`u5r<
z@?4~5Blt<OIqoZED<^#(b~L!vgJPvU;Nq~xAv&B*G>qA##ZfC%=Fio_;flIHTG*3D
zE1f`;_;)>4MX#WTGiBydts`G_%z5N2ZC5$(v}4Ss?r~Q0v|#}GE|TLm2~pkIs|#1e
zRXd*IRy7PqbQG%T){-#BT$1srvwU<MrjEy-1@+RkQKGyVG3(jP8aD$~hhR!p%}+W)
zBpIBOvJ7OpTBy{ka^@8VqQa~A0TFBmq(f+0>gJG~8aizJs=43^Wwd|P$dm^Mz^*70
zd9Y-QHx<Q`v77<!oRumoLfF*XQY(Un9b(hoeot7-MV$dM*zMTilWxiBOuH;KgFF`Y
z13788eUgABvK`C&J?Bs-lUO2m&3g4Ux>X8yZKv3amK*xc{yzDAbJ{lbD-waj^Fm?F
zI%YK;S=xT13Ce7xcR~f(P_itinZD2)Ls$mG7<z?>77HLp+erdJ+eswmPDiT`M7sST
zjcmARJq|VHL86AtS8AQ&kklAO*<rW1gx7o`&QCg@>6eCH>CKkV7j)k%9ZBkiN}+{e
zg;L76$|s^06KM&YXCzs_(^>+vlNyNhRq79E0tLg`2-N8W=d^|c!NnD+Y2-y*)k!Se
zt8<MJ12tereO6kNi5@k8rUc>P+2s*09IiOcBEA3&%ojNtCthhKjFf@PZa_|9J&Ad&
zfS4&34w(Ual*BnGl32VEjKr8HY-2@2>$XwsZ4ZG_m`-|7Lowb((4a9{vvh!LbETg%
zPOGaHf@`j>wR%QCjrTB15|%$URs%&@Ejtx9WdI0%Rj65NR<h}A67EkTgElOKIPMJ<
z_?J6Hm!1;p)TYwu=4>cxi{S&2pc(As6hSnCw49Js8}S(k7OI`LY}uyKm#W|12}ci2
z9O2dWc&F0oN}7UY&1>P^%+7p?lyvIri$j-r1fi$agg}sa1&8e7*WgE>RYz4~G5vnu
zRt$9NlK(CnDN18+6WK8?lOR47RXROAC3VG$jAIl22*bnW%DaC=iKo?Os%lG6Y#IbB
zO<GCq=S6QFPnjsCUJzLFVuZ9-vr7uBXuoi<$~GcZuF^z<uU8jpX05GSPq11~h+wgi
zyqy2Gr8(2OtK|`*rBdG2g@koahnFT=K>*Z_o_sbBZ$iR!ucAs`4`UaNWF*k)FfpCo
zB?I7O+DD~VrI*|HB4VdVdET8AOVv|&+okU9L)?X>D$J;mVlA`S3#MzyCYRLxJ-snH
z@dK!axlf|jPdQKl-C0MCzLMusMI+nPfy(o<`_RpgV20nWhO|e;4^8(hu%pse0D#7E
zeC;uggQ3sT4}WN{V^y7UL>>WF=hmA|hS`c#b>>bWb??S?U0P*&#d&zW(A3yS+FcPT
zL)U#}dM%Pw)S|GqHK<)&QB(RA!i;aFp`U=#wr;(qx-}6i&48#`?$tb~q<bGKb351|
zpC>7pcxXD3R6`V6F{XQ$H2rVi83>+L>HjHe$Dp^tY1yH8xIR#->}1H5+ooEroLPLm
zS0#LTM}f3WrN<?T91d-Ieh2>CU_6{O^(AdLVGN4%V5^>*uX1N8^=847uCz=(M9Rf=
zN?FOc!k;1IxvEDf_<OlQwN&Owt{6YKzq}No<7ptNdqnnMnU1E+>DyKc6@Ux+P=+s0
z2c>%DRastkD7!iDEMC>#;uYL4w_2ts+UBy}r+wFLGnCpR=fS9b#U%S(E^*kre)mn8
zjG1ec06=Z1n@y&RT1U8RJ~V3FXC0jkYwQ`_feQa?i6Wd%a<pw54s+5Njw<nU(o~%i
zdPK0*;Sz@#$?+{_ccDk80g`?1rxSWS=CbO$z{!(tRj^T=bXI~MPyBoQ{eK&AOn-rc
zpobaL6~|FVCF03rMiUB2bP=o|mO%!66+7$mk-WesJTsZC@J-DA`nb8(UR)uaq-%)7
zd}NEY7=mfeG}u$?Ozs+@CFw@ApXWbUwG_<vmQo46qB2a@8YtjI2CfgH-iREG_i3qd
zGOP3I>ke^zq7AoMUvM*Ph<c!n^{&Kl;BAT<={Bz27K~`ra{XggLf{vKPU~qpj0IDp
z!FAcJm}y+5=i5uO=f=dT2^Bf3yqZ#aBH}#pRoNA|Lw9N?^53{<i=>N|iqvZC^ANS_
z@Yb7bXgcUA-Y+xMft17-Fb_yklP;|?%q3QHg+#&2vZ3N5&4tPJw9RLPtB%M|?#J%<
zi-Z7K*VX{Sh5EA_;k8KqiSF1W%J=Ir*ouvyKVPdgA&3QTz`W~%d2J={@6eeWyc9&`
zn+VOy3us6tjm0Z#8<=;qx(s^#dAlIrJcpGL1KX9<-gdWdpdP|!%!Yl@qW{WZG5f5X
zm(>thnK0PDxhju1W^~1GF+uW#q2Uja&C_OXwMEDb71lO$d>^l{Qd85ddtRt4U)nxX
zU8JdXEkEO(&MUh`Erqik&%I3|=khL>gx(O4@Xb(zsHrS}CCvb}fX+;&sbI43+db-d
z%t(RL>i@z8e)oUDt!dfi#wT4e>@+{M-`$5~ATD=(<jb{B@4L2NxcaC94Me^S^Dryp
zuf7MZp;z0}Kig6l-e;n~R>BdcT<Uql=<&n|V`g^683$&uV(Q*vn6ui`w|L>C8M1#3
z&vS$$<`WW<9S<}9QFn}}m*0ow2xQo$?T&)HLH}C-V3gdt&TaK*BJ=$6`<qC;Vq_>%
z(i5wcsnr?azAuiokmZ39%j^g*)!o-dkw%YLzXU`9s!4Bb9~|C-V?ICm{c}WET|1+m
zYt@CV_4?&!)pDewe5C49rKz6ksZ@y;Jy5QNi%J`(s&690ODq!gDV{4z+ef3V;VRi{
z`+JxHh-}syKd@<Rk1c_J{-{WVhZ`o*^n+v>=eQ@WlCoft*wBjXma?O8Xu5DdJLIs{
zezP)PgxD(^g}kQEbkumtpRMr~bNdhZ)HSlsD~uayy>f=mkl${%*K%K%N88z&8?H?X
zEkC+;gpd(z`ljcK?uq#%rVw}gIg$UR1ulOA(XtII>+^RwJ`5pinUpkvzViKZl0NK-
zt(-2?cu$Dads{QU*mxGCXzn+ef)o|b1hMriX@vyyE{no0CNLG@&dB*&yaQdHf4B5|
z;y=OhR%0=-47i}(caK@vx^<1+260QxqSVl$R%FP#uNxGo9AV%cjvU+f4Io10SV9p1
za|cqF#=H5Gu^kP0=aW_(_jeA0YPhVhgq166<f&(qne{8g_dY+lCpdMs;5Q}?$&fAe
z86cSka$&4@F4-_AY2WU7($Ip#Me4_jwq9`rdE^dh;F`QN;UW8ZftVLW<ElwSjbTE|
zTxHk5cp`0uAI1Wy^r<4oyfH25VNC<@(1YXj0Xp82u+hS3MOcLUl<+3~Vk+j4z&ABV
zV7ySXC;IdTjY4QFZ}_wiuFqfnIYt9@2;k-9#*FpLmbOaXCUdcC!Yr#uiQC`l+@ed6
zT2QB&{LbVq%s!F;cNVuu3tb4Gv25m@WOsm#x6`H9_ZYw{wV&RRk!I7cX6gW@^yo|`
zsC|{XQ-Am*wEv4WeLyq3O3#;BRh;n)oif!kEWLI0&DZ{!AdkURgmWj$V(t6R`HFJn
z<mDGHq++y1*q(#q7D_O)maV)NLSV9f1-p8-j~HDl|BFS-{tSfq+jrKGkpJuC_dF>V
z9#n&Q5ZJ6?0~MDJp@o@oqezXeu}wEjgX#^>;|It>O)^o6OIo|QhOf4!?^tuee~P0S
z9BL$IF1`*cOx}83=;xnli}k*sx70^?qCRS`U|#;`)o6V~27xK{rUU)Kpl&f$1D$Vu
zS=6&{Q90rl+lF$YQ5g6hBAZ?I{}3}VItU2$|G>%R3MP=H0jYzgj`JN$JHZt7C(<^W
zn2{P5gJ-<VKn4lvHw~pIf@J<aQ{UMY!qgOu-guMFqg1C=_3}Zx-s<7O!a3Qp_jQ+7
z*OAjRz&u`W3i@&NoY->T{oM7v{O>s%k=N-E=TDVVQ4|H$N+bo1f<r7;HgQPFm`6qc
ziXeUOyeYsVJk+JfGaqRV-PeH513CS;=c)HM_0|VG^5;HrrvPoYLT{u)P82Lm3fBQ9
zjR&+IwShi)NNVIRIt=}uA9l^do~mA_mVeOlh(}cbt4CIVRj1w%E?Olj2<ELAw*B4S
zBn+rWWB}w%?u%Ci))sk4i}x)8!&X@?+BM3(I}OkpG!C;B_)P6VxK;BjJSj>Nn^2(^
zRvk^oU@Q_b0$#nVm3+Vb<s(kxqgLZ1Okj6e{Faf?N2izKMiM-yuf&w6Fc&{3zP7Tf
zq>XjOt@2+>)v<>7b8oZpX6PGNM+fOkKuKeRmas@<G|PjQ83)@Osi9#ca-_D_1XsQ&
zN;?pg5pY>$>pPj%+q?uPr<!r-0GMm*hqN<=YSosR$a7#cKS@!-Ea1oQSTcrCRS{#w
zoa%<3KyO~m%Za$;6(Y|Oi?cA(9$DrO<G>G-RU+aXN%V)6!HYkHI4a}f&QFH8d2{Vd
zAXx2UMc;|M(imDAl+KuFx0}Tv)r^^H1^@|Se7Wf;WB4((v$gzqvu#>@W;i;HeO@{W
zq$9<K8dZjODN&YYI>*BqHoU^|4#JVh(N=Yah8IMcp#nujByK4JM*T4#@Lk7yDFnPp
z$jRU{OkL4f^^9i0*!-CB&3|_*eNAejj(g`sV|<}$@GR5vV7c)t{ixRsMJ&xF2LLQ=
z<gu*-jNsg^5npsmsr4WNDGi9%<@Q^|11IQ~7TF+|VLa>{Q-{XgT_1J{4g3*!i7S}_
zHAhlTDfQ#J<-<^CMXfv=>|}pXHv1q=DwlB+5t$a8H*c;sa>c1~JfrKjv?5uP3uM(L
zYs<WO$R<YaJX0UJzNMZGBAS`~X28=ngN{$CCjPf@dt!$)Y=n6O(g;?EKqJn6U05D`
z#mNv6y0~FEM<64*yJ3{CadndVt*4Lw)MO0@`G`+>h99|gQGYX)V2^A8TwMgio-|W;
z<sQuowda%sC0`=cc}kG&x43NC3r=_S9_~wVlzrI?TX#QNdRZI-9pBima^Qu&n_~Z+
z+V2lxIY+oNb$(bGR`0&)hs0p)Eh;pP&cqp77aNM<As6hvif5$5iM%r}$0Q)pAeOoB
z$U9ca2);c%aN`W!L_hJq61Imy(WfuNF`TQvlZvu%!ILjJH8siHCDZdIHB_Ve0r5}u
zmK%9vdp{(Ce+R<)Tka^h4Nw!(oJ!%}lQ-JVG5ru7)W2oN2Gnm6Ka_|5seIrfj=#i4
zh~MZR&C?zV%1<7M$P=3d7kHV)zbxn_1Yu++s^}$SNQk05HCxoB87{(|voMVzEd>#4
z@$iWOi+@=rG8*NrRtBu)GQ=9m2kwu8FqW;YmItlbj}Hu=!<D^8041_m721L1(u647
z`UBM>B}u~oNz?km@;M<vTFhND<$HdsXy`DQ<{In|TIod_{xAZ}aIF2$x_QPWwPzOw
zecaN_=^si)g@W$w1kMctF7ho!ni0+1@Oo_JgPD`@A}X<(&SfdR=;rIAHxhj&)m1bW
zn!!V1-MTh8+4oIDz@x|bn%Oef`&F2oY0J~$d{x&?PvZP>U6Aj+MZG4a4V0{_r!#cq
z=0F&?P@feBd=KVGXfEQ?gs;*Z#L=_BSJ~mh<5R%Cou0UTb+4zmnBnh@Yn8}5(?qxD
z${xE<$G12~-O1CCW)RJms@zjyJIj6QKFi)}Ydidf6z9lupowG~{E<HHwL}h*nUc6#
zQB`KL?V3F}+_a?8tR62bE!FHurv3C`s%v)4<aBPpSAzAiE{r?|V3zyR_4gEAhHr55
z(>_g(z_yA!nT<JRSu<KT{b#}Ycl|BH@^Bxn47+)X_26E?=J5hA#(QABukGkYQ|S*^
zgH-2XZ1d0*AYN#2w3gb2#x=>klC(Y%Xk(CK$o|M9=P0U^eOcM9IFE(7EU?Z^?9-K}
zxY=!VZjPcAgrJo$d5tG8>nc9lGZ$+Gw_%5Qjo5bK7`cIx+T}*K8g3GeK>!PW8EbW~
zk;X@?^P}vNfc@=n6{~YtWey<)!?6m_r<ZF7M$<75U=k4G$kqE^PT|ma1!WiV!Vl2{
z#?R&WC-#$@L;DZYRG_AF@_nG@J<L=`{ZaDGUFNe<OsJ&gPR+pf-WwW*PP3*LN6N~;
z;>lqt7u<<3KOpV+6YOBm?39mMRc!515)GVPrq4M}*l`(63PL#!m)B1oW$VYkk{4<z
z$VeYkpev9dXDxG}k95p@1U*29Y6MJKV<4-0$Ox!g(LQ`$pr~uDGeMEYG5sfFHHwy!
zV5*5So_O=#R-Zq6{%n^qAZt`#U+1z<s>Vv~SL6q?82B|uC4uK#;mb<3!4u3H=w}bp
zQdsK-a}L$W7rutwfY>wa$lIkOEeu8}&YNNgfT<ahG#jIGoz(QN1PmL}#3be$Lz35`
zJ{z!KiK0&JtLYg0tv1ZLY-b$iJs@l}W*;0LLE6-eAiX+R29;`^Fds#Vpgb1bh&Ddp
zio%*@ZU5jnra&^{aJj-eqEueG>|BLsj5)50#(Y)G*Uhyv{A<J^x9&tL@-ms}$2CR-
z7}4$6)8TUl_ZW25&<DRs+T<e67s6{6VuvOvGv>mpuE@7Eu8YyR<{BtKujsq4ic#(P
zCS$acWT}}(ZHpam7j+(R#U<;QHtP$7F=K}vv1~JG?~=0J+BeknwvdGn7uK>8R@1=R
zX+p%<|6|!eZ<jmSJXKCuNf~$|btAn6R=5dz`gYLV;O!&~pIsv?9$3lhj{RscMYgN5
zD^|EQRJOUp*Ogj7y|hw~(4KVbMOA+ryUj@o#al&yj28xg?-|#r)TyX3J^c{-R--0G
zt0b}q|K6+Rs4%)f;gBv&j>;9rJ>C{VdmLGL{VioGvoM3uy)owox3*hU>!q(Li$aH4
zw*pN`Q6<?3JxE@s?@>ZY6EIA9!lCv%-K<l^wj_n57HSSAVz=Qpote6p%q!YjxSpUQ
zmCFJ5rwN9RCyrbns!cV;7vleCFC@aO;v^Otqb3Hk4Z}MK>^>Spf`C9H{inJ9r?&*w
zAQS(tLIGLouK=DYzTegb<NRb$u|Gs=Gg8saWQvLR%u+EVog_`XtX2YfULIxQ=BZi6
z=mZz{Iv66)jT#yQR0)NsDAkIMa`~V9(lD5@nlF4mKG3uKsS7){Ok0~z!|i)-p6hqt
z?rry{Cg9%<@gG?aYiwL$HgVI$#K}S%nN_?<Lx8y$O@pyCP0e5!sXys2htq#I4SBW0
zspuE3Je%k$UMx`{D&yY)D)i^E<k<hF?4?!ZRRr#NH__=(dGdvYj|BWGb$*&{|2N-q
zl%tOxo4&%WXxm2-R(Dj*fJ2E(O0T-<{hxrEvX}M<NL3%<L3ZPlftG`zmZGNX0gpeS
z02)uFfmkmIXw|T*b=9GXi}l9DH9MW~PQ(M_XKOZ7R?^>VB#RU#&4!)F^y;4E<aBE}
zG~W3-ah-~C6I?wjlhPb1nnI1Cy4Z}i{0eDK|Eb3PBPCAtX)Up{po-)BkW3udw=FHj
zv*GhiIQg^8W*dBZIoL+<Dca4cq7W(r;J6g&k$kdm4IZ=t*YmUmHrq~9$*#mQbIZ>E
z9aS2dzB5RyVN8?ZRUuN*Jq9MoJB!xd*K@5gx_9p(XqRA)!US(^j)}IQ-FnQ^laW@Q
zD)(`nZBpAS&%nX!5`{vuBR&*i9;IL*<D?SNZX$C^U6^oe3<@?zP3`av@q#-YV7xo5
z9Vm8nA9Db^#aRDcAIx_gWXtK560u(>F34~7usAP#|JP@Y!%m|R>9!eSsm;D<E-4vG
zclh?_8YaP;O1INZ3|Dd%EMk2oxmE}-FEeZIu`fD!EVYMB@BU9+UO~ZLR8V!*>fYEv
z|8Qe5F(C~$n<JY|ns%2K_c{T10OXEK*+sYiNvW$-<Fxum_DZd?3$vJmx)vwirc%`I
zmbp1?i2w>5)>dJn>P=zD^`1A5+dc-ocCBhZ+iEA_I_rZ$Xh_ydks)HYymnJH%Lm9O
zsQPl^`BJ{6DZF|=;w=fh{4PuX`lXDeht|~d&M=N&K#rA%7#n}0HUDq}05fIbfiMj#
z(th85Zut_t!569NRrNDth`VqwA;1~u$U(0kwl#Mr6~`|aleIG_mGuMX-|P*HU&XHb
zTwg_N=Eey#ZGYm~0d~!Tqx|g5^(`bguyBL(Rk-W=q1ms0qYlIV>sR{xIa-xX=%oj~
z=(`^Cw&0PA2LksjT`mGP;MH5_ZSe^2na_U94iBV$*(bU;dX>@UUB1P^R%$XGB}*jH
z{HWLwieU;p#(d)qbnS7Zp}7BC_<NBN8Ay`MRGsJTrw46guhEK=@>lefKx!moK7qM2
zu$@O*KrZ-R(08p=KKgZ!+IC&$wpt{Ry4j*^f|t5H8<iGXC&xks5Ir9^Y|uQZi0cm>
z&p=^?{V{bo(B_`MqaixYQR<!8iN%}92vhlvtMNLYsymB|XZ%&I#`>F0{{l_(L`)}f
zk-hFl@T3xeEzlhGHYT_f3vYJBqOrj3PPU{-y{~Z<#2S0FEc-pcU=`(V!x=R-CgzWy
z71}8&wB`94_fEqOH189?vI7NH&0L+;S5lZEVtY!XdQ4Ao{qoUVMv`MH2KHauwdYBg
z{IcbmvYSsLmwseLR0T3;!Gimw4a_$0y5K#NC<4oeAiv&RQ`5Eu#TL4oS?xb~zNs~u
zC1~AsKvT3(bfo6g@NAM1+&;FqRlBJOEdDe<=*V{4bX-USNuu<n>48JgZ9xcruXZ6l
zlVQ!xV~`jI|Ef0b(;vON8~vt-m#$xN?imEb{_(CzUutvWh@+xCv6C-P3z6Dqh$`1x
zW8|6e@I*Q=5u}TfV#iJqXYfECa!Rq~rP?OF^*}t-*&gH284&V;ypWuR*QEKBwTko0
z+LI7}hPBWG0=$2DB8yQ{bOkPMI9VW>tAbLRX;zYIKk)d=TXCoj2jP|~8S-o)E_INc
z7*|@I5Y)4vS=I^sQTU=AEHICEIV<sWcmvDGJ{#3PAA<IGQK|_NmyU0;>n*hZg6fj#
z2<M@wfoE0}y?VUxECnGULM~O~SM+4`yYha~=Uit45<E@>*XU`z^qgKfJ>v@A`L1%+
zC5awM=Fl@q_=5$`8r*Jg{0zx-;!>@711~d#z=n?cmIcfPx!itswnWw`sVoFk(QWf%
zFN;d{R%4H0v{tH!Na&`jzeiyJ$-pG8=ed84hY12z#^!H~*uVZrT}Bd7H`kgg=AqH5
zUpdpjPtEo$TG_-*@sV*_PEJWRJ_$KK5w&bGWj!+WtzY6_f|Kqu6iWs<8lj)W;p-v{
zc9_B(6662<pFeIvAO;&aeq|5Gd4Tutx#FSN8!edcBGVRZYTpQ&38tki?YqU~FLXqH
zL5}d(*G$X?c|ZhipmPw*?SUX96lul}<BQ+|#0h{AR6o@GFbrP4&QFqsIZDEd=(&C@
zb-O=r2y-wCDZG2S9zwlY*G5GF{V+q{!CS^KT-)Te9h5jJQ(DhVWLF4Epj7;#Js;GD
z`{^O+Mc|;O3#!aE{0HLz*7HkO3^c&dkGnOk7^Rf?p)&yd_`j`xc$HFGfDR1=#DxX~
z<k$aync@Ez0Z>_7<fmxp9KBfqC4xH-`&l1~4;>anD!~FRp%I0)YkEY6olZ8@Nd(<w
zMW<%nRHaR)wOnpdq^f}OE5dqFYooksO}3(WsXV9o6XP?Y`1^iq!XyC>^p51Y%RSY3
z`i_6R>wW_h5)pY8?`uSM-LsX2q!62GlG0Ml94Hu#H;eL#aaATdrskOv`#3YUb8^m(
zicTHcKZ52_%#gIpo>1O!0h3Q2s<@G~!x^79`5J|hcX#a0B-p`*nRc1~N$)UEK%bON
zY#D)0?>MhA<?2k8+E$h@e(0RS(omGn9EEVF6MWp}(cK4YG9<)4d7xYf#7EK`v}vs9
z0>s88?NqU;?Jq2z^y5cTdRIr()o%M$V!P;eT47zk-P&1biptPo%%Osrb#*9sA7R)j
zJI4kqbbV4>DjnyU?2^o?GWGUdVQSPp0z0!Wi?!^W=B4<=ccbmfG0$jTt?9Q&36G_i
z#djy|tPbd4tnKW~a#;M>s}cz|Wo7@K1A7>r%~H(6leTycx1RJ{)HaX}oCAi)^m}`5
zp4kjMqUbSgWvXavV?)2+()Q<Ulw12{1*?;bmC4<xI(2tzI!=Ak*QYQ?0_?*&G22g3
zyCwJ-5?Ue$Sum+SWXYS@@RkZx1?m0+jxyP28R*I9XG?a~)wVhv#cr?dO-&Uz09#G9
zPDcV&$rX=nrW(OQU)5o>7z>h}?gUFGHA)P&)`~_A_<nmNgP{`yNmZ3slBJO@>6+FS
z&f<q)S0_n%Q_K169hWl_jqaC(I0x43hm10lY-N>P)HwZR#;h7NhVZ0d9uM7oz~ZTM
ztwq4rDeRE3zwKLufI`i~>w`umpa*MBZhx3gxq#>TV}vvHXWtKFs`)l>ed6U*X(yXz
z*k$I`3Sz%3OB3B+mFxq;lU^=WA%b-R10~?g*0X<nD7Y@gv_VoblN`<KWPd|lZFZMd
zV|%&&GW$(8M%fE-4jtJ1Q)^#w5=x{m5|*w2lK3zml`)vX_ix!vtE3<?KhPWtk+FZ*
zMUP{GV;GNkF812a+LV@%$yZb-o5>6a8uJXWa8c%~m%vkh(77zbUzugN%h1Ua*28eq
z)H}QW$}lR|H(T8J_$$!iBb?e3zC}N71atjI^Y=+4WZo7_NC`Szp;FqYw~ehA1uEo?
zI;?ba+ChVmL-^>@L)ulOH~=Q5?#WvV^-B#>>oJXpMtk6-t&G>I|I!i6#g#5dF$CxD
z<ZTLuzt_^x;Z5@qy@ozBOR<fOm17T!AC&s|q^i-0nDD)A)$*F`Un-xnzHPM=zF$?U
z?9}~Vk6tV@bIH{MtnpAitk!Wm!iNL_Wt}bs>gSC5EHieib61EWM8GknHTY2Aq3aLj
zANvq*Lh9aggq?v$^w_QIbAvGYA&2X<PpH|Ni^cEFLj!jAupvx7GX6V_QX}<94;8Ob
ztr#qdarlt~1$>(WZ@;@5bf2-?xA7do=~@N3?9ECaq$_R?e=TBJz*~#)lp`+Q?w|{s
zgcKRKE6zi6VCNSvdI2nGVS_*W9P)b?e#xcuSo@T33k6^47g+nz;0(b5q;`eBEbO|7
zQQ$2@4CQJek-G#+y0GIpWKAmyki#p+_x*E4!`IV?;Ie*^ynzJONVRS5B_&UyHyPSs
zN4E$!ohomrL1|z^`%gKX7f_?XSQ@^hMxe)A^i`mJAw1xQ*#b~O@kzg0t8#DfMzF$J
zE$TVeYam^rvuEMP`b5Yu*b~7uhEm6uAy)IbcDT)q#cCi+(Y+!^krC|?1wP8Kb;&pJ
z5O{4wI+QRNo1%*j!z5Xmhy`JeBnCllV@cyxEk99?gH!|(eD!eZG8}jcOF)|@O~$X5
z$+Rig6a5+NPk<}(P#FEZ8+Y_>6rwFm%WElEF&R^E>_8Q>C)yK1XEs!w=3I-}s`Rxi
zKI<jg;`XREn)DMnjt3LhsRXlT7U#E?3_5L7xx~>bCh~3-*F;hlaVR=YN1@Y2`Glnn
z<9RNzU#BIk@)pV2P*u)vnA53)=J>;VsPOrkS<dh7n!v9PT0TSPk`CE~g+A02H4OHQ
zy7hqWj5Kxfc@?jWY{gT2FZCilFO8z@c|sMhzu5|>C~qlJnDgwaUU39Ur%v54xH$@C
zRFT~!b1kP#$!<vXSI??nKlH2aSbeJcmPdylslVgw6<)=Cz~*jegERQF!!A``#k!%1
z3#Fl2>;N52%?K;eL&E#Xo6Cn;7IAR!k+GJWD(dZ_mI@!p@1L_|&a1gMS=8Hu?iHPp
z*NU%tUu7)MWu2Kds;}k`5Ke;MW30Ee$WW(cX_JkIF3Je@Uc5V5>4cf5kKzw$?0Afw
zl>G2?NKaO~^fHmed19m)$)46ItBckmopewKdO#OyILFFiR#wKcYKT%k@U1#|oTq)5
zbN`uN0;#gq|NPsQiyAe&%Xo!&58js*L1k+kvD}4bv-nQ9Q~uD-B6xkmih73`td@Ol
zZ*o955@P;Eehl$AG!tYp%2`M&wMBNl*gMme_ky)ip`*~&UcASGW*jjS+>_;ib&Ulq
z8o0_zuiMBzwT%_4ojJJ^n%AvQ1+Sg^*)xW+kF-uBTEUJK=#)=P0=J(^rbh>}gdzwB
z!q_5B``j!-LR53antz*iGESW^Ci2_fOYl^5Q)PED_AoSYc7{eZ2TpU7D*7GeQ9Ia@
zGVWF_Lv$tXN3!=o^ize;A4KYnio1TJ7eM?4sooW6tc((CqK8hW=9jWB{lMa{zC*ox
zBDE2#flb()^mpjH{mCa!#7$T=feq4Oa(Q{v6iiGhY6E*bt^SI6gQVc8b!h&gnGF2L
zfKuB&`WShI#hQjx{9*vIAOz|A50E^i!}KwRo2HTLd?Eku$WcqMaoS}41WV;^pmR>?
z#WWe1tSS8{|Jl)*7f+NIkY6srbHbj5)kOK1L^H~3{k=lbUYb;EH@Wl{HyEh6v;F`<
zxjoCR9{ee%$9WNP-rMX@DG&+Wgg|E#Hb2NHZjj;-<=S-PPKH7QTM(iA>gp%FyIuC-
z{S`O{9Pk@f_EW#8_$6*Dy-t4sY%o(%WHD0L_uSO~XrNwTzgaCah+Nagt|bfKGk1*V
z49=@?6mp~G5nE4%jar`vV*vHjoCk(v{+$YyuQ+@08y>Gp@$k$G<Qy?i_Tz!rUP-*P
zBk9O-)PD!RGh(tH+U*B=*1(E(hk6H>Pl&#l1imd<speN?9```}mYYQZ68t4>q{j}l
zN${qoyT6`)+0hJ;#n=7cuv8T|ULuS>awRQ8zv{rTV_&z7H3KZ~!*xb|ir%CD3fg3r
zq$hcNia8qVos}C8tJD93u)1sw9@oL-Y8rSgXWEw>6@g7)-U&BORn!AN`UwR_uUlz@
z_#;$MKslfm5oK!1VT*wW7&?r^U%7|vW}|1Q1b4r6`)4L08H@nyBnR}dUw{WYeKL6&
zz_Hf+3dN33{$yut18>5v+aEwKU9@0kr1K7+IsoCW%e6ZBSU8j&oh=$;*)$bN@S*hA
zkS*Qp(VSm3I)c5&V+mRr%FCD>@v|crJBVS%SfP)B(T0oXHKi&6{P^~KY><)<+?<43
z5ROvz)!2rKdt37&Y2aj9bxWCcve*u)A8>;gcZ$Dtc*up>7iQ`81=}L#xWS4A>A?2K
zqv}_kVo5Yu7?fZ_2U-pNHC*doz+f{7o4H?C)J;~5&`iqb`r?0&_2rT+v<ARo!kCqU
z{VgaapGRK>lJi{viyvUGgodjkfY#4RY1kiN_Q=ELd~M@?#&4l0>OynpDE~^CuYFVg
zBAJD35J)1G%j=aErK2!zxpeJ9tIPW#!gZ=$8@0_#V$dGlUbpHHdomnyp55wQkr7v^
z{nE^$OiDMy!~7hSbgUepbkwpNU1BZv)0f26uz?6~mw?O%NY8S<c;}8yHiQKY3*4)%
zI3vK8GM=3oVSi&^m-2w07GryGv((E*E{f-S$tocBLV$eL)^1sn@<HN~98SV4m~NJE
z3Tsz+>&o*-h3J4KmyC1mRG(XTxV{7+&n6UrDQcG_T5zMI#0T=Y{O}D-qaRSm&=uiy
z5*qf7!CRgLC=k|;P)qE1h7GO`AMhL1cg~FzYWF$2N<-@-y+${am~B{i*M-mcaP(9<
zW0Ud|d=F@;H^oVw(ztyvFMm4aXN4r|;Yd>ihMuwn-`%nWRu4$TizZg*Un8g6_n~Im
z_o=45lKZUAy!*cW@CwTOJRk?3E*jiqsVA5$4apA$EPm>Vsju)p*^QMsj2O!Vqki`D
zPU+#Ss~k9b;gJm%@g}Xy?h_PrLPFeXLSaV=wEgT%nG>M~J8qESQ`hP!deM<mpJ&|}
z5sW<1YDZAnV2P~`^|RH`7U3_<inAd;=#01PtF&YZ_lshu*o<0qtLy}~cKB#I*oB=r
z9vUeEIQO3uOS)6ZS<s(n1|Zf!-%k`DYAgEUt*6_Q$&<bCHd!qFd6)g9w<*X7Lg_Gt
z<hB-{?IhV{%l;%OXL^lj=dED0I_VM|=W$ysS)AQ-IO{qyY{*lnnt0cDSY~{(;T$Q7
zO`a7evU{MNW^@~dM!G+C?I^ZW=`R>DFV+VDVg;K&o2QH78?k3rKvAt&k~1vHUvnw>
zvxKS?#Q(^Z+*`og4o3az7INVeErs>PR9sLog#DSc*di>s>H;xY!hJ$<fRd+d)s=J=
zl(2)N;flEle;8G0+ZcKEgP#+vz`L#w0Y~tSY7?@Fez3aZ_GrMF>NCm@fq4^=tLWea
z=w~SrT1OvKKKT*+R4e2iUhE@SaGO7)!Y9OxR{jwcf>=8m_@Dr4{122-&|DZ<X4is}
zSAZGI41ZgiInxQ|B38jLv8vFKzn3V2aL@v}Z?r0Wcdoa;8B8Tb6nbKH{`azfGpdo>
zk7IqvJ^EZ~4~u{HEQLw)21enNExrmy0ESw1q1~Ck(^G*uD>?-)<P3?`NO2_zi*8<^
zGDO&lG$MtF4>T7Vxs_B-ae00M0d-AnYQ*+Ld;AfoQUm+JgrbaO1a9WVN!t3#0i~^t
zlh*~YX0S2CB&x_%%XJC3w^A(?Q=Jbq+lFAj!9raaCBZ-v_RV&iM>goTCd9uoAS6e}
z(kl_wmzo!}3{Rsj3}IKcutri+UpO{nR(fk7v3{auSSGe(JIemU9!Vzk-qDMg=(xfo
z0!;mBPKaZK3WX8lvaroVg(ZnV%b<nM;h=Bu>X*G`wXt0A{QgDpAh#slEeGOE0_|FD
z|Bq*nhQe(xWtjl(A3L~)U74jIfX-y!Q{;^wjzD&!!4I7ix%vA#U#X0-AUfSN28;<Q
z&6zXKKLqhs#H(*Jg@1e$@+h#S(mtqu`i;Tq|LfVFe~3aaZU`|huz4VaxR4WtTbq~m
zlpW-h_C9I!vO6g<m7NkVtshNkz=N193*a<dJR2e?uiHC<8IZ+#c*ttZ2U6A89+hkp
zeR5`n&7TyqMAEz{Yx9JV;j6659e8Cu3CPTwg56^)>N2O+{&<l3o5=RlXPCt6MyiV(
zeKvMyvPlfD!vE1BGHRHUmd*8$n;Nov%lHKsYqz!_dpu?^W!8D&AJq0|_He<1ucpWq
zIyXz&)8aaS>MCUKN^q<l6JWjq8*x(x-|KY}34&KRz*q|$X~a}KB&xgyFS4_!fONP3
zZ~BDVfHa5+{Jq|v`vm3S40ZLLW;x&n;sl0wulYvi(g8kt&dJQuIBUWM_tI9oj^mZB
z_ot5LM8<3Op`7OTv*{b_TXm?WezCd?2cg`Lo!`HyK(GR{0OLMROyJ{#4g46#sqL+{
zhQ`wKqejIdU8shtQ7O+WpM(Y6*Eb<`o&uRpz4R6?cnO~2=j!rlv<QTKf2zl1&|kWD
z$#v<;&4UV>sayBNY*z}-iw@fkWrDxP_3xw_K*Z1wqx~Ph6^A$?g@oXe#b&N$YS2=2
zgW|aKI7Sk3Kv6obLIGkt4|-ZQ-g3Cu6tDHUQL+(P3iR|7+H@Ysn+u|jgC^Wj!}YFy
z@~x1vhIh>jvm=<<4?~*|o`5mf+QCSN`qa44>=MqI>{<@Q^+V$&!c%!9qn~}{2iUkv
z6S?fCbjp8%skmti`7_;+euN}mI^*Qctn<7wBaJ5Hu%W!ZngTZTcCNAvO;Tod4F>pe
zl@8e^!616gOutYY@hBS;??hTrUZI3L?IL;@^iGT1I2K=J!G^pj*Mu39s0lh;unEi&
z2M2qbFY|X(Ds1m5W3SFS<k&9b<WgUc9C_Ozh3tefq60c8v5)5AbEU!EvCCV=m0)Z@
zR-jTGg;@)7VF1J=#;mQ7yRAHBqEjX>#H20AD#W;U{+~sNamjolVsB6nd}6fUKNt8y
z_V@%J?-7+(t#eaPUD!T@zhI(mg$!>9KH)J4gFB!2KJmGQ&8bZF!6MWkIv`xYAJq59
zGmb-){Y1XOEeFtWsB-2hgZb1-AEA<I&@KvA3k!F3#DJNqKiDQufREU!rf+RK2`e~Z
z)sX@r?J-s(iZ&^;D9OqT#V1WXm7Q2l4=d1!Z>lcrNHtbf4E~g9AtG6(Y2$iz_72r^
zAym4ylyh6D^R;d9jd=T|tm6GGHW+yzol_zJolhluV0^_}On!F?<T8%_=O*P3L5v*D
zerE(v0iVUOM4=>K*Stb)8`BSzm~L+@y)N)-;l;`MMh6b+faW<%OPWRfPE+xWIWz{^
z+jkHn+Haae5o-5<7v$e|oDQ7XOyfki9L$!B83yq~dkm!v{YJ-*bVELJwAB(nX-hQ!
znCjVrlbTCWmyn^KnAFjs;=f;^78;w23r$w!so+CL(wAa~Lak><B~{i>Cg&f3l2tf3
z3Qnu-?irO}pU$&P!E`WXFw@+#>Dx_Z&P_m9I<R#xQw1{5^F=UGMuv|1s4137#f%6c
zHGggPB%X>7d^dQjcYwm!+hHR&{{R6o0813m;s=zprEvw(zNX9?Do)k*%ez*k^Z5oI
z>qXy|l%OIMpqgj)gty5@<79N)`%Ma7YS7?>2;aco3Z$lGgc#MJeAAeZpR%qq`#;`3
z_bLAP+DsILVUl@hFmFj4>%DsH7YN;~Tg3tDzI{Rk6jP#=^)C`+cb|nWr7XSU9agok
zDM0PkhzrG)#jKo(PoC&M2G<YKgUvUCU(*@k3sLucr7DMn(2r{uPnL717Uw}b1SYnU
z8aAaW1c=iaN&qSxX;5?}SpsTaayW(LG87r@>Kf7bayjROY6?n#ye0LcAaPoT_SR%l
z^XoK{pY}@p>t>R!d|R_C;7)e6UzHIS2-K`9v>b3il}J3n(F;Jwg8nRpNE_AxA#~<j
zf`0$5iC@&93YXx%JvNhXb`r`nQ`1amg;)K;CiqSV6)N!Wnt=ixGbNc-^GNiVaPu#q
z$7}Ve5m_fuaDk;*!_GsxjM>q1-s;WIGW0@|KVv*Y8<$Wxl3^J#3P-Fo=NRz{QC_Ue
zo;B1^zcuN@xwmbPn1zQ?2P}Cq7u;Na+oeU3^Y|iNY(eVtfw<jFtQ}Y4R>rm7Wo(Q5
zzXdXUsg*s9|Lk4u|4L-!|AWXpI_Q9<F|Il~udy_aCc$uw5k-?R<{)Dg?J5Q|i@*j%
zC#$0MYOl8A+!DSvswawPVT@QfyeU;&iZ7J{Wm3KHs;)($0@&x2y%D#&8SQGd%sQgi
zb$7}86{oxB^CbWG{SZIM-@$DXJSVy^V_s0yWs)Sjk+@Vt;b5|La7{E-9(+LXC+BLN
zD0T4eh)#^apzLZlS$}av6;#YFDzcB#SLA;BZ$9+ilG}7B7az4kb5$R?qiJym6#cl}
z=7|4N8H7WaBw@SKhCZ4}|A_n52WOT=-r6JVgKlM!|Dg}T8v1YtT<>%Qd>dhH!|uO3
zy@;YSP;qeSYRum!nvK>?F4hCa7_{J8YxQv6#5Ji>Vv@b#k<P}6^U5@l_sY&Rsb<W|
zH21L1r|FR}`SZ(<nO@X2+HDIw@EUE3;I^pX6$d9N4TZ<!Aps<*$7Y1-85*ToTnP=2
zHd`9B*iS`$Ar>BH6GCT(%=R-PCxY`#S+Fn}`+?Fhps2yLi)$sa<7ohueI?G*f7FKk
zr~U}TX)~2Iz`RqLX|l<$TkA}PNbNel6e-#-r@NH($mrE1D4QuDzW<&FUd3z9@xEV&
zVsCQJXkXm2JfX9?B<k*RW2*?ch2jvtx~4}1gOgziRr;&5JT(ei7ZiJHu9Bj8Ef{pO
zwkw$$a5$7!pU4kbeF3x^p6Neq;yjydju}piT&1G&C^nZtigtIK;R{seoQDe2nWbU^
z_~gq>DwA#JSEWp!zGOdl&QeGgS6y6n{DlZRo;0%7beJRje1ym_1EB6>y4^?$Fh7MX
zTcV@;WR0!n87mWTpZ*+*NgKK(u^6AI2VnO5ZKIAmC`JCCF0KMBsxD~bQo<5TFU!&)
zEiEnGAt*`+(hbrLE7Bo#>5>-dloX@|q?BA(8U>LQ5vBf>-|zc={=Ivjotg8_oco-+
z=RSANnHl#jd4wFpigCmD#)8GEk^`n;nLc821zYcIRd=$F2%l$PshAkVK6m|+n==u#
z1o}FwE0oql!*wJ}S9(ONS0i9-`*q<12chBd77yiNpW5gBc^pniOeSigg%=M)xci5#
zr5$ErLEPeZyR@m3lfz#Q+LPa%*#{>EMLi<V4*aQjTLckQygCE3<{OU5%?Oa`D~APz
zEZLvX234;RpA<gVN}IxQD()Y7jC705zV{nok2N>iY%f{X5Bb2g`Fd|Og=b)a@Azy^
zLWliJJ%9Of@3cWF|0mAWob*SW%;u+K9%<cA_FKaxN^MJ{+q|)OkG*y|H$`U!g%|ps
z7|;g^t{WqG>MvhdY8v&?z`R&w3r}c<^*Gl8VyCDC)obfKdpH-Emf~6k>&s_e2-_@8
zw?A3^+1YbC+;h+sg6;QBW{t+%p-OPEW}KKa=91<1y@wCG_9a@6gQ8T)-0|C_v!%xY
z8mQsnE@VD^VB(1nydUPZeV)@v(!F>`W}XIyed`jT&2@-WKn5O8zu)+<l1q;q?*0gA
z_o9p>R+9&(#2BFRTTIWsHuK?I1vcE1+}ZKy`$Q-R*iO!DOMth%R#JszW+om=AF{j@
z7O|<08pK)HLa4uPZ=F|+ANcgbwfM`ao~fkq^!H-S<MujQ+V;9mw<fi?+7;}BI%Cta
z>`Hk=B=-t=XVU0lOa(Q{2jffLa>!$0vxIHp9fMoHEXa!BpXvOW1|pjM?%IU8^XY^g
zW|sQ}TZ9UZM_}ysDYM(<l1fMOkD8k<+}Y<7R=mT6Lpms7TV^CCXSnRG_e{uWe9usP
z*X}e`fz(jW90YWXT#~A81V|)S<h4Z0u<@g}wq4lxvn!Z9q-!ue4KDB>P1J?FccZ9$
zY)8?c81J%4<WidVHahNmmocjF)C2uBwkr){ZwRp%j@mW#E{z`D$&`?~=^FbfMYe%C
zm@M`yR(MU6*-WE4-BzYU6Mx@+&BJ{HUI8jiNl(D=3pACi=Hz#_g)JL&NE!N^VW$DH
zqNB!We`s|WqO;EV&X++pe1yV7&o!WAH%d8Zmbo*KA=oCpxt_Nv)TXfC>D@+t^T*^Y
z1;U>UYi<rnxbKw_DPPvtRgQX%7XU`npC2F-eqJtaVlql^^^QCV9=PmzS>x7jY;sta
zU24u8a+I7&H9U$(K?htLK7Ju$YkT<~@hXbvOj_nrezVUiAoip(b`1X6_gH8Ho4a)}
zc5*h}bkOP&x&cYnOA*yPEIO^I{$7-9Vk6+!`aC$o?}-v$OOE4i<?`G4T_+MPotb*&
zj7GZxOX#^ln)(L`Bl+##x|kB(HT){l!GUus<Vhpz5}EXFy(EW-KlIh9fP7LWA{ZQq
zMUSNW3YOICI`=$UJAxkZt6U2C&C0$kILgnh%!P%}Nk&naV@-s;T2TAw(-Nv)KU|DG
z)JdY352g)jJMl2dqsCjX6cE>!U1bd=t1h&Ypw?_HCu*UY$ZvyInOhpweM!?3>T`2*
z*bZz<Tm6uQ8;LG?a7$%XwZuM*NwH|J1qBGN0`I3u6?v6gPdZm9w}eX`4<+xhRg=$;
zUt*wrG!GJ@wXpFgbm&BEIQnG90OA)|0Ul2{2pb~-R$uKIPJ)*)-e0MOiGi^JNJpq6
zj6|)B@*c>xGd~P{GY)2Ah@?!8A;*_h-CwG!@XY^~w8PZ#d~5}5S|H2He<66F6M$op
zU2l}9Zwh8S7!z~1{v6;wmofMK``FA=jF0JQ<Ifamc~tRUsHmtg(#qW4bv<%jph~)d
z2M>W0i-xme@iEDEGsmF=kHZbO8z089AgGb`;ThWNn!d$(Y{}14p@P#hR)MVLTVJys
zDfQeV8zO{_>y@Bv;;5<1shT-1D?fST7=jLd3q>ni^4PhNA68QVytk<$$wpz(kM)z$
z+nwqfFJ01B%s;0TXRc)$G*F79sV5M0aTq@useS&KyR2wx@2kZ+J3Lx24{l4Bh{zmL
zfqo?n>`Kz)YBIA6ALZ{KUmuU-K*wVKs1t1C>`WxXHW<4_$$kIRclnfTUhgrknnB!Z
z$IptZoco)@)NiE4^e7FhdL_2zCB&Iz>Iy1G-qRevTK4I#@#586rgIpoA|IPC($_Ut
z6;vo|8DQXnW|b7gITQpKa(ehFR3V<<T$6(^3b{%Wn#0N9fUL#}wS1P5Jru{7);GU;
zt3NeJL8^i77XB({72be#X@W7K20iAITXtUC5Xc=r(y;uDeIb)VJuZJwL+YWXMqJ;A
zRL8Oi3vsOk>A+9-cG@0IL@6$_>*NeZ7f{9|2D9kdJ*9XtvC*(qQcOWQsfQ@&A>uF1
z`CisHt|QIwHe6n2zJubias4o{AWn{KE3_UFYq0n={`!sYtMW|$se*Iyo@KF?Zf)J$
zFWz0Iw4T`An^5XJQ}Tn?+*2VCDrn!2{Dt$|>7!lJs0lJ;V)m9#LG1}qJN@Q2S;0y|
zxqh~LJ!~YV_iY(Xz=JCEX)f64^z=-PUW;a}Y53&N{T^k1w%;VVWBYxbdHo@Kr8zqn
z!TY=?y0I)5?DMjyW8Nax{HB<9y4+e7rayCQg66&Sn@K63IpSzKQjTy(+{|i1MTv(W
zqXw5Lk%NS?D7GPa*;^!CwB1__RrKHPFu@xcgXav~M3r@edv*wFLI@_+@!3U8tfTj`
zRyUbktncec;69ILbpFyj-@n;qg;XAN#FXkcjB*b-&XUIS##VT*eMfgQ!Y8blPvH<_
zhnR8kDM##Y$@CJbZQue_KOB7nldx!DVEG2Rf<_h?149z14Wb21S8##z7jy{Sc_s3T
zY03)bnBL~}&^JXy!Z!lC7LrV}Sg<pVTwM%rHL$%MlyjwU6k{ING|7)2Z&I;AGID$>
zx)lG^w7JwFFCoPxW@;Xy!6tZKh>|+p%6@t`M@k%Vak>r0aQ9)bxEXV6Gcl2*i%D54
zJd~B%;4#rEewAAQ3*|7J3v`UAC7_-Wt-^H)Su2S(I#KAym=--0=+^(j?y_LE+0-cr
ztECRF4M3F@aizBEO?@()QmLMH5T05XqA3YdZiKa_FdrqE!Hy}yX@JH38Im~Pa>BGM
zq-ny#Z6om>4m16y(?hMEk9Zypl8(*@H@4;*hU+)QCglx73?}F&dCn27X2Rdh>lY3O
z^A-d&QHGUeFT%BI6t$CTtKv3`WS!`dirJ&}d<2st1(k+gD~V2%nsH-L98?QUjEK`=
zqgV!_G^o0yyv#tA%4wL7t3_)#`OXibrQWV;LkdRYh`YbNJaM&|TFAUZQo}HZJ*tC$
z!inFg>e=>*a%Me_g~THC9p;;+lt%|P*aaLrQ`!%uyDI?yj$4AO{9JVI1hpoM76~yw
zN{V$xBSYc4?=-+W6xm&o&&{$wHxDO>r<Sa4_~VQ0iw#iWtIb+Q`fa^lmhP~8@1xXe
z<DB(lz&h=Nr2A~@b9X3NMTeORoX&KvOvs_t?umcFR;8rqj2kt=X+xz<t+_Po*+kSq
zf3J|d?Og-#MntQ%dqBC2qJhFBl-HNeZYKeg(0d6I^jiOMK>g}CnDNf~p~cikVp4HO
zi`|o^9Nr9cIDUpGZ=_k}tLVw?;v_xIPc$!PR|$-(e$nlIPo^oiqnQ$-z|?^fK}*Z@
zJhD~-BsA~bH+egca7NlBkP!6yo7D`;`r#0lp32|RTa??fyFL5X9_E*Wm*TEAlBrf_
z*}C73Xwda9miV|~OtQCkhrNgH5^s;b`;yi9P}GE^c$ZU7lNubR;QK0rURr0TYoE8$
z`6E)hkW~8&^h7doA^7r^;psk|ly<a~NWAo$XAEu6eh!LgApAoI*nfo!7TT+egcG}V
zZ2Y*5HLhIP0e+pVQb&7KIe-Y?qy7zybp@W#23H6%od+At1gt8DdNZbxHW2jVRZF7!
zWH<tJe-pk^yLfOwEhhmDXo+!AZBK+HnlLW;eub-zOM$gK1Qmp1bW(euMsi8UN^!=;
zpI!U%JC{l45rx$jAV9(BLy7HYc}P|yv#PYRYA$)nYfnuH+#ly5@Q7X#D1NX)wi9iW
zjDD2T?&iSpk8P^Bxok4gUAbeByM3~@M6lRrTI@c@8&ui1JthuZ@#x2!<?M-cngUX}
z`C$XB6Ph-Oc_qF|&G^_1ty_ALCSo!3p)unpuh)AX;R^-v3|?MEOaW!fFrXm__UF-1
ze?RFNh!AH}01pf8^LCM7U`YLaYA_>E`lsIHQ?!>0mcX1N&dp#fGIAwNl{#P2{a|xs
z`g1H1um}`(&{ZShj3XlGYAu4-F>mO!eX3)R5loqEZ-?zbs+*@5-&h%eDExACq`kRP
zy0rJ<n{$%!Y%l%!#^}$Wy`P?)V{NBXGl+AVXIdH&<5-QcsppKLBmjh%5d-mpKmH(T
z*(#DMCk;~raZgSl(hN`OW>YtTZ2wL9cwDoTp70)p*AN)r&^$k0gq(iZtq>p1P)bSK
zZb6?^?Od?gouHx6yWrI?vA!K};$^D#c7_#2=?hl+%QARp|94Uo^XW9!cBU1*8*^}1
zk58N4+$a?lpBz338#CK^2Ph(Q3V7gTRF92hE=jS~*0+~@-8his=N~U7SphqUbhd4K
zFg#t+I(Oy`PWFRgIkym%56Dk$)N%_D$CNWk$0X{jIVyV!;XQ>k*~r~x#zNxHi^t?@
z(&_;m9af6#&&12#yn;*3(M>o-j1K+&5t=W~5rZ`|BC+^w2PjLl{fXE^^{r+zqN=u=
zFGi%m>3;Rjn_6k_(q4oOQc;I>=idId*(X+SC&Msq(LZQ3oX(O7TdX!{n>ttRexURr
zJrjP9C+DZMz`I4#(nYg$i*TE%Y+GkeN1339hfeQ>S}PUo^#$R<{xt4AQw_5Z@XDxt
zQ(9KBQXyvFOkawxE;%DO2ILyEOGS1QI6$;7Vy0V!^2O#KNcaP*{Ux}lVUjN@x)!%n
znmII5OvU9h8$aEa^6e$G@yh~C#U_sH<+`&-7nAniyu0imHZVx{dz;mwxJKJv@ue6@
zBW!nE-w@%w#E#5wKFZ?YDsh?;yO<Iaa>^DKXx+!8&T=J|?<7I!C+={gQj6(UkGqv4
ztQMj)1u`di3o*B?V3IVJj=i)3zabR19d9(ZLgxhNKAjQFF4H%$Z9P5^Z}@oc=^b|0
z`}Gt(9^}eWr5t7XMPzSZAk9T4ym#;B^}VlKTBQ|vD%Vc}r<h%EVn^;ry0iC`#J+wb
zV4hLv_c(?tJ|mSB(H8zy1aH8yJ!Vb7i-~Cst3W`DiF3sp)I{as`_g$nS<mG2c*^-3
zofN7uk;~j7rI9`J(%Ac=JS$Svduy?=cb7|JiTCqk@4B(H{?=7he&zQe@=Xf=$VW=<
zGwutPwXuNHco*lmnYZ1EuDP@q{1;3sWH*ZMQ4gl~CcmRyszo61J$P%XzVPvkg*X^L
z2!YrdXn2AvjP#8PQ*$coOqA;%3^drPQB~Oohj%-T?=enh+wm0Z6PHhx-`U6z_h<eN
zj>gf+HPcObYF@ivWX+Pz_~_B?k%*RRQn~Vj6Up5MSSC%1kX9?8>dq~wV|%97`ZjF)
zXRF-?>b~h7C>xO|5l8j)otrS_C&xDD^M0bQ{ZioR6zVNsNwG^^F={z<7O0`PHr?Rb
zN%ws&o0=yM?H>yVreB)okVoIR+%cG&O+NiyG1AM4dTiatU25aj>__A--lY0Ws0ev>
z%#ad(`UjFl`R&L@^7LJT>P}#425hd-J(K4p^V=sD;RsfDNUynF&u80`k6){)-ZXUL
z<c(M7@SSIJDze6lKIiluYIy?l*iEy}IV~2u8QgZ0w;M%4At`A*%9LB|aVU?ZRpK{$
zmg@4ICA!-j*0&OKlR&G`lC*dwRaIqWS{18DI9N3~%;6@D_@3Ig5>G-F8Mv%UdkCj1
zdE+W{IvU}vb33lkAp6~0g?bWJZhEO%P%~uScwNrXw-#KxbA!r!Tm5}&W%F3m0gIj4
zZ(ASy4dt5OOzT}ktii+j;`;ClEZs|N?kuIgrL0#ql7Wvi{54$cz7sqoHzUR~^o?Vo
zY-=jDB96SD&}&zB5m-THGtMe4Q++c2R<`k#lzRw*{Y`$F<Ghv&hN8m^q#cuF2^knl
zc2s#Qu#4k?W?s1PSe~INNS)VwilOaSIJ%^y{!ko*o@7dlebwSo?Kiwbil^RoVR9;d
z?@y58Tf+*nPv++|9M!0`qwAhO?_lT}!-;=Vx^8rQN^!h{1+&ihDpto<%{=UbxY3w9
zJw+0a*irH`)?8tunxzuW@#@O-xHtWoc!<Cl8ptEqoH6x~#3kn4t7c*3f_PY~;L_O)
z+5NlniGv?e2_+7Zb+QUbpU+vB5a^J2Bj8NripSM!H8h~jQTB30=RmB#m+I)jB`#ZU
znkd^vnEL9{iCjP!BATnJvwIzA;sAT=WXHH7q9naLU%q}6K<~ApcLqHVqO2(S&>Brk
z>h(l1BNX={9$B7Xyj+6Mwzw8CTu`F|PjGQpchJl$v4pLjwI{sY$gCMD9A?RheR=N}
zJ{9Z;tkNISVIXk)8=GZ~vFRDq4;tURaZy@sMvr`)maLojqL6}dL1}3o^9*-LG)RG*
z6tkj~DN?Ti0Xm}}5j6pac3{`<XQfkOSsG?d*2mUSl2T;1&HnW9IP_W-7>&0<h@EoH
zB0{$7n|d*ciHI+I9-%{#F-XxTJqFP7nGx*><AFCgIY+n#KWH{$V*tC8@cJi{)c?Ow
zXxNk}0Gs9mIp6@n+!R2^O$hJ`1%Y3ykB2t;&!;F@3->SZPq{pH_<t49FfbVZL7{((
zg4^)^0&fB_Gkl;{=)Wv-Mg~+yeZ>wlF#wrJ2w*k~1JyF1MKnPAEDQWvmiaZSp3G<v
z_n&J7$md|7Bkn6RigWbvYnf8lbQXE8K>wRK1%+P=+`a}37XAyo1Nx?VMaCiF@c%Ym
zFfc@~;nOv)K$4FMflVYk{MusvHDHm}UmzI(U4a0W^Dxkb-j%4yg7!*OWD6nqN2Ms3
z$mpt3YXKJ+wIu@x7dSz9CVxe&@axMS|7iUgb4wfaB8V(-3q=I#u>tO&BtVBYz_O<x
z09k|pO(+;B&>qcF1K&_uAl|3IN-`YKUz7#)x?GW?LBv<U=|vcb#qCN&v?Kzu_d%1)
zfZY-m{NMEybOiv3|2jtZtmk_L>ReI)odx_Qu>s;3LO^^OLUYYgyr#DY94!9hHqrod
zOAw%883s}dy)yBASr~rpZSk7wX*e2m7tmgZ0Kf_iWEgj)b32;`*jeEO86;k@GOus|
zp_i0bDBD#S$Rzn+apkHw$T{s_R<)Sq3MIG(136^;6_Z~5)4*l__vYAS|7|1yme#~U
z4_{uf((4kSvivI&QBC*9($&-j#@8u9>qTfe6M(<L2a;|A_Iud@{Z$Cyu>k|AcLE6;
z`k<%X0OPpi)!=`b_`iM0_X0mAB>ptOug~%SMxrQ~vL8L;naQzn{s{Te2Q~W5+NS>x
F_djzcFxCJ7

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4da2435f42..0e42234001 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 02 12:33:07 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/gradlew b/gradlew
index af6708ff22..4f906e0c81 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d5937c4..ac1b06f938 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From 28b039fde3a526afa89bb3979a2cdd57f645681c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Oct 2020 14:47:35 +0200
Subject: [PATCH 067/278] Update CHANGES.md with: Updates Gradle Wrapper from
 5.6.4 to 6.6.1. (#2193)

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 92cef39707..026d7af6cd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,7 @@ SDK API changes ⚠️:
 
 Build 🧱:
  - Use Update Gradle Wrapper Action
+ - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
 
 Other changes:
  - Added registration/verification automated UI tests

From 5fcabca87c003089fa6b1d44a8283902d6ccdb25 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 16 Sep 2020 14:08:35 +0300
Subject: [PATCH 068/278] Data classes for request body created.

---
 .../session/room/search/EventContext.kt       | 34 ++++++++++++++++++
 .../internal/session/room/search/Filter.kt    | 31 ++++++++++++++++
 .../sdk/internal/session/room/search/Order.kt | 29 +++++++++++++++
 .../session/room/search/RoomEvents.kt         | 36 +++++++++++++++++++
 .../session/room/search/SearchBody.kt         | 27 ++++++++++++++
 .../session/room/search/SearchCategories.kt   | 28 +++++++++++++++
 6 files changed, 185 insertions(+)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt
new file mode 100644
index 0000000000..36de3e30a8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class EventContext(
+        // How many events before the result are returned.
+        @Json(name = "before_limit")
+        val beforeLimit: Int? = null,
+        // How many events after the result are returned.
+        @Json(name = "after_limit")
+        val afterLimit: Int? = null,
+        // Requests that the server returns the historic profile information
+        @Json(name = "include_profile")
+        val includeProfile: Boolean? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt
new file mode 100644
index 0000000000..717957fa00
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class Filter(
+        // The maximum number of events to return.
+        @Json(name = "limit")
+        val limit: Int? = null,
+        // A list of room IDs to include. If this list is absent then all rooms are included.
+        @Json(name = "rooms")
+        val rooms: List<String>? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt
new file mode 100644
index 0000000000..05a8fe6d3b
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import com.squareup.moshi.JsonClass
+
+/**
+ * Represents the order in which to search for results.
+ */
+@JsonClass(generateAdapter = false)
+enum class Order(val value: String) {
+    RANK("rank"),
+    RECENT("recent")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt
new file mode 100644
index 0000000000..83cc91e098
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class RoomEvents(
+        // Required. The string to search events for.
+        @Json(name = "search_term")
+        val searchTerm: String,
+        @Json(name = "filter")
+        val filter: Filter? = null,
+        // By default, this is "rank". One of: ["recent", "rank"]
+        @Json(name = "order_by")
+        val orderBy: Order? = null,
+        // Configures whether any context for the events returned are included in the response.
+        @Json(name = "event_context")
+        val eventContext: EventContext? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt
new file mode 100644
index 0000000000..08d4c0bec8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SearchBody(
+        @Json(name = "search_categories")
+        val searchCategories: SearchCategories
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt
new file mode 100644
index 0000000000..cfc887ca40
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SearchCategories(
+        // Mapping of category name to search criteria.
+        @Json(name = "room_events")
+        val roomEvents: RoomEvents? = null
+)

From 04b41fce3020196cfe9f2ddecb265f6e7639cb04 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 16 Sep 2020 16:04:12 +0300
Subject: [PATCH 069/278] Data classes for the search response created.

---
 .../sdk/internal/session/room/RoomAPI.kt      |  3 ++
 .../SearchRequestBody.kt}                     |  6 +--
 .../SearchRequestCategories.kt}               |  6 +--
 .../SearchRequestEventContext.kt}             |  4 +-
 .../SearchRequestFilter.kt}                   |  4 +-
 .../SearchRequestOrder.kt}                    |  4 +-
 .../SearchRequestRoomEvents.kt}               | 10 ++---
 .../room/search/response/SearchResponse.kt    | 28 +++++++++++++
 .../response/SearchResponseCategories.kt      | 27 ++++++++++++
 .../response/SearchResponseEventContext.kt    | 42 +++++++++++++++++++
 .../search/response/SearchResponseItem.kt     | 32 ++++++++++++++
 .../response/SearchResponseRoomEvents.kt      | 33 +++++++++++++++
 12 files changed, 182 insertions(+), 17 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/{SearchBody.kt => request/SearchRequestBody.kt} (84%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/{SearchCategories.kt => request/SearchRequestCategories.kt} (84%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/{EventContext.kt => request/SearchRequestEventContext.kt} (91%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/{Filter.kt => request/SearchRequestFilter.kt} (91%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/{Order.kt => request/SearchRequestOrder.kt} (87%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/{RoomEvents.kt => request/SearchRequestRoomEvents.kt} (81%)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 35c20cf5cb..ab33249e30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -365,4 +365,7 @@ internal interface RoomAPI {
     fun deleteTag(@Path("userId") userId: String,
                   @Path("roomId") roomId: String,
                   @Path("tag") tag: String): Call<Unit>
+
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
+    fun search()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestBody.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestBody.kt
index 08d4c0bec8..c174761b08 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestBody.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.room.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchBody(
+data class SearchRequestBody(
         @Json(name = "search_categories")
-        val searchCategories: SearchCategories
+        val searchCategories: SearchRequestCategories
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestCategories.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestCategories.kt
index cfc887ca40..25e078b608 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestCategories.kt
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.room.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchCategories(
+data class SearchRequestCategories(
         // Mapping of category name to search criteria.
         @Json(name = "room_events")
-        val roomEvents: RoomEvents? = null
+        val roomEvents: SearchRequestRoomEvents? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestEventContext.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestEventContext.kt
index 36de3e30a8..e74faf85b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/EventContext.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestEventContext.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.room.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class EventContext(
+data class SearchRequestEventContext(
         // How many events before the result are returned.
         @Json(name = "before_limit")
         val beforeLimit: Int? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestFilter.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestFilter.kt
index 717957fa00..25b361a2b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Filter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestFilter.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.room.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class Filter(
+data class SearchRequestFilter(
         // The maximum number of events to return.
         @Json(name = "limit")
         val limit: Int? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestOrder.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestOrder.kt
index 05a8fe6d3b..3fe17c69ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/Order.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestOrder.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.room.search.request
 
 import com.squareup.moshi.JsonClass
 
@@ -23,7 +23,7 @@ import com.squareup.moshi.JsonClass
  * Represents the order in which to search for results.
  */
 @JsonClass(generateAdapter = false)
-enum class Order(val value: String) {
+enum class SearchRequestOrder(val value: String) {
     RANK("rank"),
     RECENT("recent")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestRoomEvents.kt
similarity index 81%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestRoomEvents.kt
index 83cc91e098..ca2bfdc10e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/RoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestRoomEvents.kt
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.room.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class RoomEvents(
+data class SearchRequestRoomEvents(
         // Required. The string to search events for.
         @Json(name = "search_term")
         val searchTerm: String,
         @Json(name = "filter")
-        val filter: Filter? = null,
+        val filter: SearchRequestFilter? = null,
         // By default, this is "rank". One of: ["recent", "rank"]
         @Json(name = "order_by")
-        val orderBy: Order? = null,
+        val orderBy: SearchRequestOrder? = null,
         // Configures whether any context for the events returned are included in the response.
         @Json(name = "event_context")
-        val eventContext: EventContext? = null
+        val eventContext: SearchRequestEventContext? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt
new file mode 100644
index 0000000000..78294268bf
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SearchResponse(
+        // Required. Describes which categories to search in and their criteria.
+        @Json(name = "search_categories")
+        val searchCategories: SearchResponseCategories
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt
new file mode 100644
index 0000000000..757c6c5ea8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SearchResponseCategories(
+        @Json(name = "room_events")
+        val roomEvents: SearchResponseRoomEvents? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt
new file mode 100644
index 0000000000..3950fc7bbb
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.JsonDict
+
+@JsonClass(generateAdapter = true)
+data class SearchResponseEventContext(
+        // Events just before the result.
+        @Json(name = "events_before")
+        val eventsBefore: List<Event>,
+        // Events just after the result.
+        @Json(name = "events_after")
+        val eventsAfter: List<Event>,
+        // Pagination token for the start of the chunk
+        @Json(name = "start")
+        val start: String? = null,
+        // Pagination token for the end of the chunk
+        @Json(name = "end")
+        val end: String? = null,
+        // The historic profile information of the users that sent the events returned. The string key is the user ID for which the profile belongs to.
+        @Json(name = "profile_info")
+        val profileInfo: JsonDict? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt
new file mode 100644
index 0000000000..248589cf6e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.events.model.Event
+
+@JsonClass(generateAdapter = true)
+data class SearchResponseItem(
+        // A number that describes how closely this result matches the search. Higher is closer.
+        @Json(name = "rank")
+        val rank: Int? = null,
+        // The event that matched.
+        @Json(name = "result")
+        val event: Event
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
new file mode 100644
index 0000000000..236a93e2c6
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search.response
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class SearchResponseRoomEvents(
+        // List of results in the requested order.
+        @Json(name = "results")
+        val results: List<SearchResponseItem>? = null,
+        @Json(name = "count")
+        val count: Int? = null,
+        // List of words which should be highlighted, useful for stemming which may change the query terms.
+        @Json(name = "highlights")
+        val highlights: List<String>? = null
+)

From 051b431f1dd4647f25a101f3471547c8c18ee0f3 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 16 Sep 2020 16:20:57 +0300
Subject: [PATCH 070/278] Search api added to RoomAPI.

---
 .../matrix/android/sdk/internal/session/room/RoomAPI.kt  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index ab33249e30..c1a06ace1d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -35,6 +35,8 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.InviteBod
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
 import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestBody
+import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.session.room.tags.TagBody
 import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
@@ -366,6 +368,11 @@ internal interface RoomAPI {
                   @Path("roomId") roomId: String,
                   @Path("tag") tag: String): Call<Unit>
 
+    /**
+     * Performs a full text search across different categories.
+     */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
-    fun search()
+    fun search(
+            @Query("next_batch") nextBatch: String?,
+            @Body body: SearchRequestBody): Call<SearchResponse>
 }

From b521f3656929096d678818a2c44a67dc07f36a1c Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 16 Sep 2020 17:18:47 +0300
Subject: [PATCH 071/278] SearchTask implementation.

---
 .../sdk/internal/session/room/RoomModule.kt   |  5 ++
 .../session/room/search/SearchTask.kt         | 74 +++++++++++++++++++
 .../response/SearchResponseRoomEvents.kt      |  5 +-
 3 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 700507735b..d3a7cf7df0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -61,6 +61,8 @@ import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventFo
 import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
 import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
+import org.matrix.android.sdk.internal.session.room.search.DefaultSearchTask
+import org.matrix.android.sdk.internal.session.room.search.SearchTask
 import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.tags.AddTagToRoomTask
@@ -195,4 +197,7 @@ internal abstract class RoomModule {
 
     @Binds
     abstract fun bindDeleteTagFromRoomTask(task: DefaultDeleteTagFromRoomTask): DeleteTagFromRoomTask
+
+    @Binds
+    abstract fun bindSearchTask(task: DefaultSearchTask): SearchTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt
new file mode 100644
index 0000000000..db9e1fc604
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.session.room.RoomAPI
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestBody
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestCategories
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestEventContext
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestFilter
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestOrder
+import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestRoomEvents
+import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface SearchTask : Task<SearchTask.Params, SearchResponse> {
+
+    data class Params(
+            val searchTerm: String,
+            val rooms: List<String>,
+            val nextBatch: String? = null,
+            val orderByRecent: Boolean,
+            val limit: Int,
+            val beforeLimit: Int,
+            val afterLimit: Int,
+            val includeProfile: Boolean
+    )
+}
+
+internal class DefaultSearchTask @Inject constructor(
+        private val roomAPI: RoomAPI,
+        private val eventBus: EventBus
+) : SearchTask {
+
+    override suspend fun execute(params: SearchTask.Params): SearchResponse {
+        return executeRequest(eventBus) {
+            val searchRequestBody = SearchRequestBody(
+                    searchCategories = SearchRequestCategories(
+                            roomEvents = SearchRequestRoomEvents(
+                                    searchTerm = params.searchTerm,
+                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
+                                    filter = SearchRequestFilter(
+                                            limit = params.limit,
+                                            rooms = params.rooms
+                                    ),
+                                    eventContext = SearchRequestEventContext(
+                                            beforeLimit = params.beforeLimit,
+                                            afterLimit = params.afterLimit,
+                                            includeProfile = params.includeProfile
+                                    )
+                            )
+                    )
+            )
+            apiCall = roomAPI.search(params.nextBatch, searchRequestBody)
+        }
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
index 236a93e2c6..a14f78ee00 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
@@ -29,5 +29,8 @@ class SearchResponseRoomEvents(
         val count: Int? = null,
         // List of words which should be highlighted, useful for stemming which may change the query terms.
         @Json(name = "highlights")
-        val highlights: List<String>? = null
+        val highlights: List<String>? = null,
+        // Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call. If this field is absent, there are no more results.
+        @Json(name = "next_batch")
+        val nextBatch: String? = null
 )

From d599cab017d00270a91d128c26c27b5f9f213c14 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 16 Sep 2020 18:38:04 +0300
Subject: [PATCH 072/278] SearchService implementation.

---
 .../api/session/room/search/SearchService.kt  | 49 ++++++++++++++++
 .../sdk/internal/session/room/RoomModule.kt   |  5 ++
 .../room/search/DefaultSearchService.kt       | 56 +++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt
new file mode 100644
index 0000000000..0976ceba18
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.search
+
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+
+/**
+ * This interface defines methods to search messages in rooms.
+ */
+interface SearchService {
+
+    /**
+     * Generic function to search a term in multiple rooms.
+     * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
+     * @param searchTerm the term to search
+     * @param rooms roomIds to search term inside
+     * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
+     * @param limit the maximum number of events to return.
+     * @param beforeLimit how many events before the result are returned.
+     * @param afterLimit how many events after the result are returned.
+     * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
+     */
+    fun search(searchTerm: String,
+               rooms: List<String>,
+               nextBatch: String?,
+               orderByRecent: Boolean,
+               limit: Int,
+               beforeLimit: Int,
+               afterLimit: Int,
+               includeProfile: Boolean,
+               callback: MatrixCallback<SearchResponse>): Cancelable
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index d3a7cf7df0..af0abc526a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -25,6 +25,7 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.room.search.SearchService
 import org.matrix.android.sdk.internal.session.DefaultFileService
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
@@ -61,6 +62,7 @@ import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventFo
 import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
 import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
+import org.matrix.android.sdk.internal.session.room.search.DefaultSearchService
 import org.matrix.android.sdk.internal.session.room.search.DefaultSearchTask
 import org.matrix.android.sdk.internal.session.room.search.SearchTask
 import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
@@ -123,6 +125,9 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindFileService(service: DefaultFileService): FileService
 
+    @Binds
+    abstract fun bindSearchService(service: DefaultSearchService): SearchService
+
     @Binds
     abstract fun bindCreateRoomTask(task: DefaultCreateRoomTask): CreateRoomTask
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt
new file mode 100644
index 0000000000..cf57e2a491
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.room.search
+
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.room.search.SearchService
+import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+import javax.inject.Inject
+import org.matrix.android.sdk.internal.task.TaskExecutor
+import org.matrix.android.sdk.internal.task.configureWith
+
+internal class DefaultSearchService @Inject constructor(
+        private val taskExecutor: TaskExecutor,
+        private val searchTask: SearchTask
+) : SearchService {
+
+    override fun search(searchTerm: String,
+                        rooms: List<String>,
+                        nextBatch: String?,
+                        orderByRecent: Boolean,
+                        limit: Int,
+                        beforeLimit: Int,
+                        afterLimit: Int,
+                        includeProfile: Boolean,
+                        callback: MatrixCallback<SearchResponse>): Cancelable {
+        return searchTask
+                .configureWith(SearchTask.Params(
+                        searchTerm = searchTerm,
+                        rooms = rooms,
+                        nextBatch = nextBatch,
+                        orderByRecent = orderByRecent,
+                        limit = limit,
+                        beforeLimit = beforeLimit,
+                        afterLimit = afterLimit,
+                        includeProfile = includeProfile
+                )) {
+                    this.callback = callback
+                }.executeBy(taskExecutor)
+    }
+}

From 05f48255a341274898b3da363146c784665e8695 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 17 Sep 2020 12:02:32 +0300
Subject: [PATCH 073/278] Move search service into session module.

---
 .../session/{room => }/search/SearchService.kt   |  4 ++--
 .../sdk/internal/session/SessionModule.kt        |  5 +++++
 .../android/sdk/internal/session/room/RoomAPI.kt |  4 ++--
 .../sdk/internal/session/room/RoomModule.kt      |  9 ++-------
 .../{room => }/search/DefaultSearchService.kt    |  6 +++---
 .../session/{room => }/search/SearchTask.kt      | 16 ++++++++--------
 .../search/request/SearchRequestBody.kt          |  4 ++--
 .../search/request/SearchRequestCategories.kt    |  4 ++--
 .../search/request/SearchRequestEventContext.kt  |  4 ++--
 .../search/request/SearchRequestFilter.kt        |  4 ++--
 .../search/request/SearchRequestOrder.kt         |  4 ++--
 .../search/request/SearchRequestRoomEvents.kt    |  4 ++--
 .../{room => }/search/response/SearchResponse.kt |  2 +-
 .../search/response/SearchResponseCategories.kt  |  2 +-
 .../response/SearchResponseEventContext.kt       |  4 ++--
 .../search/response/SearchResponseItem.kt        |  2 +-
 .../search/response/SearchResponseRoomEvents.kt  |  2 +-
 17 files changed, 40 insertions(+), 40 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/{room => }/search/SearchService.kt (93%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/DefaultSearchService.kt (90%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/SearchTask.kt (79%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/request/SearchRequestBody.kt (89%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/request/SearchRequestCategories.kt (89%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/request/SearchRequestEventContext.kt (91%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/request/SearchRequestFilter.kt (90%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/request/SearchRequestOrder.kt (87%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/request/SearchRequestRoomEvents.kt (92%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/response/SearchResponse.kt (93%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/response/SearchResponseCategories.kt (92%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/response/SearchResponseEventContext.kt (93%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/response/SearchResponseItem.kt (94%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/{room => }/search/response/SearchResponseRoomEvents.kt (95%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index 0976ceba18..9a8b2e49e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.api.session.room.search
+package org.matrix.android.sdk.api.session.search
 
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 
 /**
  * This interface defines methods to search messages in rooms.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 5397b8d9bd..d615d9e35b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
+import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
@@ -81,6 +82,7 @@ import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkServic
 import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
 import org.matrix.android.sdk.internal.session.room.create.RoomCreateEventProcessor
 import org.matrix.android.sdk.internal.session.room.prune.RedactionEventProcessor
+import org.matrix.android.sdk.internal.session.search.DefaultSearchService
 import org.matrix.android.sdk.internal.session.room.tombstone.RoomTombstoneEventProcessor
 import org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
@@ -368,4 +370,7 @@ internal abstract class SessionModule {
 
     @Binds
     abstract fun bindTypingUsersTracker(tracker: DefaultTypingUsersTracker): TypingUsersTracker
+
+    @Binds
+    abstract fun bindSearchService(service: DefaultSearchService): SearchService
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index c1a06ace1d..1a23f3a2f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -35,8 +35,8 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.InviteBod
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
 import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestBody
-import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.session.room.tags.TagBody
 import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index af0abc526a..77f8f38410 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -25,7 +25,6 @@ import org.commonmark.renderer.html.HtmlRenderer
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
-import org.matrix.android.sdk.api.session.room.search.SearchService
 import org.matrix.android.sdk.internal.session.DefaultFileService
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
@@ -62,9 +61,8 @@ import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventFo
 import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
 import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
-import org.matrix.android.sdk.internal.session.room.search.DefaultSearchService
-import org.matrix.android.sdk.internal.session.room.search.DefaultSearchTask
-import org.matrix.android.sdk.internal.session.room.search.SearchTask
+import org.matrix.android.sdk.internal.session.search.DefaultSearchTask
+import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.tags.AddTagToRoomTask
@@ -125,9 +123,6 @@ internal abstract class RoomModule {
     @Binds
     abstract fun bindFileService(service: DefaultFileService): FileService
 
-    @Binds
-    abstract fun bindSearchService(service: DefaultSearchService): SearchService
-
     @Binds
     abstract fun bindCreateRoomTask(task: DefaultCreateRoomTask): CreateRoomTask
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index cf57e2a491..1937735191 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.search
 
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.room.search.SearchService
+import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import javax.inject.Inject
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index db9e1fc604..38e87a1251 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search
+package org.matrix.android.sdk.internal.session.search
 
 import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestBody
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestCategories
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestEventContext
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestFilter
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestOrder
-import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestRoomEvents
-import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestCategories
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestEventContext
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestFilter
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestOrder
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestRoomEvents
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
index c174761b08..000f89e751 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.request
+package org.matrix.android.sdk.internal.session.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchRequestBody(
+internal data class SearchRequestBody(
         @Json(name = "search_categories")
         val searchCategories: SearchRequestCategories
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
similarity index 89%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestCategories.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
index 25e078b608..606b7320e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.request
+package org.matrix.android.sdk.internal.session.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchRequestCategories(
+internal data class SearchRequestCategories(
         // Mapping of category name to search criteria.
         @Json(name = "room_events")
         val roomEvents: SearchRequestRoomEvents? = null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestEventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestEventContext.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt
index e74faf85b2..9db97295dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestEventContext.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.request
+package org.matrix.android.sdk.internal.session.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchRequestEventContext(
+internal data class SearchRequestEventContext(
         // How many events before the result are returned.
         @Json(name = "before_limit")
         val beforeLimit: Int? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestFilter.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt
index 25b361a2b2..196d49346c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.request
+package org.matrix.android.sdk.internal.session.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchRequestFilter(
+internal data class SearchRequestFilter(
         // The maximum number of events to return.
         @Json(name = "limit")
         val limit: Int? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestOrder.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
index 3fe17c69ae..eac51ad2df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestOrder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.request
+package org.matrix.android.sdk.internal.session.search.request
 
 import com.squareup.moshi.JsonClass
 
@@ -23,7 +23,7 @@ import com.squareup.moshi.JsonClass
  * Represents the order in which to search for results.
  */
 @JsonClass(generateAdapter = false)
-enum class SearchRequestOrder(val value: String) {
+internal enum class SearchRequestOrder(val value: String) {
     RANK("rank"),
     RECENT("recent")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestRoomEvents.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
index ca2bfdc10e..fef1baa990 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/request/SearchRequestRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.request
+package org.matrix.android.sdk.internal.session.search.request
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchRequestRoomEvents(
+internal data class SearchRequestRoomEvents(
         // Required. The string to search events for.
         @Json(name = "search_term")
         val searchTerm: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
index 78294268bf..b7debb6b1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.response
+package org.matrix.android.sdk.internal.session.search.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
similarity index 92%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
index 757c6c5ea8..c931b23826 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.response
+package org.matrix.android.sdk.internal.session.search.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
index 3950fc7bbb..596645c355 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseEventContext.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.response
+package org.matrix.android.sdk.internal.session.search.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
@@ -23,7 +23,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.util.JsonDict
 
 @JsonClass(generateAdapter = true)
-data class SearchResponseEventContext(
+internal data class SearchResponseEventContext(
         // Events just before the result.
         @Json(name = "events_before")
         val eventsBefore: List<Event>,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
similarity index 94%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
index 248589cf6e..6c284b61c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.response
+package org.matrix.android.sdk.internal.session.search.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
index a14f78ee00..61ed2bf3cf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/search/response/SearchResponseRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.room.search.response
+package org.matrix.android.sdk.internal.session.search.response
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass

From 2eb60213b461ac4b256b78bf8e8d4d05862efb22 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 17 Sep 2020 12:25:07 +0300
Subject: [PATCH 074/278] Do not support searching in multiple rooms for now.

---
 .../matrix/android/sdk/api/session/search/SearchService.kt    | 4 ++--
 .../sdk/internal/session/search/DefaultSearchService.kt       | 4 ++--
 .../matrix/android/sdk/internal/session/search/SearchTask.kt  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index 9a8b2e49e2..68fc4e5d6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -30,7 +30,7 @@ interface SearchService {
      * Generic function to search a term in multiple rooms.
      * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
      * @param searchTerm the term to search
-     * @param rooms roomIds to search term inside
+     * @param roomId the roomId to search term inside
      * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
      * @param limit the maximum number of events to return.
      * @param beforeLimit how many events before the result are returned.
@@ -38,7 +38,7 @@ interface SearchService {
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
      */
     fun search(searchTerm: String,
-               rooms: List<String>,
+               roomId: String,
                nextBatch: String?,
                orderByRecent: Boolean,
                limit: Int,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 1937735191..1f158ec41b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -31,7 +31,7 @@ internal class DefaultSearchService @Inject constructor(
 ) : SearchService {
 
     override fun search(searchTerm: String,
-                        rooms: List<String>,
+                        roomId: String,
                         nextBatch: String?,
                         orderByRecent: Boolean,
                         limit: Int,
@@ -42,7 +42,7 @@ internal class DefaultSearchService @Inject constructor(
         return searchTask
                 .configureWith(SearchTask.Params(
                         searchTerm = searchTerm,
-                        rooms = rooms,
+                        roomId = roomId,
                         nextBatch = nextBatch,
                         orderByRecent = orderByRecent,
                         limit = limit,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 38e87a1251..52b4805e02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -34,7 +34,7 @@ internal interface SearchTask : Task<SearchTask.Params, SearchResponse> {
 
     data class Params(
             val searchTerm: String,
-            val rooms: List<String>,
+            val roomId: String,
             val nextBatch: String? = null,
             val orderByRecent: Boolean,
             val limit: Int,
@@ -58,7 +58,7 @@ internal class DefaultSearchTask @Inject constructor(
                                     orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
                                     filter = SearchRequestFilter(
                                             limit = params.limit,
-                                            rooms = params.rooms
+                                            rooms = listOf(params.roomId)
                                     ),
                                     eventContext = SearchRequestEventContext(
                                             beforeLimit = params.beforeLimit,

From c46f0a7430bd1391e08df762613ad84de635b856 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 17 Sep 2020 16:08:46 +0300
Subject: [PATCH 075/278] Simple integration test implementation for searching
 messages in a room.

---
 .../sdk/session/search/SearchMessagesTest.kt  | 114 ++++++++++++++++++
 .../src/main/AndroidManifest.xml              |  10 ++
 2 files changed, 124 insertions(+)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
new file mode 100644
index 0000000000..3e2960af43
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.session.search
+
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.TestConstants
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+@RunWith(JUnit4::class)
+@FixMethodOrder(MethodSorters.JVM)
+class SearchMessagesTest : InstrumentedTest {
+
+    private val MESSAGE = "Lorem ipsum dolor sit amet"
+
+    private val commonTestHelper = CommonTestHelper(context())
+    private val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
+
+    @Test
+    fun sendTextMessageAndSearchPartOfIt() {
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomId = cryptoTestData.roomId
+        aliceSession.cryptoService().setWarnOnUnknownDevices(false)
+        val roomFromAlicePOV = aliceSession.getRoom(aliceRoomId)!!
+        val aliceTimeline = roomFromAlicePOV.createTimeline(null, TimelineSettings(10))
+        aliceTimeline.start()
+
+        commonTestHelper.sendTextMessage(
+                roomFromAlicePOV,
+                MESSAGE,
+                2)
+
+        run {
+            var lock = CountDownLatch(1)
+
+            val eventListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                snapshot.count { it.root.content.toModel<MessageContent>()?.body?.startsWith(MESSAGE).orFalse() } == 2
+            }
+
+            aliceTimeline.addListener(eventListener)
+            commonTestHelper.await(lock)
+
+            lock = CountDownLatch(1)
+            aliceSession
+                    .searchService()
+                    .search(
+                            searchTerm = "lore",
+                            limit = 10,
+                            includeProfile = true,
+                            afterLimit = 0,
+                            beforeLimit = 10,
+                            orderByRecent = true,
+                            nextBatch = null,
+                            roomId = aliceRoomId,
+                            callback = object : MatrixCallback<SearchResponse> {
+                                override fun onSuccess(data: SearchResponse) {
+                                    super.onSuccess(data)
+                                    assertTrue(data.searchCategories.roomEvents?.results?.size == 2)
+                                    assertTrue(
+                                            data.searchCategories.roomEvents?.results
+                                                    ?.all {
+                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                                                    }.orFalse()
+                                    )
+                                    lock.countDown()
+                                }
+
+                                override fun onFailure(failure: Throwable) {
+                                    super.onFailure(failure)
+                                    fail(failure.localizedMessage)
+                                    lock.countDown()
+                                }
+                            }
+                    )
+            lock.await(TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
+
+            aliceTimeline.removeAllListeners()
+            cryptoTestData.cleanUp(commonTestHelper)
+        }
+
+        aliceSession.startSync(true)
+}
+}
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index 52238f824c..eeb944d955 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.matrix.android.sdk">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -7,6 +8,15 @@
 
     <application android:networkSecurityConfig="@xml/network_security_config">
 
+        <!--
+        This is mandatory to run integration tests
+        -->
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
+            tools:node="remove" />
+
         <!--
          The SDK offers a secured File provider to access downloaded files.
          Access to these file will be given via the FileService, with a temporary

From 8bff468c7c8ed43c9f929826799528e8534b7f1f Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 17 Sep 2020 16:09:47 +0300
Subject: [PATCH 076/278] SearchService is added to the session.

---
 .../main/java/org/matrix/android/sdk/api/session/Session.kt | 6 ++++++
 .../matrix/android/sdk/internal/session/DefaultSession.kt   | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 4dfc24ddae..226a793bf4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.pushers.PushersService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.signout.SignOutService
@@ -201,6 +202,11 @@ interface Session :
      */
     fun permalinkService(): PermalinkService
 
+    /**
+     * Returns the search service associated with the session
+     */
+    fun searchService(): SearchService
+
     /**
      * Add a listener to the session.
      * @param listener the listener to add.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 004c5afe8f..34b6be225b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -49,6 +49,7 @@ import org.matrix.android.sdk.api.session.profile.ProfileService
 import org.matrix.android.sdk.api.session.pushers.PushersService
 import org.matrix.android.sdk.api.session.room.RoomDirectoryService
 import org.matrix.android.sdk.api.session.room.RoomService
+import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.signout.SignOutService
@@ -120,7 +121,8 @@ internal class DefaultSession @Inject constructor(
         private val taskExecutor: TaskExecutor,
         private val callSignalingService: Lazy<CallSignalingService>,
         @UnauthenticatedWithCertificate
-        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
+        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
+        private val searchService: Lazy<SearchService>
 ) : Session,
         RoomService by roomService.get(),
         RoomDirectoryService by roomDirectoryService.get(),
@@ -264,6 +266,8 @@ internal class DefaultSession @Inject constructor(
 
     override fun callSignalingService(): CallSignalingService = callSignalingService.get()
 
+    override fun searchService(): SearchService = searchService.get()
+
     override fun getOkHttpClient(): OkHttpClient {
         return unauthenticatedWithCertificateOkHttpClient.get()
     }

From 7c954d220c1bd415038c2edb8a13550574d422c3 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 17 Sep 2020 16:16:01 +0300
Subject: [PATCH 077/278] Fix search request and response fields.

---
 .../matrix/android/sdk/internal/session/search/SearchTask.kt    | 2 +-
 .../internal/session/search/request/SearchRequestRoomEvents.kt  | 2 +-
 .../sdk/internal/session/search/response/SearchResponseItem.kt  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 52b4805e02..17f980bb77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -55,7 +55,7 @@ internal class DefaultSearchTask @Inject constructor(
                     searchCategories = SearchRequestCategories(
                             roomEvents = SearchRequestRoomEvents(
                                     searchTerm = params.searchTerm,
-                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
+                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT.value else SearchRequestOrder.RANK.value,
                                     filter = SearchRequestFilter(
                                             limit = params.limit,
                                             rooms = listOf(params.roomId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
index fef1baa990..26b11e93bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
@@ -29,7 +29,7 @@ internal data class SearchRequestRoomEvents(
         val filter: SearchRequestFilter? = null,
         // By default, this is "rank". One of: ["recent", "rank"]
         @Json(name = "order_by")
-        val orderBy: SearchRequestOrder? = null,
+        val orderBy: String? = null,
         // Configures whether any context for the events returned are included in the response.
         @Json(name = "event_context")
         val eventContext: SearchRequestEventContext? = null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
index 6c284b61c7..7c675f0593 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
@@ -25,7 +25,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 data class SearchResponseItem(
         // A number that describes how closely this result matches the search. Higher is closer.
         @Json(name = "rank")
-        val rank: Int? = null,
+        val rank: Double? = null,
         // The event that matched.
         @Json(name = "result")
         val event: Event

From f1a979caa1ad0b82b843962feb04dfbaaa6031cf Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 18 Sep 2020 14:14:27 +0300
Subject: [PATCH 078/278] Make SearchTask accessible from room.

---
 .../sdk/session/search/SearchMessagesTest.kt  | 68 ++++++++++++++++++-
 .../android/sdk/api/session/room/Room.kt      | 22 ++++++
 .../sdk/api/session/search/SearchService.kt   |  2 +-
 .../sdk/internal/session/SessionModule.kt     |  5 ++
 .../sdk/internal/session/room/DefaultRoom.kt  | 29 +++++++-
 .../sdk/internal/session/room/RoomFactory.kt  |  7 +-
 .../sdk/internal/session/room/RoomModule.kt   |  5 --
 7 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index 3e2960af43..b7d253ca00 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -47,7 +47,7 @@ class SearchMessagesTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
 
     @Test
-    fun sendTextMessageAndSearchPartOfIt() {
+    fun sendTextMessageAndSearchPartOfItUsingSession() {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
         val aliceSession = cryptoTestData.firstSession
         val aliceRoomId = cryptoTestData.roomId
@@ -110,5 +110,69 @@ class SearchMessagesTest : InstrumentedTest {
         }
 
         aliceSession.startSync(true)
-}
+    }
+
+    @Test
+    fun sendTextMessageAndSearchPartOfItUsingRoom() {
+        val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(false)
+        val aliceSession = cryptoTestData.firstSession
+        val aliceRoomId = cryptoTestData.roomId
+        aliceSession.cryptoService().setWarnOnUnknownDevices(false)
+        val roomFromAlicePOV = aliceSession.getRoom(aliceRoomId)!!
+        val aliceTimeline = roomFromAlicePOV.createTimeline(null, TimelineSettings(10))
+        aliceTimeline.start()
+
+        commonTestHelper.sendTextMessage(
+                roomFromAlicePOV,
+                MESSAGE,
+                2)
+
+        run {
+            var lock = CountDownLatch(1)
+
+            val eventListener = commonTestHelper.createEventListener(lock) { snapshot ->
+                snapshot.count { it.root.content.toModel<MessageContent>()?.body?.startsWith(MESSAGE).orFalse() } == 2
+            }
+
+            aliceTimeline.addListener(eventListener)
+            commonTestHelper.await(lock)
+
+            lock = CountDownLatch(1)
+            roomFromAlicePOV
+                    .search(
+                            searchTerm = "lore",
+                            limit = 10,
+                            includeProfile = true,
+                            afterLimit = 0,
+                            beforeLimit = 10,
+                            orderByRecent = true,
+                            nextBatch = null,
+                            callback = object : MatrixCallback<SearchResponse> {
+                                override fun onSuccess(data: SearchResponse) {
+                                    super.onSuccess(data)
+                                    assertTrue(data.searchCategories.roomEvents?.results?.size == 2)
+                                    assertTrue(
+                                            data.searchCategories.roomEvents?.results
+                                                    ?.all {
+                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                                                    }.orFalse()
+                                    )
+                                    lock.countDown()
+                                }
+
+                                override fun onFailure(failure: Throwable) {
+                                    super.onFailure(failure)
+                                    fail(failure.localizedMessage)
+                                    lock.countDown()
+                                }
+                            }
+                    )
+            lock.await(TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
+
+            aliceTimeline.removeAllListeners()
+            cryptoTestData.cleanUp(commonTestHelper)
+        }
+
+        aliceSession.startSync(true)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 3d8550adf0..d09a42753b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -18,6 +18,7 @@
 package org.matrix.android.sdk.api.session.room
 
 import androidx.lifecycle.LiveData
+import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.call.RoomCallService
 import org.matrix.android.sdk.api.session.room.crypto.RoomCryptoService
 import org.matrix.android.sdk.api.session.room.members.MembershipService
@@ -33,7 +34,9 @@ import org.matrix.android.sdk.api.session.room.tags.TagsService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 
 /**
  * This interface defines methods to interact within a room.
@@ -69,4 +72,23 @@ interface Room :
      * A current snapshot of [RoomSummary] associated with the room
      */
     fun roomSummary(): RoomSummary?
+
+    /**
+     * Generic function to search a term in a room.
+     * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
+     * @param searchTerm the term to search
+     * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
+     * @param limit the maximum number of events to return.
+     * @param beforeLimit how many events before the result are returned.
+     * @param afterLimit how many events after the result are returned.
+     * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
+     */
+    fun search(searchTerm: String,
+               nextBatch: String?,
+               orderByRecent: Boolean,
+               limit: Int,
+               beforeLimit: Int,
+               afterLimit: Int,
+               includeProfile: Boolean,
+               callback: MatrixCallback<SearchResponse>): Cancelable
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index 68fc4e5d6f..2087af6a81 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -27,7 +27,7 @@ import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 interface SearchService {
 
     /**
-     * Generic function to search a term in multiple rooms.
+     * Generic function to search a term in a room.
      * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
      * @param searchTerm the term to search
      * @param roomId the roomId to search term inside
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index d615d9e35b..54478cdc02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -84,6 +84,8 @@ import org.matrix.android.sdk.internal.session.room.create.RoomCreateEventProces
 import org.matrix.android.sdk.internal.session.room.prune.RedactionEventProcessor
 import org.matrix.android.sdk.internal.session.search.DefaultSearchService
 import org.matrix.android.sdk.internal.session.room.tombstone.RoomTombstoneEventProcessor
+import org.matrix.android.sdk.internal.session.search.DefaultSearchTask
+import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
 import org.matrix.android.sdk.internal.session.user.accountdata.DefaultAccountDataService
@@ -373,4 +375,7 @@ internal abstract class SessionModule {
 
     @Binds
     abstract fun bindSearchService(service: DefaultSearchService): SearchService
+
+    @Binds
+    abstract fun bindSearchTask(task: DefaultSearchTask): SearchTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 27a51594c3..33fa98f8ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -36,10 +36,13 @@ import org.matrix.android.sdk.api.session.room.tags.TagsService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
+import org.matrix.android.sdk.internal.session.search.SearchTask
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import java.security.InvalidParameterException
@@ -62,7 +65,8 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                                                private val roomMembersService: MembershipService,
                                                private val roomPushRuleService: RoomPushRuleService,
                                                private val taskExecutor: TaskExecutor,
-                                               private val sendStateTask: SendStateTask) :
+                                               private val sendStateTask: SendStateTask,
+                                               private val searchTask: SearchTask) :
         Room,
         TimelineService by timelineService,
         SendService by sendService,
@@ -123,4 +127,27 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
             }
         }
     }
+
+    override fun search(searchTerm: String,
+                        nextBatch: String?,
+                        orderByRecent: Boolean,
+                        limit: Int,
+                        beforeLimit: Int,
+                        afterLimit: Int,
+                        includeProfile: Boolean,
+                        callback: MatrixCallback<SearchResponse>): Cancelable {
+        return searchTask
+                .configureWith(SearchTask.Params(
+                        searchTerm = searchTerm,
+                        roomId = roomId,
+                        nextBatch = nextBatch,
+                        orderByRecent = orderByRecent,
+                        limit = limit,
+                        beforeLimit = beforeLimit,
+                        afterLimit = afterLimit,
+                        includeProfile = includeProfile
+                )) {
+                    this.callback = callback
+                }.executeBy(taskExecutor)
+    }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index ac8bdb3992..28eb17314a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.session.room.tags.DefaultTagsService
 import org.matrix.android.sdk.internal.session.room.timeline.DefaultTimelineService
 import org.matrix.android.sdk.internal.session.room.typing.DefaultTypingService
 import org.matrix.android.sdk.internal.session.room.uploads.DefaultUploadsService
+import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import javax.inject.Inject
 
@@ -59,7 +60,8 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                                                       private val membershipServiceFactory: DefaultMembershipService.Factory,
                                                       private val roomPushRuleServiceFactory: DefaultRoomPushRuleService.Factory,
                                                       private val taskExecutor: TaskExecutor,
-                                                      private val sendStateTask: SendStateTask) :
+                                                      private val sendStateTask: SendStateTask,
+                                                      private val searchTask: SearchTask) :
         RoomFactory {
 
     override fun create(roomId: String): Room {
@@ -81,7 +83,8 @@ internal class DefaultRoomFactory @Inject constructor(private val cryptoService:
                 roomMembersService = membershipServiceFactory.create(roomId),
                 roomPushRuleService = roomPushRuleServiceFactory.create(roomId),
                 taskExecutor = taskExecutor,
-                sendStateTask = sendStateTask
+                sendStateTask = sendStateTask,
+                searchTask = searchTask
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 77f8f38410..700507735b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -61,8 +61,6 @@ import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventFo
 import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
 import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
-import org.matrix.android.sdk.internal.session.search.DefaultSearchTask
-import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.tags.AddTagToRoomTask
@@ -197,7 +195,4 @@ internal abstract class RoomModule {
 
     @Binds
     abstract fun bindDeleteTagFromRoomTask(task: DefaultDeleteTagFromRoomTask): DeleteTagFromRoomTask
-
-    @Binds
-    abstract fun bindSearchTask(task: DefaultSearchTask): SearchTask
 }

From fc18a7b8771abf276b161ce750074c21cbeb6b96 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 18 Sep 2020 15:19:47 +0300
Subject: [PATCH 079/278] Add search action as the menu item inside the
 timeline

---
 .../home/room/detail/RoomDetailViewModel.kt        | 14 +++++++-------
 vector/src/main/res/menu/menu_timeline.xml         |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 9d52933168..f8229731d8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -529,16 +529,16 @@ class RoomDetailViewModel @AssistedInject constructor(
             return@withState false
         }
         when (itemId) {
-            R.id.clear_message_queue ->
+            R.id.clear_message_queue           ->
                 // For now always disable when not in developer mode, worker cancellation is not working properly
                 timeline.pendingEventCount() > 0 && vectorPreferences.developerMode()
-            R.id.resend_all          -> state.asyncRoomSummary()?.hasFailedSending == true
-            R.id.clear_all           -> state.asyncRoomSummary()?.hasFailedSending == true
-            R.id.open_matrix_apps    -> true
+            R.id.resend_all                    -> state.asyncRoomSummary()?.hasFailedSending == true
+            R.id.clear_all                     -> state.asyncRoomSummary()?.hasFailedSending == true
+            R.id.open_matrix_apps, R.id.search -> true
             R.id.voice_call,
-            R.id.video_call          -> true // always show for discoverability
-            R.id.hangup_call         -> webRtcPeerConnectionManager.currentCall != null
-            else                     -> false
+            R.id.video_call                    -> true // always show for discoverability
+            R.id.hangup_call                   -> webRtcPeerConnectionManager.currentCall != null
+            else                               -> false
         }
     }
 
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 6cdbbed424..7e6cb277d2 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -3,6 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <item
+        android:id="@+id/search"
+        android:title="@string/search"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/video_call"
         android:icon="@drawable/ic_video"

From f54504e8718656373f9bbbc75fefbf86078ac00b Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 21 Sep 2020 15:40:46 +0300
Subject: [PATCH 080/278] Create search UI classes.

---
 vector/src/main/AndroidManifest.xml           |  1 +
 .../im/vector/app/core/di/FragmentModule.kt   |  6 +++
 .../im/vector/app/core/di/ScreenComponent.kt  |  2 +
 .../home/room/detail/RoomDetailFragment.kt    |  4 ++
 .../home/room/detail/search/SearchAction.kt   | 21 ++++++++
 .../home/room/detail/search/SearchActivity.kt | 50 +++++++++++++++++++
 .../home/room/detail/search/SearchFragment.kt | 46 +++++++++++++++++
 .../room/detail/search/SearchViewEvents.kt    | 21 ++++++++
 .../room/detail/search/SearchViewModel.kt     | 46 +++++++++++++++++
 .../room/detail/search/SearchViewState.kt     | 23 +++++++++
 .../features/navigation/DefaultNavigator.kt   |  7 +++
 .../app/features/navigation/Navigator.kt      |  2 +
 .../src/main/res/layout/fragment_search.xml   |  6 +++
 13 files changed, 235 insertions(+)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
 create mode 100644 vector/src/main/res/layout/fragment_search.xml

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 6865da3470..3f7ff8c808 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -219,6 +219,7 @@
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity android:name=".features.widgets.WidgetActivity" />
         <activity android:name=".features.pin.PinActivity" />
+        <activity android:name=".features.home.room.detail.search.SearchActivity" />
 
         <!-- Services -->
 
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 86d59b630b..014a244bf8 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -52,6 +52,7 @@ import im.vector.app.features.home.HomeDrawerFragment
 import im.vector.app.features.home.LoadingFragment
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
 import im.vector.app.features.home.room.detail.RoomDetailFragment
+import im.vector.app.features.home.room.detail.search.SearchFragment
 import im.vector.app.features.home.room.list.RoomListFragment
 import im.vector.app.features.login.LoginCaptchaFragment
 import im.vector.app.features.login.LoginFragment
@@ -570,4 +571,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(RoomBannedMemberListFragment::class)
     fun bindRoomBannedMemberListFragment(fragment: RoomBannedMemberListFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SearchFragment::class)
+    fun bindSearchFragment(fragment: SearchFragment): Fragment
 }
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index d337ec7977..17ec00952b 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -38,6 +38,7 @@ import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.HomeModule
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
+import im.vector.app.features.home.room.detail.search.SearchActivity
 import im.vector.app.features.home.room.detail.timeline.action.MessageActionsBottomSheet
 import im.vector.app.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet
 import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
@@ -142,6 +143,7 @@ interface ScreenComponent {
     fun inject(activity: VectorCallActivity)
     fun inject(activity: VectorAttachmentViewerActivity)
     fun inject(activity: VectorJitsiActivity)
+    fun inject(activity: SearchActivity)
 
     /* ==========================================================================================
      * BottomSheets
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 3b4795b965..34aa6a0831 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -673,6 +673,10 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.EndCall)
                 true
             }
+            R.id.search              -> {
+                navigator.openSearch(requireContext(), roomDetailArgs.roomId)
+                true
+            }
             else                     -> super.onOptionsItemSelected(item)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
new file mode 100644
index 0000000000..2774ef4d8e
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SearchAction : VectorViewModelAction
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
new file mode 100644
index 0000000000..bedc4cb881
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import android.content.Context
+import android.content.Intent
+import com.airbnb.mvrx.MvRx
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.VectorBaseActivity
+
+class SearchActivity : VectorBaseActivity() {
+
+    override fun getLayoutRes() = R.layout.activity_simple
+
+    override fun injectWith(injector: ScreenComponent) {
+        super.injectWith(injector)
+        injector.inject(this)
+    }
+
+    override fun initUiAndData() {
+        if (isFirstCreation()) {
+            val fragmentArgs: SearchArgs = intent?.extras?.getParcelable(MvRx.KEY_ARG) ?: return
+            addFragment(R.id.simpleFragmentContainer, SearchFragment::class.java, fragmentArgs)
+        }
+    }
+
+    companion object {
+        fun newIntent(context: Context, args: SearchArgs): Intent {
+            return Intent(context, SearchActivity::class.java).apply {
+                putExtra(MvRx.KEY_ARG, args)
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
new file mode 100644
index 0000000000..f5b8440b58
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.View
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import im.vector.app.R
+import im.vector.app.core.platform.VectorBaseFragment
+import kotlinx.android.parcel.Parcelize
+import javax.inject.Inject
+
+@Parcelize
+data class SearchArgs(
+        val roomId: String
+) : Parcelable
+
+class SearchFragment @Inject constructor(
+        val viewModelFactory: SearchViewModel.Factory
+) : VectorBaseFragment() {
+
+    private val fragmentArgs: SearchArgs by args()
+    private val searchViewModel: SearchViewModel by fragmentViewModel()
+
+    override fun getLayoutResId() = R.layout.fragment_search
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
new file mode 100644
index 0000000000..a5489e9240
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class SearchViewEvents : VectorViewEvents
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
new file mode 100644
index 0000000000..de75c0dd20
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+
+class SearchViewModel @AssistedInject constructor(
+        @Assisted private val initialState: SearchViewState
+) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: SearchViewState): SearchViewModel
+    }
+
+    companion object : MvRxViewModelFactory<SearchViewModel, SearchViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: SearchViewState): SearchViewModel? {
+            val fragment: SearchFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return fragment.viewModelFactory.create(state)
+        }
+    }
+
+    override fun handle(action: SearchAction) {
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
new file mode 100644
index 0000000000..785d61dc00
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import com.airbnb.mvrx.MvRxState
+
+data class SearchViewState(
+        val searchTerm: String = ""
+) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 3a8d302fc7..5ad600dfff 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -43,6 +43,8 @@ import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.debug.DebugMenuActivity
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
+import im.vector.app.features.home.room.detail.search.SearchActivity
+import im.vector.app.features.home.room.detail.search.SearchArgs
 import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
 import im.vector.app.features.invite.InviteUsersToRoomActivity
@@ -329,6 +331,11 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
+    override fun openSearch(context: Context, roomId: String) {
+        val intent = SearchActivity.newIntent(context, SearchArgs(roomId))
+        context.startActivity(intent)
+    }
+
     private fun startActivity(context: Context, intent: Intent, buildTask: Boolean) {
         if (buildTask) {
             val stackBuilder = TaskStackBuilder.create(context)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index e92fea267f..b2efb1e931 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -109,4 +109,6 @@ interface Navigator {
                         view: View,
                         inMemory: List<AttachmentData> = emptyList(),
                         options: ((MutableList<Pair<View, String>>) -> Unit)?)
+
+    fun openSearch(context: Context, roomId: String)
 }
diff --git a/vector/src/main/res/layout/fragment_search.xml b/vector/src/main/res/layout/fragment_search.xml
new file mode 100644
index 0000000000..77d9ef65f8
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_search.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 86b46d14426ec806dad0a29b4ae0388af558cc31 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 21 Sep 2020 17:01:27 +0300
Subject: [PATCH 081/278] Configure SearchView as activity toolbar.

---
 .../home/room/detail/search/SearchActivity.kt | 31 ++++++++++++-
 .../home/room/detail/search/SearchFragment.kt |  5 +++
 .../src/main/res/layout/activity_search.xml   | 43 +++++++++++++++++++
 .../src/main/res/layout/fragment_search.xml   |  3 ++
 4 files changed, 80 insertions(+), 2 deletions(-)
 create mode 100644 vector/src/main/res/layout/activity_search.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
index bedc4cb881..70205eed62 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
@@ -18,29 +18,56 @@ package im.vector.app.features.home.room.detail.search
 
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.widget.SearchView
 import com.airbnb.mvrx.MvRx
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
+import kotlinx.android.synthetic.main.activity_search.*
 
 class SearchActivity : VectorBaseActivity() {
 
-    override fun getLayoutRes() = R.layout.activity_simple
+    private val searchFragment: SearchFragment?
+        get() {
+            return supportFragmentManager.findFragmentByTag(FRAGMENT_TAG) as? SearchFragment
+        }
+
+    override fun getLayoutRes() = R.layout.activity_search
 
     override fun injectWith(injector: ScreenComponent) {
         super.injectWith(injector)
         injector.inject(this)
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        configureToolbar(searchToolbar)
+    }
+
     override fun initUiAndData() {
         if (isFirstCreation()) {
             val fragmentArgs: SearchArgs = intent?.extras?.getParcelable(MvRx.KEY_ARG) ?: return
-            addFragment(R.id.simpleFragmentContainer, SearchFragment::class.java, fragmentArgs)
+            addFragment(R.id.searchFragmentContainer, SearchFragment::class.java, fragmentArgs, FRAGMENT_TAG)
         }
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String): Boolean {
+                searchFragment?.search(query)
+                return true
+            }
+
+            override fun onQueryTextChange(newText: String): Boolean {
+                return true
+            }
+        })
+        // Open the keyboard immediately
+        searchView.requestFocus()
     }
 
     companion object {
+        private const val FRAGMENT_TAG = "SearchFragment"
+
         fun newIntent(context: Context, args: SearchArgs): Intent {
             return Intent(context, SearchActivity::class.java).apply {
                 putExtra(MvRx.KEY_ARG, args)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index f5b8440b58..0a0604eb38 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -24,6 +24,7 @@ import com.airbnb.mvrx.fragmentViewModel
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.parcel.Parcelize
+import timber.log.Timber
 import javax.inject.Inject
 
 @Parcelize
@@ -43,4 +44,8 @@ class SearchFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
     }
+
+    fun search(query: String) {
+        Timber.d(query)
+    }
 }
diff --git a/vector/src/main/res/layout/activity_search.xml b/vector/src/main/res/layout/activity_search.xml
new file mode 100644
index 0000000000..a3aa21eecc
--- /dev/null
+++ b/vector/src/main/res/layout/activity_search.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/searchToolbar"
+            style="@style/VectorToolbarStyle"
+            android:layout_width="0dp"
+            android:layout_height="?attr/actionBarSize"
+            android:elevation="4dp"
+            app:contentInsetStart="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.SearchView
+                android:id="@+id/searchView"
+                style="@style/VectorSearchView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:queryHint="@string/search_hint"
+                android:backgroundTint="@color/base_color" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/searchFragmentContainer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/searchToolbar" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_search.xml b/vector/src/main/res/layout/fragment_search.xml
index 77d9ef65f8..2916089675 100644
--- a/vector/src/main/res/layout/fragment_search.xml
+++ b/vector/src/main/res/layout/fragment_search.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8759bcca84c69e8aab5e7aa365ba37922ae05f32 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 10:14:36 +0300
Subject: [PATCH 082/278] Map api response to a domain object.

---
 .../sdk/session/search/SearchMessagesTest.kt  | 22 ++++++-------
 .../android/sdk/api/session/room/Room.kt      |  4 +--
 .../sdk/api/session/search/SearchResult.kt    | 32 +++++++++++++++++++
 .../sdk/api/session/search/SearchService.kt   |  3 +-
 .../sdk/internal/session/room/DefaultRoom.kt  |  4 +--
 .../sdk/internal/session/room/RoomAPI.kt      |  2 +-
 .../session/search/DefaultSearchService.kt    |  4 +--
 .../sdk/internal/session/search/SearchTask.kt | 17 +++++++---
 8 files changed, 64 insertions(+), 24 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index b7d253ca00..1d4eb758ed 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -30,10 +30,10 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.TestConstants
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
@@ -83,14 +83,14 @@ class SearchMessagesTest : InstrumentedTest {
                             orderByRecent = true,
                             nextBatch = null,
                             roomId = aliceRoomId,
-                            callback = object : MatrixCallback<SearchResponse> {
-                                override fun onSuccess(data: SearchResponse) {
+                            callback = object : MatrixCallback<SearchResult> {
+                                override fun onSuccess(data: SearchResult) {
                                     super.onSuccess(data)
-                                    assertTrue(data.searchCategories.roomEvents?.results?.size == 2)
+                                    assertTrue(data.results?.size == 2)
                                     assertTrue(
-                                            data.searchCategories.roomEvents?.results
+                                            data.results
                                                     ?.all {
-                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                                                        (it.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
                                                     }.orFalse()
                                     )
                                     lock.countDown()
@@ -147,14 +147,14 @@ class SearchMessagesTest : InstrumentedTest {
                             beforeLimit = 10,
                             orderByRecent = true,
                             nextBatch = null,
-                            callback = object : MatrixCallback<SearchResponse> {
-                                override fun onSuccess(data: SearchResponse) {
+                            callback = object : MatrixCallback<SearchResult> {
+                                override fun onSuccess(data: SearchResult) {
                                     super.onSuccess(data)
-                                    assertTrue(data.searchCategories.roomEvents?.results?.size == 2)
+                                    assertTrue(data.results?.size == 2)
                                     assertTrue(
-                                            data.searchCategories.roomEvents?.results
+                                            data.results
                                                     ?.all {
-                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                                                        (it.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
                                                     }.orFalse()
                                     )
                                     lock.countDown()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index d09a42753b..a27cdad551 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -34,9 +34,9 @@ import org.matrix.android.sdk.api.session.room.tags.TagsService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 
 /**
  * This interface defines methods to interact within a room.
@@ -90,5 +90,5 @@ interface Room :
                beforeLimit: Int,
                afterLimit: Int,
                includeProfile: Boolean,
-               callback: MatrixCallback<SearchResponse>): Cancelable
+               callback: MatrixCallback<SearchResult>): Cancelable
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
new file mode 100644
index 0000000000..4529bf6d13
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.search
+
+import org.matrix.android.sdk.api.session.events.model.Event
+
+/**
+ * Domain class to represent the response of a search request in a room.
+ */
+data class SearchResult(
+        // Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call. If this field is absent, there are no more results.
+        val nextBatch: String? = null,
+        // List of words which should be highlighted, useful for stemming which may change the query terms.
+        var highlights: List<String>? = null,
+        // List of results in the requested order.
+        var results: List<Event>? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index 2087af6a81..b089a597e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.api.session.search
 
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 
 /**
  * This interface defines methods to search messages in rooms.
@@ -45,5 +44,5 @@ interface SearchService {
                beforeLimit: Int,
                afterLimit: Int,
                includeProfile: Boolean,
-               callback: MatrixCallback<SearchResponse>): Cancelable
+               callback: MatrixCallback<SearchResult>): Cancelable
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 33fa98f8ce..0eb64af8a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -36,13 +36,13 @@ import org.matrix.android.sdk.api.session.room.tags.TagsService
 import org.matrix.android.sdk.api.session.room.timeline.TimelineService
 import org.matrix.android.sdk.api.session.room.typing.TypingService
 import org.matrix.android.sdk.api.session.room.uploads.UploadsService
+import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
 import org.matrix.android.sdk.internal.session.room.state.SendStateTask
 import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryDataSource
 import org.matrix.android.sdk.internal.session.search.SearchTask
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import java.security.InvalidParameterException
@@ -135,7 +135,7 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                         beforeLimit: Int,
                         afterLimit: Int,
                         includeProfile: Boolean,
-                        callback: MatrixCallback<SearchResponse>): Cancelable {
+                        callback: MatrixCallback<SearchResult>): Cancelable {
         return searchTask
                 .configureWith(SearchTask.Params(
                         searchTerm = searchTerm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 1a23f3a2f5..db99adbafb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -36,12 +36,12 @@ import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePid
 import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.session.room.tags.TagBody
 import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
 import org.matrix.android.sdk.internal.session.room.typing.TypingBody
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 1f158ec41b..0b380f4d35 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -18,9 +18,9 @@
 package org.matrix.android.sdk.internal.session.search
 
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import javax.inject.Inject
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
@@ -38,7 +38,7 @@ internal class DefaultSearchService @Inject constructor(
                         beforeLimit: Int,
                         afterLimit: Int,
                         includeProfile: Boolean,
-                        callback: MatrixCallback<SearchResponse>): Cancelable {
+                        callback: MatrixCallback<SearchResult>): Cancelable {
         return searchTask
                 .configureWith(SearchTask.Params(
                         searchTerm = searchTerm,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 17f980bb77..4502d2a60a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -18,6 +18,7 @@
 package org.matrix.android.sdk.internal.session.search
 
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
@@ -30,7 +31,7 @@ import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
-internal interface SearchTask : Task<SearchTask.Params, SearchResponse> {
+internal interface SearchTask : Task<SearchTask.Params, SearchResult> {
 
     data class Params(
             val searchTerm: String,
@@ -49,8 +50,8 @@ internal class DefaultSearchTask @Inject constructor(
         private val eventBus: EventBus
 ) : SearchTask {
 
-    override suspend fun execute(params: SearchTask.Params): SearchResponse {
-        return executeRequest(eventBus) {
+    override suspend fun execute(params: SearchTask.Params): SearchResult {
+        return executeRequest<SearchResponse>(eventBus) {
             val searchRequestBody = SearchRequestBody(
                     searchCategories = SearchRequestCategories(
                             roomEvents = SearchRequestRoomEvents(
@@ -69,6 +70,14 @@ internal class DefaultSearchTask @Inject constructor(
                     )
             )
             apiCall = roomAPI.search(params.nextBatch, searchRequestBody)
-        }
+        }.toDomain().apply { results = results?.reversed() }
+    }
+
+    private fun SearchResponse.toDomain(): SearchResult {
+        return SearchResult(
+                nextBatch = searchCategories.roomEvents?.nextBatch,
+                highlights = searchCategories.roomEvents?.highlights,
+                results = searchCategories.roomEvents?.results?.map { it.event }
+        )
     }
 }

From d6fcf63230e291f7e0b68a86266d4afd87d54205 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 10:19:26 +0300
Subject: [PATCH 083/278] Implement search result controller and item.

---
 .../detail/search/SearchResultController.kt   | 80 +++++++++++++++++++
 .../room/detail/search/SearchResultItem.kt    | 63 +++++++++++++++
 .../src/main/res/layout/fragment_search.xml   | 15 ++--
 .../main/res/layout/item_search_result.xml    | 60 ++++++++++++++
 vector/src/main/res/values/strings.xml        |  1 +
 5 files changed, 214 insertions(+), 5 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
 create mode 100644 vector/src/main/res/layout/item_search_result.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
new file mode 100644
index 0000000000..82d3120311
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import com.airbnb.epoxy.TypedEpoxyController
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.ui.list.genericItemHeader
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Event
+import java.util.Calendar
+import javax.inject.Inject
+
+class SearchResultController @Inject constructor(
+        private val session: Session,
+        private val avatarRenderer: AvatarRenderer,
+        private val dateFormatter: VectorDateFormatter
+) : TypedEpoxyController<SearchViewState>() {
+
+    var listener: Listener? = null
+
+    interface Listener {
+        fun onItemClicked(event: Event)
+    }
+
+    init {
+        setData(null)
+    }
+
+    override fun buildModels(data: SearchViewState?) {
+        data?.searchResult?.results ?: return
+
+        buildSearchResultItems(data.searchResult.results!!)
+    }
+
+    private fun buildSearchResultItems(events: List<Event>) {
+        var lastDate: Calendar? = null
+
+        events.forEach { event ->
+            val eventDate = Calendar.getInstance().apply {
+                timeInMillis = event.originServerTs ?: System.currentTimeMillis()
+            }
+            if (lastDate?.get(Calendar.DAY_OF_YEAR) != eventDate.get(Calendar.DAY_OF_YEAR)) {
+                genericItemHeader {
+                    id(eventDate.hashCode())
+                    text(dateFormatter.format(eventDate.timeInMillis, DateFormatKind.EDIT_HISTORY_HEADER))
+                }
+            }
+            lastDate = eventDate
+
+            searchResultItem {
+                id(event.eventId)
+                avatarRenderer(avatarRenderer)
+                dateFormatter(dateFormatter)
+                event(event)
+                sender(event.senderId?.let { session.getUser(it) })
+                listener(object : SearchResultItem.Listener {
+                    override fun onItemClicked() {
+                        listener?.onItemClicked(event)
+                    }
+                })
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
new file mode 100644
index 0000000000..fb0121cbcf
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.search
+
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.date.DateFormatKind
+import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
+
+@EpoxyModelClass(layout = R.layout.item_search_result)
+abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
+
+    @EpoxyAttribute var avatarRenderer: AvatarRenderer? = null
+    @EpoxyAttribute var dateFormatter: VectorDateFormatter? = null
+    @EpoxyAttribute var event: Event? = null
+    @EpoxyAttribute var sender: User? = null
+    @EpoxyAttribute var listener: Listener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        event ?: return
+
+        holder.view.setOnClickListener { listener?.onItemClicked() }
+        sender?.toMatrixItem()?.let { avatarRenderer?.render(it, holder.avatarImageView) }
+        holder.memberNameView.text = sender?.displayName
+        holder.timeView.text = dateFormatter?.format(event!!.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
+        holder.contentView.text = event?.content?.get("body") as? String
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val avatarImageView by bind<ImageView>(R.id.messageAvatarImageView)
+        val memberNameView by bind<TextView>(R.id.messageMemberNameView)
+        val timeView by bind<TextView>(R.id.messageTimeView)
+        val contentView by bind<TextView>(R.id.messageContentView)
+    }
+
+    interface Listener {
+        fun onItemClicked()
+    }
+}
diff --git a/vector/src/main/res/layout/fragment_search.xml b/vector/src/main/res/layout/fragment_search.xml
index 2916089675..5478e1f68c 100644
--- a/vector/src/main/res/layout/fragment_search.xml
+++ b/vector/src/main/res/layout/fragment_search.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/stateView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?riotx_header_panel_background">
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/searchResultRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:overScrollMode="always" />
 
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</im.vector.app.core.platform.StateView>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
new file mode 100644
index 0000000000..9946a2fb50
--- /dev/null
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+
+    <ImageView
+        android:id="@+id/messageAvatarImageView"
+        android:layout_width="44dp"
+        android:layout_height="44dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/messageMemberNameView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
+        app:layout_constraintStart_toEndOf="@+id/messageAvatarImageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@sample/matrix.json/data/displayName" />
+
+    <TextView
+        android:id="@+id/messageTimeView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/messageMemberNameView"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="@+id/messageMemberNameView"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="@tools:sample/date/hhmm" />
+
+    <TextView
+        android:id="@+id/messageContentView"
+        style="@style/TimelineContentStubBaseParams"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/messageMemberNameView"
+        app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
+        tools:text="@sample/matrix.json/data/message" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 0edd930498..ee5b8fecb1 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -628,6 +628,7 @@
     <string name="tab_title_search_messages">MESSAGES</string>
     <string name="tab_title_search_people">PEOPLE</string>
     <string name="tab_title_search_files">FILES</string>
+    <string name="search_is_not_supported_in_e2e_room">Searching in encrypted rooms is not supported yet.</string>
 
     <!-- Room recents -->
     <string name="room_recents_join">JOIN</string>

From 6c6d0dbc3d9f907faf4dc85f3054fc17c4bd7d51 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 10:20:36 +0300
Subject: [PATCH 084/278] Show not supported warning for e2e rooms.

---
 .../features/home/room/detail/RoomDetailFragment.kt    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 34aa6a0831..51aeda2aab 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -674,13 +674,21 @@ class RoomDetailFragment @Inject constructor(
                 true
             }
             R.id.search              -> {
-                navigator.openSearch(requireContext(), roomDetailArgs.roomId)
+                handleSearchAction()
                 true
             }
             else                     -> super.onOptionsItemSelected(item)
         }
     }
 
+    private fun handleSearchAction() {
+        if (session.getRoom(roomDetailArgs.roomId)?.isEncrypted() == false) {
+            navigator.openSearch(requireContext(), roomDetailArgs.roomId)
+        } else {
+            showDialogWithMessage(getString(R.string.search_is_not_supported_in_e2e_room))
+        }
+    }
+
     private fun handleCallRequest(item: MenuItem) = withState(roomDetailViewModel) { state ->
         val roomSummary = state.asyncRoomSummary.invoke() ?: return@withState
         val isVideoCall = item.itemId == R.id.video_call

From 5e56e7cf829464d429ed06cc2ffe8013bfe10ef8 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 10:21:26 +0300
Subject: [PATCH 085/278] Implement search state, action and view events.

---
 .../app/features/home/room/detail/search/SearchAction.kt | 6 +++++-
 .../features/home/room/detail/search/SearchViewEvents.kt | 5 ++++-
 .../features/home/room/detail/search/SearchViewState.kt  | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
index 2774ef4d8e..d295784a8c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
@@ -18,4 +18,8 @@ package im.vector.app.features.home.room.detail.search
 
 import im.vector.app.core.platform.VectorViewModelAction
 
-sealed class SearchAction : VectorViewModelAction
+sealed class SearchAction : VectorViewModelAction {
+    data class SearchWith(val roomId: String, val searchTerm: String) : SearchAction()
+    object ScrolledToTop : SearchAction()
+    object Retry : SearchAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
index a5489e9240..41dabd8686 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
@@ -18,4 +18,7 @@ package im.vector.app.features.home.room.detail.search
 
 import im.vector.app.core.platform.VectorViewEvents
 
-sealed class SearchViewEvents : VectorViewEvents
+sealed class SearchViewEvents : VectorViewEvents {
+    data class Failure(val throwable: Throwable) : SearchViewEvents()
+    data class Loading(val message: CharSequence? = null) : SearchViewEvents()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
index 785d61dc00..02db098e68 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -17,7 +17,14 @@
 package im.vector.app.features.home.room.detail.search
 
 import com.airbnb.mvrx.MvRxState
+import org.matrix.android.sdk.api.session.search.SearchResult
 
 data class SearchViewState(
-        val searchTerm: String = ""
+        // Accumulated search result
+        val searchResult: SearchResult? = null,
+        // Last batch result will help RecyclerView to position itself
+        val lastBatch: SearchResult? = null,
+        val searchTerm: String? = null,
+        val roomId: String? = null,
+        val isNextBatch: Boolean = false
 ) : MvRxState

From 62449ee543bec0593b060f8cb7181385cb67f846 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 10:22:26 +0300
Subject: [PATCH 086/278] Support searching and pagination.

---
 .../home/room/detail/search/SearchFragment.kt | 95 ++++++++++++++++++-
 .../room/detail/search/SearchViewModel.kt     | 92 +++++++++++++++++-
 2 files changed, 182 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 0a0604eb38..1f8f7fa422 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -19,12 +19,24 @@ package im.vector.app.features.home.room.detail.search
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
 import im.vector.app.R
+import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.trackItemsVisibilityChange
+import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.StringProvider
 import kotlinx.android.parcel.Parcelize
-import timber.log.Timber
+import kotlinx.android.synthetic.main.fragment_search.*
+import org.matrix.android.sdk.api.session.events.model.Event
 import javax.inject.Inject
 
 @Parcelize
@@ -33,19 +45,94 @@ data class SearchArgs(
 ) : Parcelable
 
 class SearchFragment @Inject constructor(
-        val viewModelFactory: SearchViewModel.Factory
-) : VectorBaseFragment() {
+        val viewModelFactory: SearchViewModel.Factory,
+        val controller: SearchResultController,
+        val stringProvider: StringProvider
+) : VectorBaseFragment(), StateView.EventCallback, SearchResultController.Listener {
 
     private val fragmentArgs: SearchArgs by args()
     private val searchViewModel: SearchViewModel by fragmentViewModel()
 
+    private var pendingScrollToPosition: Int? = null
+
     override fun getLayoutResId() = R.layout.fragment_search
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        stateView.contentView = searchResultRecycler
+        stateView.eventCallback = this
+
+        configureRecyclerView()
+
+        searchViewModel.observeViewEvents {
+            when (it) {
+                is SearchViewEvents.Failure -> {
+                    stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(it.throwable))
+                }
+                is SearchViewEvents.Loading -> {
+                    stateView.state = StateView.State.Loading
+                }
+            }.exhaustive
+        }
+    }
+
+    private fun configureRecyclerView() {
+        searchResultRecycler.trackItemsVisibilityChange()
+        searchResultRecycler.configureWith(controller, showDivider = false)
+        controller.listener = this
+
+        controller.addModelBuildListener {
+            pendingScrollToPosition?.let {
+                searchResultRecycler.scrollToPosition(it)
+            }
+        }
+
+        searchResultRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                // Load next batch when scrolled to the top
+                if (newState == RecyclerView.SCROLL_STATE_IDLE
+                        && (searchResultRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() == 0) {
+                    searchViewModel.handle(SearchAction.ScrolledToTop)
+                }
+            }
+        })
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        searchResultRecycler?.cleanup()
+        controller.listener = null
+    }
+
+    override fun invalidate() = withState(searchViewModel) { state ->
+        if (state.searchResult?.results?.isNotEmpty() == true) {
+            stateView.state = StateView.State.Content
+            controller.setData(state)
+
+            val lastBatchSize = state.lastBatch?.results?.size ?: 0
+            val scrollPosition = if (lastBatchSize > 0) lastBatchSize - 1 else 0
+            pendingScrollToPosition = scrollPosition
+        } else {
+            stateView.state = StateView.State.Empty(
+                    title = stringProvider.getString(R.string.search_no_results),
+                    image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search)
+            )
+        }
     }
 
     fun search(query: String) {
-        Timber.d(query)
+        view?.hideKeyboard()
+        searchViewModel.handle(SearchAction.SearchWith(fragmentArgs.roomId, query))
+    }
+
+    override fun onRetryClicked() {
+        searchViewModel.handle(SearchAction.Retry)
+    }
+
+    override fun onItemClicked(event: Event) {
+        event.roomId ?: return
+
+        navigator.openRoom(requireContext(), event.roomId!!, event.eventId)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index de75c0dd20..67befc80be 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -21,10 +21,15 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.search.SearchResult
 
 class SearchViewModel @AssistedInject constructor(
-        @Assisted private val initialState: SearchViewState
+        @Assisted private val initialState: SearchViewState,
+        private val session: Session
 ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
 
     @AssistedInject.Factory
@@ -42,5 +47,90 @@ class SearchViewModel @AssistedInject constructor(
     }
 
     override fun handle(action: SearchAction) {
+        when (action) {
+            is SearchAction.SearchWith    -> handleSearchWith(action)
+            is SearchAction.ScrolledToTop -> handleScrolledToTop()
+            is SearchAction.Retry         -> handleRetry()
+        }.exhaustive
+    }
+
+    private fun handleSearchWith(action: SearchAction.SearchWith) {
+        if (action.searchTerm.length > 1) {
+            setState {
+                copy(searchTerm = action.searchTerm, roomId = action.roomId, isNextBatch = false)
+            }
+
+            startSearching()
+        }
+    }
+
+    private fun handleScrolledToTop() {
+        setState {
+            copy(isNextBatch = true)
+        }
+        startSearching(true)
+    }
+
+    private fun handleRetry() {
+        startSearching()
+    }
+
+    private fun startSearching(scrolledToTop: Boolean = false) = withState { state ->
+        if (state.roomId == null || state.searchTerm == null) return@withState
+
+        // There is no batch to retrieve
+        if (scrolledToTop && state.searchResult?.nextBatch == null) return@withState
+
+        _viewEvents.post(SearchViewEvents.Loading())
+
+        session
+                .getRoom(state.roomId)
+                ?.search(
+                        searchTerm = state.searchTerm,
+                        nextBatch = state.searchResult?.nextBatch,
+                        orderByRecent = true,
+                        beforeLimit = 0,
+                        afterLimit = 0,
+                        includeProfile = true,
+                        limit = 20,
+                        callback = object : MatrixCallback<SearchResult> {
+                            override fun onFailure(failure: Throwable) {
+                                onSearchFailure(failure)
+                            }
+
+                            override fun onSuccess(data: SearchResult) {
+                                onSearchResultSuccess(data)
+                            }
+                        }
+                )
+    }
+
+    private fun onSearchFailure(failure: Throwable) {
+        setState {
+            copy(searchResult = null)
+        }
+        _viewEvents.post(SearchViewEvents.Failure(failure))
+    }
+
+    private fun onSearchResultSuccess(searchResult: SearchResult) = withState { state ->
+        val accumulatedResult = SearchResult(
+                nextBatch = searchResult.nextBatch,
+                results = searchResult.results,
+                highlights = searchResult.highlights
+        )
+
+        // Accumulate results if it is the next batch
+        if (state.isNextBatch) {
+            if (state.searchResult != null) {
+                accumulatedResult.results = accumulatedResult.results?.plus(state.searchResult.results!!)
+            }
+            if (state.searchResult?.highlights != null) {
+                accumulatedResult.highlights = accumulatedResult.highlights?.plus(state.searchResult.highlights!!)
+            }
+        }
+
+        setState {
+            copy(searchResult = accumulatedResult, lastBatch = searchResult)
+        }
     }
 }

From 0df3a8ad986b6c712105d8ae8002017178987e98 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 11:44:17 +0300
Subject: [PATCH 087/278] Changelog added.

---
 CHANGES.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 026d7af6cd..c357515efa 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@ Changes in Element 1.0.9 (2020-XX-XX)
 ===================================================
 
 Features ✨:
+ - Search messages in a room - phase 1 (#2110)
  - Hide encrypted history (before user is invited). Can be shown if wanted in developer settings
 
 Improvements 🙌:
@@ -18,7 +19,7 @@ Translations 🗣:
  -
 
 SDK API changes ⚠️:
- - 
+ - Search messages in a room by using Session.searchService() or Room.search()
 
 Build 🧱:
  - Use Update Gradle Wrapper Action

From 70be853acdbda871fee8f05de2303b151c3e1f9e Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 24 Sep 2020 12:21:31 +0300
Subject: [PATCH 088/278] Update no results found icon.

---
 .../home/room/detail/search/SearchFragment.kt |  2 +-
 .../res/drawable/ic_search_no_results.xml     | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/res/drawable/ic_search_no_results.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 1f8f7fa422..fa60d33e64 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -116,7 +116,7 @@ class SearchFragment @Inject constructor(
         } else {
             stateView.state = StateView.State.Empty(
                     title = stringProvider.getString(R.string.search_no_results),
-                    image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search)
+                    image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results)
             )
         }
     }
diff --git a/vector/src/main/res/drawable/ic_search_no_results.xml b/vector/src/main/res/drawable/ic_search_no_results.xml
new file mode 100644
index 0000000000..24c0f00131
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_search_no_results.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape
+            android:innerRadius="0dp"
+            android:shape="ring"
+            android:thicknessRatio="2"
+            android:useLevel="false">
+            <solid android:color="@android:color/transparent" />
+            <stroke android:width="2dp" />
+        </shape>
+    </item>
+
+    <item
+        android:bottom="14dp"
+        android:drawable="@drawable/ic_search"
+        android:left="14dp"
+        android:right="14dp"
+        android:top="14dp" />
+</layer-list>
\ No newline at end of file

From 430a0d249221f2830135c5b60de26699554ae5cc Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 18:51:30 +0300
Subject: [PATCH 089/278] Create separate search module.

---
 .../sdk/internal/session/SessionComponent.kt  |  4 +-
 .../sdk/internal/session/SessionModule.kt     | 10 -----
 .../sdk/internal/session/room/RoomAPI.kt      | 10 -----
 .../sdk/internal/session/search/SearchAPI.kt  | 36 +++++++++++++++
 .../internal/session/search/SearchModule.kt   | 44 +++++++++++++++++++
 .../sdk/internal/session/search/SearchTask.kt |  5 +--
 6 files changed, 85 insertions(+), 24 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 475450837e..123b87748f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -50,6 +50,7 @@ import org.matrix.android.sdk.internal.session.room.send.EncryptEventWorker
 import org.matrix.android.sdk.internal.session.room.send.MultipleEventSendingDispatcherWorker
 import org.matrix.android.sdk.internal.session.room.send.RedactEventWorker
 import org.matrix.android.sdk.internal.session.room.send.SendEventWorker
+import org.matrix.android.sdk.internal.session.search.SearchModule
 import org.matrix.android.sdk.internal.session.signout.SignOutModule
 import org.matrix.android.sdk.internal.session.sync.SyncModule
 import org.matrix.android.sdk.internal.session.sync.SyncTask
@@ -86,7 +87,8 @@ import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
             ProfileModule::class,
             SessionAssistedInjectModule::class,
             AccountModule::class,
-            CallModule::class
+            CallModule::class,
+            SearchModule::class
         ]
 )
 @SessionScope
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 54478cdc02..5397b8d9bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -39,7 +39,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.AccountDataService
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.permalinks.PermalinkService
-import org.matrix.android.sdk.api.session.search.SearchService
 import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
 import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
 import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
@@ -82,10 +81,7 @@ import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkServic
 import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
 import org.matrix.android.sdk.internal.session.room.create.RoomCreateEventProcessor
 import org.matrix.android.sdk.internal.session.room.prune.RedactionEventProcessor
-import org.matrix.android.sdk.internal.session.search.DefaultSearchService
 import org.matrix.android.sdk.internal.session.room.tombstone.RoomTombstoneEventProcessor
-import org.matrix.android.sdk.internal.session.search.DefaultSearchTask
-import org.matrix.android.sdk.internal.session.search.SearchTask
 import org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService
 import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
 import org.matrix.android.sdk.internal.session.user.accountdata.DefaultAccountDataService
@@ -372,10 +368,4 @@ internal abstract class SessionModule {
 
     @Binds
     abstract fun bindTypingUsersTracker(tracker: DefaultTypingUsersTracker): TypingUsersTracker
-
-    @Binds
-    abstract fun bindSearchService(service: DefaultSearchService): SearchService
-
-    @Binds
-    abstract fun bindSearchTask(task: DefaultSearchTask): SearchTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index db99adbafb..35c20cf5cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -35,13 +35,11 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.InviteBod
 import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
 import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
 import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
-import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
 import org.matrix.android.sdk.internal.session.room.send.SendResponse
 import org.matrix.android.sdk.internal.session.room.tags.TagBody
 import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationResponse
 import org.matrix.android.sdk.internal.session.room.typing.TypingBody
-import org.matrix.android.sdk.internal.session.search.response.SearchResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -367,12 +365,4 @@ internal interface RoomAPI {
     fun deleteTag(@Path("userId") userId: String,
                   @Path("roomId") roomId: String,
                   @Path("tag") tag: String): Call<Unit>
-
-    /**
-     * Performs a full text search across different categories.
-     */
-    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
-    fun search(
-            @Query("next_batch") nextBatch: String?,
-            @Body body: SearchRequestBody): Call<SearchResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
new file mode 100644
index 0000000000..3d5dbc306f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.search
+
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
+import org.matrix.android.sdk.internal.session.search.response.SearchResponse
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+internal interface SearchAPI {
+
+    /**
+     * Performs a full text search across different categories.
+     */
+    @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
+    fun search(
+            @Query("next_batch") nextBatch: String?,
+            @Body body: SearchRequestBody): Call<SearchResponse>
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt
new file mode 100644
index 0000000000..50cf8b8d84
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.search
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import org.matrix.android.sdk.api.session.search.SearchService
+import org.matrix.android.sdk.internal.session.SessionScope
+import retrofit2.Retrofit
+
+@Module
+internal abstract class SearchModule {
+
+    @Module
+    companion object {
+        @Provides
+        @JvmStatic
+        @SessionScope
+        fun providesSearchAPI(retrofit: Retrofit): SearchAPI {
+            return retrofit.create(SearchAPI::class.java)
+        }
+    }
+
+    @Binds
+    abstract fun bindSearchService(service: DefaultSearchService): SearchService
+
+    @Binds
+    abstract fun bindSearchTask(task: DefaultSearchTask): SearchTask
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 4502d2a60a..d36fc80d5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -20,7 +20,6 @@ package org.matrix.android.sdk.internal.session.search
 import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.internal.network.executeRequest
-import org.matrix.android.sdk.internal.session.room.RoomAPI
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestCategories
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestEventContext
@@ -46,7 +45,7 @@ internal interface SearchTask : Task<SearchTask.Params, SearchResult> {
 }
 
 internal class DefaultSearchTask @Inject constructor(
-        private val roomAPI: RoomAPI,
+        private val searchAPI: SearchAPI,
         private val eventBus: EventBus
 ) : SearchTask {
 
@@ -69,7 +68,7 @@ internal class DefaultSearchTask @Inject constructor(
                             )
                     )
             )
-            apiCall = roomAPI.search(params.nextBatch, searchRequestBody)
+            apiCall = searchAPI.search(params.nextBatch, searchRequestBody)
         }.toDomain().apply { results = results?.reversed() }
     }
 

From e21f306635c9cbc110b0992a41bafce0f1220c21 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 19:05:33 +0300
Subject: [PATCH 090/278] Use enum directly instead of its value.

---
 .../android/sdk/internal/session/search/SearchTask.kt      | 2 +-
 .../internal/session/search/request/SearchRequestOrder.kt  | 7 ++++---
 .../session/search/request/SearchRequestRoomEvents.kt      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index d36fc80d5c..a2cad6bb2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -55,7 +55,7 @@ internal class DefaultSearchTask @Inject constructor(
                     searchCategories = SearchRequestCategories(
                             roomEvents = SearchRequestRoomEvents(
                                     searchTerm = params.searchTerm,
-                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT.value else SearchRequestOrder.RANK.value,
+                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
                                     filter = SearchRequestFilter(
                                             limit = params.limit,
                                             rooms = listOf(params.roomId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
index eac51ad2df..f0b6f7bc31 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
@@ -17,13 +17,14 @@
 
 package org.matrix.android.sdk.internal.session.search.request
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
  * Represents the order in which to search for results.
  */
 @JsonClass(generateAdapter = false)
-internal enum class SearchRequestOrder(val value: String) {
-    RANK("rank"),
-    RECENT("recent")
+internal enum class SearchRequestOrder {
+    @Json(name = "rank") RANK,
+    @Json(name = "recent") RECENT
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
index 26b11e93bd..fef1baa990 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
@@ -29,7 +29,7 @@ internal data class SearchRequestRoomEvents(
         val filter: SearchRequestFilter? = null,
         // By default, this is "rank". One of: ["recent", "rank"]
         @Json(name = "order_by")
-        val orderBy: String? = null,
+        val orderBy: SearchRequestOrder? = null,
         // Configures whether any context for the events returned are included in the response.
         @Json(name = "event_context")
         val eventContext: SearchRequestEventContext? = null

From 4683dc3f21bc0048f2a8d8f94d7adf9a078f1efc Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 19:55:56 +0300
Subject: [PATCH 091/278] Documentation added to orderByRecent parameter of the
 search request.

---
 .../main/java/org/matrix/android/sdk/api/session/room/Room.kt    | 1 +
 .../org/matrix/android/sdk/api/session/search/SearchService.kt   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index a27cdad551..86029e5419 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -78,6 +78,7 @@ interface Room :
      * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
      * @param searchTerm the term to search
      * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
+     * @param orderByRecent if true, the most recent message events will return in the first places of the list
      * @param limit the maximum number of events to return.
      * @param beforeLimit how many events before the result are returned.
      * @param afterLimit how many events after the result are returned.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index b089a597e3..0abbdfd958 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -31,6 +31,7 @@ interface SearchService {
      * @param searchTerm the term to search
      * @param roomId the roomId to search term inside
      * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
+     * @param orderByRecent if true, the most recent message events will return in the first places of the list
      * @param limit the maximum number of events to return.
      * @param beforeLimit how many events before the result are returned.
      * @param afterLimit how many events after the result are returned.

From da344fae5190fac24fad4d2ff66a7d92fbe2eb43 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 20:06:39 +0300
Subject: [PATCH 092/278] One case per line.

---
 .../home/room/detail/RoomDetailViewModel.kt       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index f8229731d8..1b5e928843 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -529,16 +529,17 @@ class RoomDetailViewModel @AssistedInject constructor(
             return@withState false
         }
         when (itemId) {
-            R.id.clear_message_queue           ->
+            R.id.clear_message_queue ->
                 // For now always disable when not in developer mode, worker cancellation is not working properly
                 timeline.pendingEventCount() > 0 && vectorPreferences.developerMode()
-            R.id.resend_all                    -> state.asyncRoomSummary()?.hasFailedSending == true
-            R.id.clear_all                     -> state.asyncRoomSummary()?.hasFailedSending == true
-            R.id.open_matrix_apps, R.id.search -> true
+            R.id.resend_all          -> state.asyncRoomSummary()?.hasFailedSending == true
+            R.id.clear_all           -> state.asyncRoomSummary()?.hasFailedSending == true
+            R.id.open_matrix_apps    -> true
             R.id.voice_call,
-            R.id.video_call                    -> true // always show for discoverability
-            R.id.hangup_call                   -> webRtcPeerConnectionManager.currentCall != null
-            else                               -> false
+            R.id.video_call          -> true // always show for discoverability
+            R.id.hangup_call         -> webRtcPeerConnectionManager.currentCall != null
+            R.id.search              -> true
+            else                     -> false
         }
     }
 

From 88ca909689e018bb2ad3098378912afa8c6a9109 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 29 Sep 2020 12:37:44 +0300
Subject: [PATCH 093/278] Remove roomId from SearchAction.

---
 .../app/features/home/room/detail/search/SearchAction.kt     | 2 +-
 .../app/features/home/room/detail/search/SearchFragment.kt   | 2 +-
 .../app/features/home/room/detail/search/SearchViewModel.kt  | 2 +-
 .../app/features/home/room/detail/search/SearchViewState.kt  | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
index d295784a8c..4a2c84e258 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.home.room.detail.search
 import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class SearchAction : VectorViewModelAction {
-    data class SearchWith(val roomId: String, val searchTerm: String) : SearchAction()
+    data class SearchWith(val searchTerm: String) : SearchAction()
     object ScrolledToTop : SearchAction()
     object Retry : SearchAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index fa60d33e64..360a6b6fcc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -123,7 +123,7 @@ class SearchFragment @Inject constructor(
 
     fun search(query: String) {
         view?.hideKeyboard()
-        searchViewModel.handle(SearchAction.SearchWith(fragmentArgs.roomId, query))
+        searchViewModel.handle(SearchAction.SearchWith(query))
     }
 
     override fun onRetryClicked() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 67befc80be..5747e83cad 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -57,7 +57,7 @@ class SearchViewModel @AssistedInject constructor(
     private fun handleSearchWith(action: SearchAction.SearchWith) {
         if (action.searchTerm.length > 1) {
             setState {
-                copy(searchTerm = action.searchTerm, roomId = action.roomId, isNextBatch = false)
+                copy(searchTerm = action.searchTerm, isNextBatch = false)
             }
 
             startSearching()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
index 02db098e68..8c2eb82ad1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -27,4 +27,7 @@ data class SearchViewState(
         val searchTerm: String? = null,
         val roomId: String? = null,
         val isNextBatch: Boolean = false
-) : MvRxState
+) : MvRxState {
+
+    constructor(args: SearchArgs) : this(roomId = args.roomId)
+}

From 0d16fe019efd8c1997951ea3a9d6a05f8bf02c68 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 29 Sep 2020 13:00:02 +0300
Subject: [PATCH 094/278] Do not use string provider in fragment.

---
 .../app/features/home/room/detail/search/SearchFragment.kt  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 360a6b6fcc..1c355bfbfe 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -33,7 +33,6 @@ import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.StringProvider
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_search.*
 import org.matrix.android.sdk.api.session.events.model.Event
@@ -46,8 +45,7 @@ data class SearchArgs(
 
 class SearchFragment @Inject constructor(
         val viewModelFactory: SearchViewModel.Factory,
-        val controller: SearchResultController,
-        val stringProvider: StringProvider
+        val controller: SearchResultController
 ) : VectorBaseFragment(), StateView.EventCallback, SearchResultController.Listener {
 
     private val fragmentArgs: SearchArgs by args()
@@ -115,7 +113,7 @@ class SearchFragment @Inject constructor(
             pendingScrollToPosition = scrollPosition
         } else {
             stateView.state = StateView.State.Empty(
-                    title = stringProvider.getString(R.string.search_no_results),
+                    title = getString(R.string.search_no_results),
                     image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results)
             )
         }

From 5d190a81379f7631de18b328c18448fe7f114be0 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 29 Sep 2020 20:38:58 +0300
Subject: [PATCH 095/278] Use loading item instead of full screen loading.

---
 .../home/room/detail/search/SearchAction.kt   |  2 +-
 .../home/room/detail/search/SearchFragment.kt | 61 ++++++------
 .../detail/search/SearchResultController.kt   | 17 ++++
 .../room/detail/search/SearchViewEvents.kt    |  1 -
 .../room/detail/search/SearchViewModel.kt     | 96 +++++++++++--------
 .../room/detail/search/SearchViewState.kt     |  5 +-
 .../src/main/res/layout/fragment_search.xml   |  3 +-
 7 files changed, 104 insertions(+), 81 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
index 4a2c84e258..36d22f1914 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchAction.kt
@@ -20,6 +20,6 @@ import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class SearchAction : VectorViewModelAction {
     data class SearchWith(val searchTerm: String) : SearchAction()
-    object ScrolledToTop : SearchAction()
+    object LoadMore : SearchAction()
     object Retry : SearchAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 1c355bfbfe..5f943c6031 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -21,14 +21,15 @@ import android.os.Parcelable
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
-import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.trackItemsVisibilityChange
 import im.vector.app.core.platform.StateView
@@ -62,39 +63,19 @@ class SearchFragment @Inject constructor(
         stateView.eventCallback = this
 
         configureRecyclerView()
-
-        searchViewModel.observeViewEvents {
-            when (it) {
-                is SearchViewEvents.Failure -> {
-                    stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(it.throwable))
-                }
-                is SearchViewEvents.Loading -> {
-                    stateView.state = StateView.State.Loading
-                }
-            }.exhaustive
-        }
     }
 
     private fun configureRecyclerView() {
         searchResultRecycler.trackItemsVisibilityChange()
         searchResultRecycler.configureWith(controller, showDivider = false)
+        (searchResultRecycler.layoutManager as? LinearLayoutManager)?.stackFromEnd = true
         controller.listener = this
 
         controller.addModelBuildListener {
             pendingScrollToPosition?.let {
-                searchResultRecycler.scrollToPosition(it)
+                searchResultRecycler.smoothScrollToPosition(it)
             }
         }
-
-        searchResultRecycler.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
-                // Load next batch when scrolled to the top
-                if (newState == RecyclerView.SCROLL_STATE_IDLE
-                        && (searchResultRecycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() == 0) {
-                    searchViewModel.handle(SearchAction.ScrolledToTop)
-                }
-            }
-        })
     }
 
     override fun onDestroy() {
@@ -104,18 +85,26 @@ class SearchFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(searchViewModel) { state ->
-        if (state.searchResult?.results?.isNotEmpty() == true) {
+        if (state.searchResult?.results.isNullOrEmpty()) {
+            when (state.asyncEventsRequest) {
+                is Loading -> {
+                    stateView.state = StateView.State.Loading
+                }
+                is Fail    -> {
+                    stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(state.asyncEventsRequest.error))
+                }
+                is Success -> {
+                    stateView.state = StateView.State.Empty(
+                            title = getString(R.string.search_no_results),
+                            image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results))
+                }
+            }
+        } else {
+            val lastBatchSize = state.lastBatch?.results?.size ?: 0
+            pendingScrollToPosition = if (lastBatchSize > 0) lastBatchSize - 1 else 0
+
             stateView.state = StateView.State.Content
             controller.setData(state)
-
-            val lastBatchSize = state.lastBatch?.results?.size ?: 0
-            val scrollPosition = if (lastBatchSize > 0) lastBatchSize - 1 else 0
-            pendingScrollToPosition = scrollPosition
-        } else {
-            stateView.state = StateView.State.Empty(
-                    title = getString(R.string.search_no_results),
-                    image = ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_no_results)
-            )
         }
     }
 
@@ -133,4 +122,8 @@ class SearchFragment @Inject constructor(
 
         navigator.openRoom(requireContext(), event.roomId!!, event.eventId)
     }
+
+    override fun loadMore() {
+        searchViewModel.handle(SearchAction.LoadMore)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index 82d3120311..39e197e54f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -17,8 +17,10 @@
 package im.vector.app.features.home.room.detail.search
 
 import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.epoxy.VisibilityState
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.ui.list.genericItemHeader
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.Session
@@ -34,8 +36,11 @@ class SearchResultController @Inject constructor(
 
     var listener: Listener? = null
 
+    private var idx = 0
+
     interface Listener {
         fun onItemClicked(event: Event)
+        fun loadMore()
     }
 
     init {
@@ -45,6 +50,18 @@ class SearchResultController @Inject constructor(
     override fun buildModels(data: SearchViewState?) {
         data?.searchResult?.results ?: return
 
+        if (!data.searchResult.nextBatch.isNullOrEmpty()) {
+            loadingItem {
+                // Always use a different id, because we can be notified several times of visibility state changed
+                id("loadMore${idx++}")
+                onVisibilityStateChanged { _, _, visibilityState ->
+                    if (visibilityState == VisibilityState.VISIBLE) {
+                        listener?.loadMore()
+                    }
+                }
+            }
+        }
+
         buildSearchResultItems(data.searchResult.results!!)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
index 41dabd8686..6f07cb765c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewEvents.kt
@@ -20,5 +20,4 @@ import im.vector.app.core.platform.VectorViewEvents
 
 sealed class SearchViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable) : SearchViewEvents()
-    data class Loading(val message: CharSequence? = null) : SearchViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 5747e83cad..9786560d19 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -16,16 +16,21 @@
 
 package im.vector.app.features.home.room.detail.search
 
+import androidx.lifecycle.viewModelScope
+import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
-import org.matrix.android.sdk.api.MatrixCallback
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.search.SearchResult
+import org.matrix.android.sdk.internal.util.awaitCallback
 
 class SearchViewModel @AssistedInject constructor(
         @Assisted private val initialState: SearchViewState,
@@ -48,26 +53,22 @@ class SearchViewModel @AssistedInject constructor(
 
     override fun handle(action: SearchAction) {
         when (action) {
-            is SearchAction.SearchWith    -> handleSearchWith(action)
-            is SearchAction.ScrolledToTop -> handleScrolledToTop()
-            is SearchAction.Retry         -> handleRetry()
+            is SearchAction.SearchWith -> handleSearchWith(action)
+            is SearchAction.LoadMore   -> handleLoadMore()
+            is SearchAction.Retry      -> handleRetry()
         }.exhaustive
     }
 
     private fun handleSearchWith(action: SearchAction.SearchWith) {
         if (action.searchTerm.length > 1) {
             setState {
-                copy(searchTerm = action.searchTerm, isNextBatch = false)
+                copy(searchTerm = action.searchTerm)
             }
-
             startSearching()
         }
     }
 
-    private fun handleScrolledToTop() {
-        setState {
-            copy(isNextBatch = true)
-        }
+    private fun handleLoadMore() {
         startSearching(true)
     }
 
@@ -75,44 +76,51 @@ class SearchViewModel @AssistedInject constructor(
         startSearching()
     }
 
-    private fun startSearching(scrolledToTop: Boolean = false) = withState { state ->
+    private fun startSearching(isNextBatch: Boolean = false) = withState { state ->
         if (state.roomId == null || state.searchTerm == null) return@withState
 
         // There is no batch to retrieve
-        if (scrolledToTop && state.searchResult?.nextBatch == null) return@withState
+        if (isNextBatch && state.searchResult?.nextBatch == null) return@withState
 
-        _viewEvents.post(SearchViewEvents.Loading())
-
-        session
-                .getRoom(state.roomId)
-                ?.search(
-                        searchTerm = state.searchTerm,
-                        nextBatch = state.searchResult?.nextBatch,
-                        orderByRecent = true,
-                        beforeLimit = 0,
-                        afterLimit = 0,
-                        includeProfile = true,
-                        limit = 20,
-                        callback = object : MatrixCallback<SearchResult> {
-                            override fun onFailure(failure: Throwable) {
-                                onSearchFailure(failure)
-                            }
-
-                            override fun onSuccess(data: SearchResult) {
-                                onSearchResultSuccess(data)
-                            }
-                        }
+        // Show full screen loading just for the clean search
+        if (!isNextBatch) {
+            setState {
+                copy(
+                        asyncEventsRequest = Loading()
                 )
-    }
-
-    private fun onSearchFailure(failure: Throwable) {
-        setState {
-            copy(searchResult = null)
+            }
+        }
+
+        viewModelScope.launch {
+            try {
+                val result = awaitCallback<SearchResult> {
+                    session
+                            .getRoom(state.roomId)
+                            ?.search(
+                                    searchTerm = state.searchTerm,
+                                    nextBatch = state.searchResult?.nextBatch,
+                                    orderByRecent = true,
+                                    beforeLimit = 0,
+                                    afterLimit = 0,
+                                    includeProfile = true,
+                                    limit = 20,
+                                    callback = it
+                            )
+                }
+                onSearchResultSuccess(result, isNextBatch)
+            } catch (failure: Throwable) {
+                _viewEvents.post(SearchViewEvents.Failure(failure))
+                setState {
+                    copy(
+                            asyncEventsRequest = Fail(failure),
+                            searchResult = null
+                    )
+                }
+            }
         }
-        _viewEvents.post(SearchViewEvents.Failure(failure))
     }
 
-    private fun onSearchResultSuccess(searchResult: SearchResult) = withState { state ->
+    private fun onSearchResultSuccess(searchResult: SearchResult, isNextBatch: Boolean) = withState { state ->
         val accumulatedResult = SearchResult(
                 nextBatch = searchResult.nextBatch,
                 results = searchResult.results,
@@ -120,7 +128,7 @@ class SearchViewModel @AssistedInject constructor(
         )
 
         // Accumulate results if it is the next batch
-        if (state.isNextBatch) {
+        if (isNextBatch) {
             if (state.searchResult != null) {
                 accumulatedResult.results = accumulatedResult.results?.plus(state.searchResult.results!!)
             }
@@ -130,7 +138,11 @@ class SearchViewModel @AssistedInject constructor(
         }
 
         setState {
-            copy(searchResult = accumulatedResult, lastBatch = searchResult)
+            copy(
+                    searchResult = accumulatedResult,
+                    lastBatch = searchResult,
+                    asyncEventsRequest = Success(Unit)
+            )
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
index 8c2eb82ad1..3873769c44 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -16,7 +16,9 @@
 
 package im.vector.app.features.home.room.detail.search
 
+import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
 import org.matrix.android.sdk.api.session.search.SearchResult
 
 data class SearchViewState(
@@ -26,7 +28,8 @@ data class SearchViewState(
         val lastBatch: SearchResult? = null,
         val searchTerm: String? = null,
         val roomId: String? = null,
-        val isNextBatch: Boolean = false
+        // Current pagination request
+        val asyncEventsRequest: Async<Unit> = Uninitialized
 ) : MvRxState {
 
     constructor(args: SearchArgs) : this(roomId = args.roomId)
diff --git a/vector/src/main/res/layout/fragment_search.xml b/vector/src/main/res/layout/fragment_search.xml
index 5478e1f68c..757168850b 100644
--- a/vector/src/main/res/layout/fragment_search.xml
+++ b/vector/src/main/res/layout/fragment_search.xml
@@ -2,8 +2,7 @@
 <im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/stateView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?riotx_header_panel_background">
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/searchResultRecycler"

From 4dbeaeb46508efe525e4ea59a8061449a3c5f689 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 29 Sep 2020 20:46:47 +0300
Subject: [PATCH 096/278] Do not use hard wrapping.

---
 .../app/features/home/room/detail/search/SearchFragment.kt  | 6 +++---
 .../home/room/detail/search/SearchResultController.kt       | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 5f943c6031..9f024f50f3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -118,9 +118,9 @@ class SearchFragment @Inject constructor(
     }
 
     override fun onItemClicked(event: Event) {
-        event.roomId ?: return
-
-        navigator.openRoom(requireContext(), event.roomId!!, event.eventId)
+        event.roomId?.let {
+            navigator.openRoom(requireContext(), it, event.eventId)
+        }
     }
 
     override fun loadMore() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index 39e197e54f..cf79ed0ea6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -48,9 +48,7 @@ class SearchResultController @Inject constructor(
     }
 
     override fun buildModels(data: SearchViewState?) {
-        data?.searchResult?.results ?: return
-
-        if (!data.searchResult.nextBatch.isNullOrEmpty()) {
+        if (!data?.searchResult?.nextBatch.isNullOrEmpty()) {
             loadingItem {
                 // Always use a different id, because we can be notified several times of visibility state changed
                 id("loadMore${idx++}")
@@ -62,7 +60,7 @@ class SearchResultController @Inject constructor(
             }
         }
 
-        buildSearchResultItems(data.searchResult.results!!)
+        buildSearchResultItems(data?.searchResult?.results.orEmpty())
     }
 
     private fun buildSearchResultItems(events: List<Event>) {

From d4a0659483e8ee12ada1616639be5d52df0e69e5 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 30 Sep 2020 10:58:32 +0300
Subject: [PATCH 097/278] Init room in constructor.

---
 .../room/detail/search/SearchViewModel.kt     | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 9786560d19..62fb9c8ae9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.search.SearchResult
 import org.matrix.android.sdk.internal.util.awaitCallback
 
@@ -37,6 +38,12 @@ class SearchViewModel @AssistedInject constructor(
         private val session: Session
 ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
 
+    private var room: Room? = null
+
+    init {
+        room = initialState.roomId?.let { session.getRoom(it) }
+    }
+
     @AssistedInject.Factory
     interface Factory {
         fun create(initialState: SearchViewState): SearchViewModel
@@ -94,18 +101,16 @@ class SearchViewModel @AssistedInject constructor(
         viewModelScope.launch {
             try {
                 val result = awaitCallback<SearchResult> {
-                    session
-                            .getRoom(state.roomId)
-                            ?.search(
-                                    searchTerm = state.searchTerm,
-                                    nextBatch = state.searchResult?.nextBatch,
-                                    orderByRecent = true,
-                                    beforeLimit = 0,
-                                    afterLimit = 0,
-                                    includeProfile = true,
-                                    limit = 20,
-                                    callback = it
-                            )
+                    room?.search(
+                            searchTerm = state.searchTerm,
+                            nextBatch = state.searchResult?.nextBatch,
+                            orderByRecent = true,
+                            beforeLimit = 0,
+                            afterLimit = 0,
+                            includeProfile = true,
+                            limit = 20,
+                            callback = it
+                    )
                 }
                 onSearchResultSuccess(result, isNextBatch)
             } catch (failure: Throwable) {

From 0838cbaf03d9e075261e449601a7940f608d62a4 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 30 Sep 2020 11:07:09 +0300
Subject: [PATCH 098/278] UI fixes.

---
 vector/src/main/res/layout/item_search_result.xml | 4 +++-
 vector/src/main/res/menu/menu_timeline.xml        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml
index 9946a2fb50..73f949f777 100644
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@@ -49,9 +49,11 @@
 
     <TextView
         android:id="@+id/messageContentView"
-        style="@style/TimelineContentStubBaseParams"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="4dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/messageMemberNameView"
         app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index 7e6cb277d2..e0566ccf6d 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/search"
         android:title="@string/search"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/video_call"

From 08cc439306bb6e6cebea745b31fa3387f27745b1 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 30 Sep 2020 11:45:46 +0300
Subject: [PATCH 099/278] Cancel previous search task before starting new one.

---
 .../home/room/detail/search/SearchViewModel.kt        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 62fb9c8ae9..e9cca86e30 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -28,9 +28,11 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.search.SearchResult
+import org.matrix.android.sdk.api.util.Cancelable
 import org.matrix.android.sdk.internal.util.awaitCallback
 
 class SearchViewModel @AssistedInject constructor(
@@ -39,6 +41,7 @@ class SearchViewModel @AssistedInject constructor(
 ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
 
     private var room: Room? = null
+    private var currentTask: Cancelable? = null
 
     init {
         room = initialState.roomId?.let { session.getRoom(it) }
@@ -98,10 +101,14 @@ class SearchViewModel @AssistedInject constructor(
             }
         }
 
+        if (state.asyncEventsRequest is Loading) {
+            currentTask?.cancel()
+        }
+
         viewModelScope.launch {
             try {
                 val result = awaitCallback<SearchResult> {
-                    room?.search(
+                    currentTask = room?.search(
                             searchTerm = state.searchTerm,
                             nextBatch = state.searchResult?.nextBatch,
                             orderByRecent = true,
@@ -114,6 +121,8 @@ class SearchViewModel @AssistedInject constructor(
                 }
                 onSearchResultSuccess(result, isNextBatch)
             } catch (failure: Throwable) {
+                if (failure is Failure.Cancelled) return@launch
+
                 _viewEvents.post(SearchViewEvents.Failure(failure))
                 setState {
                     copy(

From 6e814678081afc535c8eb32fbf4f0bd31ba24ad0 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 30 Sep 2020 12:39:42 +0300
Subject: [PATCH 100/278] If SearchActivity is in the stack, use it.

---
 .../app/features/home/room/detail/search/SearchActivity.kt       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
index 70205eed62..24069a37c3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
@@ -70,6 +70,7 @@ class SearchActivity : VectorBaseActivity() {
 
         fun newIntent(context: Context, args: SearchArgs): Intent {
             return Intent(context, SearchActivity::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
                 putExtra(MvRx.KEY_ARG, args)
             }
         }

From ae346646e4f0fda00eb0810d8f30bd6c0437cc2c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Oct 2020 15:05:42 +0200
Subject: [PATCH 101/278] Cleanup

---
 .../roomprofile/uploads/RoomUploadsFragment.kt       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index b3f5047df4..876b585a59 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -23,23 +23,21 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.tabs.TabLayoutMediator
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_uploads.*
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomUploadsFragment @Inject constructor(
         private val viewModelFactory: RoomUploadsViewModel.Factory,
-        private val stringProvider: StringProvider,
         private val avatarRenderer: AvatarRenderer,
         private val notificationUtils: NotificationUtils
 ) : VectorBaseFragment(), RoomUploadsViewModel.Factory by viewModelFactory {
@@ -58,8 +56,8 @@ class RoomUploadsFragment @Inject constructor(
 
         TabLayoutMediator(roomUploadsTabs, roomUploadsViewPager) { tab, position ->
             when (position) {
-                0 -> tab.text = stringProvider.getString(R.string.uploads_media_title)
-                1 -> tab.text = stringProvider.getString(R.string.uploads_files_title)
+                0 -> tab.text = getString(R.string.uploads_media_title)
+                1 -> tab.text = getString(R.string.uploads_files_title)
             }
         }.attach()
 
@@ -70,7 +68,7 @@ class RoomUploadsFragment @Inject constructor(
                 is RoomUploadsViewEvents.FileReadyForSharing -> {
                     shareMedia(requireContext(), it.file, getMimeTypeFromUri(requireContext(), it.file.toUri()))
                 }
-                is RoomUploadsViewEvents.FileReadyForSaving  -> {
+                is RoomUploadsViewEvents.FileReadyForSaving -> {
                     saveMedia(
                             context = requireContext(),
                             file = it.file,
@@ -79,7 +77,7 @@ class RoomUploadsFragment @Inject constructor(
                             notificationUtils = notificationUtils
                     )
                 }
-                is RoomUploadsViewEvents.Failure             -> showFailure(it.throwable)
+                is RoomUploadsViewEvents.Failure -> showFailure(it.throwable)
             }.exhaustive
         }
     }

From 4649b2ac1daad64e04c2c1a290f7c3e521653297 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Oct 2020 16:09:06 +0200
Subject: [PATCH 102/278] Code review

---
 .../sdk/api/session/search/SearchResult.kt    | 17 ++++--
 .../sdk/internal/session/DefaultSession.kt    |  4 +-
 .../sdk/internal/session/search/SearchAPI.kt  |  6 +-
 .../sdk/internal/session/search/SearchTask.kt |  4 +-
 .../search/request/SearchRequestBody.kt       |  3 +
 .../search/request/SearchRequestCategories.kt |  4 +-
 .../search/request/SearchRequestRoomEvents.kt | 37 +++++++++++--
 .../session/search/response/SearchResponse.kt |  6 +-
 .../response/SearchResponseCategories.kt      |  5 +-
 .../search/response/SearchResponseItem.kt     | 19 +++++--
 .../response/SearchResponseRoomEvents.kt      |  2 +-
 .../home/room/detail/search/SearchFragment.kt | 10 ++--
 .../detail/search/SearchResultController.kt   | 13 ++---
 .../room/detail/search/SearchResultItem.kt    | 24 ++++----
 .../room/detail/search/SearchViewModel.kt     | 55 ++++++++-----------
 .../room/detail/search/SearchViewState.kt     | 11 ++--
 .../src/main/res/layout/activity_search.xml   |  4 +-
 .../src/main/res/layout/fragment_search.xml   |  4 +-
 18 files changed, 138 insertions(+), 90 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
index 4529bf6d13..59d1c4d46d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
@@ -23,10 +23,17 @@ import org.matrix.android.sdk.api.session.events.model.Event
  * Domain class to represent the response of a search request in a room.
  */
 data class SearchResult(
-        // Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call. If this field is absent, there are no more results.
+        /**
+         * Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call.
+         * If this field is null, there are no more results.
+         */
         val nextBatch: String? = null,
-        // List of words which should be highlighted, useful for stemming which may change the query terms.
-        var highlights: List<String>? = null,
-        // List of results in the requested order.
-        var results: List<Event>? = null
+        /**
+         *  List of words which should be highlighted, useful for stemming which may change the query terms.
+         */
+        val highlights: List<String>? = null,
+        /**
+         * List of results in the requested order.
+         */
+        val results: List<Event>? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index 34b6be225b..d1c0844caa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -96,6 +96,7 @@ internal class DefaultSession @Inject constructor(
         private val pushRuleService: Lazy<PushRuleService>,
         private val pushersService: Lazy<PushersService>,
         private val termsService: Lazy<TermsService>,
+        private val searchService: Lazy<SearchService>,
         private val cryptoService: Lazy<DefaultCryptoService>,
         private val defaultFileService: Lazy<FileService>,
         private val permalinkService: Lazy<PermalinkService>,
@@ -121,8 +122,7 @@ internal class DefaultSession @Inject constructor(
         private val taskExecutor: TaskExecutor,
         private val callSignalingService: Lazy<CallSignalingService>,
         @UnauthenticatedWithCertificate
-        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>,
-        private val searchService: Lazy<SearchService>
+        private val unauthenticatedWithCertificateOkHttpClient: Lazy<OkHttpClient>
 ) : Session,
         RoomService by roomService.get(),
         RoomDirectoryService by roomDirectoryService.get(),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
index 3d5dbc306f..a903cd8cc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
@@ -28,9 +28,9 @@ internal interface SearchAPI {
 
     /**
      * Performs a full text search across different categories.
+     * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-search
      */
     @POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "search")
-    fun search(
-            @Query("next_batch") nextBatch: String?,
-            @Body body: SearchRequestBody): Call<SearchResponse>
+    fun search(@Query("next_batch") nextBatch: String?,
+               @Body body: SearchRequestBody): Call<SearchResponse>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index a2cad6bb2f..3bb65fb8da 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -69,14 +69,14 @@ internal class DefaultSearchTask @Inject constructor(
                     )
             )
             apiCall = searchAPI.search(params.nextBatch, searchRequestBody)
-        }.toDomain().apply { results = results?.reversed() }
+        }.toDomain()
     }
 
     private fun SearchResponse.toDomain(): SearchResult {
         return SearchResult(
                 nextBatch = searchCategories.roomEvents?.nextBatch,
                 highlights = searchCategories.roomEvents?.highlights,
-                results = searchCategories.roomEvents?.results?.map { it.event }
+                results = searchCategories.roomEvents?.results?.map { it.event }?.reversed()
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
index 000f89e751..7cf86457d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
@@ -22,6 +22,9 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class SearchRequestBody(
+        /**
+         * Required. Describes which categories to search in and their criteria.
+         */
         @Json(name = "search_categories")
         val searchCategories: SearchRequestCategories
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
index 606b7320e5..9d87114237 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
@@ -22,7 +22,9 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class SearchRequestCategories(
-        // Mapping of category name to search criteria.
+        /**
+         * Mapping of category name to search criteria.
+         */
         @Json(name = "room_events")
         val roomEvents: SearchRequestRoomEvents? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
index fef1baa990..c5234b1052 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
@@ -22,15 +22,44 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class SearchRequestRoomEvents(
-        // Required. The string to search events for.
+        /**
+         * Required. The string to search events for.
+         */
         @Json(name = "search_term")
         val searchTerm: String,
+
+        /**
+         * The keys to search. Defaults to all. One of: ["content.body", "content.name", "content.topic"]
+         */
+        @Json(name = "keys")
+        val keys: Any? = null,
+
+        /**
+         * This takes a filter.
+         */
         @Json(name = "filter")
         val filter: SearchRequestFilter? = null,
-        // By default, this is "rank". One of: ["recent", "rank"]
+
+        /**
+         * The order in which to search for results. By default, this is "rank". One of: ["recent", "rank"]
+         */
         @Json(name = "order_by")
         val orderBy: SearchRequestOrder? = null,
-        // Configures whether any context for the events returned are included in the response.
+
+        /**
+         * Configures whether any context for the events returned are included in the response.
+         */
         @Json(name = "event_context")
-        val eventContext: SearchRequestEventContext? = null
+        val eventContext: SearchRequestEventContext? = null,
+
+        /**
+         * Requests the server return the current state for each room returned.
+         */
+        @Json(name = "include_state")
+        val include_state: Boolean? = null
+
+        /**
+         * Requests that the server partitions the result set based on the provided list of keys.
+         */
+        // val groupings: SearchRequestGroupings? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
index b7debb6b1e..8e11ba1468 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
@@ -21,8 +21,10 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchResponse(
-        // Required. Describes which categories to search in and their criteria.
+internal data class SearchResponse(
+        /**
+         * Required. Describes which categories to search in and their criteria.
+         */
         @Json(name = "search_categories")
         val searchCategories: SearchResponseCategories
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
index c931b23826..8e46502e27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
@@ -21,7 +21,10 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class SearchResponseCategories(
+internal data class SearchResponseCategories(
+        /**
+         * Mapping of category name to search criteria.
+         */
         @Json(name = "room_events")
         val roomEvents: SearchResponseRoomEvents? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
index 7c675f0593..5b0806ce85 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
@@ -22,11 +22,22 @@ import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Event
 
 @JsonClass(generateAdapter = true)
-data class SearchResponseItem(
-        // A number that describes how closely this result matches the search. Higher is closer.
+internal data class SearchResponseItem(
+        /**
+         *  A number that describes how closely this result matches the search. Higher is closer.
+         */
         @Json(name = "rank")
         val rank: Double? = null,
-        // The event that matched.
+
+        /**
+         * The event that matched.
+         */
         @Json(name = "result")
-        val event: Event
+        val event: Event,
+
+        /**
+         * Context for result, if requested.
+         */
+        @Json(name = "context")
+        val context: SearchResponseEventContext? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
index 61ed2bf3cf..1078b9a9f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
@@ -21,7 +21,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-class SearchResponseRoomEvents(
+internal data class SearchResponseRoomEvents(
         // List of results in the requested order.
         @Json(name = "results")
         val results: List<SearchResponseItem>? = null,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 9f024f50f3..ea7ba8f464 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -46,7 +46,7 @@ data class SearchArgs(
 
 class SearchFragment @Inject constructor(
         val viewModelFactory: SearchViewModel.Factory,
-        val controller: SearchResultController
+        private val controller: SearchResultController
 ) : VectorBaseFragment(), StateView.EventCallback, SearchResultController.Listener {
 
     private val fragmentArgs: SearchArgs by args()
@@ -85,13 +85,13 @@ class SearchFragment @Inject constructor(
     }
 
     override fun invalidate() = withState(searchViewModel) { state ->
-        if (state.searchResult?.results.isNullOrEmpty()) {
-            when (state.asyncEventsRequest) {
+        if (state.searchResult.isNullOrEmpty()) {
+            when (state.asyncSearchRequest) {
                 is Loading -> {
                     stateView.state = StateView.State.Loading
                 }
                 is Fail    -> {
-                    stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(state.asyncEventsRequest.error))
+                    stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(state.asyncSearchRequest.error))
                 }
                 is Success -> {
                     stateView.state = StateView.State.Empty(
@@ -100,7 +100,7 @@ class SearchFragment @Inject constructor(
                 }
             }
         } else {
-            val lastBatchSize = state.lastBatch?.results?.size ?: 0
+            val lastBatchSize = state.lastBatch?.size ?: 0
             pendingScrollToPosition = if (lastBatchSize > 0) lastBatchSize - 1 else 0
 
             stateView.state = StateView.State.Content
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index cf79ed0ea6..8daa4f60e4 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -48,7 +48,9 @@ class SearchResultController @Inject constructor(
     }
 
     override fun buildModels(data: SearchViewState?) {
-        if (!data?.searchResult?.nextBatch.isNullOrEmpty()) {
+        data ?: return
+
+        if (data.hasMoreResult) {
             loadingItem {
                 // Always use a different id, because we can be notified several times of visibility state changed
                 id("loadMore${idx++}")
@@ -60,7 +62,7 @@ class SearchResultController @Inject constructor(
             }
         }
 
-        buildSearchResultItems(data?.searchResult?.results.orEmpty())
+        buildSearchResultItems(data.searchResult.orEmpty())
     }
 
     private fun buildSearchResultItems(events: List<Event>) {
@@ -83,12 +85,9 @@ class SearchResultController @Inject constructor(
                 avatarRenderer(avatarRenderer)
                 dateFormatter(dateFormatter)
                 event(event)
+                // I think we should use the data returned by the server?
                 sender(event.senderId?.let { session.getUser(it) })
-                listener(object : SearchResultItem.Listener {
-                    override fun onItemClicked() {
-                        listener?.onItemClicked(event)
-                    }
-                })
+                listener { listener?.onItemClicked(event) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
index fb0121cbcf..2d569c1c6a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
@@ -23,8 +23,10 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
+import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.user.model.User
@@ -33,21 +35,21 @@ import org.matrix.android.sdk.api.util.toMatrixItem
 @EpoxyModelClass(layout = R.layout.item_search_result)
 abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
 
-    @EpoxyAttribute var avatarRenderer: AvatarRenderer? = null
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute var dateFormatter: VectorDateFormatter? = null
-    @EpoxyAttribute var event: Event? = null
+    @EpoxyAttribute lateinit var event: Event
     @EpoxyAttribute var sender: User? = null
-    @EpoxyAttribute var listener: Listener? = null
+    @EpoxyAttribute var listener: ClickListener? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
-        event ?: return
 
-        holder.view.setOnClickListener { listener?.onItemClicked() }
-        sender?.toMatrixItem()?.let { avatarRenderer?.render(it, holder.avatarImageView) }
-        holder.memberNameView.text = sender?.displayName
-        holder.timeView.text = dateFormatter?.format(event!!.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
-        holder.contentView.text = event?.content?.get("body") as? String
+        holder.view.onClick(listener)
+        sender?.toMatrixItem()?.let { avatarRenderer.render(it, holder.avatarImageView) }
+        holder.memberNameView.text = sender?.getBestName()
+        holder.timeView.text = dateFormatter?.format(event.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
+        // TODO Improve that (use formattedBody, etc.)
+        holder.contentView.text = event.content?.get("body") as? String
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -56,8 +58,4 @@ abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
         val timeView by bind<TextView>(R.id.messageTimeView)
         val contentView by bind<TextView>(R.id.messageContentView)
     }
-
-    interface Listener {
-        fun onItemClicked()
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index e9cca86e30..6703815f57 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -37,15 +37,14 @@ import org.matrix.android.sdk.internal.util.awaitCallback
 
 class SearchViewModel @AssistedInject constructor(
         @Assisted private val initialState: SearchViewState,
-        private val session: Session
+        session: Session
 ) : VectorViewModel<SearchViewState, SearchAction, SearchViewEvents>(initialState) {
 
-    private var room: Room? = null
+    private var room: Room? = session.getRoom(initialState.roomId)
+
     private var currentTask: Cancelable? = null
 
-    init {
-        room = initialState.roomId?.let { session.getRoom(it) }
-    }
+    private var nextBatch: String? = null
 
     @AssistedInject.Factory
     interface Factory {
@@ -64,8 +63,8 @@ class SearchViewModel @AssistedInject constructor(
     override fun handle(action: SearchAction) {
         when (action) {
             is SearchAction.SearchWith -> handleSearchWith(action)
-            is SearchAction.LoadMore   -> handleLoadMore()
-            is SearchAction.Retry      -> handleRetry()
+            is SearchAction.LoadMore -> handleLoadMore()
+            is SearchAction.Retry -> handleRetry()
         }.exhaustive
     }
 
@@ -74,7 +73,7 @@ class SearchViewModel @AssistedInject constructor(
             setState {
                 copy(searchTerm = action.searchTerm)
             }
-            startSearching()
+            startSearching(false)
         }
     }
 
@@ -83,25 +82,25 @@ class SearchViewModel @AssistedInject constructor(
     }
 
     private fun handleRetry() {
-        startSearching()
+        startSearching(false)
     }
 
-    private fun startSearching(isNextBatch: Boolean = false) = withState { state ->
-        if (state.roomId == null || state.searchTerm == null) return@withState
+    private fun startSearching(isNextBatch: Boolean) = withState { state ->
+        if (state.searchTerm == null) return@withState
 
         // There is no batch to retrieve
-        if (isNextBatch && state.searchResult?.nextBatch == null) return@withState
+        if (isNextBatch && nextBatch == null) return@withState
 
         // Show full screen loading just for the clean search
         if (!isNextBatch) {
             setState {
                 copy(
-                        asyncEventsRequest = Loading()
+                        asyncSearchRequest = Loading()
                 )
             }
         }
 
-        if (state.asyncEventsRequest is Loading) {
+        if (state.asyncSearchRequest is Loading) {
             currentTask?.cancel()
         }
 
@@ -110,7 +109,7 @@ class SearchViewModel @AssistedInject constructor(
                 val result = awaitCallback<SearchResult> {
                     currentTask = room?.search(
                             searchTerm = state.searchTerm,
-                            nextBatch = state.searchResult?.nextBatch,
+                            nextBatch = nextBatch,
                             orderByRecent = true,
                             beforeLimit = 0,
                             afterLimit = 0,
@@ -126,7 +125,7 @@ class SearchViewModel @AssistedInject constructor(
                 _viewEvents.post(SearchViewEvents.Failure(failure))
                 setState {
                     copy(
-                            asyncEventsRequest = Fail(failure),
+                            asyncSearchRequest = Fail(failure),
                             searchResult = null
                     )
                 }
@@ -135,27 +134,19 @@ class SearchViewModel @AssistedInject constructor(
     }
 
     private fun onSearchResultSuccess(searchResult: SearchResult, isNextBatch: Boolean) = withState { state ->
-        val accumulatedResult = SearchResult(
-                nextBatch = searchResult.nextBatch,
-                results = searchResult.results,
-                highlights = searchResult.highlights
-        )
-
         // Accumulate results if it is the next batch
-        if (isNextBatch) {
-            if (state.searchResult != null) {
-                accumulatedResult.results = accumulatedResult.results?.plus(state.searchResult.results!!)
-            }
-            if (state.searchResult?.highlights != null) {
-                accumulatedResult.highlights = accumulatedResult.highlights?.plus(state.searchResult.highlights!!)
-            }
-        }
+        val accumulatedResult = searchResult.results.orEmpty().plus(state.searchResult?.takeIf { isNextBatch }.orEmpty())
+
+        // Note: We do not care about the highlights for the moment, but it will be the same algorithm
+
+        nextBatch = searchResult.nextBatch
 
         setState {
             copy(
                     searchResult = accumulatedResult,
-                    lastBatch = searchResult,
-                    asyncEventsRequest = Success(Unit)
+                    hasMoreResult = !nextBatch.isNullOrEmpty(),
+                    lastBatch = searchResult.results,
+                    asyncSearchRequest = Success(Unit)
             )
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
index 3873769c44..72da1ca940 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -19,17 +19,18 @@ package im.vector.app.features.home.room.detail.search
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.search.SearchResult
+import org.matrix.android.sdk.api.session.events.model.Event
 
 data class SearchViewState(
         // Accumulated search result
-        val searchResult: SearchResult? = null,
+        val searchResult: List<Event>? = null,
+        val hasMoreResult: Boolean = false,
         // Last batch result will help RecyclerView to position itself
-        val lastBatch: SearchResult? = null,
+        val lastBatch: List<Event>? = null,
         val searchTerm: String? = null,
-        val roomId: String? = null,
+        val roomId: String = "",
         // Current pagination request
-        val asyncEventsRequest: Async<Unit> = Uninitialized
+        val asyncSearchRequest: Async<Unit> = Uninitialized
 ) : MvRxState {
 
     constructor(args: SearchArgs) : this(roomId = args.roomId)
diff --git a/vector/src/main/res/layout/activity_search.xml b/vector/src/main/res/layout/activity_search.xml
index a3aa21eecc..2268bf932c 100644
--- a/vector/src/main/res/layout/activity_search.xml
+++ b/vector/src/main/res/layout/activity_search.xml
@@ -24,8 +24,8 @@
                 style="@style/VectorSearchView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:queryHint="@string/search_hint"
-                android:backgroundTint="@color/base_color" />
+                android:backgroundTint="@color/base_color"
+                app:queryHint="@string/search_hint" />
 
         </androidx.appcompat.widget.Toolbar>
 
diff --git a/vector/src/main/res/layout/fragment_search.xml b/vector/src/main/res/layout/fragment_search.xml
index 757168850b..330e70d86b 100644
--- a/vector/src/main/res/layout/fragment_search.xml
+++ b/vector/src/main/res/layout/fragment_search.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <im.vector.app.core.platform.StateView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/stateView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -8,6 +9,7 @@
         android:id="@+id/searchResultRecycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:overScrollMode="always" />
+        android:overScrollMode="always"
+        tools:listitem="@layout/item_search_result" />
 
 </im.vector.app.core.platform.StateView>
\ No newline at end of file

From 3705fa14bd863108e48b9e820f23ff00ad71cba8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Oct 2020 17:03:53 +0200
Subject: [PATCH 103/278] Use sender data return from search result

---
 .../android/sdk/api/session/room/Room.kt      |  1 +
 .../sdk/api/session/search/SearchResult.kt    |  8 ++++-
 .../sdk/api/session/search/SearchService.kt   |  1 +
 .../sdk/internal/session/search/SearchTask.kt | 18 ++++++++++-
 .../response/SearchResponseEventContext.kt    |  2 +-
 .../home/room/detail/search/SearchActivity.kt |  3 +-
 .../home/room/detail/search/SearchFragment.kt |  5 ++--
 .../detail/search/SearchResultController.kt   | 20 +++++++------
 .../room/detail/search/SearchResultItem.kt    | 10 +++----
 .../room/detail/search/SearchViewModel.kt     | 30 +++++++++++--------
 .../room/detail/search/SearchViewState.kt     |  8 ++---
 11 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 86029e5419..9afff5f59c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -83,6 +83,7 @@ interface Room :
      * @param beforeLimit how many events before the result are returned.
      * @param afterLimit how many events after the result are returned.
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
+     * @param callback Callback to get the search result
      */
     fun search(searchTerm: String,
                nextBatch: String?,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
index 59d1c4d46d..e95d7fab19 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
@@ -18,6 +18,7 @@
 package org.matrix.android.sdk.api.session.search
 
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
  * Domain class to represent the response of a search request in a room.
@@ -35,5 +36,10 @@ data class SearchResult(
         /**
          * List of results in the requested order.
          */
-        val results: List<Event>? = null
+        val results: List<EventAndSender>? = null
+)
+
+data class EventAndSender(
+        val event: Event,
+        val sender: MatrixItem.UserItem?
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index 0abbdfd958..a8c9e79ba9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -36,6 +36,7 @@ interface SearchService {
      * @param beforeLimit how many events before the result are returned.
      * @param afterLimit how many events after the result are returned.
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
+     * @param callback Callback to get the search result
      */
     fun search(searchTerm: String,
                roomId: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 3bb65fb8da..c90068e507 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -18,7 +18,9 @@
 package org.matrix.android.sdk.internal.session.search
 
 import org.greenrobot.eventbus.EventBus
+import org.matrix.android.sdk.api.session.search.EventAndSender
 import org.matrix.android.sdk.api.session.search.SearchResult
+import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
 import org.matrix.android.sdk.internal.session.search.request.SearchRequestCategories
@@ -76,7 +78,21 @@ internal class DefaultSearchTask @Inject constructor(
         return SearchResult(
                 nextBatch = searchCategories.roomEvents?.nextBatch,
                 highlights = searchCategories.roomEvents?.highlights,
-                results = searchCategories.roomEvents?.results?.map { it.event }?.reversed()
+                results = searchCategories.roomEvents?.results?.map { searchResponseItem ->
+                    EventAndSender(
+                            searchResponseItem.event,
+                            searchResponseItem.event.senderId?.let { senderId ->
+                                searchResponseItem.context?.profileInfo?.get(senderId)
+                                        ?.let {
+                                            MatrixItem.UserItem(
+                                                    senderId,
+                                                    it["displayname"] as? String,
+                                                    it["avatar_url"] as? String
+                                            )
+                                        }
+                            }
+                    )
+                }?.reversed()
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
index 596645c355..f4d8699b2d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
@@ -38,5 +38,5 @@ internal data class SearchResponseEventContext(
         val end: String? = null,
         // The historic profile information of the users that sent the events returned. The string key is the user ID for which the profile belongs to.
         @Json(name = "profile_info")
-        val profileInfo: JsonDict? = null
+        val profileInfo: Map<String, JsonDict>? = null
 )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
index 24069a37c3..f85dccbb27 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchActivity.kt
@@ -70,7 +70,8 @@ class SearchActivity : VectorBaseActivity() {
 
         fun newIntent(context: Context, args: SearchArgs): Intent {
             return Intent(context, SearchActivity::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
+                // If we do that we will have the same room two times on the stack. Let's allow infinite stack for the moment.
+                // flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
                 putExtra(MvRx.KEY_ARG, args)
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index ea7ba8f464..666f5b3d38 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -90,7 +90,7 @@ class SearchFragment @Inject constructor(
                 is Loading -> {
                     stateView.state = StateView.State.Loading
                 }
-                is Fail    -> {
+                is Fail -> {
                     stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(state.asyncSearchRequest.error))
                 }
                 is Success -> {
@@ -100,8 +100,7 @@ class SearchFragment @Inject constructor(
                 }
             }
         } else {
-            val lastBatchSize = state.lastBatch?.size ?: 0
-            pendingScrollToPosition = if (lastBatchSize > 0) lastBatchSize - 1 else 0
+            pendingScrollToPosition = (state.lastBatchSize - 1).coerceAtLeast(0)
 
             stateView.state = StateView.State.Content
             controller.setData(state)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
index 8daa4f60e4..c917c4557d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
@@ -25,6 +25,8 @@ import im.vector.app.core.ui.list.genericItemHeader
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.search.EventAndSender
+import org.matrix.android.sdk.api.util.toMatrixItem
 import java.util.Calendar
 import javax.inject.Inject
 
@@ -62,15 +64,15 @@ class SearchResultController @Inject constructor(
             }
         }
 
-        buildSearchResultItems(data.searchResult.orEmpty())
+        buildSearchResultItems(data.searchResult)
     }
 
-    private fun buildSearchResultItems(events: List<Event>) {
+    private fun buildSearchResultItems(events: List<EventAndSender>) {
         var lastDate: Calendar? = null
 
-        events.forEach { event ->
+        events.forEach { eventAndSender ->
             val eventDate = Calendar.getInstance().apply {
-                timeInMillis = event.originServerTs ?: System.currentTimeMillis()
+                timeInMillis = eventAndSender.event.originServerTs ?: System.currentTimeMillis()
             }
             if (lastDate?.get(Calendar.DAY_OF_YEAR) != eventDate.get(Calendar.DAY_OF_YEAR)) {
                 genericItemHeader {
@@ -81,13 +83,13 @@ class SearchResultController @Inject constructor(
             lastDate = eventDate
 
             searchResultItem {
-                id(event.eventId)
+                id(eventAndSender.event.eventId)
                 avatarRenderer(avatarRenderer)
                 dateFormatter(dateFormatter)
-                event(event)
-                // I think we should use the data returned by the server?
-                sender(event.senderId?.let { session.getUser(it) })
-                listener { listener?.onItemClicked(event) }
+                event(eventAndSender.event)
+                sender(eventAndSender.sender
+                        ?: eventAndSender.event.senderId?.let { session.getUser(it) }?.toMatrixItem())
+                listener { listener?.onItemClicked(eventAndSender.event) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
index 2d569c1c6a..10407c64e0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
@@ -27,10 +27,10 @@ import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.home.AvatarRenderer
 import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.toMatrixItem
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_search_result)
 abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
@@ -38,15 +38,15 @@ abstract class SearchResultItem : VectorEpoxyModel<SearchResultItem.Holder>() {
     @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute var dateFormatter: VectorDateFormatter? = null
     @EpoxyAttribute lateinit var event: Event
-    @EpoxyAttribute var sender: User? = null
+    @EpoxyAttribute var sender: MatrixItem? = null
     @EpoxyAttribute var listener: ClickListener? = null
 
     override fun bind(holder: Holder) {
         super.bind(holder)
 
         holder.view.onClick(listener)
-        sender?.toMatrixItem()?.let { avatarRenderer.render(it, holder.avatarImageView) }
-        holder.memberNameView.text = sender?.getBestName()
+        sender?.let { avatarRenderer.render(it, holder.avatarImageView) }
+        holder.memberNameView.setTextOrHide(sender?.getBestName())
         holder.timeView.text = dateFormatter?.format(event.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
         // TODO Improve that (use formattedBody, etc.)
         holder.contentView.text = event.content?.get("body") as? String
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 6703815f57..21a2d18e71 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -69,9 +69,14 @@ class SearchViewModel @AssistedInject constructor(
     }
 
     private fun handleSearchWith(action: SearchAction.SearchWith) {
-        if (action.searchTerm.length > 1) {
+        if (action.searchTerm.isNotEmpty()) {
             setState {
-                copy(searchTerm = action.searchTerm)
+                copy(
+                        searchResult = emptyList(),
+                        hasMoreResult = false,
+                        lastBatchSize = 0,
+                        searchTerm = action.searchTerm
+                )
             }
             startSearching(false)
         }
@@ -100,9 +105,7 @@ class SearchViewModel @AssistedInject constructor(
             }
         }
 
-        if (state.asyncSearchRequest is Loading) {
-            currentTask?.cancel()
-        }
+        currentTask?.cancel()
 
         viewModelScope.launch {
             try {
@@ -118,24 +121,22 @@ class SearchViewModel @AssistedInject constructor(
                             callback = it
                     )
                 }
-                onSearchResultSuccess(result, isNextBatch)
+                onSearchResultSuccess(result)
             } catch (failure: Throwable) {
                 if (failure is Failure.Cancelled) return@launch
 
                 _viewEvents.post(SearchViewEvents.Failure(failure))
                 setState {
                     copy(
-                            asyncSearchRequest = Fail(failure),
-                            searchResult = null
+                            asyncSearchRequest = Fail(failure)
                     )
                 }
             }
         }
     }
 
-    private fun onSearchResultSuccess(searchResult: SearchResult, isNextBatch: Boolean) = withState { state ->
-        // Accumulate results if it is the next batch
-        val accumulatedResult = searchResult.results.orEmpty().plus(state.searchResult?.takeIf { isNextBatch }.orEmpty())
+    private fun onSearchResultSuccess(searchResult: SearchResult) = withState { state ->
+        val accumulatedResult = searchResult.results.orEmpty().plus(state.searchResult)
 
         // Note: We do not care about the highlights for the moment, but it will be the same algorithm
 
@@ -145,9 +146,14 @@ class SearchViewModel @AssistedInject constructor(
             copy(
                     searchResult = accumulatedResult,
                     hasMoreResult = !nextBatch.isNullOrEmpty(),
-                    lastBatch = searchResult.results,
+                    lastBatchSize = searchResult.results.orEmpty().size,
                     asyncSearchRequest = Success(Unit)
             )
         }
     }
+
+    override fun onCleared() {
+        currentTask?.cancel()
+        super.onCleared()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
index 72da1ca940..9f700b6e31 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewState.kt
@@ -19,14 +19,14 @@ package im.vector.app.features.home.room.detail.search
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.search.EventAndSender
 
 data class SearchViewState(
         // Accumulated search result
-        val searchResult: List<Event>? = null,
+        val searchResult: List<EventAndSender> = emptyList(),
         val hasMoreResult: Boolean = false,
-        // Last batch result will help RecyclerView to position itself
-        val lastBatch: List<Event>? = null,
+        // Last batch size, will help RecyclerView to position itself
+        val lastBatchSize: Int = 0,
         val searchTerm: String? = null,
         val roomId: String = "",
         // Current pagination request

From 92e021a3d7837be6ef1e0432c29110367b95ddc9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Oct 2020 18:33:33 +0200
Subject: [PATCH 104/278] Create home shortcut for any room (#1525)

---
 CHANGES.md                                    |  1 +
 .../app/features/home/ShortcutCreator.kt      | 78 +++++++++++++++++++
 .../app/features/home/ShortcutsHandler.kt     | 47 +----------
 .../features/roomprofile/RoomProfileAction.kt |  1 +
 .../roomprofile/RoomProfileController.kt      | 13 ++++
 .../roomprofile/RoomProfileFragment.kt        | 12 +++
 .../roomprofile/RoomProfileViewEvents.kt      |  2 +
 .../roomprofile/RoomProfileViewModel.kt       | 38 ++++++---
 .../drawable/ic_add_to_home_screen_24dp.xml   | 12 +++
 vector/src/main/res/values/strings.xml        |  2 +-
 10 files changed, 151 insertions(+), 55 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
 create mode 100644 vector/src/main/res/drawable/ic_add_to_home_screen_24dp.xml

diff --git a/CHANGES.md b/CHANGES.md
index 026d7af6cd..754fb35612 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
  - PIN code: request PIN code if phone has been locked
  - Small optimisation of scrolling experience in timeline (#2114)
  - Allow user to reset cross signing if he has no way to recover (#2052)
+ - Create home shortcut for any room (#1525)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
new file mode 100644
index 0000000000..171cc7b3d9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.os.Build
+import androidx.annotation.WorkerThread
+import androidx.core.content.pm.ShortcutInfoCompat
+import androidx.core.content.pm.ShortcutManagerCompat
+import androidx.core.graphics.drawable.IconCompat
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.utils.DimensionConverter
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+private val useAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+private const val adaptiveIconSizeDp = 108
+private const val adaptiveIconOuterSidesDp = 18
+
+class ShortcutCreator @Inject constructor(
+        private val context: Context,
+        private val avatarRenderer: AvatarRenderer,
+        private val dimensionConverter: DimensionConverter
+) {
+    private val adaptiveIconSize = dimensionConverter.dpToPx(adaptiveIconSizeDp)
+    private val adaptiveIconOuterSides = dimensionConverter.dpToPx(adaptiveIconOuterSidesDp)
+    private val iconSize by lazy {
+        if (useAdaptiveIcon) {
+            adaptiveIconSize - adaptiveIconOuterSides
+        } else {
+            dimensionConverter.dpToPx(72)
+        }
+    }
+
+    fun canCreateShortcut(): Boolean {
+        return ShortcutManagerCompat.isRequestPinShortcutSupported(context)
+    }
+
+    @WorkerThread
+    fun create(roomSummary: RoomSummary): ShortcutInfoCompat {
+        val intent = RoomDetailActivity.shortcutIntent(context, roomSummary.roomId)
+        val bitmap = try {
+            avatarRenderer.shortcutDrawable(GlideApp.with(context), roomSummary.toMatrixItem(), iconSize)
+        } catch (failure: Throwable) {
+            null
+        }
+        return ShortcutInfoCompat.Builder(context, roomSummary.roomId)
+                .setShortLabel(roomSummary.displayName)
+                .setIcon(bitmap?.toProfileImageIcon())
+                .setIntent(intent)
+                .build()
+    }
+
+    private fun Bitmap.toProfileImageIcon(): IconCompat {
+        return if (useAdaptiveIcon) {
+            IconCompat.createWithAdaptiveBitmap(this)
+        } else {
+            IconCompat.createWithBitmap(this)
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
index 1a476913f3..3684a8b3f8 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -18,40 +18,19 @@ package im.vector.app.features.home
 
 import android.content.Context
 import android.content.pm.ShortcutManager
-import android.graphics.Bitmap
 import android.os.Build
 import androidx.core.content.getSystemService
-import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.graphics.drawable.IconCompat
-import im.vector.app.core.glide.GlideApp
-import im.vector.app.core.utils.DimensionConverter
-import im.vector.app.features.home.room.detail.RoomDetailActivity
-import org.matrix.android.sdk.api.util.toMatrixItem
 import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 
-private val useAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
-private const val adaptiveIconSizeDp = 108
-private const val adaptiveIconOuterSidesDp = 18
-
 class ShortcutsHandler @Inject constructor(
         private val context: Context,
         private val homeRoomListStore: HomeRoomListDataSource,
-        private val avatarRenderer: AvatarRenderer,
-        private val dimensionConverter: DimensionConverter
+        private val shortcutCreator: ShortcutCreator
 ) {
-    private val adaptiveIconSize = dimensionConverter.dpToPx(adaptiveIconSizeDp)
-    private val adaptiveIconOuterSides = dimensionConverter.dpToPx(adaptiveIconOuterSidesDp)
-    private val iconSize by lazy {
-        if (useAdaptiveIcon) {
-            adaptiveIconSize - adaptiveIconOuterSides
-        } else {
-            dimensionConverter.dpToPx(72)
-        }
-    }
 
     fun observeRoomsAndBuildShortcuts(): Disposable {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) {
@@ -67,19 +46,7 @@ class ShortcutsHandler @Inject constructor(
                     val shortcuts = rooms
                             .filter { room -> room.isFavorite }
                             .take(n = 4) // Android only allows us to create 4 shortcuts
-                            .map { room ->
-                                val intent = RoomDetailActivity.shortcutIntent(context, room.roomId)
-                                val bitmap = try {
-                                    avatarRenderer.shortcutDrawable(GlideApp.with(context), room.toMatrixItem(), iconSize)
-                                } catch (failure: Throwable) {
-                                    null
-                                }
-                                ShortcutInfoCompat.Builder(context, room.roomId)
-                                        .setShortLabel(room.displayName)
-                                        .setIcon(bitmap?.toProfileImageIcon())
-                                        .setIntent(intent)
-                                        .build()
-                            }
+                            .map { shortcutCreator.create(it) }
 
                     ShortcutManagerCompat.removeAllDynamicShortcuts(context)
                     ShortcutManagerCompat.addDynamicShortcuts(context, shortcuts)
@@ -104,14 +71,4 @@ class ShortcutsHandler @Inject constructor(
             }
         }
     }
-
-    // PRIVATE API *********************************************************************************
-
-    private fun Bitmap.toProfileImageIcon(): IconCompat {
-        return if (useAdaptiveIcon) {
-            IconCompat.createWithAdaptiveBitmap(this)
-        } else {
-            IconCompat.createWithBitmap(this)
-        }
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 8061ad6bfc..1f89380449 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -26,4 +26,5 @@ sealed class RoomProfileAction: VectorViewModelAction {
     data class ChangeRoomNotificationState(val notificationState: RoomNotificationState) : RoomProfileAction()
     data class ChangeRoomAvatar(val uri: Uri, val fileName: String?) : RoomProfileAction()
     object ShareRoomProfile : RoomProfileAction()
+    object CreateShortcut : RoomProfileAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index ccfbf6d4fa..af05f2f7ab 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -24,6 +24,7 @@ import im.vector.app.core.epoxy.profiles.buildProfileSection
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
+import im.vector.app.features.home.ShortcutCreator
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import javax.inject.Inject
@@ -31,6 +32,7 @@ import javax.inject.Inject
 class RoomProfileController @Inject constructor(
         private val stringProvider: StringProvider,
         private val vectorPreferences: VectorPreferences,
+        private val shortcutCreator: ShortcutCreator,
         colorProvider: ColorProvider
 ) : TypedEpoxyController<RoomProfileViewState>() {
 
@@ -44,6 +46,7 @@ class RoomProfileController @Inject constructor(
         fun onBannedMemberListClicked()
         fun onNotificationsClicked()
         fun onUploadsClicked()
+        fun createShortcut()
         fun onSettingsClicked()
         fun onLeaveRoomClicked()
         fun onRoomIdClicked()
@@ -114,6 +117,16 @@ class RoomProfileController @Inject constructor(
                 icon = R.drawable.ic_room_profile_uploads,
                 action = { callback?.onUploadsClicked() }
         )
+        if (shortcutCreator.canCreateShortcut()) {
+            buildProfileAction(
+                    id = "shortcut",
+                    title = stringProvider.getString(R.string.room_settings_add_homescreen_shortcut),
+                    dividerColor = dividerColor,
+                    editable = false,
+                    icon = R.drawable.ic_add_to_home_screen_24dp,
+                    action = { callback?.createShortcut() }
+            )
+        }
         buildProfileAction(
                 id = "leave",
                 title = stringProvider.getString(if (roomSummary.isDirect) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index d94a326ba9..477d557bea 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -27,6 +27,7 @@ import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityOptionsCompat
+import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.net.toUri
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
@@ -115,6 +116,7 @@ class RoomProfileFragment @Inject constructor(
                 is RoomProfileViewEvents.Failure            -> showFailure(it.throwable)
                 is RoomProfileViewEvents.ShareRoomProfile   -> onShareRoomProfile(it.permalink)
                 RoomProfileViewEvents.OnChangeAvatarSuccess -> dismissLoadingDialog()
+                is RoomProfileViewEvents.OnShortcutReady    -> addShortcut(it)
             }.exhaustive
         }
         roomListQuickActionsSharedActionViewModel
@@ -232,6 +234,16 @@ class RoomProfileFragment @Inject constructor(
         roomProfileSharedActionViewModel.post(RoomProfileSharedAction.OpenRoomUploads)
     }
 
+    override fun createShortcut() {
+        // Ask the view model to prepare it...
+        roomProfileViewModel.handle(RoomProfileAction.CreateShortcut)
+    }
+
+    private fun addShortcut(onShortcutReady: RoomProfileViewEvents.OnShortcutReady) {
+        // ... and propose the user to add it
+        ShortcutManagerCompat.requestPinShortcut(requireContext(), onShortcutReady.shortcutInfo, null)
+    }
+
     override fun onLeaveRoomClicked() {
         AlertDialog.Builder(requireContext())
                 .setTitle(R.string.room_participants_leave_prompt_title)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt
index 1245016ada..380efd6fcd 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewEvents.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.roomprofile
 
+import androidx.core.content.pm.ShortcutInfoCompat
 import im.vector.app.core.platform.VectorViewEvents
 
 /**
@@ -27,4 +28,5 @@ sealed class RoomProfileViewEvents : VectorViewEvents {
 
     object OnChangeAvatarSuccess : RoomProfileViewEvents()
     data class ShareRoomProfile(val permalink: String) : RoomProfileViewEvents()
+    data class OnShortcutReady(val shortcutInfo: ShortcutInfoCompat) : RoomProfileViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 2d409888e9..12e88c2dec 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -17,15 +17,20 @@
 
 package im.vector.app.features.roomprofile
 
+import androidx.lifecycle.viewModelScope
 import com.airbnb.mvrx.FragmentViewModelContext
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.home.ShortcutCreator
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -36,10 +41,12 @@ import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 import java.util.UUID
 
-class RoomProfileViewModel @AssistedInject constructor(@Assisted private val initialState: RoomProfileViewState,
-                                                       private val stringProvider: StringProvider,
-                                                       private val session: Session)
-    : VectorViewModel<RoomProfileViewState, RoomProfileAction, RoomProfileViewEvents>(initialState) {
+class RoomProfileViewModel @AssistedInject constructor(
+        @Assisted private val initialState: RoomProfileViewState,
+        private val stringProvider: StringProvider,
+        private val shortcutCreator: ShortcutCreator,
+        private val session: Session
+) : VectorViewModel<RoomProfileViewState, RoomProfileAction, RoomProfileViewEvents>(initialState) {
 
     @AssistedInject.Factory
     interface Factory {
@@ -88,11 +95,24 @@ class RoomProfileViewModel @AssistedInject constructor(@Assisted private val ini
                 }
     }
 
-    override fun handle(action: RoomProfileAction) = when (action) {
-        RoomProfileAction.LeaveRoom                      -> handleLeaveRoom()
-        is RoomProfileAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
-        is RoomProfileAction.ShareRoomProfile            -> handleShareRoomProfile()
-        is RoomProfileAction.ChangeRoomAvatar            -> handleChangeAvatar(action)
+    override fun handle(action: RoomProfileAction) {
+        when (action) {
+            RoomProfileAction.LeaveRoom -> handleLeaveRoom()
+            is RoomProfileAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
+            is RoomProfileAction.ShareRoomProfile -> handleShareRoomProfile()
+            is RoomProfileAction.ChangeRoomAvatar -> handleChangeAvatar(action)
+            RoomProfileAction.CreateShortcut -> handleCreateShortcut()
+        }.exhaustive
+    }
+
+    private fun handleCreateShortcut() {
+        viewModelScope.launch(Dispatchers.IO) {
+            withState { state ->
+                state.roomSummary()
+                        ?.let { shortcutCreator.create(it) }
+                        ?.let { _viewEvents.post(RoomProfileViewEvents.OnShortcutReady(it)) }
+            }
+        }
     }
 
     private fun handleChangeNotificationMode(action: RoomProfileAction.ChangeRoomNotificationState) {
diff --git a/vector/src/main/res/drawable/ic_add_to_home_screen_24dp.xml b/vector/src/main/res/drawable/ic_add_to_home_screen_24dp.xml
new file mode 100644
index 0000000000..4a0a809578
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_add_to_home_screen_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,1.01L8,1C6.9,1 6,1.9 6,3V6C6,6.55 6.45,7 7,7C7.55,7 8,6.55 8,6V4.5H18V19.5H8V18C8,17.45 7.55,17 7,17C6.45,17 6,17.45 6,18V21C6,22.1 6.9,23 8,23H18C19.1,23 20,22.1 20,21V3C20,1.9 19.1,1.01 18,1.01Z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M11,14.45C11,15 10.55,15.45 10,15.45C9.45,15.45 9,15 9,14.45V11.86L4.11,16.75C3.72,17.14 3.09,17.14 2.7,16.75C2.31,16.36 2.31,15.73 2.7,15.34L7.59,10.45H5C4.45,10.45 4,10 4,9.45C4,8.9 4.45,8.45 5,8.45H10C10.55,8.45 11,8.9 11,9.45V14.45Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 0edd930498..623e5e205f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -664,7 +664,7 @@
     <string name="room_settings_direct_chat">Direct Chat</string>
     <string name="room_settings_leave_conversation">Leave Conversation</string>
     <string name="room_settings_forget">Forget</string>
-    <string name="room_settings_add_homescreen_shortcut">Add Homescreen Shortcut</string>
+    <string name="room_settings_add_homescreen_shortcut">Add to Home screen</string>
 
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Messages</string>

From a2334c3fb045181c5212eeed9e3eb30e4aea0dfa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 1 Oct 2020 18:38:27 +0200
Subject: [PATCH 105/278] Add missing leave icon in room profile

---
 .../im/vector/app/features/roomprofile/RoomProfileController.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index af05f2f7ab..160ebd56be 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -137,6 +137,7 @@ class RoomProfileController @Inject constructor(
                 dividerColor = dividerColor,
                 divider = false,
                 destructive = true,
+                icon = R.drawable.ic_room_actions_leave,
                 editable = false,
                 action = { callback?.onLeaveRoomClicked() }
         )

From f030e098a8a8438413f564c50703609c18e71ac1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 17:18:39 +0200
Subject: [PATCH 106/278] Fix code quality and compilation test

---
 .../sdk/session/search/SearchMessagesTest.kt        |  4 ++--
 .../search/response/SearchResponseRoomEvents.kt     | 13 ++++++++++---
 tools/check/forbidden_strings_in_code.txt           |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index 1d4eb758ed..8ae8ef1b44 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -90,7 +90,7 @@ class SearchMessagesTest : InstrumentedTest {
                                     assertTrue(
                                             data.results
                                                     ?.all {
-                                                        (it.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
                                                     }.orFalse()
                                     )
                                     lock.countDown()
@@ -154,7 +154,7 @@ class SearchMessagesTest : InstrumentedTest {
                                     assertTrue(
                                             data.results
                                                     ?.all {
-                                                        (it.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
+                                                        (it.event.content?.get("body") as? String)?.startsWith(MESSAGE).orFalse()
                                                     }.orFalse()
                                     )
                                     lock.countDown()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
index 1078b9a9f9..2aac427232 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
@@ -22,15 +22,22 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class SearchResponseRoomEvents(
-        // List of results in the requested order.
+        /**
+         * List of results in the requested order.
+         */
         @Json(name = "results")
         val results: List<SearchResponseItem>? = null,
         @Json(name = "count")
         val count: Int? = null,
-        // List of words which should be highlighted, useful for stemming which may change the query terms.
+        /**
+         * List of words which should be highlighted, useful for stemming which may change the query terms.
+         */
         @Json(name = "highlights")
         val highlights: List<String>? = null,
-        // Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call. If this field is absent, there are no more results.
+        /**
+         * Token that can be used to get the next batch of results, by passing as the next_batch parameter to the next call.
+         * If this field is absent, there are no more results.
+         */
         @Json(name = "next_batch")
         val nextBatch: String? = null
 )
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 1d3aaa9f69..9c00dca278 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -164,7 +164,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===80
+enum class===81
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 85417eb24c2dff8039ac3fb5c9a8227ebb7b29b3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 2 Oct 2020 21:12:19 +0200
Subject: [PATCH 107/278] Add SearchView to filter members.

Author: Onuray (I squashed 2 commits)
---
 CHANGES.md                                    |  1 +
 .../members/RoomMemberListAction.kt           |  1 +
 .../members/RoomMemberListController.kt       |  4 ++-
 .../members/RoomMemberListFragment.kt         | 17 +++++++++++++
 .../members/RoomMemberListViewModel.kt        | 25 +++++++++++++++++++
 .../members/RoomMemberListViewState.kt        |  1 +
 .../layout/fragment_room_setting_generic.xml  | 14 ++++++++++-
 7 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4a158086a2..f5d6fca073 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - Small optimisation of scrolling experience in timeline (#2114)
  - Allow user to reset cross signing if he has no way to recover (#2052)
  - Create home shortcut for any room (#1525)
+ - Filter room member by name (#2184)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt
index c61dcb98f5..342a2e8585 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListAction.kt
@@ -20,4 +20,5 @@ import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomMemberListAction : VectorViewModelAction {
     data class RevokeThreePidInvite(val stateKey: String) : RoomMemberListAction()
+    data class FilterMemberList(val searchTerm: String) : RoomMemberListAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index 59b1bca26f..f0c7e146c6 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -53,7 +53,9 @@ class RoomMemberListController @Inject constructor(
     }
 
     override fun buildModels(data: RoomMemberListViewState?) {
-        val roomMembersByPowerLevel = data?.roomMemberSummaries?.invoke() ?: return
+        data ?: return
+
+        val roomMembersByPowerLevel = data.filteredRoomMemberSummaries ?: data.roomMemberSummaries.invoke() ?: return
         val threePidInvites = data.threePidInvites().orEmpty()
         var threePidInvitesDone = threePidInvites.isEmpty()
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 46d0f35b95..e12cce9484 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -21,6 +21,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -72,12 +74,27 @@ class RoomMemberListFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
         roomMemberListController.callback = this
         setupToolbar(roomSettingsToolbar)
+        setupSearchView()
         recyclerView.configureWith(roomMemberListController, hasFixedSize = true)
         viewModel.selectSubscribe(this, RoomMemberListViewState::actionsPermissions) {
             invalidateOptionsMenu()
         }
     }
 
+    private fun setupSearchView() {
+        searchView.isVisible = true
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String): Boolean {
+                return true
+            }
+
+            override fun onQueryTextChange(newText: String): Boolean {
+                viewModel.handle(RoomMemberListAction.FilterMemberList(newText))
+                return true
+            }
+        })
+    }
+
     override fun onDestroyView() {
         recyclerView.cleanup()
         super.onDestroyView()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index fedf1729ad..c45dbb1093 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -188,6 +188,7 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
     override fun handle(action: RoomMemberListAction) {
         when (action) {
             is RoomMemberListAction.RevokeThreePidInvite -> handleRevokeThreePidInvite(action)
+            is RoomMemberListAction.FilterMemberList     -> handleFilterMemberList(action)
         }.exhaustive
     }
 
@@ -201,4 +202,28 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
             )
         }
     }
+
+    private fun handleFilterMemberList(action: RoomMemberListAction.FilterMemberList) = withState { state ->
+        if (action.searchTerm.isBlank()) {
+            setState { copy(filteredRoomMemberSummaries = null) }
+            return@withState
+        }
+        val roomMemberSummaries = state.roomMemberSummaries.invoke()
+        roomMemberSummaries
+                ?.mapNotNull { (powerLevelCategory, roomMemberList) ->
+                    roomMemberList
+                            .filter { it.displayName?.contains(action.searchTerm).orFalse() || it.userId.contains(action.searchTerm) }
+                            .takeIf { it.isNotEmpty() }
+                            ?.let { filteredMemberList ->
+                                Pair(powerLevelCategory, filteredMemberList)
+                            }
+                }
+                ?.also { filteredRoomMemberSummaries ->
+                    setState {
+                        copy(
+                                filteredRoomMemberSummaries = filteredRoomMemberSummaries
+                        )
+                    }
+                }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 4d21aa103f..01fd290e78 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -31,6 +31,7 @@ data class RoomMemberListViewState(
         val roomId: String,
         val roomSummary: Async<RoomSummary> = Uninitialized,
         val roomMemberSummaries: Async<RoomMemberSummaries> = Uninitialized,
+        val filteredRoomMemberSummaries: RoomMemberSummaries? = null,
         val threePidInvites: Async<List<Event>> = Uninitialized,
         val trustLevelMap: Async<Map<String, RoomEncryptionTrustLevel?>> = Uninitialized,
         val actionsPermissions: ActionPermissions = ActionPermissions()
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index aa86ee342b..cdbf678b2b 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -53,6 +53,18 @@
 
     </androidx.appcompat.widget.Toolbar>
 
+    <androidx.appcompat.widget.SearchView
+        android:id="@+id/searchView"
+        style="@style/VectorSearchView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:queryHint="@string/search_hint"
+        app:layout_constraintTop_toBottomOf="@id/roomSettingsToolbar"
+        android:background="@null" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
@@ -61,7 +73,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomSettingsToolbar"
+        app:layout_constraintTop_toBottomOf="@+id/searchView"
         tools:listitem="@layout/item_profile_action" />
 
     <include layout="@layout/merge_overlay_waiting_view" />

From 78ed184f60381c529b287bea20f3a33975ccb661 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 21:40:10 +0200
Subject: [PATCH 108/278] Filter in the controller, to keep a live members list

---
 .../members/RoomMemberListController.kt       | 24 +++++++-----
 .../members/RoomMemberListViewModel.kt        | 26 +++----------
 .../members/RoomMemberListViewState.kt        |  2 +-
 .../members/RoomMemberSummaryFilter.kt        | 37 +++++++++++++++++++
 4 files changed, 57 insertions(+), 32 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index f0c7e146c6..0d4b732da9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -17,12 +17,6 @@
 package im.vector.app.features.roomprofile.members
 
 import com.airbnb.epoxy.TypedEpoxyController
-import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
-import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
-import org.matrix.android.sdk.api.util.MatrixItem
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.dividerItem
 import im.vector.app.core.epoxy.profiles.buildProfileSection
@@ -31,11 +25,18 @@ import im.vector.app.core.extensions.join
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.util.MatrixItem
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomMemberListController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val stringProvider: StringProvider,
+        private val roomMemberSummaryFilter: RoomMemberSummaryFilter,
         colorProvider: ColorProvider
 ) : TypedEpoxyController<RoomMemberListViewState>() {
 
@@ -55,17 +56,20 @@ class RoomMemberListController @Inject constructor(
     override fun buildModels(data: RoomMemberListViewState?) {
         data ?: return
 
-        val roomMembersByPowerLevel = data.filteredRoomMemberSummaries ?: data.roomMemberSummaries.invoke() ?: return
+        roomMemberSummaryFilter.filter = data.filter
+
+        val roomMembersByPowerLevel = data.roomMemberSummaries.invoke() ?: return
         val threePidInvites = data.threePidInvites().orEmpty()
         var threePidInvitesDone = threePidInvites.isEmpty()
 
         for ((powerLevelCategory, roomMemberList) in roomMembersByPowerLevel) {
-            if (roomMemberList.isEmpty()) {
+            val filteredRoomMemberList = roomMemberList.filter { roomMemberSummaryFilter.test(it) }
+            if (filteredRoomMemberList.isEmpty()) {
                 continue
             }
 
             if (powerLevelCategory == RoomMemberListCategories.USER && !threePidInvitesDone) {
-                // If there is not regular invite, display threepid invite before the regular user
+                // If there is no regular invite, display threepid invite before the regular user
                 buildProfileSection(
                         stringProvider.getString(RoomMemberListCategories.INVITE.titleRes)
                 )
@@ -77,7 +81,7 @@ class RoomMemberListController @Inject constructor(
             buildProfileSection(
                     stringProvider.getString(powerLevelCategory.titleRes)
             )
-            roomMemberList.join(
+            filteredRoomMemberList.join(
                     each = { _, roomMember ->
                         profileMatrixItem {
                             id(roomMember.userId)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index c45dbb1093..60cb5867a7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -203,27 +203,11 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
         }
     }
 
-    private fun handleFilterMemberList(action: RoomMemberListAction.FilterMemberList) = withState { state ->
-        if (action.searchTerm.isBlank()) {
-            setState { copy(filteredRoomMemberSummaries = null) }
-            return@withState
+    private fun handleFilterMemberList(action: RoomMemberListAction.FilterMemberList) = withState {
+        setState {
+            copy(
+                    filter = action.searchTerm
+            )
         }
-        val roomMemberSummaries = state.roomMemberSummaries.invoke()
-        roomMemberSummaries
-                ?.mapNotNull { (powerLevelCategory, roomMemberList) ->
-                    roomMemberList
-                            .filter { it.displayName?.contains(action.searchTerm).orFalse() || it.userId.contains(action.searchTerm) }
-                            .takeIf { it.isNotEmpty() }
-                            ?.let { filteredMemberList ->
-                                Pair(powerLevelCategory, filteredMemberList)
-                            }
-                }
-                ?.also { filteredRoomMemberSummaries ->
-                    setState {
-                        copy(
-                                filteredRoomMemberSummaries = filteredRoomMemberSummaries
-                        )
-                    }
-                }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 01fd290e78..787ae920e1 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -31,7 +31,7 @@ data class RoomMemberListViewState(
         val roomId: String,
         val roomSummary: Async<RoomSummary> = Uninitialized,
         val roomMemberSummaries: Async<RoomMemberSummaries> = Uninitialized,
-        val filteredRoomMemberSummaries: RoomMemberSummaries? = null,
+        val filter: String = "",
         val threePidInvites: Async<List<Event>> = Uninitialized,
         val trustLevelMap: Async<Map<String, RoomEncryptionTrustLevel?>> = Uninitialized,
         val actionsPermissions: ActionPermissions = ActionPermissions()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
new file mode 100644
index 0000000000..813679fef3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.roomprofile.members
+
+import io.reactivex.functions.Predicate
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import javax.inject.Inject
+
+class RoomMemberSummaryFilter @Inject constructor() : Predicate<RoomMemberSummary> {
+    var filter: String = ""
+
+    override fun test(roomMemberSummary: RoomMemberSummary): Boolean {
+        if (filter.isBlank()) {
+            // No filter
+            return true
+        }
+
+        return roomMemberSummary.displayName?.contains(filter, ignoreCase = true).orFalse()
+                // We should maybe exclude the domain from the userId
+                || roomMemberSummary.userId.contains(filter, ignoreCase = true)
+    }
+}

From 9df3de2afb33fcf3e8adcd75157e24d3faa98e6c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 21:50:01 +0200
Subject: [PATCH 109/278] Rename method

---
 .../features/roomprofile/members/RoomMemberListController.kt  | 4 ++--
 .../features/roomprofile/members/RoomMemberListFragment.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index 0d4b732da9..ee6b9a71bf 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -42,7 +42,7 @@ class RoomMemberListController @Inject constructor(
 
     interface Callback {
         fun onRoomMemberClicked(roomMember: RoomMemberSummary)
-        fun onThreePidInvites(event: Event)
+        fun onThreePidInviteClicked(event: Event)
     }
 
     private val dividerColor = colorProvider.getColorFromAttribute(R.attr.vctr_list_divider_color)
@@ -134,7 +134,7 @@ class RoomMemberListController @Inject constructor(
                                             avatarRenderer(avatarRenderer)
                                             editable(data.actionsPermissions.canRevokeThreePidInvite)
                                             clickListener { _ ->
-                                                callback?.onThreePidInvites(event)
+                                                callback?.onThreePidInviteClicked(event)
                                             }
                                         }
                                     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index e12cce9484..5367788466 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -109,7 +109,7 @@ class RoomMemberListFragment @Inject constructor(
         navigator.openRoomMemberProfile(roomMember.userId, roomId = roomProfileArgs.roomId, context = requireActivity())
     }
 
-    override fun onThreePidInvites(event: Event) {
+    override fun onThreePidInviteClicked(event: Event) {
         // Display a dialog to revoke invite if power level is high enough
         val content = event.content.toModel<RoomThirdPartyInviteContent>() ?: return
         val stateKey = event.stateKey ?: return

From f5580212ea51e1d961ab023aa3253ca8439211c2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 22:16:13 +0200
Subject: [PATCH 110/278] Also filter threePids

---
 .../roomprofile/members/RoomMemberListController.kt  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
index ee6b9a71bf..71ac7fcec4 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
@@ -59,7 +59,14 @@ class RoomMemberListController @Inject constructor(
         roomMemberSummaryFilter.filter = data.filter
 
         val roomMembersByPowerLevel = data.roomMemberSummaries.invoke() ?: return
-        val threePidInvites = data.threePidInvites().orEmpty()
+        val threePidInvites = data.threePidInvites()
+                ?.filter { event ->
+                    event.content.toModel<RoomThirdPartyInviteContent>()
+                            ?.takeIf {
+                                data.filter.isEmpty() || it.displayName.contains(data.filter, ignoreCase = true)
+                            } != null
+                }
+                .orEmpty()
         var threePidInvitesDone = threePidInvites.isEmpty()
 
         for ((powerLevelCategory, roomMemberList) in roomMembersByPowerLevel) {
@@ -100,12 +107,13 @@ class RoomMemberListController @Inject constructor(
                         }
                     }
             )
-            if (powerLevelCategory == RoomMemberListCategories.INVITE) {
+            if (powerLevelCategory == RoomMemberListCategories.INVITE && !threePidInvitesDone) {
                 // Display the threepid invite after the regular invite
                 dividerItem {
                     id("divider_threepidinvites")
                     color(dividerColor)
                 }
+
                 buildThreePidInvites(data)
                 threePidInvitesDone = true
             }

From 50f6a4732c40b89622e3ba28a194ef71f242124b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 22:21:13 +0200
Subject: [PATCH 111/278] Change hint

---
 .../features/roomprofile/members/RoomMemberListFragment.kt  | 1 +
 .../src/main/res/layout/fragment_room_setting_generic.xml   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 5367788466..e4d17b4da6 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -83,6 +83,7 @@ class RoomMemberListFragment @Inject constructor(
 
     private fun setupSearchView() {
         searchView.isVisible = true
+        searchView.queryHint = getString(R.string.search_members_hint)
         searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 return true
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index cdbf678b2b..03e211a806 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -59,11 +59,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:background="@null"
         android:visibility="gone"
-        tools:visibility="visible"
-        app:queryHint="@string/search_hint"
         app:layout_constraintTop_toBottomOf="@id/roomSettingsToolbar"
-        android:background="@null" />
+        tools:queryHint="@string/search_hint"
+        tools:visibility="visible" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"

From 6147a87e46717489daa2a050aa94a84d3238e8f3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 23:06:59 +0200
Subject: [PATCH 112/278] Hide the SearchView when scrolling down

---
 .../members/RoomMemberListFragment.kt         |  2 +-
 .../layout/fragment_room_setting_generic.xml  | 52 +++++++++++++------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index e4d17b4da6..67577e866e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -82,7 +82,7 @@ class RoomMemberListFragment @Inject constructor(
     }
 
     private fun setupSearchView() {
-        searchView.isVisible = true
+        searchViewAppBarLayout.isVisible = true
         searchView.queryHint = getString(R.string.search_members_hint)
         searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 03e211a806..4ab6d2c7df 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -53,28 +53,46 @@
 
     </androidx.appcompat.widget.Toolbar>
 
-    <androidx.appcompat.widget.SearchView
-        android:id="@+id/searchView"
-        style="@style/VectorSearchView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:background="@null"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/roomSettingsToolbar"
-        tools:queryHint="@string/search_hint"
-        tools:visibility="visible" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:overScrollMode="always"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/searchView"
-        tools:listitem="@layout/item_profile_action" />
+        app:layout_constraintTop_toBottomOf="@+id/roomSettingsToolbar">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:overScrollMode="always"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            tools:listitem="@layout/item_profile_action" />
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/searchViewAppBarLayout"
+            style="@style/VectorAppBarLayoutStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:elevation="4dp"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <androidx.appcompat.widget.SearchView
+                android:id="@+id/searchView"
+                style="@style/VectorSearchView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
+                android:background="@null"
+                android:minHeight="0dp"
+                app:layout_scrollFlags="scroll|enterAlways|snap"
+                tools:queryHint="@string/search_hint" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <include layout="@layout/merge_overlay_waiting_view" />
 

From c0842d4da70e56eeb1fa20ec6d6661a09e0c6497 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 23:20:28 +0200
Subject: [PATCH 113/278] Also apply the filter to banned user screen

---
 CHANGES.md                                    |  2 +-
 .../banned/RoomBannedListMemberAction.kt      |  1 +
 .../banned/RoomBannedListMemberViewModel.kt   | 10 ++++
 .../banned/RoomBannedMemberListController.kt  | 59 ++++++++++---------
 .../banned/RoomBannedMemberListFragment.kt    | 18 ++++++
 .../banned/RoomBannedMemberListViewState.kt   |  1 +
 vector/src/main/res/values/strings.xml        |  1 +
 7 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f5d6fca073..9103acaa60 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ Improvements 🙌:
  - Small optimisation of scrolling experience in timeline (#2114)
  - Allow user to reset cross signing if he has no way to recover (#2052)
  - Create home shortcut for any room (#1525)
- - Filter room member by name (#2184)
+ - Filter room member (and banned users) by name (#2184)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
index 9af554e883..67cacf4541 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
@@ -22,4 +22,5 @@ import im.vector.app.core.platform.VectorViewModelAction
 sealed class RoomBannedListMemberAction : VectorViewModelAction {
     data class QueryInfo(val roomMemberSummary: RoomMemberSummary) : RoomBannedListMemberAction()
     data class UnBanUser(val roomMemberSummary: RoomMemberSummary) : RoomBannedListMemberAction()
+    data class Filter(val filter: String) : RoomBannedListMemberAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
index b65b3de807..d1acd80c25 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
@@ -35,6 +35,7 @@ import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
 import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
@@ -90,6 +91,15 @@ class RoomBannedListMemberViewModel @AssistedInject constructor(@Assisted initia
         when (action) {
             is RoomBannedListMemberAction.QueryInfo -> onQueryBanInfo(action.roomMemberSummary)
             is RoomBannedListMemberAction.UnBanUser -> unBanUser(action.roomMemberSummary)
+            is RoomBannedListMemberAction.Filter    -> handleFilter(action)
+        }.exhaustive
+    }
+
+    private fun handleFilter(action: RoomBannedListMemberAction.Filter) {
+        setState {
+            copy(
+                    filter = action.filter
+            )
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
index a65a30441d..2a0c787a7a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListController.kt
@@ -17,8 +17,6 @@
 package im.vector.app.features.roomprofile.banned
 
 import com.airbnb.epoxy.TypedEpoxyController
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.dividerItem
 import im.vector.app.core.epoxy.profiles.buildProfileSection
@@ -28,11 +26,15 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.roomprofile.members.RoomMemberSummaryFilter
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomBannedMemberListController @Inject constructor(
         private val avatarRenderer: AvatarRenderer,
         private val stringProvider: StringProvider,
+        private val roomMemberSummaryFilter: RoomMemberSummaryFilter,
         colorProvider: ColorProvider
 ) : TypedEpoxyController<RoomBannedMemberListViewState>() {
 
@@ -63,34 +65,37 @@ class RoomBannedMemberListController @Inject constructor(
         } else {
             buildProfileSection(quantityString)
 
-            bannedList.join(
-                    each = { _, roomMember ->
-                        val actionInProgress = data.onGoingModerationAction.contains(roomMember.userId)
-                        profileMatrixItemWithProgress {
-                            id(roomMember.userId)
-                            matrixItem(roomMember.toMatrixItem())
-                            avatarRenderer(avatarRenderer)
-                            apply {
-                                if (actionInProgress) {
-                                    inProgress(true)
-                                    editable(false)
-                                } else {
-                                    inProgress(false)
-                                    editable(true)
-                                    clickListener { _ ->
-                                        callback?.onUnbanClicked(roomMember)
+            roomMemberSummaryFilter.filter = data.filter
+            bannedList
+                    .filter { roomMemberSummaryFilter.test(it) }
+                    .join(
+                            each = { _, roomMember ->
+                                val actionInProgress = data.onGoingModerationAction.contains(roomMember.userId)
+                                profileMatrixItemWithProgress {
+                                    id(roomMember.userId)
+                                    matrixItem(roomMember.toMatrixItem())
+                                    avatarRenderer(avatarRenderer)
+                                    apply {
+                                        if (actionInProgress) {
+                                            inProgress(true)
+                                            editable(false)
+                                        } else {
+                                            inProgress(false)
+                                            editable(true)
+                                            clickListener { _ ->
+                                                callback?.onUnbanClicked(roomMember)
+                                            }
+                                        }
                                     }
                                 }
+                            },
+                            between = { _, roomMemberBefore ->
+                                dividerItem {
+                                    id("divider_${roomMemberBefore.userId}")
+                                    color(dividerColor)
+                                }
                             }
-                        }
-                    },
-                    between = { _, roomMemberBefore ->
-                        dividerItem {
-                            id("divider_${roomMemberBefore.userId}")
-                            color(dividerColor)
-                        }
-                    }
-            )
+                    )
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
index 480deea6af..84eccccfae 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
@@ -19,6 +19,8 @@ package im.vector.app.features.roomprofile.banned
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -53,6 +55,7 @@ class RoomBannedMemberListFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
         roomMemberListController.callback = this
         setupToolbar(roomSettingsToolbar)
+        setupSearchView()
         recyclerView.configureWith(roomMemberListController, hasFixedSize = true)
 
         viewModel.observeViewEvents {
@@ -84,6 +87,21 @@ class RoomBannedMemberListFragment @Inject constructor(
         super.onDestroyView()
     }
 
+    private fun setupSearchView() {
+        searchViewAppBarLayout.isVisible = true
+        searchView.queryHint = getString(R.string.search_banned_user_hint)
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String): Boolean {
+                return true
+            }
+
+            override fun onQueryTextChange(newText: String): Boolean {
+                viewModel.handle(RoomBannedListMemberAction.Filter(newText))
+                return true
+            }
+        })
+    }
+
     override fun invalidate() = withState(viewModel) { viewState ->
         roomMemberListController.setData(viewState)
         renderRoomSummary(viewState)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
index ee8e534b1f..6d8bb2f42a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
@@ -27,6 +27,7 @@ data class RoomBannedMemberListViewState(
         val roomId: String,
         val roomSummary: Async<RoomSummary> = Uninitialized,
         val bannedMemberSummaries: Async<List<RoomMemberSummary>> = Uninitialized,
+        val filter: String = "",
         val onGoingModerationAction: List<String> = emptyList(),
         val canUserBan: Boolean = false
 ) : MvRxState {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 9310af7577..9099c276e8 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -623,6 +623,7 @@
     <!-- Search -->
     <string name="search_hint">Search</string>
     <string name="search_members_hint">Filter room members</string>
+    <string name="search_banned_user_hint">Filter banned users</string>
     <string name="search_no_results">No results</string>
     <string name="tab_title_search_rooms">ROOMS</string>
     <string name="tab_title_search_messages">MESSAGES</string>

From 8170f523e091ef4ca366e4e787a79fb9fa467a12 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 23:29:48 +0200
Subject: [PATCH 114/278] Small improvement

---
 .../im/vector/app/features/home/room/list/RoomListNameFilter.kt | 2 +-
 .../app/features/roomprofile/members/RoomMemberListViewModel.kt | 2 +-
 .../app/features/roomprofile/members/RoomMemberSummaryFilter.kt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
index 4c4a9755d2..6e787b8b95 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
@@ -25,7 +25,7 @@ class RoomListNameFilter @Inject constructor() : Predicate<RoomSummary> {
     var filter: String = ""
 
     override fun test(roomSummary: RoomSummary): Boolean {
-        if (filter.isBlank()) {
+        if (filter.isEmpty()) {
             // No filter
             return true
         }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
index 60cb5867a7..9e402c675b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewModel.kt
@@ -203,7 +203,7 @@ class RoomMemberListViewModel @AssistedInject constructor(@Assisted initialState
         }
     }
 
-    private fun handleFilterMemberList(action: RoomMemberListAction.FilterMemberList) = withState {
+    private fun handleFilterMemberList(action: RoomMemberListAction.FilterMemberList) {
         setState {
             copy(
                     filter = action.searchTerm
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
index 813679fef3..e2cc3f7b99 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberSummaryFilter.kt
@@ -25,7 +25,7 @@ class RoomMemberSummaryFilter @Inject constructor() : Predicate<RoomMemberSummar
     var filter: String = ""
 
     override fun test(roomMemberSummary: RoomMemberSummary): Boolean {
-        if (filter.isBlank()) {
+        if (filter.isEmpty()) {
             // No filter
             return true
         }

From 44d850e78f080beb1c5084ec7164091a4a79449b Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Fri, 2 Oct 2020 10:05:47 +0000
Subject: [PATCH 115/278] Translated using Weblate (German)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index d075cc44dd..1a271eaa09 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2654,7 +2654,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
         <item quantity="other">Falscher code, %d verbleibende Versuche</item>
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Warnung! Letzter Versuch bevor du ausgeloggt wirst!</string>
-    <string name="too_many_pin_failures">Zu viele Fehler, du bist ausgeloggt worden</string>
+    <string name="too_many_pin_failures">Zu viele Fehler. Du wurdest ausgeloggt</string>
     <string name="auth_msisdn_already_defined">Diese Telefonnummer ist bereits registriert.</string>
     <string name="settings_phone_number_empty">Deinem Konto wurde keine Telefonnummer hinzugefügt</string>
     <string name="settings_emails">E-mail-Adressen</string>

From 1b3a5097c10cd431840b2c7a40970ae32b399fef Mon Sep 17 00:00:00 2001
From: Cadence Ember <cloudrac3r@vivaldi.net>
Date: Sun, 4 Oct 2020 12:43:26 +1300
Subject: [PATCH 116/278] Replace "him" with "them" in report interface

All genders can spam a chatroom :)
---
 vector/src/main/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 9310af7577..c025054f98 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1851,11 +1851,11 @@
     <string name="block_user">"IGNORE USER"</string>
 
     <string name="content_reported_title">"Content reported"</string>
-    <string name="content_reported_content">"This content was reported.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <string name="content_reported_content">"This content was reported.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
     <string name="content_reported_as_spam_title">"Reported as spam"</string>
-    <string name="content_reported_as_spam_content">"This content was reported as spam.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <string name="content_reported_as_spam_content">"This content was reported as spam.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
     <string name="content_reported_as_inappropriate_title">"Reported as inappropriate"</string>
-    <string name="content_reported_as_inappropriate_content">"This content was reported as inappropriate.\n\nIf you don't want to see any more content from this user, you can block him to hide his messages"</string>
+    <string name="content_reported_as_inappropriate_content">"This content was reported as inappropriate.\n\nIf you don't want to see any more content from this user, you can ignore them to hide their messages."</string>
 
     <string name="permissions_rationale_msg_keys_backup_export">Element needs permission to save your E2E keys on disk.\n\nPlease allow access on the next pop-up to be able to export your keys manually.</string>
 

From b2030930739b839b8d5dc483d05e95537b7f2ba0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Sun, 4 Oct 2020 11:17:57 +0200
Subject: [PATCH 117/278] Use an extra container for the margin to be taken
 into account by the layout_scrollFlags

---
 .../layout/fragment_room_setting_generic.xml  | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_room_setting_generic.xml b/vector/src/main/res/layout/fragment_room_setting_generic.xml
index 4ab6d2c7df..07744436ea 100644
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@@ -78,17 +78,24 @@
             android:visibility="gone"
             tools:visibility="visible">
 
-            <androidx.appcompat.widget.SearchView
-                android:id="@+id/searchView"
-                style="@style/VectorSearchView"
+            <!-- Use an extra container for the margin to be taken into account by the layout_scrollFlags -->
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:background="@null"
-                android:minHeight="0dp"
-                app:layout_scrollFlags="scroll|enterAlways|snap"
-                tools:queryHint="@string/search_hint" />
+                app:layout_scrollFlags="scroll|enterAlways|snap">
+
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/searchView"
+                    style="@style/VectorSearchView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:background="@null"
+                    android:minHeight="0dp"
+                    tools:queryHint="@string/search_hint" />
+
+            </FrameLayout>
 
         </com.google.android.material.appbar.AppBarLayout>
 

From 6f2736566ea68cca395a9b084970c08c4997bf8c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 1 Oct 2020 17:43:43 +0200
Subject: [PATCH 118/278] Add a menu item to open the setting in room list and
 in room (#2171)

---
 CHANGES.md                                                | 1 +
 .../main/java/im/vector/app/features/home/HomeActivity.kt | 4 ++++
 .../app/features/home/room/detail/RoomDetailFragment.kt   | 4 ++++
 .../app/features/home/room/detail/RoomDetailViewModel.kt  | 1 +
 vector/src/main/res/menu/home.xml                         | 8 +++++++-
 vector/src/main/res/menu/menu_timeline.xml                | 6 ++++++
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4a158086a2..90a5b7afc2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Improvements 🙌:
  - Small optimisation of scrolling experience in timeline (#2114)
  - Allow user to reset cross signing if he has no way to recover (#2052)
  - Create home shortcut for any room (#1525)
+ - Add a menu item to open the setting in room list and in room (#2171)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index eb024c4db1..233bceaf7f 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -305,6 +305,10 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable, UnknownDeviceDet
                 navigator.openRoomsFiltering(this)
                 return true
             }
+            R.id.menu_home_setting ->{
+                navigator.openSettings(this)
+                return true
+            }
         }
 
         return super.onOptionsItemSelected(item)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 51aeda2aab..74a689977f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -656,6 +656,10 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.ClearSendQueue)
                 true
             }
+            R.id.timeline_setting    -> {
+                navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
+                true
+            }
             R.id.resend_all          -> {
                 roomDetailViewModel.handle(RoomDetailAction.ResendAll)
                 true
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 1b5e928843..c6896a8b87 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -533,6 +533,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                 // For now always disable when not in developer mode, worker cancellation is not working properly
                 timeline.pendingEventCount() > 0 && vectorPreferences.developerMode()
             R.id.resend_all          -> state.asyncRoomSummary()?.hasFailedSending == true
+            R.id.timeline_setting    -> true
             R.id.clear_all           -> state.asyncRoomSummary()?.hasFailedSending == true
             R.id.open_matrix_apps    -> true
             R.id.voice_call,
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/home.xml
index db84db6622..7a77c45240 100644
--- a/vector/src/main/res/menu/home.xml
+++ b/vector/src/main/res/menu/home.xml
@@ -2,6 +2,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_home_setting"
+        android:icon="@drawable/ic_settings_x"
+        android:title="@string/settings"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/menu_home_suggestion"
         android:icon="@drawable/ic_material_bug_report"
@@ -15,8 +21,8 @@
     <item
         android:id="@+id/menu_home_filter"
         android:icon="@drawable/ic_search"
-        app:iconTint="?riotx_text_secondary"
         android:title="@string/home_filter_placeholder_home"
+        app:iconTint="?riotx_text_secondary"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index e0566ccf6d..eb2227ad21 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -3,6 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <item
+        android:id="@+id/timeline_setting"
+        android:icon="@drawable/ic_settings_x"
+        android:title="@string/settings"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/search"
         android:title="@string/search"

From ae3c453f35ccac752e33a9f51c3b721f758f4500 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 10:10:55 +0200
Subject: [PATCH 119/278] Add a menu item in the timeline as a shortcut to
 invite user (#2171)

---
 CHANGES.md                                                   | 1 +
 .../app/features/home/room/detail/RoomDetailFragment.kt      | 4 ++++
 .../app/features/home/room/detail/RoomDetailViewModel.kt     | 3 +++
 .../app/features/home/room/detail/RoomDetailViewState.kt     | 1 +
 vector/src/main/res/menu/menu_timeline.xml                   | 5 +++++
 5 files changed, 14 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 90a5b7afc2..1b973dd521 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,7 @@ Improvements 🙌:
  - Allow user to reset cross signing if he has no way to recover (#2052)
  - Create home shortcut for any room (#1525)
  - Add a menu item to open the setting in room list and in room (#2171)
+ - Add a menu item in the timeline as a shortcut to invite user (#2171)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 74a689977f..137b430522 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -656,6 +656,10 @@ class RoomDetailFragment @Inject constructor(
                 roomDetailViewModel.handle(RoomDetailAction.ClearSendQueue)
                 true
             }
+            R.id.invite              -> {
+                navigator.openInviteUsersToRoom(requireActivity(), roomDetailArgs.roomId)
+                true
+            }
             R.id.timeline_setting    -> {
                 navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
                 true
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index c6896a8b87..b00b326800 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -180,11 +180,13 @@ class RoomDetailViewModel @AssistedInject constructor(
         PowerLevelsObservableFactory(room).createObservable()
                 .subscribe {
                     val canSendMessage = PowerLevelsHelper(it).isUserAllowedToSend(session.myUserId, false, EventType.MESSAGE)
+                    val canInvite = PowerLevelsHelper(it).isUserAbleToInvite(session.myUserId)
                     val isAllowedToManageWidgets = session.widgetService().hasPermissionsToHandleWidgets(room.roomId)
                     val isAllowedToStartWebRTCCall = PowerLevelsHelper(it).isUserAllowedToSend(session.myUserId, false, EventType.CALL_INVITE)
                     setState {
                         copy(
                                 canSendMessage = canSendMessage,
+                                canInvite = canInvite,
                                 isAllowedToManageWidgets = isAllowedToManageWidgets,
                                 isAllowedToStartWebRTCCall = isAllowedToStartWebRTCCall
                         )
@@ -534,6 +536,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                 timeline.pendingEventCount() > 0 && vectorPreferences.developerMode()
             R.id.resend_all          -> state.asyncRoomSummary()?.hasFailedSending == true
             R.id.timeline_setting    -> true
+            R.id.invite              -> state.canInvite
             R.id.clear_all           -> state.asyncRoomSummary()?.hasFailedSending == true
             R.id.open_matrix_apps    -> true
             R.id.voice_call,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 36acc35148..b36f62fe15 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -67,6 +67,7 @@ data class RoomDetailViewState(
         val canShowJumpToReadMarker: Boolean = true,
         val changeMembershipState: ChangeMembershipState = ChangeMembershipState.Unknown,
         val canSendMessage: Boolean = true,
+        val canInvite: Boolean = true,
         val isAllowedToManageWidgets: Boolean = false,
         val isAllowedToStartWebRTCCall: Boolean = true
 ) : MvRxState {
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index eb2227ad21..86ffe1f724 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -14,6 +14,11 @@
         android:title="@string/search"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/invite"
+        android:title="@string/invite"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/video_call"
         android:icon="@drawable/ic_video"

From 724c1132b6108025b05d4bf9ed770b529db9cb98 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 14:51:21 +0200
Subject: [PATCH 120/278] Drawer: move settings access and add sign out action
 (#2171)

---
 CHANGES.md                                    |  1 +
 .../app/features/home/HomeDrawerFragment.kt   |  7 ++
 .../settings/VectorSettingsGeneralFragment.kt |  3 +-
 .../workers/signout/SignOutUiWorker.kt        |  9 +--
 .../main/res/drawable/ic_settings_18dp.xml    | 10 +++
 .../src/main/res/drawable/ic_signout_18dp.xml | 18 ++++++
 .../main/res/layout/fragment_home_drawer.xml  | 64 ++++++++++++++-----
 7 files changed, 88 insertions(+), 24 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_settings_18dp.xml
 create mode 100644 vector/src/main/res/drawable/ic_signout_18dp.xml

diff --git a/CHANGES.md b/CHANGES.md
index 1b973dd521..de611dfffd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,7 @@ Improvements 🙌:
  - Create home shortcut for any room (#1525)
  - Add a menu item to open the setting in room list and in room (#2171)
  - Add a menu item in the timeline as a shortcut to invite user (#2171)
+ - Drawer: move settings access and add sign out action (#2171)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 3344989b0a..3b2ae74789 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -23,6 +23,7 @@ import im.vector.app.core.extensions.observeK
 import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.grouplist.GroupListFragment
+import im.vector.app.features.workers.signout.SignOutUiWorker
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.toMatrixItem
 import kotlinx.android.synthetic.main.fragment_home_drawer.*
@@ -53,10 +54,16 @@ class HomeDrawerFragment @Inject constructor(
                 homeDrawerUserIdView.text = user.userId
             }
         }
+        // Settings
         homeDrawerHeaderSettingsView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
             navigator.openSettings(requireActivity())
         }
+        // Sign out
+        homeDrawerHeaderSignoutView.debouncedClicks {
+            sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
+            SignOutUiWorker(requireActivity()).perform()
+        }
 
         // Debug menu
         homeDrawerHeaderDebugView.debouncedClicks {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index f538c4993b..6c0aefe9da 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -259,8 +259,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         findPreference<VectorPreference>("SETTINGS_SIGN_OUT_KEY")!!
                 .onPreferenceClickListener = Preference.OnPreferenceClickListener {
             activity?.let {
-                SignOutUiWorker(requireActivity())
-                        .perform(requireContext())
+                SignOutUiWorker(requireActivity()).perform()
             }
 
             false
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
index d78b652113..53ea5c7887 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutUiWorker.kt
@@ -16,11 +16,9 @@
 
 package im.vector.app.features.workers.signout
 
-import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentActivity
 import im.vector.app.R
-import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.cannotLogoutSafely
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.features.MainActivity
@@ -28,11 +26,8 @@ import im.vector.app.features.MainActivityArgs
 
 class SignOutUiWorker(private val activity: FragmentActivity) {
 
-    lateinit var activeSessionHolder: ActiveSessionHolder
-
-    fun perform(context: Context) {
-        activeSessionHolder = context.vectorComponent().activeSessionHolder()
-        val session = activeSessionHolder.getActiveSession()
+    fun perform() {
+        val session = activity.vectorComponent().activeSessionHolder().getSafeActiveSession() ?: return
         if (session.cannotLogoutSafely()) {
             // The backup check on logout flow has to be displayed if there are keys in the store, and the keys backup state is not Ready
             val signOutDialog = SignOutBottomSheetDialogFragment.newInstance()
diff --git a/vector/src/main/res/drawable/ic_settings_18dp.xml b/vector/src/main/res/drawable/ic_settings_18dp.xml
new file mode 100644
index 0000000000..4ca1725703
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_settings_18dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M14.89,6.83C15.05,7.25 15.46,7.53 15.91,7.53C16.51,7.53 17,8.02 17,8.62V9.38C17,9.98 16.51,10.47 15.91,10.47C15.46,10.47 15.05,10.75 14.89,11.17C14.8768,11.2031 14.8635,11.2366 14.8502,11.2704C14.8031,11.3901 14.7546,11.5131 14.7,11.63C14.51,12.04 14.6,12.52 14.92,12.84C15.35,13.26 15.35,13.95 14.92,14.38L14.38,14.92C13.96,15.35 13.27,15.35 12.84,14.92C12.53,14.6 12.04,14.51 11.63,14.7C11.48,14.77 11.33,14.83 11.17,14.89C10.75,15.05 10.47,15.46 10.47,15.91C10.47,16.51 9.98,17 9.38,17H8.62C8.02,17 7.53,16.51 7.53,15.91C7.53,15.46 7.25,15.05 6.83,14.89C6.7969,14.8768 6.7634,14.8635 6.7296,14.8502C6.61,14.8031 6.4869,14.7546 6.37,14.7C5.96,14.51 5.48,14.6 5.16,14.92C4.74,15.35 4.05,15.35 3.62,14.92L3.08,14.38C2.65,13.96 2.65,13.27 3.08,12.84C3.4,12.53 3.49,12.04 3.3,11.63C3.23,11.48 3.17,11.33 3.11,11.17C2.95,10.75 2.54,10.47 2.09,10.47C1.49,10.47 1,9.98 1,9.38V8.62C1,8.02 1.49,7.53 2.09,7.53C2.54,7.53 2.95,7.25 3.11,6.83C3.1416,6.729 3.1811,6.632 3.221,6.534C3.2444,6.4767 3.2679,6.419 3.29,6.36C3.48,5.95 3.39,5.47 3.07,5.15C2.64,4.73 2.64,4.04 3.07,3.61L3.62,3.08C4.04,2.65 4.73,2.65 5.16,3.08C5.47,3.4 5.96,3.49 6.37,3.3C6.52,3.23 6.67,3.16 6.83,3.11C7.25,2.95 7.53,2.54 7.53,2.09C7.53,1.49 8.02,1 8.62,1H9.38C9.98,1 10.47,1.49 10.47,2.09C10.47,2.55 10.75,2.95 11.17,3.11C11.2031,3.1232 11.2366,3.1365 11.2704,3.1498C11.3901,3.1969 11.5131,3.2454 11.63,3.3C12.04,3.49 12.52,3.4 12.84,3.08C13.26,2.65 13.95,2.65 14.38,3.08L14.92,3.62C15.35,4.04 15.35,4.73 14.92,5.16C14.6,5.47 14.51,5.96 14.7,6.37C14.77,6.52 14.83,6.67 14.89,6.83ZM9,13C6.79,13 5,11.21 5,9C5,6.79 6.79,5 9,5C11.21,5 13,6.79 13,9C13,11.21 11.21,13 9,13Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_signout_18dp.xml b/vector/src/main/res/drawable/ic_signout_18dp.xml
new file mode 100644
index 0000000000..80f2995bc0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_signout_18dp.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M9,2L14.8586,1.1631C15.461,1.077 16,1.5445 16,2.153V15.847C16,16.4555 15.461,16.923 14.8586,16.8369L9,16V2Z"
+      android:fillColor="#000000"/>
+  <group>
+    <clip-path
+        android:pathData="M3,2L10,2A1,1 0,0 1,11 3L11,15A1,1 0,0 1,10 16L3,16A1,1 0,0 1,2 15L2,3A1,1 0,0 1,3 2z"/>
+    <path
+        android:pathData="M3,2L10,2A1,1 0,0 1,11 3L11,15A1,1 0,0 1,10 16L3,16A1,1 0,0 1,2 15L2,3A1,1 0,0 1,3 2z"
+        android:strokeWidth="3"
+        android:fillColor="#00000000"
+        android:strokeColor="#000000"/>
+  </group>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index e09e26c575..12562bc98a 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?riotx_background"
     android:clickable="true"
     android:focusable="true">
 
@@ -42,11 +43,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="?riotx_text_primary"
             android:textSize="15sp"
-            app:layout_constraintEnd_toStartOf="@id/homeDrawerHeaderSettingsView"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
             tools:text="@sample/matrix.json/data/displayName" />
@@ -55,39 +57,71 @@
             android:id="@+id/homeDrawerUserIdView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:layout_marginBottom="17dp"
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/homeDrawerHeaderSettingsView"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerUsernameView"
             tools:text="@sample/matrix.json/data/mxid" />
 
-        <ImageView
-            android:id="@+id/homeDrawerHeaderSettingsView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:contentDescription="@string/room_sliding_menu_settings"
-            android:padding="16dp"
-            android:src="@drawable/ic_settings_x"
-            android:tint="?riotx_text_secondary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/homeDrawerGroupListContainer"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="?riotx_background"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/homeDrawerBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeader" />
 
+    <View
+        android:id="@+id/homeDrawerBottomSeparator"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?attr/vctr_list_divider_color"
+        app:layout_constraintBottom_toTopOf="@+id/homeDrawerHeaderSettingsView" />
+
+    <TextView
+        android:id="@+id/homeDrawerHeaderSettingsView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:drawablePadding="9dp"
+        android:gravity="center_vertical"
+        android:minWidth="120dp"
+        android:minHeight="52dp"
+        android:padding="16dp"
+        android:text="@string/settings"
+        android:textSize="14sp"
+        android:tint="?riotx_android_secondary"
+        app:drawableStartCompat="@drawable/ic_settings_18dp"
+        app:drawableTint="?riotx_android_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/homeDrawerHeaderSignoutView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:drawablePadding="9dp"
+        android:gravity="center_vertical"
+        android:minWidth="120dp"
+        android:minHeight="52dp"
+        android:padding="16dp"
+        android:text="@string/logout"
+        android:textSize="14sp"
+        android:tint="?riotx_android_secondary"
+        app:drawableStartCompat="@drawable/ic_signout_18dp"
+        app:drawableTint="?riotx_android_secondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 85c8092e65157a42201191e9ed6fe817b1a14d21 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 14:58:07 +0200
Subject: [PATCH 121/278] Add missing code to sign out when user click on the
 action

---
 .../workers/signout/SignOutBottomSheetDialogFragment.kt       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index ac4d495a8c..df7c5c023e 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -138,6 +138,10 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
             }
         }
 
+        signOutButton.action = {
+            onSignOut?.run()
+        }
+
         exportManuallyButton.action = {
             withState(viewModel) { state ->
                 queryExportKeys(state.userId, QUERY_EXPORT_KEYS)

From 015678ca207a00726c8c74dc0220b675c99bc081 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 15:15:40 +0200
Subject: [PATCH 122/278] Fix issue on SignOutBottomSheet (Sign out action
 displayed by mistake) Also improve code clarity by reordering lines and
 removing private method, which lead to bug (ex: duplicate action on
 `setupMegolmBackupButton` in `hideViews(setupMegolmBackupButton,
 setupMegolmBackupButton, signOutButton, exportManuallyButton)`)

---
 .../SignOutBottomSheetDialogFragment.kt       | 66 ++++++++-----------
 1 file changed, 27 insertions(+), 39 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index df7c5c023e..30f7ed93a3 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -35,8 +35,6 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.dialogs.ExportKeysDialog
@@ -45,6 +43,9 @@ import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import im.vector.app.features.crypto.recover.BootstrapBottomSheet
 import im.vector.app.features.crypto.recover.SetupMode
+import kotlinx.android.synthetic.main.bottom_sheet_logout_and_backup.*
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -57,21 +58,6 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
     @BindView(R.id.bottom_sheet_signout_backingup_status_group)
     lateinit var backingUpStatusGroup: ViewGroup
 
-    @BindView(R.id.setupRecoveryButton)
-    lateinit var setupRecoveryButton: SignoutBottomSheetActionButton
-
-    @BindView(R.id.setupMegolmBackupButton)
-    lateinit var setupMegolmBackupButton: SignoutBottomSheetActionButton
-
-    @BindView(R.id.exportManuallyButton)
-    lateinit var exportManuallyButton: SignoutBottomSheetActionButton
-
-    @BindView(R.id.exitAnywayButton)
-    lateinit var exitAnywayButton: SignoutBottomSheetActionButton
-
-    @BindView(R.id.signOutButton)
-    lateinit var signOutButton: SignoutBottomSheetActionButton
-
     @BindView(R.id.bottom_sheet_signout_icon_progress_bar)
     lateinit var backupProgress: ProgressBar
 
@@ -186,10 +172,10 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
             // we should show option to setup 4S
             setupRecoveryButton.isVisible = true
             setupMegolmBackupButton.isVisible = false
-            signOutButton.isVisible = false
             // We let the option to ignore and quit
             exportManuallyButton.isVisible = true
             exitAnywayButton.isVisible = true
+            signOutButton.isVisible = false
         } else if (state.keysBackupState == KeysBackupState.Unknown || state.keysBackupState == KeysBackupState.Disabled) {
             sheetTitle.text = getString(R.string.sign_out_bottom_sheet_warning_no_backup)
             backingUpStatusGroup.isVisible = false
@@ -198,10 +184,10 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
             // we should show option to setup 4S
             setupRecoveryButton.isVisible = false
             setupMegolmBackupButton.isVisible = true
-            signOutButton.isVisible = false
             // We let the option to ignore and quit
             exportManuallyButton.isVisible = true
             exitAnywayButton.isVisible = true
+            signOutButton.isVisible = false
         } else {
             // so keybackup is setup
             // You should wait until all are uploaded
@@ -217,13 +203,14 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
                     backupCompleteImage.isVisible = true
                     backupStatusTex.text = getString(R.string.keys_backup_info_keys_all_backup_up)
 
-                    hideViews(setupMegolmBackupButton, exportManuallyButton, exitAnywayButton)
+                    setupMegolmBackupButton.isVisible = false
+                    exportManuallyButton.isVisible = false
+                    exitAnywayButton.isVisible = false
                     // You can signout
                     signOutButton.isVisible = true
                 }
-
                 KeysBackupState.WillBackUp,
-                KeysBackupState.BackingUp     -> {
+                KeysBackupState.BackingUp -> {
                     sheetTitle.text = getString(R.string.sign_out_bottom_sheet_warning_backing_up)
 
                     // save in progress
@@ -232,18 +219,21 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
                     backupCompleteImage.isVisible = false
                     backupStatusTex.text = getString(R.string.sign_out_bottom_sheet_backing_up_keys)
 
-                    hideViews(setupMegolmBackupButton, setupMegolmBackupButton, signOutButton, exportManuallyButton)
+                    setupMegolmBackupButton.isVisible = false
+                    exportManuallyButton.isVisible = false
                     exitAnywayButton.isVisible = true
+                    signOutButton.isVisible = false
                 }
-                KeysBackupState.NotTrusted    -> {
+                KeysBackupState.NotTrusted -> {
                     sheetTitle.text = getString(R.string.sign_out_bottom_sheet_warning_backup_not_active)
                     // It's not trusted and we know there are unsaved keys..
                     backingUpStatusGroup.isVisible = false
 
-                    exportManuallyButton.isVisible = true
                     // option to enter pass/key
                     setupMegolmBackupButton.isVisible = true
+                    exportManuallyButton.isVisible = true
                     exitAnywayButton.isVisible = true
+                    signOutButton.isVisible = false
                 }
                 else                          -> {
                     // mmm.. strange state
@@ -257,21 +247,23 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
         when (state.hasBeenExportedToFile) {
             is Loading -> {
                 signoutExportingLoading.isVisible = true
-                hideViews(setupRecoveryButton,
-                        setupMegolmBackupButton,
-                        exportManuallyButton,
-                        backingUpStatusGroup,
-                        signOutButton)
+                backingUpStatusGroup.isVisible = false
+
+                setupRecoveryButton.isVisible = false
+                setupMegolmBackupButton.isVisible = false
+                exportManuallyButton.isVisible = false
                 exitAnywayButton.isVisible = true
+                signOutButton.isVisible = false
             }
             is Success -> {
                 if (state.hasBeenExportedToFile.invoke()) {
                     sheetTitle.text = getString(R.string.action_sign_out_confirmation_simple)
-                    hideViews(setupRecoveryButton,
-                            setupMegolmBackupButton,
-                            exportManuallyButton,
-                            backingUpStatusGroup,
-                            exitAnywayButton)
+                    backingUpStatusGroup.isVisible = false
+
+                    setupRecoveryButton.isVisible = false
+                    setupMegolmBackupButton.isVisible = false
+                    exportManuallyButton.isVisible = false
+                    exitAnywayButton.isVisible = false
                     signOutButton.isVisible = true
                 }
             }
@@ -319,8 +311,4 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
             }
         }
     }
-
-    private fun hideViews(vararg views: View) {
-        views.forEach { it.isVisible = false }
-    }
 }

From cae7510a77864fe7c4dfd6f2c290694a5f2d6e0a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 5 Oct 2020 15:25:14 +0200
Subject: [PATCH 123/278] Show debug access only in developer mode

---
 .../java/im/vector/app/features/home/HomeDrawerFragment.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 3b2ae74789..b8eb054076 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -18,19 +18,22 @@ package im.vector.app.features.home
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.extensions.observeK
 import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.grouplist.GroupListFragment
+import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.workers.signout.SignOutUiWorker
+import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.toMatrixItem
-import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import javax.inject.Inject
 
 class HomeDrawerFragment @Inject constructor(
         private val session: Session,
+        private val vectorPreferences: VectorPreferences,
         private val avatarRenderer: AvatarRenderer
 ) : VectorBaseFragment() {
 
@@ -66,6 +69,7 @@ class HomeDrawerFragment @Inject constructor(
         }
 
         // Debug menu
+        homeDrawerHeaderDebugView.isVisible = vectorPreferences.developerMode()
         homeDrawerHeaderDebugView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
             navigator.openDebug(requireActivity())

From 88dd6ae5dac184a2376f00370f84cef5b8a8d915 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 15:25:46 +0200
Subject: [PATCH 124/278] Rename some classes

---
 .../signout/SignoutBottomSheetActionButton.kt        | 12 ++++++------
 .../res/layout/bottom_sheet_logout_and_backup.xml    | 10 +++++-----
 vector/src/main/res/values/attrs.xml                 |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
index 02ea2569e8..3b73455923 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
@@ -31,7 +31,7 @@ import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.themes.ThemeUtils
 
-class SignoutBottomSheetActionButton @JvmOverloads constructor(
+class SignOutBottomSheetActionButton @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : LinearLayout(context, attrs, defStyleAttr) {
 
@@ -80,11 +80,11 @@ class SignoutBottomSheetActionButton @JvmOverloads constructor(
         inflate(context, R.layout.item_signout_action, this)
         ButterKnife.bind(this)
 
-        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SignoutBottomSheetActionButton, 0, 0)
-        title = typedArray.getString(R.styleable.SignoutBottomSheetActionButton_actionTitle) ?: ""
-        leftIcon = typedArray.getDrawable(R.styleable.SignoutBottomSheetActionButton_leftIcon)
-        tint = typedArray.getColor(R.styleable.SignoutBottomSheetActionButton_iconTint, ThemeUtils.getColor(context, android.R.attr.textColor))
-        textColor = typedArray.getColor(R.styleable.SignoutBottomSheetActionButton_textColor, ThemeUtils.getColor(context, android.R.attr.textColor))
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SignOutBottomSheetActionButton, 0, 0)
+        title = typedArray.getString(R.styleable.SignOutBottomSheetActionButton_actionTitle) ?: ""
+        leftIcon = typedArray.getDrawable(R.styleable.SignOutBottomSheetActionButton_leftIcon)
+        tint = typedArray.getColor(R.styleable.SignOutBottomSheetActionButton_iconTint, ThemeUtils.getColor(context, android.R.attr.textColor))
+        textColor = typedArray.getColor(R.styleable.SignOutBottomSheetActionButton_textColor, ThemeUtils.getColor(context, android.R.attr.textColor))
 
         typedArray.recycle()
 
diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
index c109e821cb..63a250e219 100644
--- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
+++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
@@ -81,7 +81,7 @@
             android:layout_height="wrap_content" />
     </LinearLayout>
 
-    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
         android:id="@+id/setupRecoveryButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
         app:textColor="?riotx_text_secondary" />
 
 
-    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
         android:id="@+id/setupMegolmBackupButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
         app:leftIcon="@drawable/backup_keys"
         app:textColor="?riotx_text_secondary" />
 
-    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
         android:id="@+id/exportManuallyButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -109,7 +109,7 @@
         app:leftIcon="@drawable/ic_download"
         app:textColor="?riotx_text_secondary" />
 
-    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
         android:id="@+id/exitAnywayButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
         app:leftIcon="@drawable/ic_material_leave"
         app:textColor="@color/riotx_destructive_accent" />
 
-    <im.vector.app.features.workers.signout.SignoutBottomSheetActionButton
+    <im.vector.app.features.workers.signout.SignOutBottomSheetActionButton
         android:id="@+id/signOutButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index bf393b779a..55a4f9a84e 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -60,7 +60,7 @@
         <attr name="forceStartPadding" format="boolean" />
     </declare-styleable>
 
-    <declare-styleable name="SignoutBottomSheetActionButton">
+    <declare-styleable name="SignOutBottomSheetActionButton">
         <attr name="iconTint" format="color" />
         <attr name="actionTitle"/>
         <attr name="leftIcon" />

From 19def67a9aba5077ac15e0434e99062defa5fd93 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Sun, 4 Oct 2020 13:43:47 +0000
Subject: [PATCH 125/278] Translated using Weblate (German)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1a271eaa09..1b653375cc 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -96,9 +96,9 @@
     <string name="no_room_placeholder">Keine Räume</string>
     <string name="no_public_room_placeholder">Keine öffentl. Räume verfügbar</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 Benutzer</item>
-        <item quantity="other">%d Benutzer</item>
-    </plurals>
+	<item quantity="one">1 Benutzer</item>
+	<item quantity="other">%d Benutzer/in</item>
+</plurals>
 
     <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
@@ -312,7 +312,7 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="room_participants_action_remove">Aus diesem Raum entfernen</string>
     <string name="room_participants_action_ban">Verbannen</string>
     <string name="room_participants_action_unban">Verbannung aufheben</string>
-    <string name="room_participants_action_set_default_power_level">Zum normalen Benutzer herabstufen</string>
+    <string name="room_participants_action_set_default_power_level">Zum/r normalen Benutzer/in herabstufen</string>
     <string name="room_participants_action_set_moderator">Zum Moderator machen</string>
     <string name="room_participants_action_set_admin">Zum Admin machen</string>
     <string name="room_participants_action_ignore">Alle Nachrichten dieses Nutzers verbergen</string>
@@ -320,8 +320,7 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="room_participants_invite_search_another_user">Nutzer-ID, Name oder E-Mail-Adresse</string>
     <string name="room_participants_action_mention">Erwähnen</string>
     <string name="room_participants_action_devices_list">Sitzungsliste anzeigen</string>
-    <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da der Benutzer dasselbe Berechtigungslevel wie du selbst erhalten wirst.
-Bist du sicher?</string>
+    <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da der/die Benutzer!n dasselbe Berechtigungslevel wie du selbst erhalten wirst. Bist du sicher\?</string>
 
     <string name="room_participants_invite_prompt_msg">"Bist du sicher, dass du %s in diesen Chat einladen willst?"</string>
 

From 0a31cf2c4477fc44e2fdac5a3575d405e196ae7c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 16:21:25 +0200
Subject: [PATCH 126/278] ktlint

---
 .../src/main/java/im/vector/app/features/home/HomeActivity.kt   | 2 +-
 ...omSheetActionButton.kt => SignOutBottomSheetActionButton.kt} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename vector/src/main/java/im/vector/app/features/workers/signout/{SignoutBottomSheetActionButton.kt => SignOutBottomSheetActionButton.kt} (100%)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 233bceaf7f..829ab1624b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -305,7 +305,7 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable, UnknownDeviceDet
                 navigator.openRoomsFiltering(this)
                 return true
             }
-            R.id.menu_home_setting ->{
+            R.id.menu_home_setting    -> {
                 navigator.openSettings(this)
                 return true
             }
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt
similarity index 100%
rename from vector/src/main/java/im/vector/app/features/workers/signout/SignoutBottomSheetActionButton.kt
rename to vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetActionButton.kt

From 26b8ef8af93cfe7a962d48f5c9e7a7bffdfa2937 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Mon, 5 Oct 2020 17:28:05 +0200
Subject: [PATCH 127/278] Changed rainbow algorithm

---
 CHANGES.md                                    |  1 +
 .../composer/rainbow/RainbowGenerator.kt      | 83 ++++++++++---------
 .../composer/rainbow/RainbowGeneratorTest.kt  | 78 ++++++++---------
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 4a158086a2..f0bae1aa32 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,6 +4,7 @@ Changes in Element 1.0.9 (2020-XX-XX)
 Features ✨:
  - Search messages in a room - phase 1 (#2110)
  - Hide encrypted history (before user is invited). Can be shown if wanted in developer settings
+ - Changed rainbow algorithm
 
 Improvements 🙌:
  - Wording differentiation for direct rooms (#2176)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
index 7bed9f8e64..7a64d437c5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
@@ -18,8 +18,10 @@ package im.vector.app.features.home.room.detail.composer.rainbow
 
 import im.vector.app.core.utils.splitEmoji
 import javax.inject.Inject
-import kotlin.math.abs
+import kotlin.math.cos
+import kotlin.math.pow
 import kotlin.math.roundToInt
+import kotlin.math.sin
 
 /**
  * Inspired from React-Sdk
@@ -29,7 +31,7 @@ class RainbowGenerator @Inject constructor() {
 
     fun generate(text: String): String {
         val split = text.splitEmoji()
-        val frequency = 360f / split.size
+        val frequency = 360.0 / split.size
 
         return split
                 .mapIndexed { idx, letter ->
@@ -37,53 +39,54 @@ class RainbowGenerator @Inject constructor() {
                     if (letter == " ") {
                         "$letter"
                     } else {
-                        val dashColor = hueToRGB(idx * frequency, 1.0f, 0.5f).toDashColor()
+                        val (a, b) = generateAB(idx * frequency, 1f)
+                        val dashColor = labToRGB(75, a, b).toDashColor()
                         "<font color=\"$dashColor\">$letter</font>"
                     }
                 }
                 .joinToString(separator = "")
     }
 
-    private fun hueToRGB(h: Float, s: Float, l: Float): RgbColor {
-        val c = s * (1 - abs(2 * l - 1))
-        val x = c * (1 - abs((h / 60) % 2 - 1))
-        val m = l - c / 2
+    private fun generateAB(hue: Double, chroma: Float): Pair<Double, Double> {
+        val radians = Math.toRadians(hue)
 
-        var r = 0f
-        var g = 0f
-        var b = 0f
+        val a = chroma * 127 * cos(radians)
+        val b = chroma * 127 * sin(radians)
 
-        when {
-            h < 60f  -> {
-                r = c
-                g = x
-            }
-            h < 120f -> {
-                r = x
-                g = c
-            }
-            h < 180f -> {
-                g = c
-                b = x
-            }
-            h < 240f -> {
-                g = x
-                b = c
-            }
-            h < 300f -> {
-                r = x
-                b = c
-            }
-            else     -> {
-                r = c
-                b = x
-            }
+        return Pair(a, b)
+    }
+
+    private fun labToRGB(l: Int, a: Double, b: Double): RgbColor {
+        var y = (l + 16) / 116.0
+        val x = adjustXYZ(y + a / 500) * 0.9505
+        val z = adjustXYZ(y - b / 200) * 1.0890
+
+        y = adjustXYZ(y)
+
+        val red = 3.24096994 * x - 1.53738318 * y - 0.49861076 * z
+        val green = -0.96924364 * x + 1.8759675 * y + 0.04155506 * z
+        val blue = 0.05563008 * x - 0.20397696 * y + 1.05697151 * z
+
+        return RgbColor(adjustRGB(red), adjustRGB(green), adjustRGB(blue))
+    }
+
+    private fun adjustXYZ(value: Double): Double {
+        if (value > 0.2069) {
+            return value.pow(3)
         }
+        return 0.1284 * value - 0.01771
+    }
 
-        return RgbColor(
-                ((r + m) * 255).roundToInt(),
-                ((g + m) * 255).roundToInt(),
-                ((b + m) * 255).roundToInt()
-        )
+    private fun gammaCorrection(value: Double): Double {
+        if (value <= 0.0031308) {
+            return 12.92 * value
+        }
+        return 1.055 * value.pow(1 / 2.4) - 0.055
+    }
+
+    private fun adjustRGB(value: Double): Int {
+        return (gammaCorrection(value)
+                .coerceIn(0.0, 1.0) * 255)
+                .roundToInt()
     }
 }
diff --git a/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
index 0e46d67860..20b041fd1e 100644
--- a/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
+++ b/vector/src/test/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGeneratorTest.kt
@@ -32,14 +32,14 @@ class RainbowGeneratorTest {
 
     @Test
     fun testAscii1() {
-        assertEquals("""<font color="#ff0000">a</font>""", rainbowGenerator.generate("a"))
+        assertEquals("""<font color="#ff00be">a</font>""", rainbowGenerator.generate("a"))
     }
 
     @Test
     fun testAscii2() {
         val expected = """
-            <font color="#ff0000">a</font>
-            <font color="#00ffff">b</font>
+            <font color="#ff00be">a</font>
+            <font color="#00e6b6">b</font>
         """.trimIndentOneLine()
 
         assertEquals(expected, rainbowGenerator.generate("ab"))
@@ -48,24 +48,24 @@ class RainbowGeneratorTest {
     @Test
     fun testAscii3() {
         val expected = """
-            <font color="#ff0000">T</font>
-            <font color="#ff5500">h</font>
-            <font color="#ffaa00">i</font>
-            <font color="#ffff00">s</font>
+            <font color="#ff00be">T</font>
+            <font color="#ff0072">h</font>
+            <font color="#ff3b1d">i</font>
+            <font color="#ff7e00">s</font>
              
-            <font color="#55ff00">i</font>
-            <font color="#00ff00">s</font>
+            <font color="#bdc100">i</font>
+            <font color="#64d200">s</font>
              
-            <font color="#00ffaa">a</font>
+            <font color="#00e261">a</font>
              
-            <font color="#00aaff">r</font>
-            <font color="#0055ff">a</font>
-            <font color="#0000ff">i</font>
-            <font color="#5500ff">n</font>
-            <font color="#aa00ff">b</font>
-            <font color="#ff00ff">o</font>
-            <font color="#ff00aa">w</font>
-            <font color="#ff0055">!</font>
+            <font color="#00e7ff">r</font>
+            <font color="#00e6ff">a</font>
+            <font color="#00e1ff">i</font>
+            <font color="#00d4ff">n</font>
+            <font color="#00bdff">b</font>
+            <font color="#9598ff">o</font>
+            <font color="#ff60ff">w</font>
+            <font color="#ff00ff">!</font>
         """.trimIndentOneLine()
 
         assertEquals(expected, rainbowGenerator.generate("This is a rainbow!"))
@@ -73,19 +73,19 @@ class RainbowGeneratorTest {
 
     @Test
     fun testEmoji1() {
-        assertEquals("""<font color="#ff0000">🤞</font>""", rainbowGenerator.generate("\uD83E\uDD1E")) // 🤞
+        assertEquals("""<font color="#ff00be">🤞</font>""", rainbowGenerator.generate("\uD83E\uDD1E")) // 🤞
     }
 
     @Test
     fun testEmoji2() {
-        assertEquals("""<font color="#ff0000">🤞</font>""", rainbowGenerator.generate("🤞"))
+        assertEquals("""<font color="#ff00be">🤞</font>""", rainbowGenerator.generate("🤞"))
     }
 
     @Test
     fun testEmoji3() {
         val expected = """
-            <font color="#ff0000">🤞</font>
-            <font color="#00ffff">🙂</font>
+            <font color="#ff00be">🤞</font>
+            <font color="#00e6b6">🙂</font>
         """.trimIndentOneLine()
 
         assertEquals(expected, rainbowGenerator.generate("🤞🙂"))
@@ -94,20 +94,20 @@ class RainbowGeneratorTest {
     @Test
     fun testEmojiMix1() {
         val expected = """
-            <font color="#ff0000">H</font>
-            <font color="#ff6d00">e</font>
-            <font color="#ffdb00">l</font>
-            <font color="#b6ff00">l</font>
-            <font color="#49ff00">o</font>
+            <font color="#ff00be">H</font>
+            <font color="#ff005d">e</font>
+            <font color="#ff6700">l</font>
+            <font color="#ffa100">l</font>
+            <font color="#b2c400">o</font>
              
-            <font color="#00ff92">🤞</font>
+            <font color="#00e147">🤞</font>
              
-            <font color="#0092ff">w</font>
-            <font color="#0024ff">o</font>
-            <font color="#4900ff">r</font>
-            <font color="#b600ff">l</font>
-            <font color="#ff00db">d</font>
-            <font color="#ff006d">!</font>
+            <font color="#00e7ff">w</font>
+            <font color="#00e4ff">o</font>
+            <font color="#00d6ff">r</font>
+            <font color="#00b9ff">l</font>
+            <font color="#da83ff">d</font>
+            <font color="#ff03ff">!</font>
         """.trimIndentOneLine()
 
         assertEquals(expected, rainbowGenerator.generate("Hello 🤞 world!"))
@@ -116,8 +116,8 @@ class RainbowGeneratorTest {
     @Test
     fun testEmojiMix2() {
         val expected = """
-            <font color="#ff0000">a</font>
-            <font color="#00ffff">🤞</font>
+            <font color="#ff00be">a</font>
+            <font color="#00e6b6">🤞</font>
         """.trimIndentOneLine()
 
         assertEquals(expected, rainbowGenerator.generate("a🤞"))
@@ -126,8 +126,8 @@ class RainbowGeneratorTest {
     @Test
     fun testEmojiMix3() {
         val expected = """
-            <font color="#ff0000">🤞</font>
-            <font color="#00ffff">a</font>
+            <font color="#ff00be">🤞</font>
+            <font color="#00e6b6">a</font>
         """.trimIndentOneLine()
 
         assertEquals(expected, rainbowGenerator.generate("🤞a"))
@@ -135,6 +135,6 @@ class RainbowGeneratorTest {
 
     @Test
     fun testError1() {
-        assertEquals("<font color=\"#ff0000\">\uD83E</font>", rainbowGenerator.generate("\uD83E"))
+        assertEquals("<font color=\"#ff00be\">\uD83E</font>", rainbowGenerator.generate("\uD83E"))
     }
 }

From aa0520d47dba1c2b0d50b946aef4784a6317d75f Mon Sep 17 00:00:00 2001
From: ganfra
 <francoisg@matrix.orgfrancoisg@matrix.orgfrancoisg@matrix.orgfrancoisg@matrix.org>
Date: Tue, 22 Sep 2020 18:56:05 +0200
Subject: [PATCH 128/278] Start reworking draft (simplify)

---
 .../java/org/matrix/android/sdk/rx/RxRoom.kt  |   7 +-
 .../sdk/api/session/room/send/DraftService.kt |  11 +-
 .../session/room/draft/DefaultDraftService.kt |   7 +-
 .../session/room/draft/DraftRepository.kt     | 111 ++++++------------
 .../home/room/detail/RoomDetailViewModel.kt   |  61 ++--------
 5 files changed, 65 insertions(+), 132 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index 0717a10d03..2bb6c0ff69 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -101,8 +101,11 @@ class RxRoom(private val room: Room) {
         return room.getEventReadReceiptsLive(eventId).asObservable()
     }
 
-    fun liveDrafts(): Observable<List<UserDraft>> {
-        return room.getDraftsLive().asObservable()
+    fun liveDraft(): Observable<Optional<UserDraft>> {
+        return room.getDraftLive().asObservable()
+                .startWithCallable {
+                    room.getDraft().toOptional()
+                }
     }
 
     fun liveNotificationState(): Observable<RoomNotificationState> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
index dc91d5177f..6ef73d6486 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
@@ -20,6 +20,7 @@ package org.matrix.android.sdk.api.session.room.send
 import androidx.lifecycle.LiveData
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
 
 interface DraftService {
 
@@ -34,8 +35,12 @@ interface DraftService {
     fun deleteDraft(callback: MatrixCallback<Unit>): Cancelable
 
     /**
-     * Return the current drafts if any, as a live data
-     * The draft list can contain one draft for {regular, reply, quote} and an arbitrary number of {edit} drafts
+     * Return the current draft or null
      */
-    fun getDraftsLive(): LiveData<List<UserDraft>>
+    fun getDraft(): UserDraft?
+
+    /**
+     * Return the current draft if any, as a live data
+     */
+    fun getDraftLive(): LiveData<Optional<UserDraft>>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
index dafa7df0eb..0426ee13e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.room.send.DraftService
 import org.matrix.android.sdk.api.session.room.send.UserDraft
 import org.matrix.android.sdk.api.util.Cancelable
+import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.launchToCallback
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
@@ -55,7 +56,11 @@ internal class DefaultDraftService @AssistedInject constructor(@Assisted private
         }
     }
 
-    override fun getDraftsLive(): LiveData<List<UserDraft>> {
+    override fun getDraft(): UserDraft? {
+        return draftRepository.getDraft(roomId)
+    }
+
+    override fun getDraftLive(): LiveData<Optional<UserDraft>> {
         return draftRepository.getDraftsLive(roomId)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
index bc50b2d990..9262eb2f49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@@ -20,35 +20,61 @@ package org.matrix.android.sdk.internal.session.room.draft
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import io.realm.kotlin.createObject
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.session.room.send.UserDraft
+import org.matrix.android.sdk.api.util.Optional
+import org.matrix.android.sdk.api.util.toOptional
 import org.matrix.android.sdk.internal.database.mapper.DraftMapper
-import org.matrix.android.sdk.internal.database.model.DraftEntity
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.UserDraftsEntity
 import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.util.awaitTransaction
-import io.realm.Realm
-import io.realm.kotlin.createObject
 import timber.log.Timber
 import javax.inject.Inject
 
-class DraftRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy) {
+internal class DraftRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy) {
 
     suspend fun saveDraft(roomId: String, userDraft: UserDraft) {
         monarchy.awaitTransaction {
-            saveDraft(it, userDraft, roomId)
+            saveDraftInDb(it, userDraft, roomId)
         }
     }
 
     suspend fun deleteDraft(roomId: String) {
         monarchy.awaitTransaction {
-            deleteDraft(it, roomId)
+            deleteDraftFromDb(it, roomId)
         }
     }
 
-    private fun deleteDraft(realm: Realm, roomId: String) {
+    fun getDraft(roomId: String): UserDraft? {
+        return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
+            UserDraftsEntity.where(realm, roomId).findFirst()
+                    ?.userDrafts
+                    ?.firstOrNull()
+                    ?.let {
+                        DraftMapper.map(it)
+                    }
+        }
+    }
+
+    fun getDraftsLive(roomId: String): LiveData<Optional<UserDraft>> {
+        val liveData = monarchy.findAllMappedWithChanges(
+                { UserDraftsEntity.where(it, roomId) },
+                {
+                    it.userDrafts.map { draft ->
+                        DraftMapper.map(draft)
+                    }
+                }
+        )
+        return Transformations.map(liveData) {
+            it.firstOrNull()?.firstOrNull().toOptional()
+        }
+    }
+
+    private fun deleteDraftFromDb(realm: Realm, roomId: String) {
         UserDraftsEntity.where(realm, roomId).findFirst()?.let { userDraftsEntity ->
             if (userDraftsEntity.userDrafts.isNotEmpty()) {
                 userDraftsEntity.userDrafts.removeAt(userDraftsEntity.userDrafts.size - 1)
@@ -56,7 +82,7 @@ class DraftRepository @Inject constructor(@SessionDatabase private val monarchy:
         }
     }
 
-    private fun saveDraft(realm: Realm, draft: UserDraft, roomId: String) {
+    private fun saveDraftInDb(realm: Realm, draft: UserDraft, roomId: String) {
         val roomSummaryEntity = RoomSummaryEntity.where(realm, roomId).findFirst()
                 ?: realm.createObject(roomId)
 
@@ -68,62 +94,15 @@ class DraftRepository @Inject constructor(@SessionDatabase private val monarchy:
         userDraftsEntity.let { userDraftEntity ->
             // Save only valid draft
             if (draft.isValid()) {
-                // Add a new draft or update the current one?
+                // Replace the current draft
                 val newDraft = DraftMapper.map(draft)
-
-                // Is it an update of the top draft?
-                val topDraft = userDraftEntity.userDrafts.lastOrNull()
-
-                if (topDraft == null) {
-                    Timber.d("Draft: create a new draft ${privacySafe(draft)}")
-                    userDraftEntity.userDrafts.add(newDraft)
-                } else if (topDraft.draftMode == DraftEntity.MODE_EDIT) {
-                    // top draft is an edit
-                    if (newDraft.draftMode == DraftEntity.MODE_EDIT) {
-                        if (topDraft.linkedEventId == newDraft.linkedEventId) {
-                            // Update the top draft
-                            Timber.d("Draft: update the top edit draft ${privacySafe(draft)}")
-                            topDraft.content = newDraft.content
-                        } else {
-                            // Check a previously EDIT draft with the same id
-                            val existingEditDraftOfSameEvent = userDraftEntity.userDrafts.find {
-                                it.draftMode == DraftEntity.MODE_EDIT && it.linkedEventId == newDraft.linkedEventId
-                            }
-
-                            if (existingEditDraftOfSameEvent != null) {
-                                // Ignore the new text, restore what was typed before, by putting the draft to the top
-                                Timber.d("Draft: restore a previously edit draft ${privacySafe(draft)}")
-                                userDraftEntity.userDrafts.remove(existingEditDraftOfSameEvent)
-                                userDraftEntity.userDrafts.add(existingEditDraftOfSameEvent)
-                            } else {
-                                Timber.d("Draft: add a new edit draft ${privacySafe(draft)}")
-                                userDraftEntity.userDrafts.add(newDraft)
-                            }
-                        }
-                    } else {
-                        // Add a new regular draft to the top
-                        Timber.d("Draft: add a new draft ${privacySafe(draft)}")
-                        userDraftEntity.userDrafts.add(newDraft)
-                    }
-                } else {
-                    // Top draft is not an edit
-                    if (newDraft.draftMode == DraftEntity.MODE_EDIT) {
-                        Timber.d("Draft: create a new edit draft ${privacySafe(draft)}")
-                        userDraftEntity.userDrafts.add(newDraft)
-                    } else {
-                        // Update the top draft
-                        Timber.d("Draft: update the top draft ${privacySafe(draft)}")
-                        topDraft.draftMode = newDraft.draftMode
-                        topDraft.content = newDraft.content
-                        topDraft.linkedEventId = newDraft.linkedEventId
-                    }
-                }
+                Timber.d("Draft: create a new draft ${privacySafe(draft)}")
+                userDraftEntity.userDrafts.clear()
+                userDraftEntity.userDrafts.add(newDraft)
             } else {
                 // There is no draft to save, so the composer was clear
                 Timber.d("Draft: delete a draft")
-
                 val topDraft = userDraftEntity.userDrafts.lastOrNull()
-
                 if (topDraft == null) {
                     Timber.d("Draft: nothing to do")
                 } else {
@@ -135,20 +114,6 @@ class DraftRepository @Inject constructor(@SessionDatabase private val monarchy:
         }
     }
 
-    fun getDraftsLive(roomId: String): LiveData<List<UserDraft>> {
-        val liveData = monarchy.findAllMappedWithChanges(
-                { UserDraftsEntity.where(it, roomId) },
-                {
-                    it.userDrafts.map { draft ->
-                        DraftMapper.map(draft)
-                    }
-                }
-        )
-        return Transformations.map(liveData) {
-            it.firstOrNull().orEmpty()
-        }
-    }
-
     private fun privacySafe(o: Any): Any {
         if (BuildConfig.LOG_PRIVATE_DATA) {
             return o
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 1b5e928843..42ce8567cd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -680,7 +680,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }.exhaustive
                 }
-                is SendMode.EDIT    -> {
+                is SendMode.EDIT -> {
                     // is original event a reply?
                     val inReplyTo = state.sendMode.timelineEvent.root.getClearContent().toModel<MessageContent>()?.relatesTo?.inReplyTo?.eventId
                             ?: state.sendMode.timelineEvent.root.content.toModel<EncryptedEventContent>()?.relatesTo?.inReplyTo?.eventId
@@ -706,7 +706,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.QUOTE   -> {
+                is SendMode.QUOTE -> {
                     val messageContent: MessageContent? =
                             state.sendMode.timelineEvent.annotations?.editSummary?.aggregatedContent.toModel()
                                     ?: state.sendMode.timelineEvent.root.getClearContent().toModel()
@@ -729,7 +729,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.REPLY   -> {
+                is SendMode.REPLY -> {
                     state.sendMode.timelineEvent.let {
                         room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
                         _viewEvents.post(RoomDetailViewEvents.MessageSent)
@@ -741,6 +741,9 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun popDraft() {
+        setState {
+            copy(sendMode = SendMode.REGULAR(""))
+        }
         room.deleteDraft(NoOpMatrixCallback())
     }
 
@@ -915,73 +918,25 @@ class RoomDetailViewModel @AssistedInject constructor(
     }
 
     private fun handleEditAction(action: RoomDetailAction.EnterEditMode) {
-        saveCurrentDraft(action.text)
-
         room.getTimeLineEvent(action.eventId)?.let { timelineEvent ->
-            setState { copy(sendMode = SendMode.EDIT(timelineEvent, action.text)) }
-            timelineEvent.root.eventId?.let {
-                room.saveDraft(UserDraft.EDIT(it, timelineEvent.getTextEditableContent() ?: ""), NoOpMatrixCallback())
-            }
+            setState { copy(sendMode = SendMode.EDIT(timelineEvent, timelineEvent.getTextEditableContent() ?: "")) }
         }
     }
 
     private fun handleQuoteAction(action: RoomDetailAction.EnterQuoteMode) {
-        saveCurrentDraft(action.text)
-
         room.getTimeLineEvent(action.eventId)?.let { timelineEvent ->
             setState { copy(sendMode = SendMode.QUOTE(timelineEvent, action.text)) }
-            withState { state ->
-                // Save a new draft and keep the previously entered text, if it was not an edit
-                timelineEvent.root.eventId?.let {
-                    if (state.sendMode is SendMode.EDIT) {
-                        room.saveDraft(UserDraft.QUOTE(it, ""), NoOpMatrixCallback())
-                    } else {
-                        room.saveDraft(UserDraft.QUOTE(it, action.text), NoOpMatrixCallback())
-                    }
-                }
-            }
         }
     }
 
     private fun handleReplyAction(action: RoomDetailAction.EnterReplyMode) {
-        saveCurrentDraft(action.text)
-
         room.getTimeLineEvent(action.eventId)?.let { timelineEvent ->
             setState { copy(sendMode = SendMode.REPLY(timelineEvent, action.text)) }
-            withState { state ->
-                // Save a new draft and keep the previously entered text, if it was not an edit
-                timelineEvent.root.eventId?.let {
-                    if (state.sendMode is SendMode.EDIT) {
-                        room.saveDraft(UserDraft.REPLY(it, ""), NoOpMatrixCallback())
-                    } else {
-                        room.saveDraft(UserDraft.REPLY(it, action.text), NoOpMatrixCallback())
-                    }
-                }
-            }
-        }
-    }
-
-    private fun saveCurrentDraft(draft: String) {
-        // Save the draft with the current text if any
-        withState {
-            if (draft.isNotBlank()) {
-                when (it.sendMode) {
-                    is SendMode.REGULAR -> room.saveDraft(UserDraft.REGULAR(draft), NoOpMatrixCallback())
-                    is SendMode.REPLY   -> room.saveDraft(UserDraft.REPLY(it.sendMode.timelineEvent.root.eventId!!, draft), NoOpMatrixCallback())
-                    is SendMode.QUOTE   -> room.saveDraft(UserDraft.QUOTE(it.sendMode.timelineEvent.root.eventId!!, draft), NoOpMatrixCallback())
-                    is SendMode.EDIT    -> room.saveDraft(UserDraft.EDIT(it.sendMode.timelineEvent.root.eventId!!, draft), NoOpMatrixCallback())
-                }
-            }
         }
     }
 
     private fun handleExitSpecialMode(action: RoomDetailAction.ExitSpecialMode) = withState {
-        if (it.sendMode is SendMode.EDIT) {
-            room.deleteDraft(NoOpMatrixCallback())
-        } else {
-            // Save a new draft and keep the previously entered text
-            room.saveDraft(UserDraft.REGULAR(action.text), NoOpMatrixCallback())
-        }
+        room.deleteDraft(NoOpMatrixCallback())
         setState { copy(sendMode = SendMode.REGULAR(action.text)) }
     }
 

From f9c35e6bcba071b544cc46d06cd0be002a46904a Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 6 Oct 2020 11:15:00 +0300
Subject: [PATCH 129/278] If there is a pending email validation continue on
 this step

---
 CHANGES.md                                         |  1 +
 .../im/vector/app/features/login/LoginAction.kt    |  2 +-
 .../im/vector/app/features/login/LoginActivity.kt  | 14 +++++++-------
 .../im/vector/app/features/login/LoginViewModel.kt |  7 +++++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 754fb35612..697aa17b35 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
  - Small optimisation of scrolling experience in timeline (#2114)
  - Allow user to reset cross signing if he has no way to recover (#2052)
  - Create home shortcut for any room (#1525)
+ - Can't confirm email due to killing by Android (#2021)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginAction.kt b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
index 9067984852..9788060ad3 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
@@ -27,7 +27,7 @@ sealed class LoginAction : VectorViewModelAction {
     data class UpdateSignMode(val signMode: SignMode) : LoginAction()
     data class LoginWithToken(val loginToken: String) : LoginAction()
     data class WebLoginSuccess(val credentials: Credentials) : LoginAction()
-    data class InitWith(val loginConfig: LoginConfig) : LoginAction()
+    data class InitWith(val loginConfig: LoginConfig?) : LoginAction()
     data class ResetPassword(val email: String, val newPassword: String) : LoginAction()
     object ResetPasswordMailConfirmed : LoginAction()
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
index 0eb4ef3e32..01e835b4e3 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
@@ -91,19 +91,19 @@ open class LoginActivity : VectorBaseActivity(), ToolbarConfigurable, UnlockedAc
             addFirstFragment()
         }
 
-        // Get config extra
-        val loginConfig = intent.getParcelableExtra<LoginConfig?>(EXTRA_CONFIG)
-        if (loginConfig != null && isFirstCreation()) {
-            // TODO Check this
-            loginViewModel.handle(LoginAction.InitWith(loginConfig))
-        }
-
         loginViewModel
                 .subscribe(this) {
                     updateWithState(it)
                 }
 
         loginViewModel.observeViewEvents { handleLoginViewEvents(it) }
+
+        // Get config extra
+        val loginConfig = intent.getParcelableExtra<LoginConfig?>(EXTRA_CONFIG)
+        if (isFirstCreation()) {
+            // TODO Check this
+            loginViewModel.handle(LoginAction.InitWith(loginConfig))
+        }
     }
 
     protected open fun addFirstFragment() {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index f986227961..dc513d1666 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -417,6 +417,13 @@ class LoginViewModel @AssistedInject constructor(
 
     private fun handleInitWith(action: LoginAction.InitWith) {
         loginConfig = action.loginConfig
+
+        // If there is a pending email validation continue on this step
+        currentThreePid?.let {
+            if (isRegistrationStarted) {
+                handle(LoginAction.PostViewEvent(LoginViewEvents.OnSendEmailSuccess(it)))
+            }
+        }
     }
 
     private fun handleResetPassword(action: LoginAction.ResetPassword) {

From 91b81af5a8d74a3b114eb99c6cc12d1be5908cb7 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 23 Sep 2020 13:32:07 +0200
Subject: [PATCH 130/278] Draft: handle sharing so it doesn't destroy the
 previous draft

---
 .../session/room/draft/DraftRepository.kt     |   6 +-
 .../home/room/detail/RoomDetailAction.kt      |   2 +-
 .../home/room/detail/RoomDetailFragment.kt    |   9 +-
 .../home/room/detail/RoomDetailViewModel.kt   | 184 +++++++++---------
 .../home/room/detail/RoomDetailViewState.kt   |   9 +-
 5 files changed, 106 insertions(+), 104 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
index 9262eb2f49..7ca5e3c3ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@@ -75,11 +75,7 @@ internal class DraftRepository @Inject constructor(@SessionDatabase private val
     }
 
     private fun deleteDraftFromDb(realm: Realm, roomId: String) {
-        UserDraftsEntity.where(realm, roomId).findFirst()?.let { userDraftsEntity ->
-            if (userDraftsEntity.userDrafts.isNotEmpty()) {
-                userDraftsEntity.userDrafts.removeAt(userDraftsEntity.userDrafts.size - 1)
-            }
-        }
+        UserDraftsEntity.where(realm, roomId).findFirst()?.userDrafts?.clear()
     }
 
     private fun saveDraftInDb(realm: Realm, draft: UserDraft, roomId: String) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index 4bdf2e7e57..5f851b8da7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -51,7 +51,7 @@ sealed class RoomDetailAction : VectorViewModelAction {
     data class EnterEditMode(val eventId: String, val text: String) : RoomDetailAction()
     data class EnterQuoteMode(val eventId: String, val text: String) : RoomDetailAction()
     data class EnterReplyMode(val eventId: String, val text: String) : RoomDetailAction()
-    data class ExitSpecialMode(val text: String) : RoomDetailAction()
+    data class EnterRegularMode(val text: String, val fromSharing: Boolean) : RoomDetailAction()
 
     data class ResendMessage(val eventId: String) : RoomDetailAction()
     data class RemoveFailedEcho(val eventId: String) : RoomDetailAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 51aeda2aab..2fc2fe94a5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -485,8 +485,7 @@ class RoomDetailFragment @Inject constructor(
         if (savedInstanceState == null) {
             when (val sharedData = roomDetailArgs.sharedData) {
                 is SharedData.Text        -> {
-                    // Save a draft to set the shared text to the composer
-                    roomDetailViewModel.handle(RoomDetailAction.SaveDraft(sharedData.text))
+                    roomDetailViewModel.handle(RoomDetailAction.EnterRegularMode(sharedData.text, fromSharing = true))
                 }
                 is SharedData.Attachments -> {
                     // open share edition
@@ -1014,7 +1013,7 @@ class RoomDetailFragment @Inject constructor(
             }
 
             override fun onCloseRelatedMessage() {
-                roomDetailViewModel.handle(RoomDetailAction.ExitSpecialMode(composerLayout.text.toString()))
+                roomDetailViewModel.handle(RoomDetailAction.EnterRegularMode(composerLayout.text.toString(), false))
             }
 
             override fun onRichContentSelected(contentUri: Uri): Boolean {
@@ -1147,12 +1146,8 @@ class RoomDetailFragment @Inject constructor(
 
     private fun renderSendMessageResult(sendMessageResult: RoomDetailViewEvents.SendMessageResult) {
         when (sendMessageResult) {
-            is RoomDetailViewEvents.MessageSent                -> {
-                updateComposerText("")
-            }
             is RoomDetailViewEvents.SlashCommandHandled        -> {
                 sendMessageResult.messageRes?.let { showSnackWithMessage(getString(it)) }
-                updateComposerText("")
             }
             is RoomDetailViewEvents.SlashCommandError          -> {
                 displayCommandError(getString(R.string.command_problem_with_parameters, sendMessageResult.command.command))
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 42ce8567cd..985604a49c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -164,7 +164,7 @@ class RoomDetailViewModel @AssistedInject constructor(
         getUnreadState()
         observeSyncState()
         observeEventDisplayedActions()
-        observeDrafts()
+        getDraftIfAny()
         observeUnreadState()
         observeMyRoomMember()
         observeActiveRoomWidgets()
@@ -226,52 +226,52 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomDetailAction) {
         when (action) {
-            is RoomDetailAction.UserIsTyping                     -> handleUserIsTyping(action)
-            is RoomDetailAction.SaveDraft                        -> handleSaveDraft(action)
-            is RoomDetailAction.SendMessage                      -> handleSendMessage(action)
-            is RoomDetailAction.SendMedia                        -> handleSendMedia(action)
-            is RoomDetailAction.SendSticker                      -> handleSendSticker(action)
-            is RoomDetailAction.TimelineEventTurnsVisible        -> handleEventVisible(action)
-            is RoomDetailAction.TimelineEventTurnsInvisible      -> handleEventInvisible(action)
-            is RoomDetailAction.LoadMoreTimelineEvents           -> handleLoadMore(action)
-            is RoomDetailAction.SendReaction                     -> handleSendReaction(action)
-            is RoomDetailAction.AcceptInvite                     -> handleAcceptInvite()
-            is RoomDetailAction.RejectInvite                     -> handleRejectInvite()
-            is RoomDetailAction.RedactAction                     -> handleRedactEvent(action)
-            is RoomDetailAction.UndoReaction                     -> handleUndoReact(action)
-            is RoomDetailAction.UpdateQuickReactAction           -> handleUpdateQuickReaction(action)
-            is RoomDetailAction.ExitSpecialMode                  -> handleExitSpecialMode(action)
-            is RoomDetailAction.EnterEditMode                    -> handleEditAction(action)
-            is RoomDetailAction.EnterQuoteMode                   -> handleQuoteAction(action)
-            is RoomDetailAction.EnterReplyMode                   -> handleReplyAction(action)
-            is RoomDetailAction.DownloadOrOpen                   -> handleOpenOrDownloadFile(action)
-            is RoomDetailAction.NavigateToEvent                  -> handleNavigateToEvent(action)
-            is RoomDetailAction.HandleTombstoneEvent             -> handleTombstoneEvent(action)
-            is RoomDetailAction.ResendMessage                    -> handleResendEvent(action)
-            is RoomDetailAction.RemoveFailedEcho                 -> handleRemove(action)
-            is RoomDetailAction.ClearSendQueue                   -> handleClearSendQueue()
-            is RoomDetailAction.ResendAll                        -> handleResendAll()
-            is RoomDetailAction.MarkAllAsRead                    -> handleMarkAllAsRead()
-            is RoomDetailAction.ReportContent                    -> handleReportContent(action)
-            is RoomDetailAction.IgnoreUser                       -> handleIgnoreUser(action)
+            is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
+            is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
+            is RoomDetailAction.SendMessage -> handleSendMessage(action)
+            is RoomDetailAction.SendMedia -> handleSendMedia(action)
+            is RoomDetailAction.SendSticker -> handleSendSticker(action)
+            is RoomDetailAction.TimelineEventTurnsVisible -> handleEventVisible(action)
+            is RoomDetailAction.TimelineEventTurnsInvisible -> handleEventInvisible(action)
+            is RoomDetailAction.LoadMoreTimelineEvents -> handleLoadMore(action)
+            is RoomDetailAction.SendReaction -> handleSendReaction(action)
+            is RoomDetailAction.AcceptInvite -> handleAcceptInvite()
+            is RoomDetailAction.RejectInvite -> handleRejectInvite()
+            is RoomDetailAction.RedactAction -> handleRedactEvent(action)
+            is RoomDetailAction.UndoReaction -> handleUndoReact(action)
+            is RoomDetailAction.UpdateQuickReactAction -> handleUpdateQuickReaction(action)
+            is RoomDetailAction.EnterRegularMode -> handleEnterRegularMode(action)
+            is RoomDetailAction.EnterEditMode -> handleEditAction(action)
+            is RoomDetailAction.EnterQuoteMode -> handleQuoteAction(action)
+            is RoomDetailAction.EnterReplyMode -> handleReplyAction(action)
+            is RoomDetailAction.DownloadOrOpen -> handleOpenOrDownloadFile(action)
+            is RoomDetailAction.NavigateToEvent -> handleNavigateToEvent(action)
+            is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
+            is RoomDetailAction.ResendMessage -> handleResendEvent(action)
+            is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
+            is RoomDetailAction.ClearSendQueue -> handleClearSendQueue()
+            is RoomDetailAction.ResendAll -> handleResendAll()
+            is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
+            is RoomDetailAction.ReportContent -> handleReportContent(action)
+            is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
             is RoomDetailAction.EnterTrackingUnreadMessagesState -> startTrackingUnreadMessages()
-            is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
-            is RoomDetailAction.ReplyToOptions                   -> handleReplyToOptions(action)
-            is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
-            is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
-            is RoomDetailAction.ResumeVerification               -> handleResumeRequestVerification(action)
-            is RoomDetailAction.ReRequestKeys                    -> handleReRequestKeys(action)
-            is RoomDetailAction.TapOnFailedToDecrypt             -> handleTapOnFailedToDecrypt(action)
-            is RoomDetailAction.SelectStickerAttachment          -> handleSelectStickerAttachment()
-            is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
-            is RoomDetailAction.StartCall                        -> handleStartCall(action)
-            is RoomDetailAction.EndCall                          -> handleEndCall()
-            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
-            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
-            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
-            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
-            is RoomDetailAction.CancelSend                       -> handleCancel(action)
+            is RoomDetailAction.ExitTrackingUnreadMessagesState -> stopTrackingUnreadMessages()
+            is RoomDetailAction.ReplyToOptions -> handleReplyToOptions(action)
+            is RoomDetailAction.AcceptVerificationRequest -> handleAcceptVerification(action)
+            is RoomDetailAction.DeclineVerificationRequest -> handleDeclineVerification(action)
+            is RoomDetailAction.RequestVerification -> handleRequestVerification(action)
+            is RoomDetailAction.ResumeVerification -> handleResumeRequestVerification(action)
+            is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
+            is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
+            is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
+            is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
+            is RoomDetailAction.StartCall -> handleStartCall(action)
+            is RoomDetailAction.EndCall -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend -> handleCancel(action)
         }.exhaustive
     }
 
@@ -451,45 +451,48 @@ class RoomDetailViewModel @AssistedInject constructor(
      */
     private fun handleSaveDraft(action: RoomDetailAction.SaveDraft) {
         withState {
-            when (it.sendMode) {
-                is SendMode.REGULAR -> room.saveDraft(UserDraft.REGULAR(action.draft), NoOpMatrixCallback())
-                is SendMode.REPLY   -> room.saveDraft(UserDraft.REPLY(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
-                is SendMode.QUOTE   -> room.saveDraft(UserDraft.QUOTE(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
-                is SendMode.EDIT    -> room.saveDraft(UserDraft.EDIT(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
-            }.exhaustive
+            when {
+                it.sendMode is SendMode.REGULAR && !it.sendMode.fromSharing -> {
+                    room.saveDraft(UserDraft.REGULAR(action.draft), NoOpMatrixCallback())
+                }
+                it.sendMode is SendMode.REPLY                               -> {
+                    room.saveDraft(UserDraft.REPLY(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
+                }
+                it.sendMode is SendMode.QUOTE                               -> {
+                    room.saveDraft(UserDraft.QUOTE(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
+                }
+                it.sendMode is SendMode.EDIT                                -> {
+                    room.saveDraft(UserDraft.EDIT(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
+                }
+            }
         }
     }
 
-    private fun observeDrafts() {
-        room.rx().liveDrafts()
-                .subscribe {
-                    Timber.d("Draft update --> SetState")
-                    setState {
-                        val draft = it.lastOrNull() ?: UserDraft.REGULAR("")
-                        copy(
-                                // Create a sendMode from a draft and retrieve the TimelineEvent
-                                sendMode = when (draft) {
-                                    is UserDraft.REGULAR -> SendMode.REGULAR(draft.text)
-                                    is UserDraft.QUOTE   -> {
-                                        room.getTimeLineEvent(draft.linkedEventId)?.let { timelineEvent ->
-                                            SendMode.QUOTE(timelineEvent, draft.text)
-                                        }
-                                    }
-                                    is UserDraft.REPLY   -> {
-                                        room.getTimeLineEvent(draft.linkedEventId)?.let { timelineEvent ->
-                                            SendMode.REPLY(timelineEvent, draft.text)
-                                        }
-                                    }
-                                    is UserDraft.EDIT    -> {
-                                        room.getTimeLineEvent(draft.linkedEventId)?.let { timelineEvent ->
-                                            SendMode.EDIT(timelineEvent, draft.text)
-                                        }
-                                    }
-                                } ?: SendMode.REGULAR("")
-                        )
-                    }
-                }
-                .disposeOnClear()
+    private fun getDraftIfAny() {
+        val currentDraft = room.getDraft() ?: return
+        setState {
+            copy(
+                    // Create a sendMode from a draft and retrieve the TimelineEvent
+                    sendMode = when (currentDraft) {
+                        is UserDraft.REGULAR -> SendMode.REGULAR(currentDraft.text, false)
+                        is UserDraft.QUOTE   -> {
+                            room.getTimeLineEvent(currentDraft.linkedEventId)?.let { timelineEvent ->
+                                SendMode.QUOTE(timelineEvent, currentDraft.text)
+                            }
+                        }
+                        is UserDraft.REPLY   -> {
+                            room.getTimeLineEvent(currentDraft.linkedEventId)?.let { timelineEvent ->
+                                SendMode.REPLY(timelineEvent, currentDraft.text)
+                            }
+                        }
+                        is UserDraft.EDIT    -> {
+                            room.getTimeLineEvent(currentDraft.linkedEventId)?.let { timelineEvent ->
+                                SendMode.EDIT(timelineEvent, currentDraft.text)
+                            }
+                        }
+                    } ?: SendMode.REGULAR("", fromSharing = false)
+            )
+        }
     }
 
     private fun handleUserIsTyping(action: RoomDetailAction.UserIsTyping) {
@@ -740,11 +743,15 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
     }
 
-    private fun popDraft() {
-        setState {
-            copy(sendMode = SendMode.REGULAR(""))
+    private fun popDraft() = withState {
+        if (it.sendMode is SendMode.REGULAR && it.sendMode.fromSharing) {
+            // If we were sharing, we want to get back our last value from draft
+            getDraftIfAny()
+        } else {
+            // Otherwise we clear the composer and remove the draft from db
+            setState { copy(sendMode = SendMode.REGULAR("", false)) }
+            room.deleteDraft(NoOpMatrixCallback())
         }
-        room.deleteDraft(NoOpMatrixCallback())
     }
 
     private fun handleJoinToAnotherRoomSlashCommand(command: ParsedCommand.JoinRoom) {
@@ -935,9 +942,8 @@ class RoomDetailViewModel @AssistedInject constructor(
         }
     }
 
-    private fun handleExitSpecialMode(action: RoomDetailAction.ExitSpecialMode) = withState {
-        room.deleteDraft(NoOpMatrixCallback())
-        setState { copy(sendMode = SendMode.REGULAR(action.text)) }
+    private fun handleEnterRegularMode(action: RoomDetailAction.EnterRegularMode) = setState {
+        copy(sendMode = SendMode.REGULAR(action.text, action.fromSharing))
     }
 
     private fun handleOpenOrDownloadFile(action: RoomDetailAction.DownloadOrOpen) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index 36acc35148..c443d61252 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -37,7 +37,12 @@ import org.matrix.android.sdk.api.session.widgets.model.Widget
  * Depending on the state the bottom toolbar will change (icons/preview/actions...)
  */
 sealed class SendMode(open val text: String) {
-    data class REGULAR(override val text: String) : SendMode(text)
+    data class REGULAR(
+            override val text: String,
+            val fromSharing: Boolean,
+            // This is necessary for forcing refresh on selectSubscribe
+            private val ts: Long = System.currentTimeMillis()
+    ) : SendMode(text)
     data class QUOTE(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
     data class EDIT(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
     data class REPLY(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
@@ -58,7 +63,7 @@ data class RoomDetailViewState(
         val asyncRoomSummary: Async<RoomSummary> = Uninitialized,
         val activeRoomWidgets: Async<List<Widget>> = Uninitialized,
         val typingMessage: String? = null,
-        val sendMode: SendMode = SendMode.REGULAR(""),
+        val sendMode: SendMode = SendMode.REGULAR("", false),
         val tombstoneEvent: Event? = null,
         val tombstoneEventHandling: Async<String> = Uninitialized,
         val syncState: SyncState = SyncState.Idle,

From dfbe1188f016eea2b041e004fad24beef7c127fe Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 23 Sep 2020 13:43:34 +0200
Subject: [PATCH 131/278] Draft: use session realm provider when possible

---
 .../sdk/internal/session/room/draft/DraftRepository.kt      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
index 7ca5e3c3ce..5cc6c990d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.session.room.send.UserDraft
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.api.util.toOptional
+import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.database.mapper.DraftMapper
 import org.matrix.android.sdk.internal.database.model.RoomSummaryEntity
 import org.matrix.android.sdk.internal.database.model.UserDraftsEntity
@@ -35,7 +36,8 @@ import org.matrix.android.sdk.internal.util.awaitTransaction
 import timber.log.Timber
 import javax.inject.Inject
 
-internal class DraftRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy) {
+internal class DraftRepository @Inject constructor(@SessionDatabase private val monarchy: Monarchy,
+                                                   private val realmSessionProvider: RealmSessionProvider) {
 
     suspend fun saveDraft(roomId: String, userDraft: UserDraft) {
         monarchy.awaitTransaction {
@@ -50,7 +52,7 @@ internal class DraftRepository @Inject constructor(@SessionDatabase private val
     }
 
     fun getDraft(roomId: String): UserDraft? {
-        return Realm.getInstance(monarchy.realmConfiguration).use { realm ->
+        return realmSessionProvider.withRealm { realm ->
             UserDraftsEntity.where(realm, roomId).findFirst()
                     ?.userDrafts
                     ?.firstOrNull()

From 211a8dc27277878649efdee539e3faf0954126fe Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 23 Sep 2020 13:43:42 +0200
Subject: [PATCH 132/278] Draft: fix icon tint

---
 vector/src/main/res/layout/item_room.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index c844f10ed2..814ef645d7 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -105,6 +105,7 @@
         android:layout_marginEnd="4dp"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
+        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
         app:layout_constraintEnd_toStartOf="@+id/roomUnreadCounterBadgeView"
         app:layout_constraintStart_toEndOf="@+id/roomNameView"

From 3b8a0f8671048a20cab6d8b27195c001269ce2a7 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 23 Sep 2020 14:03:08 +0200
Subject: [PATCH 133/278] Tint swip reply icon

---
 .../room/detail/RoomMessageTouchHelperCallback.kt  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
index ef13865374..41f386c606 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomMessageTouchHelperCallback.kt
@@ -25,12 +25,15 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_SWIPE
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.EpoxyTouchHelperCallback
 import com.airbnb.epoxy.EpoxyViewHolder
+import im.vector.app.R
+import im.vector.app.features.themes.ThemeUtils
 import timber.log.Timber
 import kotlin.math.abs
 import kotlin.math.min
@@ -52,7 +55,16 @@ class RoomMessageTouchHelperCallback(private val context: Context,
     private var replyButtonProgress: Float = 0F
     private var lastReplyButtonAnimationTime: Long = 0
 
-    private var imageDrawable: Drawable = ContextCompat.getDrawable(context, actionIcon)!!
+    private val imageDrawable: Drawable = DrawableCompat.wrap(
+            ContextCompat.getDrawable(context, actionIcon)!!
+    )
+
+    init {
+        DrawableCompat.setTint(
+                imageDrawable,
+                ThemeUtils.getColor(context, R.attr.riotx_text_primary)
+        )
+    }
 
     private val triggerDistance = convertToPx(100)
     private val minShowDistance = convertToPx(20)

From bcc64fb276195ae03b7e452446e9211cc387baa0 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Wed, 23 Sep 2020 14:03:39 +0200
Subject: [PATCH 134/278] Update CHANGES

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 4a158086a2..a3bf5d4f9c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
  - Fix Splash layout on small screens
+ - Simplifies draft management and should fix bunch of draft issues (#952, #683)
 
 Translations 🗣:
  -

From 038e6613c08f73ce60c3c35df286aa565484c9d5 Mon Sep 17 00:00:00 2001
From: ganfra
 <francoisg@matrix.orgfrancoisg@matrix.orgfrancoisg@matrix.orgfrancoisg@matrix.org>
Date: Mon, 28 Sep 2020 14:05:24 +0200
Subject: [PATCH 135/278] Draft: update state when saving draft to avoid
 loosing current text

---
 .../home/room/detail/RoomDetailViewModel.kt   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 985604a49c..ce48d8ff89 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -449,21 +449,23 @@ class RoomDetailViewModel @AssistedInject constructor(
     /**
      * Convert a send mode to a draft and save the draft
      */
-    private fun handleSaveDraft(action: RoomDetailAction.SaveDraft) {
-        withState {
-            when {
-                it.sendMode is SendMode.REGULAR && !it.sendMode.fromSharing -> {
-                    room.saveDraft(UserDraft.REGULAR(action.draft), NoOpMatrixCallback())
-                }
-                it.sendMode is SendMode.REPLY                               -> {
-                    room.saveDraft(UserDraft.REPLY(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
-                }
-                it.sendMode is SendMode.QUOTE                               -> {
-                    room.saveDraft(UserDraft.QUOTE(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
-                }
-                it.sendMode is SendMode.EDIT                                -> {
-                    room.saveDraft(UserDraft.EDIT(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
-                }
+    private fun handleSaveDraft(action: RoomDetailAction.SaveDraft) = withState {
+        when {
+            it.sendMode is SendMode.REGULAR && !it.sendMode.fromSharing -> {
+                setState { copy(sendMode = it.sendMode.copy(action.draft)) }
+                room.saveDraft(UserDraft.REGULAR(action.draft), NoOpMatrixCallback())
+            }
+            it.sendMode is SendMode.REPLY                               -> {
+                setState { copy(sendMode = it.sendMode.copy(text = action.draft)) }
+                room.saveDraft(UserDraft.REPLY(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
+            }
+            it.sendMode is SendMode.QUOTE                               -> {
+                setState { copy(sendMode = it.sendMode.copy(text = action.draft)) }
+                room.saveDraft(UserDraft.QUOTE(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
+            }
+            it.sendMode is SendMode.EDIT                                -> {
+                setState { copy(sendMode = it.sendMode.copy(text = action.draft)) }
+                room.saveDraft(UserDraft.EDIT(it.sendMode.timelineEvent.root.eventId!!, action.draft), NoOpMatrixCallback())
             }
         }
     }

From 72a412904d549d13de8f3ac83f88693096cf77d8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 12:26:18 +0200
Subject: [PATCH 136/278] small cleanup

---
 .../crypto/secrets/DefaultSharedSecretStorageService.kt       | 4 ++--
 .../app/features/crypto/keysrequest/KeyRequestHandler.kt      | 2 +-
 .../app/features/crypto/recover/BootstrapCrossSigningTask.kt  | 2 +-
 .../app/features/crypto/recover/BootstrapSharedViewModel.kt   | 2 +-
 .../verification/epoxy/BottomSheetVerificationEmojisItem.kt   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 7186bc3cd0..1cae1a4e2b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -371,7 +371,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 callback.onFailure(SharedSecretStorageError.BadKeyFormat)
             }
             cryptoCoroutineScope.launch(coroutineDispatchers.main) {
-                kotlin.runCatching {
+                runCatching {
                     // decrypt from recovery key
                     withOlmDecryption { olmPkDecryption ->
                         olmPkDecryption.setPrivateKey(keySpec.privateKey)
@@ -390,7 +390,7 @@ internal class DefaultSharedSecretStorageService @Inject constructor(
                 callback.onFailure(SharedSecretStorageError.BadKeyFormat)
             }
             cryptoCoroutineScope.launch(coroutineDispatchers.main) {
-                kotlin.runCatching {
+                runCatching {
                     decryptAesHmacSha2(keySpec, name, secretContent)
                 }.foldToCallback(callback)
             }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
index 4ed0e037d4..4268317700 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
@@ -126,7 +126,7 @@ class KeyRequestHandler @Inject constructor(
                     // can we get more info on this device?
                     session?.cryptoService()?.getMyDevicesInfo()?.firstOrNull { it.deviceId == deviceId }?.let {
                         postAlert(context, userId, deviceId, true, deviceInfo, it)
-                    } ?: kotlin.run {
+                    } ?: run {
                         postAlert(context, userId, deviceId, true, deviceInfo)
                     }
                 } else {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
index 4dc2b92751..b7c689f41f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapCrossSigningTask.kt
@@ -139,7 +139,7 @@ class BootstrapCrossSigningTask @Inject constructor(
                             null,
                             it
                     )
-                } ?: kotlin.run {
+                } ?: run {
                     ssssService.generateKey(
                             UUID.randomUUID().toString(),
                             params.keySpec,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index a3955d561e..6d711ec0e9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -301,7 +301,7 @@ class BootstrapSharedViewModel @AssistedInject constructor(
     // =======================================
     private fun saveRecoveryKeyToUri(os: OutputStream) = withState { state ->
         viewModelScope.launch(Dispatchers.IO) {
-            kotlin.runCatching {
+            runCatching {
                 os.use {
                     os.write((state.recoveryKeyCreationInfo?.recoveryKey?.formatRecoveryKey() ?: "").toByteArray())
                 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
index 77fa9cb775..daa9a913c9 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
@@ -72,7 +72,7 @@ abstract class BottomSheetVerificationEmojisItem : VectorEpoxyModel<BottomSheetV
             view.findViewById<TextView>(R.id.item_emoji_tv).isVisible = false
             view.findViewById<ImageView>(R.id.item_emoji_image).isVisible = true
             view.findViewById<ImageView>(R.id.item_emoji_image).setImageDrawable(ContextCompat.getDrawable(view.context, it))
-        } ?: kotlin.run {
+        } ?: run {
             view.findViewById<TextView>(R.id.item_emoji_tv).isVisible = true
             view.findViewById<ImageView>(R.id.item_emoji_image).isVisible = false
             view.findViewById<TextView>(R.id.item_emoji_tv).text = rep.emoji

From 5056615eb0b863bba70d6de3297486a4608e781f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 12:33:40 +0200
Subject: [PATCH 137/278] Upgrade kotlin version from `1.3.72` to `1.4.10` and
 kotlin coroutines version from `1.3.8` to `1.3.9`

---
 CHANGES.md                      | 1 +
 build.gradle                    | 4 +++-
 matrix-sdk-android/build.gradle | 9 ++++-----
 vector/build.gradle             | 5 ++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5b3c34d9a0..b02e5b82ff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,6 +30,7 @@ SDK API changes ⚠️:
 Build 🧱:
  - Use Update Gradle Wrapper Action
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
+ - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
 
 Other changes:
  - Added registration/verification automated UI tests
diff --git a/build.gradle b/build.gradle
index f06d1859b5..fdb42f8f43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    // Ref: https://kotlinlang.org/releases.html
+    ext.kotlin_version = '1.4.10'
+    ext.kotlin_coroutines_version = "1.3.9"
     repositories {
         google()
         jcenter()
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 2c20137647..a8aea28754 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,15 +112,14 @@ dependencies {
     def moshi_version = '1.8.0'
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
-    def coroutines_version = "1.3.8"
     def markwon_version = '3.1.0'
     def daggerVersion = '2.25.4'
     def work_version = '2.4.0'
     def retrofit_version = '2.6.2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.appcompat:appcompat:1.2.0"
     implementation "androidx.core:core-ktx:1.3.1"
@@ -191,7 +190,7 @@ dependencies {
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     testImplementation 'io.mockk:mockk:1.9.2.kotlin12'
     testImplementation 'org.amshove.kluent:kluent-android:1.44'
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test
     testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
@@ -205,7 +204,7 @@ dependencies {
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     androidTestImplementation 'io.mockk:mockk-android:1.9.2.kotlin12'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
-    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 87c8696b02..3acfd99f87 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -283,7 +283,6 @@ dependencies {
     def epoxy_version = '3.11.0'
     def fragment_version = '1.2.5'
     def arrow_version = "0.8.2"
-    def coroutines_version = "1.3.8"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'
     def glide_version = '4.11.0'
@@ -307,8 +306,8 @@ dependencies {
     implementation 'com.android.support:multidex:1.0.3'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05"
     implementation 'androidx.appcompat:appcompat:1.2.0'

From 7a146327ca73453c91d232a0748cd3270fb60d54 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 6 Oct 2020 13:05:39 +0200
Subject: [PATCH 138/278] Upgrade build tools from `3.5.3` to `4.0.1`

---
 CHANGES.md   | 1 +
 build.gradle | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b02e5b82ff..8fdda34058 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@ Build 🧱:
  - Use Update Gradle Wrapper Action
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
  - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
+ - Upgrade build tools from `3.5.3` to `4.0.1`
 
 Other changes:
  - Added registration/verification automated UI tests
diff --git a/build.gradle b/build.gradle
index fdb42f8f43..59305598e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        // Warning: 3.6.3 leads to infinite gradle builds. Stick to 3.5.3 for the moment
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath "com.airbnb.okreplay:gradle-plugin:1.5.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

From ebfee5868e6f8ade9e1520a68d550ab0898d96b1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 13:06:24 +0200
Subject: [PATCH 139/278] Remove OkReplay, not compatible to build tools
 `4.0.1` (and not used)

---
 build.gradle                                  |  1 -
 matrix-sdk-android/build.gradle               |  5 ---
 .../sdk/OkReplayRuleChainNoActivity.kt        | 32 -------------------
 .../android/sdk/internal/di/NetworkModule.kt  | 11 +------
 4 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt

diff --git a/build.gradle b/build.gradle
index 59305598e5..ca502e4e7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.2'
-        classpath "com.airbnb.okreplay:gradle-plugin:1.5.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index a8aea28754..495c204bfa 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'realm-android'
-apply plugin: 'okreplay'
 
 buildscript {
     repositories {
@@ -180,10 +179,6 @@ dependencies {
     // Use the same WebRTC library than the one used by Jitsi library
     implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
 
-    debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
-    releaseImplementation 'com.airbnb.okreplay:noop:1.5.0'
-    androidTestImplementation 'com.airbnb.okreplay:espresso:1.5.0'
-
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:4.3'
     //testImplementation 'org.robolectric:shadows-support-v4:3.0'
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt
deleted file mode 100644
index 372ef95be8..0000000000
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/OkReplayRuleChainNoActivity.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.matrix.android.sdk
-
-import okreplay.OkReplayConfig
-import okreplay.PermissionRule
-import okreplay.RecorderRule
-import org.junit.rules.RuleChain
-import org.junit.rules.TestRule
-
-class OkReplayRuleChainNoActivity(
-        private val configuration: OkReplayConfig) {
-
-    fun get(): TestRule {
-        return RuleChain.outerRule(PermissionRule(configuration))
-                .around(RecorderRule(configuration))
-    }
-}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index 5fff658a56..1c11ef79f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -29,7 +29,6 @@ import org.matrix.android.sdk.internal.network.interceptors.CurlLoggingIntercept
 import org.matrix.android.sdk.internal.network.interceptors.FormattedJsonHttpLogger
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import okreplay.OkReplayInterceptor
 import java.util.concurrent.TimeUnit
 
 @Module
@@ -44,12 +43,6 @@ internal object NetworkModule {
         return interceptor
     }
 
-    @Provides
-    @JvmStatic
-    fun providesOkReplayInterceptor(): OkReplayInterceptor {
-        return OkReplayInterceptor()
-    }
-
     @Provides
     @JvmStatic
     fun providesStethoInterceptor(): StethoInterceptor {
@@ -71,8 +64,7 @@ internal object NetworkModule {
                              timeoutInterceptor: TimeOutInterceptor,
                              userAgentInterceptor: UserAgentInterceptor,
                              httpLoggingInterceptor: HttpLoggingInterceptor,
-                             curlLoggingInterceptor: CurlLoggingInterceptor,
-                             okReplayInterceptor: OkReplayInterceptor): OkHttpClient {
+                             curlLoggingInterceptor: CurlLoggingInterceptor): OkHttpClient {
         return OkHttpClient.Builder()
                 .connectTimeout(30, TimeUnit.SECONDS)
                 .readTimeout(60, TimeUnit.SECONDS)
@@ -93,7 +85,6 @@ internal object NetworkModule {
                         proxy(it)
                     }
                 }
-                .addInterceptor(okReplayInterceptor)
                 .build()
     }
 

From 282a3f8ee3ec6de7e2e606bfcb49ad65e0ff906e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 13:08:36 +0200
Subject: [PATCH 140/278] Upgrade com.google.gms:google-services from `4.3.2`
 to `4.3.4`

---
 CHANGES.md   | 1 +
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8fdda34058..60f8129d9f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,6 +32,7 @@ Build 🧱:
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
  - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
  - Upgrade build tools from `3.5.3` to `4.0.1`
+ - Upgrade com.google.gms:google-services from `4.3.2` to `4.3.4`
 
 Other changes:
  - Added registration/verification automated UI tests
diff --git a/build.gradle b/build.gradle
index ca502e4e7f..bd2f18d41b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.google.gms:google-services:4.3.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'

From 1a0dba74227f90fb5a15e9d32fc8cf9a4b060dac Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 14:47:57 +0200
Subject: [PATCH 141/278] Upgrade Moshi to `1.11.0`, Dagger to `2.29.1`, Epoxy
 to `4.1.0`

---
 CHANGES.md                      | 1 +
 matrix-sdk-android/build.gradle | 4 ++--
 vector/build.gradle             | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 60f8129d9f..ec853d96ef 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -33,6 +33,7 @@ Build 🧱:
  - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
  - Upgrade build tools from `3.5.3` to `4.0.1`
  - Upgrade com.google.gms:google-services from `4.3.2` to `4.3.4`
+ - Upgrade Moshi to `1.11.0`, Dagger to `2.29.1`, Epoxy to `4.1.0`
 
 Other changes:
  - Added registration/verification automated UI tests
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 495c204bfa..710b658bea 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -108,11 +108,11 @@ static def gitRevisionDate() {
 dependencies {
 
     def arrow_version = "0.8.2"
-    def moshi_version = '1.8.0'
+    def moshi_version = '1.11.0'
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
     def markwon_version = '3.1.0'
-    def daggerVersion = '2.25.4'
+    def daggerVersion = '2.29.1'
     def work_version = '2.4.0'
     def retrofit_version = '2.6.2'
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 3acfd99f87..cfcdea9ae6 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -280,14 +280,14 @@ android {
 
 dependencies {
 
-    def epoxy_version = '3.11.0'
+    def epoxy_version = '4.1.0'
     def fragment_version = '1.2.5'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'
     def glide_version = '4.11.0'
-    def moshi_version = '1.8.0'
-    def daggerVersion = '2.25.4'
+    def moshi_version = '1.11.0'
+    def daggerVersion = '2.29.1'
     def autofill_version = "1.0.0"
     def work_version = '2.4.0'
     def arch_version = '2.1.0'

From e708b0f01b13faa8cffb994835bdaf8e2bf2a775 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 15:09:41 +0200
Subject: [PATCH 142/278] Fix compilation warning (due to Kotlin 1.4)

---
 .../org/matrix/android/sdk/internal/auth/version/Versions.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index 483c43f502..6f0c756127 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -105,6 +105,6 @@ private fun Versions.doesServerSeparatesAddAndBind(): Boolean {
 private fun Versions.getMaxVersion(): HomeServerVersion {
     return supportedVersions
             ?.mapNotNull { HomeServerVersion.parse(it) }
-            ?.max()
+            ?.maxOrNull()
             ?: HomeServerVersion.r0_0_0
 }

From 9e0ebc94c5e2e20f857ac621553084d19a21e53e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 15:44:30 +0200
Subject: [PATCH 143/278] Upgrade other dependencies, and remove unused
 dependencies

---
 attachment-viewer/build.gradle     | 16 +++++-----------
 matrix-sdk-android-rx/build.gradle |  6 +-----
 matrix-sdk-android/build.gradle    | 22 +++++++++++-----------
 multipicker/build.gradle           |  9 ++-------
 vector/build.gradle                | 18 +++++++++---------
 5 files changed, 28 insertions(+), 43 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 3a5c3298d4..59ba6c4500 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -58,21 +58,15 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.4'
 
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
-    implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
 
+    implementation 'com.google.android.material:material:1.2.1'
 }
\ No newline at end of file
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index 70a05114c2..03b60bbcf7 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -35,7 +35,7 @@ android {
 
 dependencies {
     implementation project(":matrix-sdk-android")
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // Paging
@@ -43,8 +43,4 @@ dependencies {
 
     // Logging
     implementation 'com.jakewharton.timber:timber:4.7.1'
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 710b658bea..c0030cca3d 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -121,7 +121,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.appcompat:appcompat:1.2.0"
-    implementation "androidx.core:core-ktx:1.3.1"
+    implementation "androidx.core:core-ktx:1.3.2"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
@@ -141,7 +141,7 @@ dependencies {
     implementation "ru.noties.markwon:core:$markwon_version"
 
     // Image
-    implementation 'androidx.exifinterface:exifinterface:1.3.0-alpha01'
+    implementation 'androidx.exifinterface:exifinterface:1.3.0'
 
     // Database
     implementation 'com.github.Zhuinden:realm-monarchy:0.5.1'
@@ -179,23 +179,23 @@ dependencies {
     // Use the same WebRTC library than the one used by Jitsi library
     implementation('com.facebook.react:react-native-webrtc:1.84.0-jitsi-5112273@aar')
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'org.robolectric:robolectric:4.3'
     //testImplementation 'org.robolectric:shadows-support-v4:3.0'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     testImplementation 'io.mockk:mockk:1.9.2.kotlin12'
-    testImplementation 'org.amshove.kluent:kluent-android:1.44'
+    testImplementation 'org.amshove.kluent:kluent-android:1.61'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test
     testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
     kaptAndroidTest "com.google.dagger:dagger-compiler:$daggerVersion"
-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'org.amshove.kluent:kluent-android:1.44'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'org.amshove.kluent:kluent-android:1.61'
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
     androidTestImplementation 'io.mockk:mockk-android:1.9.2.kotlin12'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
@@ -203,5 +203,5 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
-    androidTestUtil 'androidx.test:orchestrator:1.2.0'
+    androidTestUtil 'androidx.test:orchestrator:1.3.0'
 }
diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 8f2226e884..0eb38c23dd 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -43,13 +43,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-    implementation 'androidx.exifinterface:exifinterface:1.3.0-alpha01'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.0'
 
     // Log
     implementation 'com.jakewharton.timber:timber:4.7.1'
diff --git a/vector/build.gradle b/vector/build.gradle
index cfcdea9ae6..3b43aa12e1 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -281,7 +281,7 @@ android {
 dependencies {
 
     def epoxy_version = '4.1.0'
-    def fragment_version = '1.2.5'
+    def fragment_version = '1.3.0-beta01'
     def arrow_version = "0.8.2"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'
@@ -294,7 +294,7 @@ dependencies {
     def lifecycle_version = '2.2.0'
 
     // Tests
-    def kluent_version = '1.44'
+    def kluent_version = '1.61'
     def androidxTest_version = '1.3.0'
     def espresso_version = '3.3.0'
 
@@ -309,13 +309,13 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05"
+    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha06"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment:$fragment_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     // Keep at 2.0.0-beta4 at the moment, as updating is breaking some UI
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
     implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.7.0"
@@ -346,7 +346,7 @@ dependencies {
     implementation "com.airbnb.android:epoxy-glide-preloading:$epoxy_version"
     kapt "com.airbnb.android:epoxy-processor:$epoxy_version"
     implementation "com.airbnb.android:epoxy-paging:$epoxy_version"
-    implementation 'com.airbnb.android:mvrx:1.3.0'
+    implementation 'com.airbnb.android:mvrx:1.5.1'
 
     // Work
     implementation "androidx.work:work-runtime-ktx:$work_version"
@@ -362,7 +362,7 @@ dependencies {
 
     // UI
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.google.android.material:material:1.3.0-alpha01'
+    implementation 'com.google.android.material:material:1.3.0-alpha02'
     implementation 'me.gujun.android:span:1.7'
     implementation "io.noties.markwon:core:$markwon_version"
     implementation "io.noties.markwon:html:$markwon_version"
@@ -397,7 +397,7 @@ dependencies {
     implementation "com.github.piasy:GlideImageViewFactory:$big_image_viewer_version"
 
     // implementation 'com.github.MikeOrtiz:TouchImageView:3.0.2'
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.4'
 
     implementation "com.github.bumptech.glide:glide:$glide_version"
     kapt "com.github.bumptech.glide:compiler:$glide_version"
@@ -414,7 +414,7 @@ dependencies {
     kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.5.0'
 
     // gplay flavor only
-    gplayImplementation('com.google.firebase:firebase-messaging:20.2.4') {
+    gplayImplementation('com.google.firebase:firebase-messaging:20.3.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -438,7 +438,7 @@ dependencies {
     implementation 'me.dm7.barcodescanner:zxing:1.9.13'
 
     // TESTS
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation "org.amshove.kluent:kluent-android:$kluent_version"
     // Plant Timber tree for test
     testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'

From 250ac42fa3e842bcc0c73829f5c7ac6a60859f19 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 15:57:31 +0200
Subject: [PATCH 144/278] Fix some compilation warnings

---
 .../vector/app/features/home/room/detail/RoomDetailViewModel.kt | 2 +-
 .../features/home/room/detail/timeline/item/MessagePollItem.kt  | 2 +-
 .../im/vector/app/features/reactions/EmojiChooserFragment.kt    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 871a550bd6..ebc265d935 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -1074,7 +1074,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                 .buffer(1, TimeUnit.SECONDS)
                 .filter { it.isNotEmpty() }
                 .subscribeBy(onNext = { actions ->
-                    val bufferedMostRecentDisplayedEvent = actions.maxBy { it.event.displayIndex }?.event ?: return@subscribeBy
+                    val bufferedMostRecentDisplayedEvent = actions.maxByOrNull { it.event.displayIndex }?.event ?: return@subscribeBy
                     val globalMostRecentDisplayedEvent = mostRecentDisplayedEvent
                     if (trackUnreadMessages.get()) {
                         if (globalMostRecentDisplayedEvent == null) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
index 9d500b99b0..a7db58deb1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessagePollItem.kt
@@ -84,7 +84,7 @@ abstract class MessagePollItem : AbsMessageItem<MessagePollItem.Holder>() {
             }
         } else {
             holder.resultWrapper.isVisible = true
-            val maxCount = votes?.maxBy { it.value }?.value ?: 0
+            val maxCount = votes?.maxByOrNull { it.value }?.value ?: 0
             optionsContent?.options?.forEachIndexed { index, item ->
                 if (index < resultLines.size) {
                     val optionCount = votes?.get(index) ?: 0
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
index 447525f72f..af40aa970d 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiChooserFragment.kt
@@ -17,7 +17,6 @@ package im.vector.app.features.reactions
 
 import android.os.Bundle
 import android.view.View
-import androidx.lifecycle.observe
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.VectorBaseFragment

From 7e3acaa9875d6705ecaa541bcc4eab172dc0ad00 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 16:00:29 +0200
Subject: [PATCH 145/278] False positive

---
 .../java/im/vector/app/core/platform/VectorViewModel.kt   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
index 6429c9dfe5..002dfcf068 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorViewModel.kt
@@ -42,9 +42,11 @@ abstract class VectorViewModel<S : MvRxState, VA : VectorViewModelAction, VE : V
      * This method does the same thing as the execute function, but it doesn't subscribe to the stream
      * so you can use this in a switchMap or a flatMap
      */
+    // False positive
+    @Suppress("USELESS_CAST")
     fun <T> Single<T>.toAsync(stateReducer: S.(Async<T>) -> S): Single<Async<T>> {
         setState { stateReducer(Loading()) }
-        return this.map { Success(it) as Async<T> }
+        return map { Success(it) as Async<T> }
                 .onErrorReturn { Fail(it) }
                 .doOnSuccess { setState { stateReducer(it) } }
     }
@@ -53,9 +55,11 @@ abstract class VectorViewModel<S : MvRxState, VA : VectorViewModelAction, VE : V
      * This method does the same thing as the execute function, but it doesn't subscribe to the stream
      * so you can use this in a switchMap or a flatMap
      */
+    // False positive
+    @Suppress("USELESS_CAST")
     fun <T> Observable<T>.toAsync(stateReducer: S.(Async<T>) -> S): Observable<Async<T>> {
         setState { stateReducer(Loading()) }
-        return this.map { Success(it) as Async<T> }
+        return map { Success(it) as Async<T> }
                 .onErrorReturn { Fail(it) }
                 .doOnNext { setState { stateReducer(it) } }
     }

From 3877b2f58ea3b39cc5b5d3590dcc5a7b403475c4 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 6 Oct 2020 17:02:49 +0300
Subject: [PATCH 146/278] Delete pending session store and states after session
 is created.

---
 CHANGES.md                                         |  1 +
 .../im/vector/app/features/login/LoginViewModel.kt | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 85eb76f5f2..d2767d0174 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
  - Fix Splash layout on small screens
+ - Invalid popup when pressing back (#1635)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
index dc513d1666..81d6a78123 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginViewModel.kt
@@ -419,10 +419,15 @@ class LoginViewModel @AssistedInject constructor(
         loginConfig = action.loginConfig
 
         // If there is a pending email validation continue on this step
-        currentThreePid?.let {
-            if (isRegistrationStarted) {
-                handle(LoginAction.PostViewEvent(LoginViewEvents.OnSendEmailSuccess(it)))
+        try {
+            if (registrationWizard?.isRegistrationStarted == true) {
+                currentThreePid?.let {
+                    handle(LoginAction.PostViewEvent(LoginViewEvents.OnSendEmailSuccess(it)))
+                }
             }
+        } catch (e: Throwable) {
+            // NOOP. API is designed to use wizards in a login/registration flow,
+            // but we need to check the state anyway.
         }
     }
 
@@ -679,6 +684,7 @@ class LoginViewModel @AssistedInject constructor(
 
     private fun onSessionCreated(session: Session) {
         activeSessionHolder.setActiveSession(session)
+        authenticationService.reset()
         session.configureAndStart(applicationContext)
         setState {
             copy(
@@ -747,7 +753,7 @@ class LoginViewModel @AssistedInject constructor(
 
             override fun onSuccess(data: LoginFlowResult) {
                 when (data) {
-                    is LoginFlowResult.Success            -> {
+                    is LoginFlowResult.Success -> {
                         val loginMode = when {
                             // SSO login is taken first
                             data.supportedLoginTypes.contains(LoginFlowTypes.SSO)      -> LoginMode.Sso

From 32434703d8297466ab1877c150f02b3f821d5148 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 16:17:54 +0200
Subject: [PATCH 147/278] onActivityCreated() is deprecated (not tested)

---
 .../KeysBackupRestoreFromKeyFragment.kt       |  5 ++--
 ...KeysBackupRestoreFromPassphraseFragment.kt |  4 +--
 .../KeysBackupRestoreSuccessFragment.kt       |  5 ++--
 .../setup/KeysBackupSetupStep1Fragment.kt     |  4 +--
 .../setup/KeysBackupSetupStep2Fragment.kt     |  5 ++--
 .../setup/KeysBackupSetupStep3Fragment.kt     |  4 +--
 .../home/room/detail/RoomDetailFragment.kt    | 29 ++++++++++---------
 .../DisplayReadReceiptsBottomSheet.kt         |  5 ++--
 .../action/MessageActionsBottomSheet.kt       |  5 ++--
 .../edithistory/ViewEditHistoryBottomSheet.kt |  5 ++--
 .../reactions/ViewReactionsBottomSheet.kt     |  5 ++--
 .../detail/widget/RoomWidgetsBottomSheet.kt   |  5 ++--
 .../RoomListQuickActionsBottomSheet.kt        |  5 ++--
 .../devices/DeviceListBottomSheet.kt          |  5 ++--
 .../devices/DeviceListFragment.kt             |  5 ++--
 .../devices/DeviceTrustInfoActionFragment.kt  |  5 ++--
 .../CrossSigningSettingsFragment.kt           | 10 ++-----
 .../DeviceVerificationInfoBottomSheet.kt      |  5 ++--
 .../SignOutBottomSheetDialogFragment.kt       |  4 +--
 19 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
index cc10256fc4..966ad9d0b8 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@@ -19,6 +19,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
+import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import androidx.lifecycle.Observer
@@ -50,8 +51,8 @@ class KeysBackupRestoreFromKeyFragment @Inject constructor()
     @BindView(R.id.keys_restore_key_enter_edittext)
     lateinit var mKeyTextEdit: EditText
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         viewModel = fragmentViewModelProvider.get(KeysBackupRestoreFromKeyViewModel::class.java)
         sharedViewModel = activityViewModelProvider.get(KeysBackupRestoreSharedViewModel::class.java)
         mKeyTextEdit.setText(viewModel.recoveryCode.value)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
index 7941d95add..79aa728da1 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseFragment.kt
@@ -59,8 +59,8 @@ class KeysBackupRestoreFromPassphraseFragment @Inject constructor() : VectorBase
         viewModel.showPasswordMode.value = !(viewModel.showPasswordMode.value ?: false)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         viewModel = fragmentViewModelProvider.get(KeysBackupRestoreFromPassphraseViewModel::class.java)
         sharedViewModel = activityViewModelProvider.get(KeysBackupRestoreSharedViewModel::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index fa571b86c1..30a6cfe696 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -16,6 +16,7 @@
 package im.vector.app.features.crypto.keysbackup.restore
 
 import android.os.Bundle
+import android.view.View
 import android.widget.TextView
 import androidx.core.view.isVisible
 import butterknife.BindView
@@ -36,8 +37,8 @@ class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragmen
 
     private lateinit var sharedViewModel: KeysBackupRestoreSharedViewModel
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         sharedViewModel = activityViewModelProvider.get(KeysBackupRestoreSharedViewModel::class.java)
 
         if (compareValues(sharedViewModel.importKeyResult?.totalNumberOfKeys, 0) > 0) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
index 0a82edd150..f855b86b6c 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep1Fragment.kt
@@ -40,8 +40,8 @@ class KeysBackupSetupStep1Fragment @Inject constructor() : VectorBaseFragment()
     @BindView(R.id.keys_backup_setup_step1_manualExport)
     lateinit var manualExportButton: Button
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         viewModel = activityViewModelProvider.get(KeysBackupSetupSharedViewModel::class.java)
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
index 0520098866..af279c9140 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep2Fragment.kt
@@ -16,6 +16,7 @@
 package im.vector.app.features.crypto.keysbackup.setup
 
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
@@ -77,8 +78,8 @@ class KeysBackupSetupStep2Fragment @Inject constructor() : VectorBaseFragment()
 
     private lateinit var viewModel: KeysBackupSetupSharedViewModel
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         viewModel = activityViewModelProvider.get(KeysBackupSetupSharedViewModel::class.java)
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index 41b7cbddfe..e508f06e4d 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -65,8 +65,8 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
 
     private lateinit var viewModel: KeysBackupSetupSharedViewModel
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         viewModel = activityViewModelProvider.get(KeysBackupSetupSharedViewModel::class.java)
 
         viewModel.shouldPromptOnBack = false
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index cca7e9e542..8694cf3978 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -371,6 +371,10 @@ class RoomDetailFragment @Inject constructor(
                 is RoomDetailViewEvents.RequestNativeWidgetPermission    -> requestNativeWidgetPermission(it)
             }.exhaustive
         }
+
+        if(savedInstanceState == null) {
+            handleShareData()
+        }
     }
 
     private fun requestNativeWidgetPermission(it: RoomDetailViewEvents.RequestNativeWidgetPermission) {
@@ -480,20 +484,17 @@ class RoomDetailFragment @Inject constructor(
         navigator.openRoom(vectorBaseActivity, action.roomId)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        if (savedInstanceState == null) {
-            when (val sharedData = roomDetailArgs.sharedData) {
-                is SharedData.Text        -> {
-                    roomDetailViewModel.handle(RoomDetailAction.EnterRegularMode(sharedData.text, fromSharing = true))
-                }
-                is SharedData.Attachments -> {
-                    // open share edition
-                    onContentAttachmentsReady(sharedData.attachmentData)
-                }
-                null                      -> Timber.v("No share data to process")
-            }.exhaustive
-        }
+    private fun handleShareData() {
+        when (val sharedData = roomDetailArgs.sharedData) {
+            is SharedData.Text        -> {
+                roomDetailViewModel.handle(RoomDetailAction.EnterRegularMode(sharedData.text, fromSharing = true))
+            }
+            is SharedData.Attachments -> {
+                // open share edition
+                onContentAttachmentsReady(sharedData.attachmentData)
+            }
+            null                      -> Timber.v("No share data to process")
+        }.exhaustive
     }
 
     override fun onDestroyView() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
index 7593118c9f..5fefc9aba8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/readreceipts/DisplayReadReceiptsBottomSheet.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail.readreceipts
 
 import android.os.Bundle
 import android.os.Parcelable
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.MvRx
@@ -59,8 +60,8 @@ class DisplayReadReceiptsBottomSheet : VectorBaseBottomSheetDialogFragment(), Di
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
         recyclerView.configureWith(epoxyController, hasFixedSize = false)
         bottomSheetTitle.text = getString(R.string.seen_by)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
index 9858d2a03c..f337f0ba5f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt
@@ -16,6 +16,7 @@
 package im.vector.app.features.home.room.detail.timeline.action
 
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.fragmentViewModel
@@ -51,8 +52,8 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
         recyclerView.configureWith(messageActionsEpoxyController, hasFixedSize = false, disableItemAnimation = true)
         messageActionsEpoxyController.listener = this
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
index 93fdd253d8..080ccaea7c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt
@@ -16,6 +16,7 @@
 package im.vector.app.features.home.room.detail.timeline.edithistory
 
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.MvRx
@@ -55,8 +56,8 @@ class ViewEditHistoryBottomSheet : VectorBaseBottomSheetDialogFragment() {
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         recyclerView.configureWith(
                 epoxyController,
                 showDivider = true,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
index a5555e4ebb..2e0d07aa67 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ViewReactionsBottomSheet.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.timeline.reactions
 
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.MvRx
@@ -55,8 +56,8 @@ class ViewReactionsBottomSheet : VectorBaseBottomSheetDialogFragment(), ViewReac
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
         recyclerView.configureWith(epoxyController, hasFixedSize = false, showDivider = true)
         bottomSheetTitle.text = context?.getString(R.string.reactions)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
index e87f5cdaa9..24f1299c19 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.home.room.detail.widget
 
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.parentFragmentViewModel
@@ -55,8 +56,8 @@ class RoomWidgetsBottomSheet : VectorBaseBottomSheetDialogFragment(), RoomWidget
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         recyclerView.configureWith(epoxyController, hasFixedSize = false)
         bottomSheetTitle.text = getString(R.string.active_widgets_title)
         bottomSheetTitle.textSize = 20f
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
index c33d964d22..ccd38125f9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.list.actions
 
 import android.os.Bundle
 import android.os.Parcelable
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.fragmentViewModel
@@ -67,8 +68,8 @@ class RoomListQuickActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), R
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
         recyclerView.configureWith(roomListActionsEpoxyController, viewPool = sharedViewPool, hasFixedSize = false, disableItemAnimation = true)
         roomListActionsEpoxyController.listener = this
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
index 9ba1c59983..323e25a022 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheet.kt
@@ -20,6 +20,7 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.KeyEvent
+import android.view.View
 import androidx.fragment.app.Fragment
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.fragmentViewModel
@@ -46,8 +47,8 @@ class DeviceListBottomSheet : VectorBaseBottomSheetDialogFragment() {
         injector.inject(this)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         viewModel.observeViewEvents {
             when (it) {
                 is DeviceListBottomSheetViewEvents.Verify -> {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
index 9f90ffbb84..e9fdd15af4 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListFragment.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.roommemberprofile.devices
 
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.parentFragmentViewModel
@@ -41,8 +42,8 @@ class DeviceListFragment @Inject constructor(
     @BindView(R.id.bottomSheetRecyclerView)
     lateinit var recyclerView: RecyclerView
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         recyclerView.setPadding(0, dimensionConverter.dpToPx(16), 0, dimensionConverter.dpToPx(16))
         recyclerView.configureWith(
                 epoxyController,
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
index decc22c979..e31f3172e9 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoActionFragment.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.roommemberprofile.devices
 
 import android.os.Bundle
+import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import com.airbnb.mvrx.parentFragmentViewModel
@@ -41,8 +42,8 @@ class DeviceTrustInfoActionFragment @Inject constructor(
     @BindView(R.id.bottomSheetRecyclerView)
     lateinit var recyclerView: RecyclerView
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         recyclerView.setPadding(0, dimensionConverter.dpToPx(16), 0, dimensionConverter.dpToPx(16))
         recyclerView.configureWith(
                 epoxyController,
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
index 711819f764..ebeac5aca1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsFragment.kt
@@ -41,8 +41,9 @@ class CrossSigningSettingsFragment @Inject constructor(
 
     private val viewModel: CrossSigningSettingsViewModel by fragmentViewModel()
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView()
         viewModel.observeViewEvents {
             when (it) {
                 is CrossSigningSettingsViewEvents.Failure -> {
@@ -62,11 +63,6 @@ class CrossSigningSettingsFragment @Inject constructor(
         (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.encryption_information_cross_signing_state)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        setupRecyclerView()
-    }
-
     override fun invalidate() = withState(viewModel) { state ->
         controller.setData(state)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
index c8b12e26a5..dbaa99e1df 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt
@@ -17,6 +17,7 @@ package im.vector.app.features.settings.devices
 
 import android.os.Bundle
 import android.os.Parcelable
+import android.view.View
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
@@ -58,8 +59,8 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(),
 
     override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         recyclerView.configureWith(
                 controller,
                 showDivider = false,
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index 30f7ed93a3..756aa3cbac 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -104,8 +104,8 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
         viewModel.refreshRemoteStateIfNeeded()
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         setupRecoveryButton.action = {
             BootstrapBottomSheet.show(parentFragmentManager, SetupMode.NORMAL)

From dd1c9976e3413fdee955455dff1ac6061195a5b5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 17:13:57 +0200
Subject: [PATCH 148/278] Fix runtime issue after upgrading Moshi library

---
 .../session/content/ContentAttachmentData.kt  |  5 ++-
 .../sdk/api/session/room/model/Signed.kt      |  2 ++
 .../crypto/IncomingSecretShareRequest.kt      |  2 ++
 .../android/sdk/internal/di/MoshiProvider.kt  |  4 +++
 .../parsing/CipherSuiteMoshiAdapter.kt        | 35 +++++++++++++++++++
 .../network/parsing/TlsVersionMoshiAdapter.kt | 35 +++++++++++++++++++
 6 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
index 045a9bc1a0..b89dfee77f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
@@ -20,9 +20,11 @@ package org.matrix.android.sdk.api.session.content
 import android.net.Uri
 import android.os.Parcelable
 import androidx.exifinterface.media.ExifInterface
+import com.squareup.moshi.JsonClass
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
+@JsonClass(generateAdapter = true)
 data class ContentAttachmentData(
         val size: Long = 0,
         val duration: Long? = 0,
@@ -32,10 +34,11 @@ data class ContentAttachmentData(
         val exifOrientation: Int = ExifInterface.ORIENTATION_UNDEFINED,
         val name: String? = null,
         val queryUri: Uri,
-        private val mimeType: String?,
+        val mimeType: String?,
         val type: Type
 ) : Parcelable {
 
+    @JsonClass(generateAdapter = false)
     enum class Type {
         FILE,
         IMAGE,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
index 9c14275b3e..9f0e0c17ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
@@ -18,7 +18,9 @@
 package org.matrix.android.sdk.api.session.room.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 data class Signed(
         @Json(name = "token") val token: String,
         @Json(name = "signatures") val signatures: Any,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
index 4b91ed5d76..de71fd2391 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
@@ -17,6 +17,7 @@
 
 package org.matrix.android.sdk.internal.crypto
 
+import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
@@ -24,6 +25,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
 /**
  * IncomingRoomKeyRequest class defines the incoming room keys request.
  */
+@JsonClass(generateAdapter = true)
 data class IncomingSecretShareRequest(
         /**
          * The user id
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 5e16d0b455..5921e28f59 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -32,8 +32,10 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import org.matrix.android.sdk.api.session.room.model.message.MessageVerificationRequestContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.internal.network.parsing.CipherSuiteMoshiAdapter
 import org.matrix.android.sdk.internal.network.parsing.ForceToBooleanJsonAdapter
 import org.matrix.android.sdk.internal.network.parsing.RuntimeJsonAdapterFactory
+import org.matrix.android.sdk.internal.network.parsing.TlsVersionMoshiAdapter
 import org.matrix.android.sdk.internal.network.parsing.UriMoshiAdapter
 
 object MoshiProvider {
@@ -41,6 +43,8 @@ object MoshiProvider {
     private val moshi: Moshi = Moshi.Builder()
             .add(UriMoshiAdapter())
             .add(ForceToBooleanJsonAdapter())
+            .add(CipherSuiteMoshiAdapter())
+            .add(TlsVersionMoshiAdapter())
             .add(RuntimeJsonAdapterFactory.of(MessageContent::class.java, "msgtype", MessageDefaultContent::class.java)
                     .registerSubtype(MessageTextContent::class.java, MessageType.MSGTYPE_TEXT)
                     .registerSubtype(MessageNoticeContent::class.java, MessageType.MSGTYPE_NOTICE)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt
new file mode 100644
index 0000000000..ad5821cb0f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.network.parsing
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import okhttp3.CipherSuite
+
+internal class CipherSuiteMoshiAdapter {
+
+    @ToJson
+    fun toJson(cipherSuite: CipherSuite): String {
+        return cipherSuite.javaName
+    }
+
+    @FromJson
+    fun fromJson(cipherSuiteString: String): CipherSuite {
+        return CipherSuite.forJavaName(cipherSuiteString)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt
new file mode 100644
index 0000000000..75301521d5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.network.parsing
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import okhttp3.TlsVersion
+
+internal class TlsVersionMoshiAdapter {
+
+    @ToJson
+    fun toJson(tlsVersion: TlsVersion): String {
+        return tlsVersion.javaName
+    }
+
+    @FromJson
+    fun fromJson(tlsVersionString: String): TlsVersion {
+        return TlsVersion.forJavaName(tlsVersionString)
+    }
+}

From 182158c3af11ba55a9b5f8cd6f2afccd93c7c663 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 17:47:00 +0200
Subject: [PATCH 149/278] Fix runtime issue after upgrading Moshi library

---
 .../crypto/IncomingGossipingRequestManager.kt | 12 ++++--
 .../crypto/IncomingSecretShareRequest.kt      |  4 +-
 .../sdk/internal/crypto/SendGossipWorker.kt   | 40 ++++++++++++++-----
 .../keysbackup/model/rest/KeysVersion.kt      |  7 +++-
 .../internal/crypto/store/IMXCryptoStore.kt   | 29 ++++++++++----
 .../crypto/store/db/RealmCryptoStore.kt       | 11 +++--
 6 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
index da72186136..18356ffbb0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
@@ -17,6 +17,8 @@
 
 package org.matrix.android.sdk.internal.crypto
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
@@ -36,8 +38,6 @@ import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.android.sdk.internal.util.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -327,7 +327,9 @@ internal class IncomingGossipingRequestManager @Inject constructor(
                 val params = SendGossipWorker.Params(
                         sessionId = sessionId,
                         secretValue = secretValue,
-                        request = request
+                        requestUserId = request.userId,
+                        requestDeviceId = request.deviceId,
+                        requestId = request.requestId
                 )
 
                 cryptoStore.updateGossipingRequestState(request, GossipingRequestState.ACCEPTING)
@@ -351,7 +353,9 @@ internal class IncomingGossipingRequestManager @Inject constructor(
             val params = SendGossipWorker.Params(
                     sessionId = userId,
                     secretValue = secretValue,
-                    request = request
+                    requestUserId = request.userId,
+                    requestDeviceId = request.deviceId,
+                    requestId = request.requestId
             )
 
             cryptoStore.updateGossipingRequestState(request, GossipingRequestState.ACCEPTING)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
index de71fd2391..c376a66f09 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
@@ -17,15 +17,13 @@
 
 package org.matrix.android.sdk.internal.crypto
 
-import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
 
 /**
- * IncomingRoomKeyRequest class defines the incoming room keys request.
+ * IncomingSecretShareRequest class defines the incoming secret keys request.
  */
-@JsonClass(generateAdapter = true)
 data class IncomingSecretShareRequest(
         /**
          * The user id
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
index c8bfdcd542..1c28dc6fbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
@@ -47,7 +47,9 @@ internal class SendGossipWorker(context: Context,
     internal data class Params(
             override val sessionId: String,
             val secretValue: String,
-            val request: IncomingSecretShareRequest,
+            val requestUserId: String?,
+            val requestDeviceId: String?,
+            val requestId: String?,
             override val lastFailureMessage: String? = null
     ) : SessionWorkerParams
 
@@ -67,16 +69,21 @@ internal class SendGossipWorker(context: Context,
         val eventType: String = EventType.SEND_SECRET
 
         val toDeviceContent = SecretSendEventContent(
-                requestId = params.request.requestId ?: "",
+                requestId = params.requestId ?: "",
                 secretValue = params.secretValue
         )
 
-        val requestingUserId = params.request.userId ?: ""
-        val requestingDeviceId = params.request.deviceId ?: ""
+        val requestingUserId = params.requestUserId ?: ""
+        val requestingDeviceId = params.requestDeviceId ?: ""
         val deviceInfo = cryptoStore.getUserDevice(requestingUserId, requestingDeviceId)
                 ?: return buildErrorResult(params, "Unknown deviceInfo, cannot send message").also {
-                    cryptoStore.updateGossipingRequestState(params.request, GossipingRequestState.FAILED_TO_ACCEPTED)
-                    Timber.e("Unknown deviceInfo, cannot send message, sessionId: ${params.request.deviceId}")
+                    cryptoStore.updateGossipingRequestState(
+                            requestUserId = params.requestUserId,
+                            requestDeviceId = params.requestDeviceId,
+                            requestId = params.requestId,
+                            state = GossipingRequestState.FAILED_TO_ACCEPTED
+                    )
+                    Timber.e("Unknown deviceInfo, cannot send message, sessionId: ${params.requestDeviceId}")
                 }
 
         val sendToDeviceMap = MXUsersDevicesMap<Any>()
@@ -88,7 +95,12 @@ internal class SendGossipWorker(context: Context,
             // no session with this device, probably because there
             // were no one-time keys.
             return buildErrorResult(params, "no session with this device").also {
-                cryptoStore.updateGossipingRequestState(params.request, GossipingRequestState.FAILED_TO_ACCEPTED)
+                cryptoStore.updateGossipingRequestState(
+                        requestUserId = params.requestUserId,
+                        requestDeviceId = params.requestDeviceId,
+                        requestId = params.requestId,
+                        state = GossipingRequestState.FAILED_TO_ACCEPTED
+                )
                 Timber.e("no session with this device, probably because there were no one-time keys.")
             }
         }
@@ -121,13 +133,23 @@ internal class SendGossipWorker(context: Context,
                             transactionId = localId
                     )
             )
-            cryptoStore.updateGossipingRequestState(params.request, GossipingRequestState.ACCEPTED)
+            cryptoStore.updateGossipingRequestState(
+                    requestUserId = params.requestUserId,
+                    requestDeviceId = params.requestDeviceId,
+                    requestId = params.requestId,
+                    state = GossipingRequestState.ACCEPTED
+            )
             return Result.success()
         } catch (throwable: Throwable) {
             return if (throwable.shouldBeRetried()) {
                 Result.retry()
             } else {
-                cryptoStore.updateGossipingRequestState(params.request, GossipingRequestState.FAILED_TO_ACCEPTED)
+                cryptoStore.updateGossipingRequestState(
+                        requestUserId = params.requestUserId,
+                        requestDeviceId = params.requestDeviceId,
+                        requestId = params.requestId,
+                        state = GossipingRequestState.FAILED_TO_ACCEPTED
+                )
                 buildErrorResult(params, throwable.localizedMessage ?: "error")
             }
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
index 3ca8df3131..115e7814d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
@@ -17,7 +17,12 @@
 
 package org.matrix.android.sdk.internal.crypto.keysbackup.model.rest
 
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
 data class KeysVersion(
         // the keys backup version
-        var version: String? = null
+        @Json(name = "version")
+        val version: String? = null
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index f248e464c2..491a69a1de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
@@ -215,11 +214,12 @@ internal interface IMXCryptoStore {
     // TODO temp
     fun getLiveDeviceList(): LiveData<List<CryptoDeviceInfo>>
 
-    fun getMyDevicesInfo() : List<DeviceInfo>
+    fun getMyDevicesInfo(): List<DeviceInfo>
 
-    fun getLiveMyDevicesInfo() : LiveData<List<DeviceInfo>>
+    fun getLiveMyDevicesInfo(): LiveData<List<DeviceInfo>>
 
     fun saveMyDevicesInfo(info: List<DeviceInfo>)
+
     /**
      * Store the crypto algorithm for a room.
      *
@@ -367,7 +367,19 @@ internal interface IMXCryptoStore {
 
     fun saveGossipingEvent(event: Event)
 
-    fun updateGossipingRequestState(request: IncomingShareRequestCommon, state: GossipingRequestState)
+    fun updateGossipingRequestState(request: IncomingShareRequestCommon, state: GossipingRequestState) {
+        updateGossipingRequestState(
+                requestUserId = request.userId,
+                requestDeviceId = request.deviceId,
+                requestId = request.requestId,
+                state = state
+        )
+    }
+
+    fun updateGossipingRequestState(requestUserId: String?,
+                                    requestDeviceId: String?,
+                                    requestId: String?,
+                                    state: GossipingRequestState)
 
     /**
      * Search an IncomingRoomKeyRequest
@@ -411,7 +423,7 @@ internal interface IMXCryptoStore {
     fun getLiveCrossSigningPrivateKeys(): LiveData<Optional<PrivateKeysInfo>>
 
     fun saveBackupRecoveryKey(recoveryKey: String?, version: String?)
-    fun getKeyBackupRecoveryKeyInfo() : SavedKeyBackupKeyInfo?
+    fun getKeyBackupRecoveryKeyInfo(): SavedKeyBackupKeyInfo?
 
     fun setUserKeysAsTrusted(userId: String, trusted: Boolean = true)
     fun setDeviceTrust(userId: String, deviceId: String, crossSignedVerified: Boolean, locallyVerified: Boolean?)
@@ -421,12 +433,13 @@ internal interface IMXCryptoStore {
     fun updateUsersTrust(check: (String) -> Boolean)
 
     fun addWithHeldMegolmSession(withHeldContent: RoomKeyWithHeldContent)
-    fun getWithHeldMegolmSession(roomId: String, sessionId: String) : RoomKeyWithHeldContent?
+    fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent?
 
     fun markedSessionAsShared(roomId: String?, sessionId: String, userId: String, deviceId: String, chainIndex: Int)
-    fun wasSessionSharedWithUser(roomId: String?, sessionId: String, userId: String, deviceId: String) : SharedSessionResult
+    fun wasSessionSharedWithUser(roomId: String?, sessionId: String, userId: String, deviceId: String): SharedSessionResult
     data class SharedSessionResult(val found: Boolean, val chainIndex: Int?)
-    fun getSharedWithInfo(roomId: String?, sessionId: String) : MXUsersDevicesMap<Int>
+
+    fun getSharedWithInfo(roomId: String?, sessionId: String): MXUsersDevicesMap<Int>
     // Dev tools
 
     fun getOutgoingRoomKeyRequests(): List<OutgoingRoomKeyRequest>
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index df71ef9eba..4f63ddc238 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -1134,12 +1134,15 @@ internal class RealmCryptoStore @Inject constructor(
 //        }
 //    }
 
-    override fun updateGossipingRequestState(request: IncomingShareRequestCommon, state: GossipingRequestState) {
+    override fun updateGossipingRequestState(requestUserId: String?,
+                                             requestDeviceId: String?,
+                                             requestId: String?,
+                                             state: GossipingRequestState) {
         doRealmTransaction(realmConfiguration) { realm ->
             realm.where<IncomingGossipingRequestEntity>()
-                    .equalTo(IncomingGossipingRequestEntityFields.OTHER_USER_ID, request.userId)
-                    .equalTo(IncomingGossipingRequestEntityFields.OTHER_DEVICE_ID, request.deviceId)
-                    .equalTo(IncomingGossipingRequestEntityFields.REQUEST_ID, request.requestId)
+                    .equalTo(IncomingGossipingRequestEntityFields.OTHER_USER_ID, requestUserId)
+                    .equalTo(IncomingGossipingRequestEntityFields.OTHER_DEVICE_ID, requestDeviceId)
+                    .equalTo(IncomingGossipingRequestEntityFields.REQUEST_ID, requestId)
                     .findAll().forEach {
                         it.requestState = state
                     }

From 3182850e19097ea6c58d433daaf677537e2966cf Mon Sep 17 00:00:00 2001
From: rkfg <rkfg@rkfg.me>
Date: Mon, 5 Oct 2020 20:44:49 +0000
Subject: [PATCH 150/278] Translated using Weblate (Russian)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index f4e870d913..f3665caded 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1227,7 +1227,7 @@
     <string name="settings_noisy_notifications_preferences">Настроить шумные уведомления</string>
     <string name="settings_call_notifications_preferences">Настроить уведомления о вызовах</string>
     <string name="settings_silent_notifications_preferences">Настроить беззвучные уведомления</string>
-    <string name="settings_system_preferences_summary">Выберать цвет светодиода, вибрацию, звук…</string>
+    <string name="settings_system_preferences_summary">Выбрать цвет светодиода, вибрацию, звук…</string>
 
 
     <string name="settings_cryptography_manage_keys">Управление криптографическими ключами</string>

From a7f034f50064741988f76e5b8ee8f4729d7373ec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 10:53:37 +0200
Subject: [PATCH 151/278] Stop using deprecated API to manage Permissions
 request from Fragment

---
 .../vector/app/core/utils/PermissionsTools.kt |  57 ++------
 .../VerificationChooseMethodFragment.kt       |  16 +--
 .../home/room/detail/RoomDetailFragment.kt    | 124 +++++++++---------
 .../roomprofile/RoomProfileFragment.kt        |  16 +--
 .../settings/VectorSettingsGeneralFragment.kt |  16 +--
 5 files changed, 90 insertions(+), 139 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index aff26ae494..3b83364f35 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
@@ -105,7 +106,7 @@ fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                      activity: Activity,
                      requestCode: Int,
                      @StringRes rationaleMessage: Int = 0): Boolean {
-    return checkPermissions(permissionsToBeGrantedBitMap, activity, null, requestCode, rationaleMessage)
+    return checkPermissions(permissionsToBeGrantedBitMap, activity, null, null, requestCode, rationaleMessage)
 }
 
 /**
@@ -117,9 +118,9 @@ fun checkPermissions(permissionsToBeGrantedBitMap: Int,
  */
 fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                      fragment: Fragment,
-                     requestCode: Int,
-                     @StringRes rationaleMessage: Int = 0): Boolean {
-    return checkPermissions(permissionsToBeGrantedBitMap, fragment.activity, fragment, requestCode, rationaleMessage)
+                     @StringRes rationaleMessage: Int = 0,
+                     allGranted: (Boolean) -> Unit): Boolean {
+    return checkPermissions(permissionsToBeGrantedBitMap, fragment.activity, fragment, allGranted, 0, rationaleMessage)
 }
 
 /**
@@ -143,6 +144,7 @@ fun checkPermissions(permissionsToBeGrantedBitMap: Int,
 private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                              activity: Activity?,
                              fragment: Fragment?,
+                             allGranted: ((Boolean) -> Unit)?,
                              requestCode: Int,
                              @StringRes rationaleMessage: Int
 ): Boolean {
@@ -222,7 +224,10 @@ private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                     .setOnCancelListener { Toast.makeText(activity, R.string.missing_permissions_warning, Toast.LENGTH_SHORT).show() }
                     .setPositiveButton(R.string.ok) { _, _ ->
                         if (permissionsListToBeGranted.isNotEmpty()) {
-                            fragment?.requestPermissions(permissionsListToBeGranted.toTypedArray(), requestCode)
+                            fragment?.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
+                                allGranted?.invoke(result.keys.all { result[it] == true })
+                            }
+                                    ?.launch(permissionsListToBeGranted.toTypedArray())
                                     ?: run {
                                         ActivityCompat.requestPermissions(activity, permissionsListToBeGranted.toTypedArray(), requestCode)
                                     }
@@ -262,7 +267,10 @@ private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                             .show()
                     */
                 } else {
-                    fragment?.requestPermissions(permissionsArrayToBeGranted, requestCode)
+                    fragment?.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
+                        allGranted?.invoke(result.keys.all { result[it] == true })
+                    }
+                            ?.launch(permissionsArrayToBeGranted)
                             ?: run {
                                 ActivityCompat.requestPermissions(activity, permissionsArrayToBeGranted, requestCode)
                             }
@@ -307,43 +315,6 @@ private fun updatePermissionsToBeGranted(activity: Activity,
     return isRequestPermissionRequested
 }
 
-/**
- * Helper method to process [.PERMISSIONS_FOR_AUDIO_IP_CALL]
- * on onRequestPermissionsResult() methods.
- *
- * @param context      App context
- * @param grantResults permissions granted results
- * @return true if audio IP call is permitted, false otherwise
- */
-fun onPermissionResultAudioIpCall(context: Context, grantResults: IntArray): Boolean {
-    val arePermissionsGranted = allGranted(grantResults)
-
-    if (!arePermissionsGranted) {
-        Toast.makeText(context, R.string.permissions_action_not_performed_missing_permissions, Toast.LENGTH_SHORT).show()
-    }
-
-    return arePermissionsGranted
-}
-
-/**
- * Helper method to process [.PERMISSIONS_FOR_VIDEO_IP_CALL]
- * on onRequestPermissionsResult() methods.
- * For video IP calls, record audio and camera permissions are both mandatory.
- *
- * @param context      App context
- * @param grantResults permissions granted results
- * @return true if video IP call is permitted, false otherwise
- */
-fun onPermissionResultVideoIpCall(context: Context, grantResults: IntArray): Boolean {
-    val arePermissionsGranted = allGranted(grantResults)
-
-    if (!arePermissionsGranted) {
-        Toast.makeText(context, R.string.permissions_action_not_performed_missing_permissions, Toast.LENGTH_SHORT).show()
-    }
-
-    return arePermissionsGranted
-}
-
 /**
  * Return true if all permissions are granted, false if not or if permission request has been cancelled
  */
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index fc715301f2..b176cc0815 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -27,8 +27,6 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.app.core.utils.allGranted
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.features.crypto.verification.VerificationAction
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
@@ -76,15 +74,11 @@ class VerificationChooseMethodFragment @Inject constructor(
     }
 
     override fun openCamera() {
-        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this, PERMISSION_REQUEST_CODE_LAUNCH_CAMERA)) {
-            doOpenQRCodeScanner()
-        }
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        if (requestCode == PERMISSION_REQUEST_CODE_LAUNCH_CAMERA && allGranted(grantResults)) {
+        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this) { allGranted ->
+                    if (allGranted) {
+                        doOpenQRCodeScanner()
+                    }
+                }) {
             doOpenQRCodeScanner()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 8694cf3978..6ee6212cf6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -91,18 +91,13 @@ import im.vector.app.core.utils.KeyboardStateUtils
 import im.vector.app.core.utils.PERMISSIONS_FOR_AUDIO_IP_CALL
 import im.vector.app.core.utils.PERMISSIONS_FOR_VIDEO_IP_CALL
 import im.vector.app.core.utils.PERMISSIONS_FOR_WRITING_FILES
-import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_INCOMING_URI
-import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_PICK_ATTACHMENT
 import im.vector.app.core.utils.TextUtils
-import im.vector.app.core.utils.allGranted
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.createJSonViewerStyleProvider
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.core.utils.isValidUrl
-import im.vector.app.core.utils.onPermissionResultAudioIpCall
-import im.vector.app.core.utils.onPermissionResultVideoIpCall
 import im.vector.app.core.utils.openUrlInExternalBrowser
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
@@ -234,11 +229,6 @@ class RoomDetailFragment @Inject constructor(
         ActiveCallView.Callback {
 
     companion object {
-
-        private const val AUDIO_CALL_PERMISSION_REQUEST_CODE = 1
-        private const val VIDEO_CALL_PERMISSION_REQUEST_CODE = 2
-        private const val SAVE_ATTACHEMENT_REQUEST_CODE = 3
-
         /**
          * Sanitize the display name.
          *
@@ -797,15 +787,35 @@ class RoomDetailFragment @Inject constructor(
         roomDetailViewModel.pendingAction = startCallAction
         if (isVideoCall) {
             if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL,
-                            this, VIDEO_CALL_PERMISSION_REQUEST_CODE,
-                            R.string.permissions_rationale_msg_camera_and_audio)) {
+                            this,
+                            R.string.permissions_rationale_msg_camera_and_audio) { allGranted ->
+                        if (allGranted) {
+                            (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
+                                roomDetailViewModel.pendingAction = null
+                                roomDetailViewModel.handle(it)
+                            }
+                        } else {
+                            context?.toast(R.string.permissions_action_not_performed_missing_permissions)
+                            cleanUpAfterPermissionNotGranted()
+                        }
+                    }) {
                 roomDetailViewModel.pendingAction = null
                 roomDetailViewModel.handle(startCallAction)
             }
         } else {
             if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL,
-                            this, AUDIO_CALL_PERMISSION_REQUEST_CODE,
-                            R.string.permissions_rationale_msg_record_audio)) {
+                            this,
+                            R.string.permissions_rationale_msg_record_audio) { allGranted ->
+                        if (allGranted) {
+                            (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
+                                roomDetailViewModel.pendingAction = null
+                                roomDetailViewModel.handle(it)
+                            }
+                        } else {
+                            context?.toast(R.string.permissions_action_not_performed_missing_permissions)
+                            cleanUpAfterPermissionNotGranted()
+                        }
+                    }) {
                 roomDetailViewModel.pendingAction = null
                 roomDetailViewModel.handle(startCallAction)
             }
@@ -1027,7 +1037,17 @@ class RoomDetailFragment @Inject constructor(
 
             override fun onRichContentSelected(contentUri: Uri): Boolean {
                 // We need WRITE_EXTERNAL permission
-                return if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this@RoomDetailFragment, PERMISSION_REQUEST_CODE_INCOMING_URI)) {
+                return if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this@RoomDetailFragment) { allGranted ->
+                            if (allGranted) {
+                                val pendingUri = roomDetailViewModel.pendingUri
+                                if (pendingUri != null) {
+                                    roomDetailViewModel.pendingUri = null
+                                    sendUri(pendingUri)
+                                }
+                            } else {
+                                cleanUpAfterPermissionNotGranted()
+                            }
+                        }) {
                     sendUri(contentUri)
                 } else {
                     roomDetailViewModel.pendingUri = contentUri
@@ -1417,52 +1437,11 @@ class RoomDetailFragment @Inject constructor(
 // //        }
 //    }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        if (allGranted(grantResults)) {
-            when (requestCode) {
-                SAVE_ATTACHEMENT_REQUEST_CODE           -> {
-                    sharedActionViewModel.pendingAction?.let {
-                        handleActions(it)
-                        sharedActionViewModel.pendingAction = null
-                    }
-                }
-                PERMISSION_REQUEST_CODE_INCOMING_URI    -> {
-                    val pendingUri = roomDetailViewModel.pendingUri
-                    if (pendingUri != null) {
-                        roomDetailViewModel.pendingUri = null
-                        sendUri(pendingUri)
-                    }
-                }
-                PERMISSION_REQUEST_CODE_PICK_ATTACHMENT -> {
-                    val pendingType = attachmentsHelper.pendingType
-                    if (pendingType != null) {
-                        attachmentsHelper.pendingType = null
-                        launchAttachmentProcess(pendingType)
-                    }
-                }
-                AUDIO_CALL_PERMISSION_REQUEST_CODE      -> {
-                    if (onPermissionResultAudioIpCall(requireContext(), grantResults)) {
-                        (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
-                            roomDetailViewModel.pendingAction = null
-                            roomDetailViewModel.handle(it)
-                        }
-                    }
-                }
-                VIDEO_CALL_PERMISSION_REQUEST_CODE      -> {
-                    if (onPermissionResultVideoIpCall(requireContext(), grantResults)) {
-                        (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
-                            roomDetailViewModel.pendingAction = null
-                            roomDetailViewModel.handle(it)
-                        }
-                    }
-                }
-            }
-        } else {
-            // Reset all pending data
-            roomDetailViewModel.pendingAction = null
-            roomDetailViewModel.pendingUri = null
-            attachmentsHelper.pendingType = null
-        }
+    private fun cleanUpAfterPermissionNotGranted() {
+        // Reset all pending data
+        roomDetailViewModel.pendingAction = null
+        roomDetailViewModel.pendingUri = null
+        attachmentsHelper.pendingType = null
     }
 
 //    override fun onAudioMessageClicked(messageAudioContent: MessageAudioContent) {
@@ -1579,7 +1558,16 @@ class RoomDetailFragment @Inject constructor(
 
     private fun onSaveActionClicked(action: EventSharedAction.Save) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
-                && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this, SAVE_ATTACHEMENT_REQUEST_CODE)) {
+                && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this) { allGranted ->
+                    if (allGranted) {
+                        sharedActionViewModel.pendingAction?.let {
+                            handleActions(it)
+                            sharedActionViewModel.pendingAction = null
+                        }
+                    } else {
+                        cleanUpAfterPermissionNotGranted()
+                    }
+                }) {
             sharedActionViewModel.pendingAction = action
             return
         }
@@ -1818,7 +1806,17 @@ class RoomDetailFragment @Inject constructor(
 // AttachmentTypeSelectorView.Callback
 
     override fun onTypeSelected(type: AttachmentTypeSelectorView.Type) {
-        if (checkPermissions(type.permissionsBit, this, PERMISSION_REQUEST_CODE_PICK_ATTACHMENT)) {
+        if (checkPermissions(type.permissionsBit, this) { allGranted ->
+                    if (allGranted) {
+                        val pendingType = attachmentsHelper.pendingType
+                        if (pendingType != null) {
+                            attachmentsHelper.pendingType = null
+                            launchAttachmentProcess(pendingType)
+                        }
+                    } else {
+                        cleanUpAfterPermissionNotGranted()
+                    }
+                }) {
             launchAttachmentProcess(type)
         } else {
             attachmentsHelper.pendingType = type
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 477d557bea..f5c80b378f 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -46,8 +46,6 @@ import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
-import im.vector.app.core.utils.allGranted
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.startSharePlainTextIntent
@@ -288,7 +286,11 @@ class RoomProfileFragment @Inject constructor(
     private var avatarCameraUri: Uri? = null
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
-            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this, PERMISSION_REQUEST_CODE_LAUNCH_CAMERA)) {
+            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this) { allGranted ->
+                        if (allGranted) {
+                            onAvatarTypeSelected(true)
+                        }
+                    }) {
                 avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
             }
         } else {
@@ -331,14 +333,6 @@ class RoomProfileFragment @Inject constructor(
         super.onActivityResult(requestCode, resultCode, data)
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        if (allGranted(grantResults)) {
-            when (requestCode) {
-                PERMISSION_REQUEST_CODE_LAUNCH_CAMERA -> onAvatarTypeSelected(true)
-            }
-        }
-    }
-
     private fun onAvatarCropped(uri: Uri?) {
         if (uri != null) {
             roomProfileViewModel.handle(RoomProfileAction.ChangeRoomAvatar(uri, getFilenameFromUri(context, uri)))
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 6c0aefe9da..2f2c0d4c33 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -48,9 +48,7 @@ import im.vector.app.core.preference.UserAvatarPreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorSwitchPreference
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
 import im.vector.app.core.utils.TextUtils
-import im.vector.app.core.utils.allGranted
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.getSizeOfFiles
 import im.vector.app.core.utils.toast
@@ -279,14 +277,6 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         session.integrationManagerService().removeListener(integrationServiceListener)
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        if (allGranted(grantResults)) {
-            if (requestCode == PERMISSION_REQUEST_CODE_LAUNCH_CAMERA) {
-                onAvatarTypeSelected(true)
-            }
-        }
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
@@ -402,7 +392,11 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
 
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
-            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this, PERMISSION_REQUEST_CODE_LAUNCH_CAMERA)) {
+            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this) { allGranted ->
+                        if (allGranted) {
+                            onAvatarTypeSelected(true)
+                        }
+                    }) {
                 avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
             }
         } else {

From 05950ec1c8a73ed08c56a21cd92bbdd8471fd4f7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 11:52:29 +0200
Subject: [PATCH 152/278] registerForActivityResult has to be called at
 Fragment creation

---
 .../vector/app/core/utils/PermissionsTools.kt |  39 +++---
 .../VerificationChooseMethodFragment.kt       |  13 +-
 .../home/room/detail/RoomDetailFragment.kt    | 114 +++++++++---------
 .../roomprofile/RoomProfileFragment.kt        |  13 +-
 .../settings/VectorSettingsGeneralFragment.kt |  13 +-
 5 files changed, 101 insertions(+), 91 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
index 3b83364f35..44fc6afa4e 100644
--- a/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/PermissionsTools.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
@@ -95,6 +96,12 @@ fun logPermissionStatuses(context: Context) {
     }
 }
 
+fun Fragment.registerForPermissionsResult(allGranted: (Boolean) -> Unit): ActivityResultLauncher<Array<String>> {
+    return registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
+        allGranted.invoke(result.keys.all { result[it] == true })
+    }
+}
+
 /**
  * See [.checkPermissions]
  *
@@ -106,21 +113,21 @@ fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                      activity: Activity,
                      requestCode: Int,
                      @StringRes rationaleMessage: Int = 0): Boolean {
-    return checkPermissions(permissionsToBeGrantedBitMap, activity, null, null, requestCode, rationaleMessage)
+    return checkPermissions(permissionsToBeGrantedBitMap, activity, null, requestCode, rationaleMessage)
 }
 
 /**
  * See [.checkPermissions]
  *
  * @param permissionsToBeGrantedBitMap
- * @param fragment
+ * @param activityResultLauncher       from the calling fragment that is requesting the permissions
  * @return true if the permissions are granted (synchronous flow), false otherwise (asynchronous flow)
  */
 fun checkPermissions(permissionsToBeGrantedBitMap: Int,
-                     fragment: Fragment,
-                     @StringRes rationaleMessage: Int = 0,
-                     allGranted: (Boolean) -> Unit): Boolean {
-    return checkPermissions(permissionsToBeGrantedBitMap, fragment.activity, fragment, allGranted, 0, rationaleMessage)
+                     activity: Activity,
+                     activityResultLauncher: ActivityResultLauncher<Array<String>>,
+                     @StringRes rationaleMessage: Int = 0): Boolean {
+    return checkPermissions(permissionsToBeGrantedBitMap, activity, activityResultLauncher, 0, rationaleMessage)
 }
 
 /**
@@ -138,23 +145,19 @@ fun checkPermissions(permissionsToBeGrantedBitMap: Int,
  *
  * @param permissionsToBeGrantedBitMap the permissions bit map to be granted
  * @param activity                     the calling Activity that is requesting the permissions (or fragment parent)
- * @param fragment                     the calling fragment that is requesting the permissions
+ * @param activityResultLauncher       from the calling fragment that is requesting the permissions
  * @return true if the permissions are granted (synchronous flow), false otherwise (asynchronous flow)
  */
 private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
-                             activity: Activity?,
-                             fragment: Fragment?,
-                             allGranted: ((Boolean) -> Unit)?,
+                             activity: Activity,
+                             activityResultLauncher: ActivityResultLauncher<Array<String>>?,
                              requestCode: Int,
                              @StringRes rationaleMessage: Int
 ): Boolean {
     var isPermissionGranted = false
 
     // sanity check
-    if (null == activity) {
-        Timber.w("## checkPermissions(): invalid input data")
-        isPermissionGranted = false
-    } else if (PERMISSIONS_EMPTY == permissionsToBeGrantedBitMap) {
+    if (PERMISSIONS_EMPTY == permissionsToBeGrantedBitMap) {
         isPermissionGranted = true
     } else if (PERMISSIONS_FOR_AUDIO_IP_CALL != permissionsToBeGrantedBitMap
             && PERMISSIONS_FOR_VIDEO_IP_CALL != permissionsToBeGrantedBitMap
@@ -224,9 +227,7 @@ private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                     .setOnCancelListener { Toast.makeText(activity, R.string.missing_permissions_warning, Toast.LENGTH_SHORT).show() }
                     .setPositiveButton(R.string.ok) { _, _ ->
                         if (permissionsListToBeGranted.isNotEmpty()) {
-                            fragment?.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
-                                allGranted?.invoke(result.keys.all { result[it] == true })
-                            }
+                            activityResultLauncher
                                     ?.launch(permissionsListToBeGranted.toTypedArray())
                                     ?: run {
                                         ActivityCompat.requestPermissions(activity, permissionsListToBeGranted.toTypedArray(), requestCode)
@@ -267,9 +268,7 @@ private fun checkPermissions(permissionsToBeGrantedBitMap: Int,
                             .show()
                     */
                 } else {
-                    fragment?.registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
-                        allGranted?.invoke(result.keys.all { result[it] == true })
-                    }
+                    activityResultLauncher
                             ?.launch(permissionsArrayToBeGranted)
                             ?: run {
                                 ActivityCompat.requestPermissions(activity, permissionsArrayToBeGranted, requestCode)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index b176cc0815..a1ce84e2f4 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -28,6 +28,7 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
+import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.features.crypto.verification.VerificationAction
 import im.vector.app.features.crypto.verification.VerificationBottomSheetViewModel
 import im.vector.app.features.qrcode.QrCodeScannerActivity
@@ -73,12 +74,14 @@ class VerificationChooseMethodFragment @Inject constructor(
                 state.pendingRequest.invoke()?.transactionId ?: ""))
     }
 
+    private val openCameraActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            doOpenQRCodeScanner()
+        }
+    }
+
     override fun openCamera() {
-        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this) { allGranted ->
-                    if (allGranted) {
-                        doOpenQRCodeScanner()
-                    }
-                }) {
+        if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), openCameraActivityResultLauncher)) {
             doOpenQRCodeScanner()
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 6ee6212cf6..c861e5ce73 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -99,6 +99,7 @@ import im.vector.app.core.utils.createJSonViewerStyleProvider
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.core.utils.isValidUrl
 import im.vector.app.core.utils.openUrlInExternalBrowser
+import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
 import im.vector.app.core.utils.toast
@@ -782,40 +783,35 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private val startCallActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
+                roomDetailViewModel.pendingAction = null
+                roomDetailViewModel.handle(it)
+            }
+        } else {
+            context?.toast(R.string.permissions_action_not_performed_missing_permissions)
+            cleanUpAfterPermissionNotGranted()
+        }
+    }
+
+
     private fun safeStartCall2(isVideoCall: Boolean) {
         val startCallAction = RoomDetailAction.StartCall(isVideoCall)
         roomDetailViewModel.pendingAction = startCallAction
         if (isVideoCall) {
             if (checkPermissions(PERMISSIONS_FOR_VIDEO_IP_CALL,
-                            this,
-                            R.string.permissions_rationale_msg_camera_and_audio) { allGranted ->
-                        if (allGranted) {
-                            (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
-                                roomDetailViewModel.pendingAction = null
-                                roomDetailViewModel.handle(it)
-                            }
-                        } else {
-                            context?.toast(R.string.permissions_action_not_performed_missing_permissions)
-                            cleanUpAfterPermissionNotGranted()
-                        }
-                    }) {
+                            requireActivity(),
+                            startCallActivityResultLauncher,
+                            R.string.permissions_rationale_msg_camera_and_audio)) {
                 roomDetailViewModel.pendingAction = null
                 roomDetailViewModel.handle(startCallAction)
             }
         } else {
             if (checkPermissions(PERMISSIONS_FOR_AUDIO_IP_CALL,
-                            this,
-                            R.string.permissions_rationale_msg_record_audio) { allGranted ->
-                        if (allGranted) {
-                            (roomDetailViewModel.pendingAction as? RoomDetailAction.StartCall)?.let {
-                                roomDetailViewModel.pendingAction = null
-                                roomDetailViewModel.handle(it)
-                            }
-                        } else {
-                            context?.toast(R.string.permissions_action_not_performed_missing_permissions)
-                            cleanUpAfterPermissionNotGranted()
-                        }
-                    }) {
+                            requireActivity(),
+                            startCallActivityResultLauncher,
+                            R.string.permissions_rationale_msg_record_audio)) {
                 roomDetailViewModel.pendingAction = null
                 roomDetailViewModel.handle(startCallAction)
             }
@@ -1005,6 +1001,18 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private val writingFileActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            val pendingUri = roomDetailViewModel.pendingUri
+            if (pendingUri != null) {
+                roomDetailViewModel.pendingUri = null
+                sendUri(pendingUri)
+            }
+        } else {
+            cleanUpAfterPermissionNotGranted()
+        }
+    }
+
     private fun setupComposer() {
         autoCompleter.setup(composerLayout.composerEditText)
 
@@ -1037,17 +1045,7 @@ class RoomDetailFragment @Inject constructor(
 
             override fun onRichContentSelected(contentUri: Uri): Boolean {
                 // We need WRITE_EXTERNAL permission
-                return if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this@RoomDetailFragment) { allGranted ->
-                            if (allGranted) {
-                                val pendingUri = roomDetailViewModel.pendingUri
-                                if (pendingUri != null) {
-                                    roomDetailViewModel.pendingUri = null
-                                    sendUri(pendingUri)
-                                }
-                            } else {
-                                cleanUpAfterPermissionNotGranted()
-                            }
-                        }) {
+                return if (checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), writingFileActivityResultLauncher)) {
                     sendUri(contentUri)
                 } else {
                     roomDetailViewModel.pendingUri = contentUri
@@ -1556,18 +1554,20 @@ class RoomDetailFragment @Inject constructor(
         )
     }
 
+    private val saveActionActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            sharedActionViewModel.pendingAction?.let {
+                handleActions(it)
+                sharedActionViewModel.pendingAction = null
+            }
+        } else {
+            cleanUpAfterPermissionNotGranted()
+        }
+    }
+
     private fun onSaveActionClicked(action: EventSharedAction.Save) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
-                && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, this) { allGranted ->
-                    if (allGranted) {
-                        sharedActionViewModel.pendingAction?.let {
-                            handleActions(it)
-                            sharedActionViewModel.pendingAction = null
-                        }
-                    } else {
-                        cleanUpAfterPermissionNotGranted()
-                    }
-                }) {
+                && !checkPermissions(PERMISSIONS_FOR_WRITING_FILES, requireActivity(), saveActionActivityResultLauncher)) {
             sharedActionViewModel.pendingAction = action
             return
         }
@@ -1805,18 +1805,20 @@ class RoomDetailFragment @Inject constructor(
 
 // AttachmentTypeSelectorView.Callback
 
+    private val typeSelectedActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            val pendingType = attachmentsHelper.pendingType
+            if (pendingType != null) {
+                attachmentsHelper.pendingType = null
+                launchAttachmentProcess(pendingType)
+            }
+        } else {
+            cleanUpAfterPermissionNotGranted()
+        }
+    }
+
     override fun onTypeSelected(type: AttachmentTypeSelectorView.Type) {
-        if (checkPermissions(type.permissionsBit, this) { allGranted ->
-                    if (allGranted) {
-                        val pendingType = attachmentsHelper.pendingType
-                        if (pendingType != null) {
-                            attachmentsHelper.pendingType = null
-                            launchAttachmentProcess(pendingType)
-                        }
-                    } else {
-                        cleanUpAfterPermissionNotGranted()
-                    }
-                }) {
+        if (checkPermissions(type.permissionsBit, requireActivity(), typeSelectedActivityResultLauncher)) {
             launchAttachmentProcess(type)
         } else {
             attachmentsHelper.pendingType = type
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index f5c80b378f..a6e1fda793 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -48,6 +48,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.copyToClipboard
+import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.features.crypto.util.toImageRes
 import im.vector.app.features.home.AvatarRenderer
@@ -283,14 +284,16 @@ class RoomProfileFragment @Inject constructor(
                 .show()
     }
 
+    private val takePhotoActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            onAvatarTypeSelected(true)
+        }
+    }
+
     private var avatarCameraUri: Uri? = null
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
-            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this) { allGranted ->
-                        if (allGranted) {
-                            onAvatarTypeSelected(true)
-                        }
-                    }) {
+            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), takePhotoActivityResultLauncher)) {
                 avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
             }
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 2f2c0d4c33..c1d8eb1abe 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -51,6 +51,7 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.TextUtils
 import im.vector.app.core.utils.checkPermissions
 import im.vector.app.core.utils.getSizeOfFiles
+import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
@@ -390,13 +391,15 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
                 }.show()
     }
 
+    private val takePhotoActivityResultLauncher = registerForPermissionsResult { allGranted ->
+        if (allGranted) {
+            onAvatarTypeSelected(true)
+        }
+    }
+
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
-            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this) { allGranted ->
-                        if (allGranted) {
-                            onAvatarTypeSelected(true)
-                        }
-                    }) {
+            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), takePhotoActivityResultLauncher)) {
                 avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
             }
         } else {

From ff0f42900d4714afef65c226c218067dcafbac5b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 16:02:01 +0200
Subject: [PATCH 153/278] Do not use deprecated Fragment.startActivityForResult
 anymore

---
 attachment-viewer/build.gradle                |   1 +
 matrix-sdk-android-rx/build.gradle            |   1 +
 matrix-sdk-android/build.gradle               |   1 +
 multipicker/build.gradle                      |   2 +-
 .../im/vector/lib/multipicker/AudioPicker.kt  |  11 +-
 .../im/vector/lib/multipicker/CameraPicker.kt |  67 +++++----
 .../vector/lib/multipicker/ContactPicker.kt   |  11 +-
 .../im/vector/lib/multipicker/FilePicker.kt   |  11 +-
 .../im/vector/lib/multipicker/ImagePicker.kt  |  11 +-
 .../java/im/vector/lib/multipicker/Picker.kt  |  16 +--
 .../im/vector/lib/multipicker/VideoPicker.kt  |  11 +-
 .../im/vector/app/core/extensions/Fragment.kt |  16 ++-
 .../core/utils/ExternalApplicationsUtil.kt    |  13 +-
 .../features/attachments/AttachmentsHelper.kt | 130 +++++++++---------
 .../preview/AttachmentsPreviewActivity.kt     |   2 -
 .../app/features/call/VectorCallActivity.kt   |   1 +
 .../call/conference/VectorJitsiActivity.kt    |   1 +
 .../createdirect/CreateDirectRoomActivity.kt  |   1 +
 .../setup/KeysBackupSetupStep3Fragment.kt     |  23 ++--
 .../VerificationChooseMethodFragment.kt       |  26 ++--
 .../discovery/DiscoverySettingsFragment.kt    |  21 ++-
 .../change/SetIdentityServerFragment.kt       |  19 ++-
 .../home/room/detail/RoomDetailFragment.kt    | 103 +++++++++-----
 .../room/detail/widget/WidgetRequestCodes.kt  |  22 ---
 .../invite/InviteUsersToRoomActivity.kt       |   1 +
 .../features/media/BigImageViewerActivity.kt  |   5 +-
 .../features/navigation/DefaultNavigator.kt   |  40 ++++--
 .../app/features/navigation/Navigator.kt      |  27 ++--
 .../features/qrcode/QrCodeScannerActivity.kt  |   6 +-
 .../reactions/EmojiReactionPickerActivity.kt  |   8 +-
 .../roomprofile/RoomProfileFragment.kt        |  50 ++++---
 .../settings/VectorSettingsGeneralFragment.kt | 126 ++++-------------
 .../settings/VectorSettingsPinFragment.kt     |  16 +--
 .../VectorSettingsSecurityPrivacyFragment.kt  | 103 +++++++-------
 .../features/share/IncomingShareFragment.kt   |  21 ++-
 .../app/features/terms/ReviewTermsActivity.kt |   1 -
 .../app/features/widgets/WidgetFragment.kt    |  41 +++---
 .../SignOutBottomSheetDialogFragment.kt       |  45 +++---
 38 files changed, 464 insertions(+), 547 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 59ba6c4500..91ddd519df 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -66,6 +66,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
 
     implementation 'com.google.android.material:material:1.2.1'
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index 03b60bbcf7..3d62758065 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -36,6 +36,7 @@ android {
 dependencies {
     implementation project(":matrix-sdk-android")
     implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     // Paging
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index c0030cca3d..0bf4819d25 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -121,6 +121,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation "androidx.core:core-ktx:1.3.2"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 0eb38c23dd..b6e500e493 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -41,9 +41,9 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.fragment:fragment:1.3.0-beta01"
     implementation 'androidx.exifinterface:exifinterface:1.3.0'
 
     // Log
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
index c51084dd39..e796137af2 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadataRetriever
@@ -30,15 +29,9 @@ class AudioPicker(override val requestCode: Int) : Picker<MultiPickerAudioType>(
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
-     * Returns selected audio files or empty list if request code is wrong
-     * or result code is not Activity.RESULT_OK
-     * or user did not select any files.
+     * Returns selected audio files or empty list if user did not select any files.
      */
-    override fun getSelectedFiles(context: Context, requestCode: Int, resultCode: Int, data: Intent?): List<MultiPickerAudioType> {
-        if (requestCode != this.requestCode && resultCode != Activity.RESULT_OK) {
-            return emptyList()
-        }
-
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerAudioType> {
         val audioList = mutableListOf<MultiPickerAudioType>()
 
         getSelectedUriList(data).forEach { selectedUri ->
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
index be6fdb5ee8..319bc31af9 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
@@ -21,8 +21,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.provider.MediaStore
+import androidx.activity.result.ActivityResultLauncher
 import androidx.core.content.FileProvider
-import androidx.fragment.app.Fragment
 import im.vector.lib.multipicker.entity.MultiPickerImageType
 import im.vector.lib.multipicker.utils.ImageUtils
 import java.io.File
@@ -51,15 +51,14 @@ class CameraPicker(val requestCode: Int) {
 
     /**
      * Start camera by using a Fragment
-     * @param fragment Fragment to handle onActivityResult().
      * @return Uri of taken photo or null if the operation is cancelled.
      */
-    fun startWithExpectingFile(fragment: Fragment): Uri? {
-        val photoUri = createPhotoUri(fragment.requireContext())
+    fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri? {
+        val photoUri = createPhotoUri(context)
         val intent = createIntent().apply {
             putExtra(MediaStore.EXTRA_OUTPUT, photoUri)
         }
-        fragment.startActivityForResult(intent, requestCode)
+        activityResultLauncher.launch(intent)
         return photoUri
     }
 
@@ -69,40 +68,38 @@ class CameraPicker(val requestCode: Int) {
      * or result code is not Activity.RESULT_OK
      * or user cancelled the operation.
      */
-    fun getTakenPhoto(context: Context, requestCode: Int, resultCode: Int, photoUri: Uri): MultiPickerImageType? {
-        if (requestCode == this.requestCode && resultCode == Activity.RESULT_OK) {
-            val projection = arrayOf(
-                    MediaStore.Images.Media.DISPLAY_NAME,
-                    MediaStore.Images.Media.SIZE
-            )
+    fun getTakenPhoto(context: Context, photoUri: Uri): MultiPickerImageType? {
+        val projection = arrayOf(
+                MediaStore.Images.Media.DISPLAY_NAME,
+                MediaStore.Images.Media.SIZE
+        )
 
-            context.contentResolver.query(
-                    photoUri,
-                    projection,
-                    null,
-                    null,
-                    null
-            )?.use { cursor ->
-                val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
-                val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
+        context.contentResolver.query(
+                photoUri,
+                projection,
+                null,
+                null,
+                null
+        )?.use { cursor ->
+            val nameColumn = cursor.getColumnIndex(MediaStore.Images.Media.DISPLAY_NAME)
+            val sizeColumn = cursor.getColumnIndex(MediaStore.Images.Media.SIZE)
 
-                if (cursor.moveToNext()) {
-                    val name = cursor.getString(nameColumn)
-                    val size = cursor.getLong(sizeColumn)
+            if (cursor.moveToNext()) {
+                val name = cursor.getString(nameColumn)
+                val size = cursor.getLong(sizeColumn)
 
-                    val bitmap = ImageUtils.getBitmap(context, photoUri)
-                    val orientation = ImageUtils.getOrientation(context, photoUri)
+                val bitmap = ImageUtils.getBitmap(context, photoUri)
+                val orientation = ImageUtils.getOrientation(context, photoUri)
 
-                    return MultiPickerImageType(
-                            name,
-                            size,
-                            context.contentResolver.getType(photoUri),
-                            photoUri,
-                            bitmap?.width ?: 0,
-                            bitmap?.height ?: 0,
-                            orientation
-                    )
-                }
+                return MultiPickerImageType(
+                        name,
+                        size,
+                        context.contentResolver.getType(photoUri),
+                        photoUri,
+                        bitmap?.width ?: 0,
+                        bitmap?.height ?: 0,
+                        orientation
+                )
             }
         }
         return null
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
index e9ae096174..5eb8a98999 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.ContentResolver
 import android.content.Context
 import android.content.Intent
@@ -30,15 +29,9 @@ class ContactPicker(override val requestCode: Int) : Picker<MultiPickerContactTy
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
-     * Returns selected contact or empty list if request code is wrong
-     * or result code is not Activity.RESULT_OK
-     * or user did not select any files.
+     * Returns selected contact or empty list if user did not select any contacts.
      */
-    override fun getSelectedFiles(context: Context, requestCode: Int, resultCode: Int, data: Intent?): List<MultiPickerContactType> {
-        if (requestCode != this.requestCode && resultCode != Activity.RESULT_OK) {
-            return emptyList()
-        }
-
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerContactType> {
         val contactList = mutableListOf<MultiPickerContactType>()
 
         data?.data?.let { selectedUri ->
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
index d5718b9951..7510d06b2b 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.provider.OpenableColumns
@@ -29,15 +28,9 @@ class FilePicker(override val requestCode: Int) : Picker<MultiPickerFileType>(re
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
-     * Returns selected files or empty list if request code is wrong
-     * or result code is not Activity.RESULT_OK
-     * or user did not select any files.
+     * Returns selected files or empty list if user did not select any files.
      */
-    override fun getSelectedFiles(context: Context, requestCode: Int, resultCode: Int, data: Intent?): List<MultiPickerFileType> {
-        if (requestCode != this.requestCode && resultCode != Activity.RESULT_OK) {
-            return emptyList()
-        }
-
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerFileType> {
         val fileList = mutableListOf<MultiPickerFileType>()
 
         getSelectedUriList(data).forEach { selectedUri ->
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
index ec87e027f9..054bfba365 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.provider.MediaStore
@@ -30,15 +29,9 @@ class ImagePicker(override val requestCode: Int) : Picker<MultiPickerImageType>(
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
-     * Returns selected image files or empty list if request code is wrong
-     * or result code is not Activity.RESULT_OK
-     * or user did not select any files.
+     * Returns selected image files or empty list if user did not select any files.
      */
-    override fun getSelectedFiles(context: Context, requestCode: Int, resultCode: Int, data: Intent?): List<MultiPickerImageType> {
-        if (requestCode != this.requestCode && resultCode != Activity.RESULT_OK) {
-            return emptyList()
-        }
-
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerImageType> {
         val imageList = mutableListOf<MultiPickerImageType>()
 
         getSelectedUriList(data).forEach { selectedUri ->
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
index 65ec77e02a..33da23e2b6 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
@@ -22,7 +22,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.net.Uri
-import androidx.fragment.app.Fragment
+import androidx.activity.result.ActivityResultLauncher
 
 /**
  * Abstract class to provide all types of Pickers
@@ -33,11 +33,9 @@ abstract class Picker<T>(open val requestCode: Int) {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
-     * @return selected files or empty list if request code is wrong
-     * or result code is not Activity.RESULT_OK
-     * or user did not select any files.
+     * @return selected files or empty list if user did not select any files.
      */
-    abstract fun getSelectedFiles(context: Context, requestCode: Int, resultCode: Int, data: Intent?): List<T>
+    abstract fun getSelectedFiles(context: Context, data: Intent?): List<T>
 
     /**
      * Use this function to retrieve files which are shared from another application or internally
@@ -61,7 +59,7 @@ abstract class Picker<T>(open val requestCode: Int) {
                 context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
             }
         }
-        return getSelectedFiles(context, requestCode, Activity.RESULT_OK, data)
+        return getSelectedFiles(context, data)
     }
 
     /**
@@ -84,10 +82,10 @@ abstract class Picker<T>(open val requestCode: Int) {
 
     /**
      * Start Storage Access Framework UI by using a Fragment.
-     * @param fragment Fragment to handle onActivityResult().
+     * @param activityResultLauncher to handle the result.
      */
-    fun startWith(fragment: Fragment) {
-        fragment.startActivityForResult(createIntent().apply { addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) }, requestCode)
+    fun startWith(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        activityResultLauncher.launch(createIntent().apply { addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) })
     }
 
     protected fun getSelectedUriList(data: Intent?): List<Uri> {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
index 965c8e08e0..c1d1f74aab 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadataRetriever
@@ -30,15 +29,9 @@ class VideoPicker(override val requestCode: Int) : Picker<MultiPickerVideoType>(
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
-     * Returns selected video files or empty list if request code is wrong
-     * or result code is not Activity.RESULT_OK
-     * or user did not select any files.
+     * Returns selected video files or empty list if user did not select any files.
      */
-    override fun getSelectedFiles(context: Context, requestCode: Int, resultCode: Int, data: Intent?): List<MultiPickerVideoType> {
-        if (requestCode != this.requestCode && resultCode != Activity.RESULT_OK) {
-            return emptyList()
-        }
-
+    override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerVideoType> {
         val videoList = mutableListOf<MultiPickerVideoType>()
 
         getSelectedUriList(data).forEach { selectedUri ->
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
index fbcd6900c1..80be149711 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
@@ -17,7 +17,11 @@
 package im.vector.app.core.extensions
 
 import android.app.Activity
+import android.content.Intent
 import android.os.Parcelable
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
@@ -26,6 +30,10 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 
+fun Fragment.registerStartForActivityResult(onResult: (ActivityResult) -> Unit): ActivityResultLauncher<Intent> {
+    return registerForActivityResult(ActivityResultContracts.StartActivityForResult(), onResult)
+}
+
 fun VectorBaseFragment.addFragment(
         frameId: Int,
         fragment: Fragment,
@@ -160,15 +168,15 @@ fun Fragment.getAllChildFragments(): List<Fragment> {
 // Define a missing constant
 const val POP_BACK_STACK_EXCLUSIVE = 0
 
-fun Fragment.queryExportKeys(userId: String, requestCode: Int) {
+fun Fragment.queryExportKeys(userId: String, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val timestamp = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
 
     selectTxtFileToWrite(
             activity = requireActivity(),
-            fragment = this,
+            activityResultLauncher = activityResultLauncher,
             defaultFileName = "element-megolm-export-$userId-$timestamp.txt",
             chooserHint = getString(R.string.keys_backup_setup_step1_manual_export),
-            requestCode = requestCode
+            requestCode = 0
     )
 }
 
@@ -177,7 +185,7 @@ fun Activity.queryExportKeys(userId: String, requestCode: Int) {
 
     selectTxtFileToWrite(
             activity = this,
-            fragment = null,
+            activityResultLauncher = null,
             defaultFileName = "element-megolm-export-$userId-$timestamp.txt",
             chooserHint = getString(R.string.keys_backup_setup_step1_manual_export),
             requestCode = requestCode
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index d28f6749a6..750c4e071b 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -31,6 +31,7 @@ import android.provider.Browser
 import android.provider.MediaStore
 import android.webkit.MimeTypeMap
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsSession
 import androidx.core.content.ContextCompat
@@ -130,7 +131,7 @@ fun openSoundRecorder(activity: Activity, requestCode: Int) {
  * Open file selection activity
  */
 fun openFileSelection(activity: Activity,
-                      fragment: Fragment?,
+                      activityResultLauncher: ActivityResultLauncher<Intent>?,
                       allowMultipleSelection: Boolean,
                       requestCode: Int) {
     val fileIntent = Intent(Intent.ACTION_GET_CONTENT)
@@ -140,8 +141,8 @@ fun openFileSelection(activity: Activity,
     fileIntent.type = "*/*"
 
     try {
-        fragment
-                ?.startActivityForResult(fileIntent, requestCode)
+        activityResultLauncher
+                ?.launch(fileIntent)
                 ?: run {
                     activity.startActivityForResult(fileIntent, requestCode)
                 }
@@ -440,7 +441,7 @@ fun openPlayStore(activity: Activity, appId: String = BuildConfig.APPLICATION_ID
  */
 fun selectTxtFileToWrite(
         activity: Activity,
-        fragment: Fragment?,
+        activityResultLauncher: ActivityResultLauncher<Intent>?,
         defaultFileName: String,
         chooserHint: String,
         requestCode: Int
@@ -452,8 +453,8 @@ fun selectTxtFileToWrite(
 
     try {
         val chooserIntent = Intent.createChooser(intent, chooserHint)
-        if (fragment != null) {
-            fragment.startActivityForResult(chooserIntent, requestCode)
+        if (activityResultLauncher != null) {
+            activityResultLauncher.launch(chooserIntent)
         } else {
             activity.startActivityForResult(chooserIntent, requestCode)
         }
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index 1d7c67b046..d4efb22eb8 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -15,12 +15,11 @@
  */
 package im.vector.app.features.attachments
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.fragment.app.Fragment
+import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.core.platform.Restorable
 import im.vector.lib.multipicker.MultiPicker
 import org.matrix.android.sdk.BuildConfig
@@ -48,6 +47,7 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
 
     // Capture path allows to handle camera image picking. It must be restored if the activity gets killed.
     private var captureUri: Uri? = null
+
     // The pending type is set if we have to handle permission request. It must be restored if the activity gets killed.
     var pendingType: AttachmentTypeSelectorView.Type? = null
 
@@ -72,99 +72,93 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
     /**
      * Starts the process for handling file picking
      */
-    fun selectFile(fragment: Fragment) {
-        MultiPicker.get(MultiPicker.FILE).startWith(fragment)
+    fun selectFile(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        MultiPicker.get(MultiPicker.FILE).startWith(activityResultLauncher)
     }
 
     /**
      * Starts the process for handling image picking
      */
-    fun selectGallery(fragment: Fragment) {
-        MultiPicker.get(MultiPicker.IMAGE).startWith(fragment)
+    fun selectGallery(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        MultiPicker.get(MultiPicker.IMAGE).startWith(activityResultLauncher)
     }
 
     /**
      * Starts the process for handling audio picking
      */
-    fun selectAudio(fragment: Fragment) {
-        MultiPicker.get(MultiPicker.AUDIO).startWith(fragment)
+    fun selectAudio(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        MultiPicker.get(MultiPicker.AUDIO).startWith(activityResultLauncher)
     }
 
     /**
      * Starts the process for handling capture image picking
      */
-    fun openCamera(fragment: Fragment) {
-        captureUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(fragment)
+    fun openCamera(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>) {
+        captureUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(context, activityResultLauncher)
     }
 
     /**
      * Starts the process for handling contact picking
      */
-    fun selectContact(fragment: Fragment) {
-        MultiPicker.get(MultiPicker.CONTACT).startWith(fragment)
+    fun selectContact(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        MultiPicker.get(MultiPicker.CONTACT).startWith(activityResultLauncher)
     }
 
     /**
-     * This methods aims to handle on activity result data.
-     *
-     * @return true if it can handle the data, false otherwise
+     * This methods aims to handle the result data.
      */
-    fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                MultiPicker.REQUEST_CODE_PICK_FILE    -> {
-                    callback.onContentAttachmentsReady(
-                            MultiPicker.get(MultiPicker.FILE)
-                                    .getSelectedFiles(context, requestCode, resultCode, data)
-                                    .map { it.toContentAttachmentData() }
-                    )
+    fun onFileResult(data: Intent?) {
+        callback.onContentAttachmentsReady(
+                MultiPicker.get(MultiPicker.FILE)
+                        .getSelectedFiles(context, data)
+                        .map { it.toContentAttachmentData() }
+        )
+    }
+
+    fun onAudioResult(data: Intent?) {
+        callback.onContentAttachmentsReady(
+                MultiPicker.get(MultiPicker.AUDIO)
+                        .getSelectedFiles(context, data)
+                        .map { it.toContentAttachmentData() }
+        )
+    }
+
+    fun onContactResult(data: Intent?) {
+        MultiPicker.get(MultiPicker.CONTACT)
+                .getSelectedFiles(context, data)
+                .firstOrNull()
+                ?.toContactAttachment()
+                ?.let {
+                    callback.onContactAttachmentReady(it)
                 }
-                MultiPicker.REQUEST_CODE_PICK_AUDIO   -> {
-                    callback.onContentAttachmentsReady(
-                            MultiPicker.get(MultiPicker.AUDIO)
-                                    .getSelectedFiles(context, requestCode, resultCode, data)
-                                    .map { it.toContentAttachmentData() }
-                    )
-                }
-                MultiPicker.REQUEST_CODE_PICK_CONTACT -> {
-                    MultiPicker.get(MultiPicker.CONTACT)
-                            .getSelectedFiles(context, requestCode, resultCode, data)
-                            .firstOrNull()
-                            ?.toContactAttachment()
-                            ?.let {
-                                callback.onContactAttachmentReady(it)
-                            }
-                }
-                MultiPicker.REQUEST_CODE_PICK_IMAGE   -> {
-                    callback.onContentAttachmentsReady(
-                            MultiPicker.get(MultiPicker.IMAGE)
-                                    .getSelectedFiles(context, requestCode, resultCode, data)
-                                    .map { it.toContentAttachmentData() }
-                    )
-                }
-                MultiPicker.REQUEST_CODE_TAKE_PHOTO   -> {
-                    captureUri?.let { captureUri ->
-                        MultiPicker.get(MultiPicker.CAMERA)
-                                .getTakenPhoto(context, requestCode, resultCode, captureUri)
-                                ?.let {
-                                    callback.onContentAttachmentsReady(
-                                            listOf(it).map { it.toContentAttachmentData() }
-                                    )
-                                }
+    }
+
+    fun onImageResult(data: Intent?) {
+        callback.onContentAttachmentsReady(
+                MultiPicker.get(MultiPicker.IMAGE)
+                        .getSelectedFiles(context, data)
+                        .map { it.toContentAttachmentData() }
+        )
+    }
+
+    fun onPhotoResult() {
+        captureUri?.let { captureUri ->
+            MultiPicker.get(MultiPicker.CAMERA)
+                    .getTakenPhoto(context, captureUri)
+                    ?.let {
+                        callback.onContentAttachmentsReady(
+                                listOf(it).map { it.toContentAttachmentData() }
+                        )
                     }
-                }
-                MultiPicker.REQUEST_CODE_PICK_VIDEO   -> {
-                    callback.onContentAttachmentsReady(
-                            MultiPicker.get(MultiPicker.VIDEO)
-                                    .getSelectedFiles(context, requestCode, resultCode, data)
-                                    .map { it.toContentAttachmentData() }
-                    )
-                }
-                else                                  -> return false
-            }
-            return true
         }
-        return false
+    }
+
+    fun onVideoResult(data: Intent?) {
+        callback.onContentAttachmentsReady(
+                MultiPicker.get(MultiPicker.VIDEO)
+                        .getSelectedFiles(context, data)
+                        .map { it.toContentAttachmentData() }
+        )
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
index bfa44a7a70..8e830d00a4 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewActivity.kt
@@ -30,8 +30,6 @@ import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 class AttachmentsPreviewActivity : VectorBaseActivity(), ToolbarConfigurable {
 
     companion object {
-        const val REQUEST_CODE = 55
-
         private const val EXTRA_FRAGMENT_ARGS = "EXTRA_FRAGMENT_ARGS"
         private const val ATTACHMENTS_PREVIEW_RESULT = "ATTACHMENTS_PREVIEW_RESULT"
         private const val KEEP_ORIGINAL_IMAGES_SIZE = "KEEP_ORIGINAL_IMAGES_SIZE"
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index 4d6c4e3add..44c440c0d1 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -298,6 +298,7 @@ class VectorCallActivity : VectorBaseActivity(), CallControlsView.InteractionLis
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (requestCode == CAPTURE_PERMISSION_REQUEST_CODE && allGranted(grantResults)) {
             start()
         } else {
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 5a4c25a8ad..1ab6fb6363 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -150,6 +150,7 @@ class VectorJitsiActivity : VectorBaseActivity(), JitsiMeetActivityInterface, Ji
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 27ca636142..501d0fdbb7 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -111,6 +111,7 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
                 doOnPostResume {  addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index e508f06e4d..03ad5d5d9f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -31,6 +31,7 @@ import butterknife.BindView
 import butterknife.OnClick
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.LiveEvent
 import im.vector.app.core.utils.copyToClipboard
@@ -48,10 +49,6 @@ import javax.inject.Inject
 
 class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment() {
 
-    companion object {
-        private const val SAVE_RECOVERY_KEY_REQUEST_CODE = 2754
-    }
-
     override fun getLayoutResId() = R.layout.fragment_keys_backup_setup_step3
 
     @BindView(R.id.keys_backup_setup_step3_button)
@@ -138,10 +135,10 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
             val timestamp = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
             selectTxtFileToWrite(
                     activity = requireActivity(),
-                    fragment = this,
+                    activityResultLauncher = saveRecoveryActivityResultLauncher,
                     defaultFileName = "recovery-key-$userId-$timestamp.txt",
                     chooserHint = getString(R.string.save_recovery_key_chooser_hint),
-                    requestCode = SAVE_RECOVERY_KEY_REQUEST_CODE
+                    requestCode = 0
             )
             dialog.dismiss()
         }
@@ -202,15 +199,11 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when (requestCode) {
-            SAVE_RECOVERY_KEY_REQUEST_CODE -> {
-                val uri = data?.data
-                if (resultCode == Activity.RESULT_OK && uri != null) {
-                    viewModel.recoveryKey.value?.let {
-                        exportRecoveryKeyToFile(uri, it)
-                    }
-                }
+    private val saveRecoveryActivityResultLauncher = registerStartForActivityResult { activityRessult ->
+        val uri = activityRessult.data?.data ?: return@registerStartForActivityResult
+        if (activityRessult.resultCode == Activity.RESULT_OK) {
+            viewModel.recoveryKey.value?.let {
+                exportRecoveryKeyToFile(uri, it)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
index a1ce84e2f4..72cd063bbd 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodFragment.kt
@@ -16,7 +16,6 @@
 package im.vector.app.features.crypto.verification.choose
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
@@ -25,6 +24,7 @@ import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.checkPermissions
@@ -91,24 +91,18 @@ class VerificationChooseMethodFragment @Inject constructor(
     }
 
     private fun doOpenQRCodeScanner() {
-        QrCodeScannerActivity.startForResult(this)
+        QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
+    private val scanActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data)
+            val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
 
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                QrCodeScannerActivity.QR_CODE_SCANNER_REQUEST_CODE -> {
-                    val scannedQrCode = QrCodeScannerActivity.getResultText(data)
-                    val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(data)
-
-                    if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
-                        onRemoteQrCodeScanned(scannedQrCode)
-                    } else {
-                        Timber.w("It was not a QR code, or empty result")
-                    }
-                }
+            if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
+                onRemoteQrCodeScanned(scannedQrCode)
+            } else {
+                Timber.w("It was not a QR code, or empty result")
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 21f65ec9ef..7dd32a7cd0 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -16,7 +16,6 @@
 package im.vector.app.features.discovery
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
@@ -27,16 +26,17 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.features.discovery.change.SetIdentityServerFragment
 import im.vector.app.features.settings.VectorSettingsActivity
-import im.vector.app.features.terms.ReviewTermsActivity
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
+import timber.log.Timber
 import javax.inject.Inject
 
 class DiscoverySettingsFragment @Inject constructor(
@@ -92,22 +92,19 @@ class DiscoverySettingsFragment @Inject constructor(
         viewModel.handle(DiscoverySettingsAction.Refresh)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == ReviewTermsActivity.TERMS_REQUEST_CODE) {
-            if (Activity.RESULT_OK == resultCode) {
-                viewModel.handle(DiscoverySettingsAction.RetrieveBinding)
-            } else {
-                // add some error?
-            }
+    private val termsActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            viewModel.handle(DiscoverySettingsAction.RetrieveBinding)
+        } else {
+            // add some error?
         }
-
-        super.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun openIdentityServerTerms() = withState(viewModel) { state ->
         if (state.termsNotSigned) {
             navigator.openTerms(
-                    this,
+                    requireContext(),
+                    termsActivityResultLauncher,
                     TermsService.ServiceType.IdentityService,
                     state.identityServer()?.ensureProtocol() ?: "",
                     null)
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index 863270b762..05708089ea 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -16,7 +16,6 @@
 package im.vector.app.features.discovery.change
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.inputmethod.EditorInfo
@@ -28,13 +27,13 @@ import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.textChanges
 import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.features.discovery.DiscoverySharedViewModel
-import im.vector.app.features.terms.ReviewTermsActivity
 import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.synthetic.main.fragment_set_identity_server.*
 import javax.inject.Inject
@@ -121,7 +120,8 @@ class SetIdentityServerFragment @Inject constructor(
                 is SetIdentityServerViewEvents.TermsAccepted -> processIdentityServerChange()
                 is SetIdentityServerViewEvents.ShowTerms     -> {
                     navigator.openTerms(
-                            this,
+                            requireContext(),
+                            termsActivityResultLauncher,
                             TermsService.ServiceType.IdentityService,
                             it.identityServerUrl,
                             null)
@@ -150,15 +150,12 @@ class SetIdentityServerFragment @Inject constructor(
         (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.identity_server)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == ReviewTermsActivity.TERMS_REQUEST_CODE) {
-            if (Activity.RESULT_OK == resultCode) {
-                processIdentityServerChange()
-            } else {
-                // add some error?
-            }
+    private val termsActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            processIdentityServerChange()
+        } else {
+            // add some error?
         }
-        super.onActivityResult(requestCode, resultCode, data)
     }
 
     private fun processIdentityServerChange() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index c861e5ce73..61041aa70f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.home.room.detail
 
 import android.annotation.SuppressLint
-import android.app.Activity.RESULT_OK
+import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.Typeface
@@ -73,6 +73,7 @@ import im.vector.app.core.epoxy.LayoutManagerStateRestorer
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.extensions.showKeyboard
 import im.vector.app.core.extensions.trackItemsVisibilityChange
@@ -134,7 +135,6 @@ import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem
 import im.vector.app.features.home.room.detail.timeline.item.ReadReceiptData
 import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsBottomSheet
 import im.vector.app.features.home.room.detail.widget.RoomWidgetsBottomSheet
-import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.html.EventHtmlRenderer
 import im.vector.app.features.html.PillImageSpan
 import im.vector.app.features.invite.VectorInviteView
@@ -202,8 +202,6 @@ data class RoomDetailArgs(
         val sharedData: SharedData? = null
 ) : Parcelable
 
-private const val REACTION_SELECT_REQUEST_CODE = 0
-
 class RoomDetailFragment @Inject constructor(
         private val session: Session,
         private val avatarRenderer: AvatarRenderer,
@@ -396,9 +394,14 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
+    private val integrationManagerActivityResultLauncher = registerStartForActivityResult {
+        // Noop
+    }
+
     private fun openIntegrationManager(screen: String? = null) {
         navigator.openIntegrationManager(
-                fragment = this,
+                context = requireContext(),
+                activityResultLauncher = integrationManagerActivityResultLauncher,
                 roomId = roomDetailArgs.roomId,
                 integId = null,
                 screen = screen
@@ -435,7 +438,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun openStickerPicker(event: RoomDetailViewEvents.OpenStickerPicker) {
-        navigator.openStickerPicker(this, roomDetailArgs.roomId, event.widget)
+        navigator.openStickerPicker(requireContext(), stickerActivityResultLauncher, roomDetailArgs.roomId, event.widget)
     }
 
     private fun startOpenFileIntent(action: RoomDetailViewEvents.OpenFile) {
@@ -886,27 +889,63 @@ class RoomDetailFragment @Inject constructor(
         roomDetailViewModel.handle(RoomDetailAction.SaveDraft(composerLayout.composerEditText.text.toString()))
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        val hasBeenHandled = attachmentsHelper.onActivityResult(requestCode, resultCode, data)
-        if (!hasBeenHandled && resultCode == RESULT_OK && data != null) {
-            when (requestCode) {
-                AttachmentsPreviewActivity.REQUEST_CODE        -> {
-                    val sendData = AttachmentsPreviewActivity.getOutput(data)
-                    val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
-                    roomDetailViewModel.handle(RoomDetailAction.SendMedia(sendData, !keepOriginalSize))
-                }
-                REACTION_SELECT_REQUEST_CODE                   -> {
-                    val (eventId, reaction) = EmojiReactionPickerActivity.getOutput(data) ?: return
-                    roomDetailViewModel.handle(RoomDetailAction.SendReaction(eventId, reaction))
-                }
-                WidgetRequestCodes.STICKER_PICKER_REQUEST_CODE -> {
-                    val content = WidgetActivity.getOutput(data).toModel<MessageStickerContent>() ?: return
-                    roomDetailViewModel.handle(RoomDetailAction.SendSticker(content))
-                }
+    private val attachmentFileActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onImageResult(it.data)
+        }
+    }
+
+    private val attachmentAudioActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onAudioResult(it.data)
+        }
+    }
+
+    private val attachmentContactActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onContactResult(it.data)
+        }
+    }
+
+    private val attachmentImageActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onImageResult(it.data)
+        }
+    }
+
+    private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            attachmentsHelper.onPhotoResult()
+        }
+    }
+
+    private val contentAttachmentActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        val data = activityResult.data ?: return@registerStartForActivityResult
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val sendData = AttachmentsPreviewActivity.getOutput(data)
+            val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
+            roomDetailViewModel.handle(RoomDetailAction.SendMedia(sendData, !keepOriginalSize))
+        }
+    }
+
+    private val emojiActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val eventId = EmojiReactionPickerActivity.getOutputEventId(activityResult.data)
+            val reaction = EmojiReactionPickerActivity.getOutputReaction(activityResult.data)
+            if (eventId != null && reaction != null) {
+                roomDetailViewModel.handle(RoomDetailAction.SendReaction(eventId, reaction))
             }
         }
-        // TODO why don't we call super here?
-        // super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private val stickerActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        val data = activityResult.data ?: return@registerStartForActivityResult
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            WidgetActivity.getOutput(data).toModel<MessageStickerContent>()
+                    ?.let { content ->
+                        roomDetailViewModel.handle(RoomDetailAction.SendSticker(content))
+                    }
+        }
     }
 
 // PRIVATE METHODS *****************************************************************************
@@ -1600,7 +1639,7 @@ class RoomDetailFragment @Inject constructor(
                 openRoomMemberProfile(action.userId)
             }
             is EventSharedAction.AddReaction                -> {
-                startActivityForResult(EmojiReactionPickerActivity.intent(requireContext(), action.eventId), REACTION_SELECT_REQUEST_CODE)
+                emojiActivityResultLauncher.launch(EmojiReactionPickerActivity.intent(requireContext(), action.eventId))
             }
             is EventSharedAction.ViewReactions              -> {
                 ViewReactionsBottomSheet.newInstance(roomDetailArgs.roomId, action.messageInformationData)
@@ -1827,11 +1866,11 @@ class RoomDetailFragment @Inject constructor(
 
     private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
         when (type) {
-            AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(this)
-            AttachmentTypeSelectorView.Type.FILE    -> attachmentsHelper.selectFile(this)
-            AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(this)
-            AttachmentTypeSelectorView.Type.AUDIO   -> attachmentsHelper.selectAudio(this)
-            AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(this)
+            AttachmentTypeSelectorView.Type.CAMERA  -> attachmentsHelper.openCamera(requireContext(), attachmentPhotoActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.FILE    -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentImageActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.AUDIO   -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher)
+            AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
             AttachmentTypeSelectorView.Type.STICKER -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment)
         }.exhaustive
     }
@@ -1850,7 +1889,7 @@ class RoomDetailFragment @Inject constructor(
             }
             if (grouped.previewables.isNotEmpty()) {
                 val intent = AttachmentsPreviewActivity.newIntent(requireContext(), AttachmentsPreviewArgs(grouped.previewables))
-                startActivityForResult(intent, AttachmentsPreviewActivity.REQUEST_CODE)
+                contentAttachmentActivityResultLauncher.launch(intent)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt
deleted file mode 100644
index 5f0e6866db..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/WidgetRequestCodes.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.home.room.detail.widget
-
-object WidgetRequestCodes {
-    const val STICKER_PICKER_REQUEST_CODE = 16000
-    const val INTEGRATION_MANAGER_REQUEST_CODE = 16001
-}
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
index b4f0aabea5..8f3e11453e 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
@@ -112,6 +112,7 @@ class InviteUsersToRoomActivity : SimpleFragmentActivity() {
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
                 doOnPostResume {  addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
diff --git a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
index c619b4aa92..144b9739da 100644
--- a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
@@ -133,7 +133,7 @@ class BigImageViewerActivity : VectorBaseActivity() {
                 MultiPicker.REQUEST_CODE_TAKE_PHOTO -> {
                     avatarCameraUri?.let { uri ->
                         MultiPicker.get(MultiPicker.CAMERA)
-                                .getTakenPhoto(this, requestCode, resultCode, uri)
+                                .getTakenPhoto(this, uri)
                                 ?.let {
                                     onRoomAvatarSelected(it)
                                 }
@@ -142,7 +142,7 @@ class BigImageViewerActivity : VectorBaseActivity() {
                 MultiPicker.REQUEST_CODE_PICK_IMAGE -> {
                     MultiPicker
                             .get(MultiPicker.IMAGE)
-                            .getSelectedFiles(this, requestCode, resultCode, data)
+                            .getSelectedFiles(this, data)
                             .firstOrNull()?.let {
                                 onRoomAvatarSelected(it)
                             }
@@ -154,6 +154,7 @@ class BigImageViewerActivity : VectorBaseActivity() {
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (allGranted(grantResults)) {
             when (requestCode) {
                 PERMISSION_REQUEST_CODE_LAUNCH_CAMERA -> onAvatarTypeSelected(true)
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 5ad600dfff..237fa4f65d 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -21,11 +21,11 @@ import android.content.Context
 import android.content.Intent
 import android.view.View
 import android.view.Window
+import androidx.activity.result.ActivityResultLauncher
 import androidx.core.app.ActivityOptionsCompat
 import androidx.core.app.TaskStackBuilder
 import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
-import androidx.fragment.app.Fragment
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
@@ -45,7 +45,6 @@ import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
 import im.vector.app.features.home.room.detail.search.SearchActivity
 import im.vector.app.features.home.room.detail.search.SearchArgs
-import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
 import im.vector.app.features.invite.InviteUsersToRoomActivity
 import im.vector.app.features.media.AttachmentData
@@ -266,21 +265,32 @@ class DefaultNavigator @Inject constructor(
                 }
     }
 
-    override fun openTerms(fragment: Fragment, serviceType: TermsService.ServiceType, baseUrl: String, token: String?, requestCode: Int) {
-        val intent = ReviewTermsActivity.intent(fragment.requireContext(), serviceType, baseUrl, token)
-        fragment.startActivityForResult(intent, requestCode)
+    override fun openTerms(context: Context,
+                           activityResultLauncher: ActivityResultLauncher<Intent>,
+                           serviceType: TermsService.ServiceType,
+                           baseUrl: String,
+                           token: String?) {
+        val intent = ReviewTermsActivity.intent(context, serviceType, baseUrl, token)
+        activityResultLauncher.launch(intent)
     }
 
-    override fun openStickerPicker(fragment: Fragment, roomId: String, widget: Widget, requestCode: Int) {
+    override fun openStickerPicker(context: Context,
+                                   activityResultLauncher: ActivityResultLauncher<Intent>,
+                                   roomId: String,
+                                   widget: Widget) {
         val widgetArgs = widgetArgsBuilder.buildStickerPickerArgs(roomId, widget)
-        val intent = WidgetActivity.newIntent(fragment.requireContext(), widgetArgs)
-        fragment.startActivityForResult(intent, WidgetRequestCodes.STICKER_PICKER_REQUEST_CODE)
+        val intent = WidgetActivity.newIntent(context, widgetArgs)
+        activityResultLauncher.launch(intent)
     }
 
-    override fun openIntegrationManager(fragment: Fragment, roomId: String, integId: String?, screen: String?) {
+    override fun openIntegrationManager(context: Context,
+                                        activityResultLauncher: ActivityResultLauncher<Intent>,
+                                        roomId: String,
+                                        integId: String?,
+                                        screen: String?) {
         val widgetArgs = widgetArgsBuilder.buildIntegrationManagerArgs(roomId, integId, screen)
-        val intent = WidgetActivity.newIntent(fragment.requireContext(), widgetArgs)
-        fragment.startActivityForResult(intent, WidgetRequestCodes.INTEGRATION_MANAGER_REQUEST_CODE)
+        val intent = WidgetActivity.newIntent(context, widgetArgs)
+        activityResultLauncher.launch(intent)
     }
 
     override fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map<String, Any>?) {
@@ -293,9 +303,11 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override fun openPinCode(fragment: Fragment, pinMode: PinMode, requestCode: Int) {
-        val intent = PinActivity.newIntent(fragment.requireContext(), PinArgs(pinMode))
-        fragment.startActivityForResult(intent, requestCode)
+    override fun openPinCode(context: Context,
+                             activityResultLauncher: ActivityResultLauncher<Intent>,
+                             pinMode: PinMode) {
+        val intent = PinActivity.newIntent(context, PinArgs(pinMode))
+        activityResultLauncher.launch(intent)
     }
 
     override fun openPinCode(activity: Activity, pinMode: PinMode, requestCode: Int) {
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index b2efb1e931..4344f918ce 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -18,18 +18,17 @@ package im.vector.app.features.navigation
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.view.View
+import androidx.activity.result.ActivityResultLauncher
 import androidx.core.util.Pair
-import androidx.fragment.app.Fragment
 import im.vector.app.features.crypto.recover.SetupMode
-import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinMode
 import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.share.SharedData
-import im.vector.app.features.terms.ReviewTermsActivity
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoom
 import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import org.matrix.android.sdk.api.session.terms.TermsService
@@ -84,22 +83,28 @@ interface Navigator {
 
     fun openBigImageViewer(activity: Activity, sharedElement: View?, matrixItem: MatrixItem)
 
-    fun openPinCode(fragment: Fragment, pinMode: PinMode, requestCode: Int = PinActivity.PIN_REQUEST_CODE)
+    fun openPinCode(context: Context,
+                    activityResultLauncher: ActivityResultLauncher<Intent>,
+                    pinMode: PinMode)
 
     fun openPinCode(activity: Activity, pinMode: PinMode, requestCode: Int = PinActivity.PIN_REQUEST_CODE)
 
-    fun openTerms(fragment: Fragment,
+    fun openTerms(context: Context,
+                  activityResultLauncher: ActivityResultLauncher<Intent>,
                   serviceType: TermsService.ServiceType,
                   baseUrl: String,
-                  token: String?,
-                  requestCode: Int = ReviewTermsActivity.TERMS_REQUEST_CODE)
+                  token: String?)
 
-    fun openStickerPicker(fragment: Fragment,
+    fun openStickerPicker(context: Context,
+                          activityResultLauncher: ActivityResultLauncher<Intent>,
                           roomId: String,
-                          widget: Widget,
-                          requestCode: Int = WidgetRequestCodes.STICKER_PICKER_REQUEST_CODE)
+                          widget: Widget)
 
-    fun openIntegrationManager(fragment: Fragment, roomId: String, integId: String?, screen: String?)
+    fun openIntegrationManager(context: Context,
+                               activityResultLauncher: ActivityResultLauncher<Intent>,
+                               roomId: String,
+                               integId: String?,
+                               screen: String?)
 
     fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map<String, Any>? = null)
 
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
index 616da791d3..563f9c65fa 100644
--- a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.qrcode
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.fragment.app.Fragment
+import androidx.activity.result.ActivityResultLauncher
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.Result
 import com.google.zxing.ResultMetadataType
@@ -82,8 +82,8 @@ class QrCodeScannerActivity : VectorBaseActivity() {
             activity.startActivityForResult(Intent(activity, QrCodeScannerActivity::class.java), requestCode)
         }
 
-        fun startForResult(fragment: Fragment, requestCode: Int = QR_CODE_SCANNER_REQUEST_CODE) {
-            fragment.startActivityForResult(Intent(fragment.requireActivity(), QrCodeScannerActivity::class.java), requestCode)
+        fun startForResult(activity: Activity, activityResultLauncher: ActivityResultLauncher<Intent>) {
+            activityResultLauncher.launch(Intent(activity, QrCodeScannerActivity::class.java))
         }
 
         fun getResultText(data: Intent?): String? {
diff --git a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
index 4fe74c2bcc..25cb90d3a4 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/EmojiReactionPickerActivity.kt
@@ -212,10 +212,8 @@ class EmojiReactionPickerActivity : VectorBaseActivity(),
             return intent
         }
 
-        fun getOutput(data: Intent): Pair<String, String>? {
-            val eventId = data.getStringExtra(EXTRA_EVENT_ID) ?: return null
-            val reaction = data.getStringExtra(EXTRA_REACTION_RESULT) ?: return null
-            return eventId to reaction
-        }
+        fun getOutputEventId(data: Intent?): String? = data?.getStringExtra(EXTRA_EVENT_ID)
+
+        fun getOutputReaction(data: Intent?): String? = data?.getStringExtra(EXTRA_REACTION_RESULT)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index a6e1fda793..82c16db5ee 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -42,6 +42,7 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.copyOnLongClick
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.VectorBaseFragment
@@ -284,7 +285,7 @@ class RoomProfileFragment @Inject constructor(
                 .show()
     }
 
-    private val takePhotoActivityResultLauncher = registerForPermissionsResult { allGranted ->
+    private val takePhotoPermissionActivityResultLauncher = registerForPermissionsResult { allGranted ->
         if (allGranted) {
             onAvatarTypeSelected(true)
         }
@@ -293,11 +294,11 @@ class RoomProfileFragment @Inject constructor(
     private var avatarCameraUri: Uri? = null
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
-            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), takePhotoActivityResultLauncher)) {
-                avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
+            if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), takePhotoPermissionActivityResultLauncher)) {
+                avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(requireActivity(), takePhotoActivityResultLauncher)
             }
         } else {
-            MultiPicker.get(MultiPicker.IMAGE).single().startWith(this)
+            MultiPicker.get(MultiPicker.IMAGE).single().startWith(pickImageActivityResultLauncher)
         }
     }
 
@@ -309,30 +310,37 @@ class RoomProfileFragment @Inject constructor(
                 .start(requireContext(), this)
     }
 
+    private val takePhotoActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            avatarCameraUri?.let { uri ->
+                MultiPicker.get(MultiPicker.CAMERA)
+                        .getTakenPhoto(requireContext(), uri)
+                        ?.let {
+                            onRoomAvatarSelected(it)
+                        }
+            }
+        }
+    }
+
+    private val pickImageActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            MultiPicker
+                    .get(MultiPicker.IMAGE)
+                    .getSelectedFiles(requireContext(), activityResult.data)
+                    .firstOrNull()?.let {
+                        onRoomAvatarSelected(it)
+                    }
+        }
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             when (requestCode) {
-                MultiPicker.REQUEST_CODE_TAKE_PHOTO -> {
-                    avatarCameraUri?.let { uri ->
-                        MultiPicker.get(MultiPicker.CAMERA)
-                                .getTakenPhoto(requireContext(), requestCode, resultCode, uri)
-                                ?.let {
-                                    onRoomAvatarSelected(it)
-                                }
-                    }
-                }
-                MultiPicker.REQUEST_CODE_PICK_IMAGE -> {
-                    MultiPicker
-                            .get(MultiPicker.IMAGE)
-                            .getSelectedFiles(requireContext(), requestCode, resultCode, data)
-                            .firstOrNull()?.let {
-                                onRoomAvatarSelected(it)
-                            }
-                }
                 UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
                 BigImageViewerActivity.REQUEST_CODE -> data?.let { onAvatarCropped(it.data) }
             }
         }
+        // TODO
         super.onActivityResult(requestCode, resultCode, data)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index c1d8eb1abe..9928325289 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -41,6 +41,7 @@ import com.google.android.material.textfield.TextInputLayout
 import com.yalantis.ucrop.UCrop
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.showPassword
 import im.vector.app.core.intent.getFilenameFromUri
 import im.vector.app.core.platform.SimpleTextWatcher
@@ -278,81 +279,38 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         session.integrationManagerService().removeListener(integrationServiceListener)
     }
 
+    private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult {activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            avatarCameraUri?.let { uri ->
+                MultiPicker.get(MultiPicker.CAMERA)
+                        .getTakenPhoto(requireContext(), uri)
+                        ?.let {
+                            onAvatarSelected(it)
+                        }
+            }
+        }
+    }
+
+    private val attachmentImageActivityResultLauncher = registerStartForActivityResult {activityResult ->
+        val data = activityResult.data ?: return@registerStartForActivityResult
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            MultiPicker
+                    .get(MultiPicker.IMAGE)
+                    .getSelectedFiles(requireContext(), data)
+                    .firstOrNull()?.let {
+                        onAvatarSelected(it)
+                    }
+        }
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        @Suppress("DEPRECATION")
         super.onActivityResult(requestCode, resultCode, data)
 
         if (resultCode == Activity.RESULT_OK) {
             when (requestCode) {
-                REQUEST_NEW_PHONE_NUMBER            -> refreshPhoneNumbersList()
-                REQUEST_PHONEBOOK_COUNTRY           -> onPhonebookCountryUpdate(data)
-                MultiPicker.REQUEST_CODE_TAKE_PHOTO -> {
-                    avatarCameraUri?.let { uri ->
-                        MultiPicker.get(MultiPicker.CAMERA)
-                                .getTakenPhoto(requireContext(), requestCode, resultCode, uri)
-                                ?.let {
-                                    onAvatarSelected(it)
-                                }
-                    }
-                }
-                MultiPicker.REQUEST_CODE_PICK_IMAGE -> {
-                    MultiPicker
-                            .get(MultiPicker.IMAGE)
-                            .getSelectedFiles(requireContext(), requestCode, resultCode, data)
-                            .firstOrNull()?.let {
-                                onAvatarSelected(it)
-                            }
-                }
-                UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
-                /* TODO
-                    VectorUtils.TAKE_IMAGE -> {
-                        val thumbnailUri = VectorUtils.getThumbnailUriFromIntent(activity, data, session.mediaCache)
-
-                        if (null != thumbnailUri) {
-                            displayLoadingView()
-
-                            val resource = ResourceUtils.openResource(activity, thumbnailUri, null)
-
-                            if (null != resource) {
-                                session.mediaCache.uploadContent(resource.mContentStream, null, resource.mMimeType, null, object : MXMediaUploadListener() {
-
-                                    override fun onUploadError(uploadId: String?, serverResponseCode: Int, serverErrorMessage: String?) {
-                                        activity?.runOnUiThread { onCommonDone(serverResponseCode.toString() + " : " + serverErrorMessage) }
-                                    }
-
-                                    override fun onUploadComplete(uploadId: String?, contentUri: String?) {
-                                        activity?.runOnUiThread {
-                                            session.myUser.updateAvatarUrl(contentUri, object : MatrixCallback<Unit> {
-                                                override fun onSuccess(info: Void?) {
-                                                    onCommonDone(null)
-                                                    refreshDisplay()
-                                                }
-
-                                                override fun onNetworkError(e: Exception) {
-                                                    onCommonDone(e.localizedMessage)
-                                                }
-
-                                                override fun onMatrixError(e: MatrixError) {
-                                                    if (MatrixError.M_CONSENT_NOT_GIVEN == e.errcode) {
-                                                        activity?.runOnUiThread {
-                                                            hideLoadingView()
-                                                            (activity as VectorAppCompatActivity).consentNotGivenHelper.displayDialog(e)
-                                                        }
-                                                    } else {
-                                                        onCommonDone(e.localizedMessage)
-                                                    }
-                                                }
-
-                                                override fun onUnexpectedError(e: Exception) {
-                                                    onCommonDone(e.localizedMessage)
-                                                }
-                                            })
-                                        }
-                                    }
-                                })
-                            }
-                        }
-                    }
-                    */
+                // TODO Migrate this too
+                UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
             }
         }
     }
@@ -400,10 +358,10 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
             if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, requireActivity(), takePhotoActivityResultLauncher)) {
-                avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
+                avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(requireActivity(), attachmentPhotoActivityResultLauncher)
             }
         } else {
-            MultiPicker.get(MultiPicker.IMAGE).single().startWith(this)
+            MultiPicker.get(MultiPicker.IMAGE).single().startWith(attachmentImageActivityResultLauncher)
         }
     }
 
@@ -461,29 +419,10 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         */
     }
 
-    private fun onPhonebookCountryUpdate(data: Intent?) {
-        /* TODO
-        if (data != null && data.hasExtra(CountryPickerActivity.EXTRA_OUT_COUNTRY_NAME)
-                && data.hasExtra(CountryPickerActivity.EXTRA_OUT_COUNTRY_CODE)) {
-            val countryCode = data.getStringExtra(CountryPickerActivity.EXTRA_OUT_COUNTRY_CODE)
-            if (!TextUtils.equals(countryCode, PhoneNumberUtils.getCountryCode(activity))) {
-                PhoneNumberUtils.setCountryCode(activity, countryCode)
-                mContactPhonebookCountryPreference.summary = data.getStringExtra(CountryPickerActivity.EXTRA_OUT_COUNTRY_NAME)
-            }
-        }
-        */
-    }
-
     // ==============================================================================================================
     // Phone number management
     // ==============================================================================================================
 
-    /**
-     * Refresh phone number list
-     */
-    private fun refreshPhoneNumbersList() {
-    }
-
     /**
      * Update the password.
      */
@@ -643,9 +582,4 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
             })
         }
     }
-
-    companion object {
-        private const val REQUEST_NEW_PHONE_NUMBER = 456
-        private const val REQUEST_PHONEBOOK_COUNTRY = 789
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
index 4a6965618e..37465258f6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
@@ -16,14 +16,13 @@
 
 package im.vector.app.features.settings
 
-import android.content.Intent
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.notifications.NotificationDrawerManager
-import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinCodeStore
 import im.vector.app.features.pin.PinMode
 import kotlinx.coroutines.launch
@@ -67,17 +66,18 @@ class VectorSettingsPinFragment @Inject constructor(
                         refreshPinCodeStatus()
                     }
                 } else {
-                    navigator.openPinCode(this@VectorSettingsPinFragment, PinMode.CREATE)
+                    navigator.openPinCode(
+                            requireContext(),
+                            pinActivityResultLauncher,
+                            PinMode.CREATE
+                    )
                 }
                 true
             }
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == PinActivity.PIN_REQUEST_CODE) {
-            refreshPinCodeStatus()
-        }
+    private val pinActivityResultLauncher = registerStartForActivityResult {
+        refreshPinCodeStatus()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index b0ec7426a7..39120f1157 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -39,6 +39,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.dialogs.ExportKeysDialog
 import im.vector.app.core.extensions.queryExportKeys
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.showPassword
 import im.vector.app.core.intent.ExternalIntentData
 import im.vector.app.core.intent.analyseIntent
@@ -55,7 +56,6 @@ import im.vector.app.features.crypto.keysbackup.settings.KeysBackupManageActivit
 import im.vector.app.features.crypto.recover.BootstrapBottomSheet
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.navigation.Navigator
-import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinCodeStore
 import im.vector.app.features.pin.PinMode
 import im.vector.app.features.raw.wellknown.getElementWellknown
@@ -320,48 +320,45 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                REQUEST_CODE_SAVE_MEGOLM_EXPORT -> {
-                    val uri = data?.data
-                    if (uri != null) {
-                        activity?.let { activity ->
-                            ExportKeysDialog().show(activity, object : ExportKeysDialog.ExportKeyDialogListener {
-                                override fun onPassphrase(passphrase: String) {
-                                    displayLoadingView()
+    private val saveMegolmStartForActivityResult = registerStartForActivityResult {
+        val uri = it.data?.data ?: return@registerStartForActivityResult
+        if (it.resultCode == Activity.RESULT_OK)
+            ExportKeysDialog().show(requireActivity(), object : ExportKeysDialog.ExportKeyDialogListener {
+                override fun onPassphrase(passphrase: String) {
+                    displayLoadingView()
 
-                                    KeysExporter(session)
-                                            .export(requireContext(),
-                                                    passphrase,
-                                                    uri,
-                                                    object : MatrixCallback<Boolean> {
-                                                        override fun onSuccess(data: Boolean) {
-                                                            if (data) {
-                                                                requireActivity().toast(getString(R.string.encryption_exported_successfully))
-                                                            } else {
-                                                                requireActivity().toast(getString(R.string.unexpected_error))
-                                                            }
-                                                            hideLoadingView()
-                                                        }
+                    KeysExporter(session)
+                            .export(requireContext(),
+                                    passphrase,
+                                    uri,
+                                    object : MatrixCallback<Boolean> {
+                                        override fun onSuccess(data: Boolean) {
+                                            if (data) {
+                                                requireActivity().toast(getString(R.string.encryption_exported_successfully))
+                                            } else {
+                                                requireActivity().toast(getString(R.string.unexpected_error))
+                                            }
+                                            hideLoadingView()
+                                        }
 
-                                                        override fun onFailure(failure: Throwable) {
-                                                            onCommonDone(failure.localizedMessage)
-                                                        }
-                                                    })
-                                }
-                            })
-                        }
-                    }
+                                        override fun onFailure(failure: Throwable) {
+                                            onCommonDone(failure.localizedMessage)
+                                        }
+                                    })
                 }
-                PinActivity.PIN_REQUEST_CODE    -> {
-                    doOpenPinCodePreferenceScreen()
-                }
-                REQUEST_E2E_FILE_REQUEST_CODE   -> {
-                    importKeys(data)
-                }
-            }
+            })
+    }
+
+    private val pinActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            doOpenPinCodePreferenceScreen()
+        }
+    }
+
+    private val importKeysActivityResultLauncher = registerStartForActivityResult {
+        val data = it.data ?: return@registerStartForActivityResult
+        if (it.resultCode == Activity.RESULT_OK) {
+            importKeys(data)
         }
     }
 
@@ -369,7 +366,10 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         lifecycleScope.launchWhenResumed {
             val hasPinCode = pinCodeStore.hasEncodedPin()
             if (hasPinCode) {
-                navigator.openPinCode(this@VectorSettingsSecurityPrivacyFragment, PinMode.AUTH)
+                navigator.openPinCode(
+                        requireContext(),
+                        pinActivityResultLauncher,
+                        PinMode.AUTH)
             } else {
                 doOpenPinCodePreferenceScreen()
             }
@@ -391,7 +391,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         }
 
         exportPref.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            queryExportKeys(activeSessionHolder.getSafeActiveSession()?.myUserId ?: "", REQUEST_CODE_SAVE_MEGOLM_EXPORT)
+            queryExportKeys(activeSessionHolder.getSafeActiveSession()?.myUserId ?: "", saveMegolmStartForActivityResult)
             true
         }
 
@@ -406,7 +406,12 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
      */
     @SuppressLint("NewApi")
     private fun importKeys() {
-        activity?.let { openFileSelection(it, this, false, REQUEST_E2E_FILE_REQUEST_CODE) }
+        openFileSelection(
+                requireActivity(),
+                importKeysActivityResultLauncher,
+                false,
+                0
+        )
     }
 
     /**
@@ -414,12 +419,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
      *
      * @param intent the intent result
      */
-    private fun importKeys(intent: Intent?) {
-        // sanity check
-        if (null == intent) {
-            return
-        }
-
+    private fun importKeys(intent: Intent) {
         val sharedDataItems = analyseIntent(intent)
         val thisActivity = activity
 
@@ -605,9 +605,4 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
             }
         })
     }
-
-    companion object {
-        private const val REQUEST_E2E_FILE_REQUEST_CODE = 123
-        private const val REQUEST_CODE_SAVE_MEGOLM_EXPORT = 124
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index a75cfa4304..5e776fb17a 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -33,6 +33,7 @@ import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.attachments.AttachmentsHelper
 import im.vector.app.features.attachments.preview.AttachmentsPreviewActivity
@@ -118,20 +119,16 @@ class IncomingShareFragment @Inject constructor(
 
     private fun handleEditMediaBeforeSending(event: IncomingShareViewEvents.EditMediaBeforeSending) {
         val intent = AttachmentsPreviewActivity.newIntent(requireContext(), AttachmentsPreviewArgs(event.contentAttachmentData))
-        startActivityForResult(intent, AttachmentsPreviewActivity.REQUEST_CODE)
+        attachmentPreviewActivityResultLauncher.launch(intent)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        val hasBeenHandled = attachmentsHelper.onActivityResult(requestCode, resultCode, data)
-        if (!hasBeenHandled && resultCode == Activity.RESULT_OK && data != null) {
-            when (requestCode) {
-                AttachmentsPreviewActivity.REQUEST_CODE -> {
-                    val sendData = AttachmentsPreviewActivity.getOutput(data)
-                    val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
-                    viewModel.handle(IncomingShareAction.UpdateSharedData(SharedData.Attachments(sendData)))
-                    viewModel.handle(IncomingShareAction.ShareMedia(keepOriginalSize))
-                }
-            }
+    private val attachmentPreviewActivityResultLauncher = registerStartForActivityResult {
+        val data = it.data ?: return@registerStartForActivityResult
+        if (it.resultCode == Activity.RESULT_OK) {
+            val sendData = AttachmentsPreviewActivity.getOutput(data)
+            val keepOriginalSize = AttachmentsPreviewActivity.getKeepOriginalSize(data)
+            viewModel.handle(IncomingShareAction.UpdateSharedData(SharedData.Attachments(sendData)))
+            viewModel.handle(IncomingShareAction.ShareMedia(keepOriginalSize))
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
index 4fea176249..9d1f10f39e 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
@@ -73,7 +73,6 @@ class ReviewTermsActivity : SimpleFragmentActivity() {
     }
 
     companion object {
-        const val TERMS_REQUEST_CODE = 15000
         private const val EXTRA_INFO = "EXTRA_INFO"
 
         fun intent(context: Context, serviceType: TermsService.ServiceType, baseUrl: String, token: String?): Intent {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index 37ae89ab36..2d3e5e4e69 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -37,11 +37,10 @@ import com.airbnb.mvrx.args
 import com.airbnb.mvrx.withState
 import org.matrix.android.sdk.api.session.terms.TermsService
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.openUrlInExternalBrowser
-import im.vector.app.features.home.room.detail.widget.WidgetRequestCodes
-import im.vector.app.features.terms.ReviewTermsActivity
 import im.vector.app.features.webview.WebViewEventListener
 import im.vector.app.features.widgets.webview.clearAfterWidget
 import im.vector.app.features.widgets.webview.setupForWidget
@@ -86,19 +85,18 @@ class WidgetFragment @Inject constructor() : VectorBaseFragment(), WebViewEventL
         viewModel.handle(WidgetAction.LoadFormattedUrl)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        when (requestCode) {
-            ReviewTermsActivity.TERMS_REQUEST_CODE              -> {
-                Timber.v("On terms results")
-                if (resultCode == Activity.RESULT_OK) {
-                    viewModel.handle(WidgetAction.OnTermsReviewed)
-                } else {
-                    vectorBaseActivity.finish()
-                }
-            }
-            WidgetRequestCodes.INTEGRATION_MANAGER_REQUEST_CODE -> {
-                viewModel.handle(WidgetAction.LoadFormattedUrl)
-            }
+    private val termsActivityResultLauncher = registerStartForActivityResult {
+        Timber.v("On terms results")
+        if (it.resultCode == Activity.RESULT_OK) {
+            viewModel.handle(WidgetAction.OnTermsReviewed)
+        } else {
+            vectorBaseActivity.finish()
+        }
+    }
+
+    private val integrationManagerActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            viewModel.handle(WidgetAction.LoadFormattedUrl)
         }
     }
 
@@ -146,7 +144,12 @@ class WidgetFragment @Inject constructor() : VectorBaseFragment(), WebViewEventL
     override fun onOptionsItemSelected(item: MenuItem): Boolean = withState(viewModel) { state ->
         when (item.itemId) {
             R.id.action_edit            -> {
-                navigator.openIntegrationManager(this, state.roomId, state.widgetId, state.widgetKind.screenId)
+                navigator.openIntegrationManager(
+                        requireContext(),
+                        integrationManagerActivityResultLauncher,
+                        state.roomId,
+                        state.widgetId,
+                        state.widgetKind.screenId)
                 return@withState true
             }
             R.id.action_delete          -> {
@@ -261,7 +264,8 @@ class WidgetFragment @Inject constructor() : VectorBaseFragment(), WebViewEventL
 
     private fun displayTerms(displayTerms: WidgetViewEvents.DisplayTerms) {
         navigator.openTerms(
-                fragment = this,
+                context = requireContext(),
+                activityResultLauncher = termsActivityResultLauncher,
                 serviceType = TermsService.ServiceType.IntegrationManager,
                 baseUrl = displayTerms.url,
                 token = displayTerms.token
@@ -287,7 +291,8 @@ class WidgetFragment @Inject constructor() : VectorBaseFragment(), WebViewEventL
 
     private fun displayIntegrationManager(event: WidgetViewEvents.DisplayIntegrationManager) {
         navigator.openIntegrationManager(
-                fragment = this,
+                context = requireContext(),
+                activityResultLauncher = integrationManagerActivityResultLauncher,
                 roomId = fragmentArgs.roomId,
                 integId = event.integId,
                 screen = event.integType
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index 756aa3cbac..2fe984dfc7 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.workers.signout
 
 import android.app.Activity
 import android.app.Dialog
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
@@ -39,6 +38,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.dialogs.ExportKeysDialog
 import im.vector.app.core.extensions.queryExportKeys
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import im.vector.app.features.crypto.recover.BootstrapBottomSheet
@@ -77,9 +77,6 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
 
     companion object {
         fun newInstance() = SignOutBottomSheetDialogFragment()
-
-        private const val EXPORT_REQ = 0
-        private const val QUERY_EXPORT_KEYS = 1
     }
 
     init {
@@ -130,12 +127,12 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
 
         exportManuallyButton.action = {
             withState(viewModel) { state ->
-                queryExportKeys(state.userId, QUERY_EXPORT_KEYS)
+                queryExportKeys(state.userId, manualExportKeysActivityResultLauncher)
             }
         }
 
         setupMegolmBackupButton.action = {
-            startActivityForResult(KeysBackupSetupActivity.intent(requireContext(), true), EXPORT_REQ)
+            setupBackupActivityResultLauncher.launch(KeysBackupSetupActivity.intent(requireContext(), true))
         }
 
         viewModel.observeViewEvents {
@@ -289,26 +286,26 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
         return dialog
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        if (resultCode == Activity.RESULT_OK) {
-            if (requestCode == QUERY_EXPORT_KEYS) {
-                val uri = data?.data
-                if (resultCode == Activity.RESULT_OK && uri != null) {
-                    activity?.let { activity ->
-                        ExportKeysDialog().show(activity, object : ExportKeysDialog.ExportKeyDialogListener {
-                            override fun onPassphrase(passphrase: String) {
-                                viewModel.handle(SignoutCheckViewModel.Actions.ExportKeys(passphrase, uri))
-                            }
-                        })
-                    }
-                }
-            } else if (requestCode == EXPORT_REQ) {
-                if (data?.getBooleanExtra(KeysBackupSetupActivity.MANUAL_EXPORT, false) == true) {
-                    viewModel.handle(SignoutCheckViewModel.Actions.KeySuccessfullyManuallyExported)
+    private val manualExportKeysActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            val uri = it.data?.data
+            if (uri != null) {
+                activity?.let { activity ->
+                    ExportKeysDialog().show(activity, object : ExportKeysDialog.ExportKeyDialogListener {
+                        override fun onPassphrase(passphrase: String) {
+                            viewModel.handle(SignoutCheckViewModel.Actions.ExportKeys(passphrase, uri))
+                        }
+                    })
                 }
             }
         }
     }
+
+    private val setupBackupActivityResultLauncher = registerStartForActivityResult {
+        if (it.resultCode == Activity.RESULT_OK) {
+            if (it.data?.getBooleanExtra(KeysBackupSetupActivity.MANUAL_EXPORT, false) == true) {
+                viewModel.handle(SignoutCheckViewModel.Actions.KeySuccessfullyManuallyExported)
+            }
+        }
+    }
 }

From c53f79ca8b3e45debf1625be7612abd45aa0db5a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 17:21:05 +0200
Subject: [PATCH 154/278] Do not use deprecated Fragment.startActivityForResult
 anymore - step 2

---
 .../im/vector/app/core/utils/SystemUtils.kt   | 22 ++++++---
 .../KeysBackupRestoreFromKeyFragment.kt       | 44 +++++++----------
 .../setup/KeysBackupSetupStep3Fragment.kt     | 10 ++--
 .../quads/SharedSecuredStorageKeyFragment.kt  | 16 ++----
 .../recover/BootstrapMigrateBackupFragment.kt | 16 ++----
 .../BootstrapSaveRecoveryKeyFragment.kt       | 49 +++++++++----------
 .../verification/VerificationBottomSheet.kt   | 18 +++----
 .../features/media/BigImageViewerActivity.kt  |  1 -
 .../RoomMemberProfileFragment.kt              |  7 ++-
 .../roomprofile/RoomProfileFragment.kt        | 21 ++++++--
 ...rSettingsNotificationPreferenceFragment.kt | 27 +++++-----
 .../VectorSettingsVoiceVideoFragment.kt       | 27 ++++------
 12 files changed, 120 insertions(+), 138 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index c1253e76d3..7c41457811 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -28,6 +28,7 @@ import android.os.Build
 import android.os.PowerManager
 import android.provider.Settings
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.getSystemService
@@ -136,32 +137,37 @@ fun startAddGoogleAccountIntent(context: AppCompatActivity, requestCode: Int) {
     }
 }
 
-fun startSharePlainTextIntent(fragment: Fragment, chooserTitle: String?, text: String, subject: String? = null, requestCode: Int? = null) {
+fun startSharePlainTextIntent(fragment: Fragment,
+                              activityResultLauncher: ActivityResultLauncher<Intent>?,
+                              chooserTitle: String?,
+                              text: String,
+                              subject: String? = null) {
     val share = Intent(Intent.ACTION_SEND)
     share.type = "text/plain"
     share.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT)
     // Add data to the intent, the receiving app will decide what to do with it.
     share.putExtra(Intent.EXTRA_SUBJECT, subject)
     share.putExtra(Intent.EXTRA_TEXT, text)
+    val intent = Intent.createChooser(share, chooserTitle)
     try {
-        if (requestCode != null) {
-            fragment.startActivityForResult(Intent.createChooser(share, chooserTitle), requestCode)
+        if (activityResultLauncher != null) {
+            activityResultLauncher.launch(intent)
         } else {
-            fragment.startActivity(Intent.createChooser(share, chooserTitle))
+            fragment.startActivity(intent)
         }
     } catch (activityNotFoundException: ActivityNotFoundException) {
         fragment.activity?.toast(R.string.error_no_external_application_found)
     }
 }
 
-fun startImportTextFromFileIntent(fragment: Fragment, requestCode: Int) {
+fun startImportTextFromFileIntent(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
         type = "text/plain"
     }
-    if (intent.resolveActivity(fragment.requireActivity().packageManager) != null) {
-        fragment.startActivityForResult(intent, requestCode)
+    if (intent.resolveActivity(context.packageManager) != null) {
+        activityResultLauncher.launch(intent)
     } else {
-        fragment.activity?.toast(R.string.error_no_external_application_found)
+        context.toast(R.string.error_no_external_application_found)
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
index 966ad9d0b8..580a3443e7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreFromKeyFragment.kt
@@ -16,7 +16,6 @@
 package im.vector.app.features.crypto.keysbackup.restore
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.view.View
@@ -28,19 +27,15 @@ import butterknife.OnClick
 import butterknife.OnTextChanged
 import com.google.android.material.textfield.TextInputLayout
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startImportTextFromFileIntent
-import timber.log.Timber
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
 class KeysBackupRestoreFromKeyFragment @Inject constructor()
     : VectorBaseFragment() {
 
-    companion object {
-
-        private const val REQUEST_TEXT_FILE_GET = 1
-    }
-
     override fun getLayoutResId() = R.layout.fragment_keys_backup_restore_from_key
 
     private lateinit var viewModel: KeysBackupRestoreFromKeyViewModel
@@ -48,6 +43,7 @@ class KeysBackupRestoreFromKeyFragment @Inject constructor()
 
     @BindView(R.id.keys_backup_key_enter_til)
     lateinit var mKeyInputLayout: TextInputLayout
+
     @BindView(R.id.keys_restore_key_enter_edittext)
     lateinit var mKeyTextEdit: EditText
 
@@ -89,29 +85,23 @@ class KeysBackupRestoreFromKeyFragment @Inject constructor()
 
     @OnClick(R.id.keys_backup_import)
     fun onImport() {
-        startImportTextFromFileIntent(this, REQUEST_TEXT_FILE_GET)
+        startImportTextFromFileIntent(requireContext(), textFileStartForActivityResult)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_TEXT_FILE_GET && resultCode == Activity.RESULT_OK) {
-            val dataURI = data?.data
-            if (dataURI != null) {
-                try {
-                    activity
-                            ?.contentResolver
-                            ?.openInputStream(dataURI)
-                            ?.bufferedReader()
-                            ?.use { it.readText() }
-                            ?.let {
-                                mKeyTextEdit.setText(it)
-                                mKeyTextEdit.setSelection(it.length)
-                            }
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to read recovery kay from text")
-                }
+    private val textFileStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val dataURI = activityResult.data?.data ?: return@registerStartForActivityResult
+            tryOrNull(message = "Failed to read recovery kay from text") {
+                activity
+                        ?.contentResolver
+                        ?.openInputStream(dataURI)
+                        ?.bufferedReader()
+                        ?.use { it.readText() }
+                        ?.let {
+                            mKeyTextEdit.setText(it)
+                            mKeyTextEdit.setSelection(it.length)
+                        }
             }
-            return
         }
-        super.onActivityResult(requestCode, resultCode, data)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index 03ad5d5d9f..5e7a2a738a 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -144,10 +144,12 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
         }
 
         dialog.findViewById<View>(R.id.keys_backup_setup_share)?.setOnClickListener {
-            startSharePlainTextIntent(this,
-                    context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
-                    recoveryKey,
-                    context?.getString(R.string.recovery_key))
+            startSharePlainTextIntent(
+                    fragment = this,
+                    activityResultLauncher = null,
+                    chooserTitle = context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
+                    text = recoveryKey,
+                    subject = context?.getString(R.string.recovery_key))
             viewModel.copyHasBeenMade = true
             dialog.dismiss()
         }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
index 366c979155..9fb3f637e1 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecuredStorageKeyFragment.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.crypto.quads
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.inputmethod.EditorInfo
@@ -25,6 +24,7 @@ import com.airbnb.mvrx.activityViewModel
 import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startImportTextFromFileIntent
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -61,7 +61,7 @@ class SharedSecuredStorageKeyFragment @Inject constructor() : VectorBaseFragment
                 }
                 .disposeOnDestroyView()
 
-        ssss_key_use_file.debouncedClicks { startImportTextFromFileIntent(this, IMPORT_FILE_REQ) }
+        ssss_key_use_file.debouncedClicks { startImportTextFromFileIntent(requireContext(), importFileStartForActivityResult) }
 
         ssss_key_reset.clickableView.debouncedClicks {
             sharedViewModel.handle(SharedSecureStorageAction.ForgotResetAll)
@@ -85,9 +85,9 @@ class SharedSecuredStorageKeyFragment @Inject constructor() : VectorBaseFragment
         sharedViewModel.handle(SharedSecureStorageAction.SubmitKey(text))
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == IMPORT_FILE_REQ && resultCode == Activity.RESULT_OK) {
-            data?.data?.let { dataURI ->
+    private val importFileStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            activityResult.data?.data?.let { dataURI ->
                 tryOrNull {
                     activity?.contentResolver?.openInputStream(dataURI)
                             ?.bufferedReader()
@@ -97,12 +97,6 @@ class SharedSecuredStorageKeyFragment @Inject constructor() : VectorBaseFragment
                             }
                 }
             }
-            return
         }
-        super.onActivityResult(requestCode, resultCode, data)
-    }
-
-    companion object {
-        private const val IMPORT_FILE_REQ = 0
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
index a89e08988c..69c809c773 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
@@ -17,7 +17,6 @@
 package im.vector.app.features.crypto.recover
 
 import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import android.text.InputType.TYPE_CLASS_TEXT
 import android.text.InputType.TYPE_TEXT_FLAG_MULTI_LINE
@@ -32,6 +31,7 @@ import com.jakewharton.rxbinding3.widget.editorActionEvents
 import com.jakewharton.rxbinding3.widget.textChanges
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.showPassword
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
@@ -82,7 +82,7 @@ class BootstrapMigrateBackupFragment @Inject constructor(
         bootstrapMigrateContinueButton.debouncedClicks { submit() }
         bootstrapMigrateShowPassword.debouncedClicks { sharedViewModel.handle(BootstrapActions.TogglePasswordVisibility) }
         bootstrapMigrateForgotPassphrase.debouncedClicks { sharedViewModel.handle(BootstrapActions.HandleForgotBackupPassphrase) }
-        bootstrapMigrateUseFile.debouncedClicks { startImportTextFromFileIntent(this, IMPORT_FILE_REQ) }
+        bootstrapMigrateUseFile.debouncedClicks { startImportTextFromFileIntent(requireContext(), importFileStartForActivityResult) }
     }
 
     private fun submit() = withState(sharedViewModel) { state ->
@@ -147,9 +147,9 @@ class BootstrapMigrateBackupFragment @Inject constructor(
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == IMPORT_FILE_REQ && resultCode == Activity.RESULT_OK) {
-            data?.data?.let { dataURI ->
+    private val importFileStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            activityResult.data?.data?.let { dataURI ->
                 tryOrNull {
                     activity?.contentResolver?.openInputStream(dataURI)
                             ?.bufferedReader()
@@ -159,12 +159,6 @@ class BootstrapMigrateBackupFragment @Inject constructor(
                             }
                 }
             }
-            return
         }
-        super.onActivityResult(requestCode, resultCode, data)
-    }
-
-    companion object {
-        private const val IMPORT_FILE_REQ = 0
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
index 750dadbc9f..e426394d77 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.crypto.recover
 
-import android.app.Activity.RESULT_OK
+import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.os.Bundle
@@ -25,6 +25,7 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.startSharePlainTextIntent
@@ -65,43 +66,46 @@ class BootstrapSaveRecoveryKeyFragment @Inject constructor(
 
         try {
             sharedViewModel.handle(BootstrapActions.SaveReqQueryStarted)
-            startActivityForResult(Intent.createChooser(intent, getString(R.string.keys_backup_setup_step3_please_make_copy)), REQUEST_CODE_SAVE)
+            saveStartForActivityResult.launch(Intent.createChooser(intent, getString(R.string.keys_backup_setup_step3_please_make_copy)))
         } catch (activityNotFoundException: ActivityNotFoundException) {
             requireActivity().toast(R.string.error_no_external_application_found)
             sharedViewModel.handle(BootstrapActions.SaveReqFailed)
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_CODE_SAVE) {
-            val uri = data?.data
-            if (resultCode == RESULT_OK && uri != null) {
-                GlobalScope.launch(Dispatchers.IO) {
-                    try {
-                        sharedViewModel.handle(BootstrapActions.SaveKeyToUri(requireContext().contentResolver!!.openOutputStream(uri)!!))
-                    } catch (failure: Throwable) {
-                        sharedViewModel.handle(BootstrapActions.SaveReqFailed)
-                    }
+    private val saveStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val uri = activityResult.data?.data ?: return@registerStartForActivityResult
+            GlobalScope.launch(Dispatchers.IO) {
+                try {
+                    sharedViewModel.handle(BootstrapActions.SaveKeyToUri(requireContext().contentResolver!!.openOutputStream(uri)!!))
+                } catch (failure: Throwable) {
+                    sharedViewModel.handle(BootstrapActions.SaveReqFailed)
                 }
-            } else {
-                // result code seems to be always cancelled here.. so act as if it was saved
-                sharedViewModel.handle(BootstrapActions.SaveReqFailed)
             }
-            return
-        } else if (requestCode == REQUEST_CODE_COPY) {
+        } else {
+            // result code seems to be always cancelled here.. so act as if it was saved
+            sharedViewModel.handle(BootstrapActions.SaveReqFailed)
+        }
+    }
+
+    private val copyStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
             sharedViewModel.handle(BootstrapActions.RecoveryKeySaved)
         }
-        super.onActivityResult(requestCode, resultCode, data)
     }
 
     private fun shareRecoveryKey() = withState(sharedViewModel) { state ->
         val recoveryKey = state.recoveryKeyCreationInfo?.recoveryKey?.formatRecoveryKey()
                 ?: return@withState
 
-        startSharePlainTextIntent(this,
+        startSharePlainTextIntent(
+                this,
+                copyStartForActivityResult,
                 context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
                 recoveryKey,
-                context?.getString(R.string.recovery_key), REQUEST_CODE_COPY)
+                context?.getString(R.string.recovery_key)
+        )
     }
 
     override fun invalidate() = withState(sharedViewModel) { state ->
@@ -111,9 +115,4 @@ class BootstrapSaveRecoveryKeyFragment @Inject constructor(
         recoveryContinue.isVisible = step.isSaved
         bootstrapRecoveryKeyText.text = state.recoveryKeyCreationInfo?.recoveryKey?.formatRecoveryKey()
     }
-
-    companion object {
-        const val REQUEST_CODE_SAVE = 123
-        const val REQUEST_CODE_COPY = 124
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index c7ce4d6f01..d91194e002 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -35,6 +35,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.crypto.quads.SharedSecureStorageActivity
@@ -108,12 +109,12 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
             when (it) {
                 is VerificationBottomSheetViewEvents.Dismiss           -> dismiss()
                 is VerificationBottomSheetViewEvents.AccessSecretStore -> {
-                    startActivityForResult(SharedSecureStorageActivity.newIntent(
+                    secretStartForActivityResult.launch(SharedSecureStorageActivity.newIntent(
                             requireContext(),
                             null, // use default key
                             listOf(MASTER_KEY_SSSS_NAME, USER_SIGNING_KEY_SSSS_NAME, SELF_SIGNING_KEY_SSSS_NAME, KEYBACKUP_SECRET_SSSS_NAME),
                             SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
-                    ), SECRET_REQUEST_CODE)
+                    ))
                 }
                 is VerificationBottomSheetViewEvents.ModalError        -> {
                     AlertDialog.Builder(requireContext())
@@ -145,10 +146,10 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK && requestCode == SECRET_REQUEST_CODE) {
-            val result = data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)
-            val reset = data?.getBooleanExtra(SharedSecureStorageActivity.EXTRA_DATA_RESET, false) ?: false
+    private val secretStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val result = activityResult.data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)
+            val reset = activityResult.data?.getBooleanExtra(SharedSecureStorageActivity.EXTRA_DATA_RESET, false) ?: false
             if (result != null) {
                 viewModel.handle(VerificationAction.GotResultFromSsss(result, SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS))
             } else if (reset) {
@@ -156,11 +157,9 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
                 viewModel.handle(VerificationAction.SecuredStorageHasBeenReset)
             }
         }
-        super.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-
         state.otherUserMxItem?.let { matrixItem ->
             if (state.isMe) {
                 avatarRenderer.render(matrixItem, otherUserAvatarImageView)
@@ -347,9 +346,6 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment() {
     }
 
     companion object {
-
-        const val SECRET_REQUEST_CODE = 101
-
         fun withArgs(roomId: String?, otherUserId: String, transactionId: String? = null): VerificationBottomSheet {
             return VerificationBottomSheet().apply {
                 arguments = Bundle().apply {
diff --git a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
index 144b9739da..04fd6e3850 100644
--- a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
@@ -175,7 +175,6 @@ class BigImageViewerActivity : VectorBaseActivity() {
         private const val EXTRA_TITLE = "EXTRA_TITLE"
         private const val EXTRA_IMAGE_URL = "EXTRA_IMAGE_URL"
         private const val EXTRA_CAN_EDIT_IMAGE = "EXTRA_CAN_EDIT_IMAGE"
-        const val REQUEST_CODE = 1000
 
         fun newIntent(context: Context, title: String?, imageUrl: String, canEditImage: Boolean = false): Intent {
             return Intent(context, BigImageViewerActivity::class.java).apply {
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index cda2d83e3d..169cba09eb 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -284,7 +284,12 @@ class RoomMemberProfileFragment @Inject constructor(
     }
 
     private fun handleShareRoomMemberProfile(permalink: String) {
-        startSharePlainTextIntent(fragment = this, chooserTitle = null, text = permalink)
+        startSharePlainTextIntent(
+                fragment = this,
+                activityResultLauncher = null,
+                chooserTitle = null,
+                text = permalink
+        )
     }
 
     private fun onAvatarClicked(view: View, userMatrixItem: MatrixItem) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 82c16db5ee..2b67624ed1 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -260,14 +260,19 @@ class RoomProfileFragment @Inject constructor(
     }
 
     private fun onShareRoomProfile(permalink: String) {
-        startSharePlainTextIntent(fragment = this, chooserTitle = null, text = permalink)
+        startSharePlainTextIntent(
+                fragment = this,
+                activityResultLauncher = null,
+                chooserTitle = null,
+                text = permalink
+        )
     }
 
     private fun onAvatarClicked(view: View, matrixItem: MatrixItem.RoomItem) = withState(roomProfileViewModel) {
         if (matrixItem.avatarUrl?.isNotEmpty() == true) {
             val intent = BigImageViewerActivity.newIntent(requireContext(), matrixItem.getBestName(), matrixItem.avatarUrl!!, it.canChangeAvatar)
             val options = ActivityOptionsCompat.makeSceneTransitionAnimation(requireActivity(), view, ViewCompat.getTransitionName(view) ?: "")
-            startActivityForResult(intent, BigImageViewerActivity.REQUEST_CODE, options.toBundle())
+            bigImageStartForActivityResult.launch(intent, options)
         } else if (it.canChangeAvatar) {
             showAvatarSelector()
         }
@@ -333,14 +338,20 @@ class RoomProfileFragment @Inject constructor(
         }
     }
 
+    private val bigImageStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            activityResult.data?.let { onAvatarCropped(it.data) }
+        }
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             when (requestCode) {
-                UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
-                BigImageViewerActivity.REQUEST_CODE -> data?.let { onAvatarCropped(it.data) }
+                UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
             }
         }
-        // TODO
+        // TODO handle this one (Ucrop lib)
+        @Suppress("DEPRECATION")
         super.onActivityResult(requestCode, resultCode, data)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index d6d9cf6e31..99a05ae6c1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -27,6 +27,7 @@ import androidx.preference.Preference
 import androidx.preference.SwitchPreference
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.preference.VectorEditTextPreference
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.preference.VectorPreferenceCategory
@@ -210,27 +211,22 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                     intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, vectorPreferences.getNotificationRingTone())
                 }
 
-                startActivityForResult(intent, REQUEST_NOTIFICATION_RINGTONE)
+                ringtoneStartForActivityResult.launch(intent)
                 false
             }
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                REQUEST_NOTIFICATION_RINGTONE -> {
-                    vectorPreferences.setNotificationRingTone(data?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) as Uri?)
+    private val ringtoneStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            vectorPreferences.setNotificationRingTone(activityResult.data?.getParcelableExtra<Parcelable>(RingtoneManager.EXTRA_RINGTONE_PICKED_URI) as Uri?)
 
-                    // test if the selected ring tone can be played
-                    val notificationRingToneName = vectorPreferences.getNotificationRingToneName()
-                    if (null != notificationRingToneName) {
-                        vectorPreferences.setNotificationRingTone(vectorPreferences.getNotificationRingTone())
-                        findPreference<VectorPreference>(VectorPreferences.SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY)!!
-                                .summary = notificationRingToneName
-                    }
-                }
+            // test if the selected ring tone can be played
+            val notificationRingToneName = vectorPreferences.getNotificationRingToneName()
+            if (null != notificationRingToneName) {
+                vectorPreferences.setNotificationRingTone(vectorPreferences.getNotificationRingTone())
+                findPreference<VectorPreference>(VectorPreferences.SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY)!!
+                        .summary = notificationRingToneName
             }
         }
     }
@@ -342,7 +338,6 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
     }
 
     companion object {
-        private const val REQUEST_NOTIFICATION_RINGTONE = 888
         private const val REQUEST_BATTERY_OPTIMIZATION = 500
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
index dba3c78220..05d1a1f60f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsVoiceVideoFragment.kt
@@ -23,6 +23,7 @@ import android.net.Uri
 import androidx.preference.Preference
 import androidx.preference.SwitchPreference
 import im.vector.app.R
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.utils.getCallRingtoneName
 import im.vector.app.core.utils.getCallRingtoneUri
@@ -57,19 +58,13 @@ class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                REQUEST_CALL_RINGTONE -> {
-                    val callRingtoneUri: Uri? = data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
-                    val thisActivity = activity
-                    if (callRingtoneUri != null && thisActivity != null) {
-                        setCallRingtoneUri(thisActivity, callRingtoneUri)
-                        mCallRingtonePreference.summary = getCallRingtoneName(thisActivity)
-                    }
-                }
+    private val ringtoneStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val callRingtoneUri: Uri? = activityResult.data?.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
+            val thisActivity = activity
+            if (callRingtoneUri != null && thisActivity != null) {
+                setCallRingtoneUri(thisActivity, callRingtoneUri)
+                mCallRingtonePreference.summary = getCallRingtoneName(thisActivity)
             }
         }
     }
@@ -82,10 +77,6 @@ class VectorSettingsVoiceVideoFragment : VectorSettingsBaseFragment() {
             putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_RINGTONE)
             activity?.let { putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, getCallRingtoneUri(it)) }
         }
-        startActivityForResult(intent, REQUEST_CALL_RINGTONE)
-    }
-
-    companion object {
-        private const val REQUEST_CALL_RINGTONE = 999
+        ringtoneStartForActivityResult.launch(intent)
     }
 }

From 29d25c377bf20b6ecb3d08552f569249f2a4a9e7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 18:07:04 +0200
Subject: [PATCH 155/278] Do not use deprecated Activity.startActivityForResult
 anymore - step 2

---
 .../troubleshoot/TestFirebaseToken.kt         |  6 ++--
 .../settings/troubleshoot/TestPlayServices.kt |  4 ++-
 .../troubleshoot/TestTokenRegistration.kt     |  8 +++--
 .../im/vector/app/core/extensions/Activity.kt |  9 ++++++
 .../im/vector/app/core/extensions/Fragment.kt | 10 +++---
 .../app/core/platform/VectorBaseActivity.kt   | 32 +++++++++----------
 .../core/utils/ExternalApplicationsUtil.kt    | 11 ++-----
 .../im/vector/app/core/utils/SystemUtils.kt   | 16 ++++------
 .../restore/KeysBackupRestoreActivity.kt      | 26 +++++++--------
 .../setup/KeysBackupSetupActivity.kt          | 13 ++++----
 .../setup/KeysBackupSetupStep3Fragment.kt     |  3 +-
 .../features/navigation/DefaultNavigator.kt   |  4 +--
 .../app/features/navigation/Navigator.kt      |  2 +-
 .../im/vector/app/features/pin/PinActivity.kt |  2 --
 ...rSettingsNotificationPreferenceFragment.kt | 13 ++++----
 ...ttingsNotificationsTroubleshootFragment.kt | 18 ++++++-----
 .../NotificationTroubleshootTestManager.kt    | 16 ++++------
 .../troubleshoot/TestAccountSettings.kt       |  8 +++--
 .../troubleshoot/TestDeviceSettings.kt        |  6 ++--
 .../troubleshoot/TestPushRulesSettings.kt     |  4 ++-
 .../troubleshoot/TestSystemSettings.kt        |  6 ++--
 .../settings/troubleshoot/TroubleshootTest.kt |  4 ++-
 22 files changed, 112 insertions(+), 109 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
index 318867af91..46bdb7967a 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import com.google.firebase.iid.FirebaseInstanceId
 import im.vector.app.R
@@ -32,7 +34,7 @@ import javax.inject.Inject
 class TestFirebaseToken @Inject constructor(private val context: AppCompatActivity,
                                             private val stringProvider: StringProvider) : TroubleshootTest(R.string.settings_troubleshoot_test_fcm_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         status = TestStatus.RUNNING
         try {
             FirebaseInstanceId.getInstance().instanceId
@@ -48,7 +50,7 @@ class TestFirebaseToken @Inject constructor(private val context: AppCompatActivi
                                 description = stringProvider.getString(R.string.settings_troubleshoot_test_fcm_failed_account_missing, errorMsg)
                                 quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_fcm_failed_account_missing_quick_fix) {
                                     override fun doFix() {
-                                        startAddGoogleAccountIntent(context, NotificationTroubleshootTestManager.REQ_CODE_FIX)
+                                        startAddGoogleAccountIntent(context, activityResultLauncher)
                                     }
                                 }
                             } else {
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
index 133fe1cb05..92e713de81 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
@@ -31,7 +33,7 @@ class TestPlayServices @Inject constructor(private val context: AppCompatActivit
                                            private val stringProvider: StringProvider)
     : TroubleshootTest(R.string.settings_troubleshoot_test_play_services_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val apiAvailability = GoogleApiAvailability.getInstance()
         val resultCode = apiAvailability.isGooglePlayServicesAvailable(context)
         if (resultCode == ConnectionResult.SUCCESS) {
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
index 6cb9c38fc6..f400c17d46 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.work.WorkInfo
@@ -37,7 +39,7 @@ class TestTokenRegistration @Inject constructor(private val context: AppCompatAc
                                                 private val activeSessionHolder: ActiveSessionHolder)
     : TroubleshootTest(R.string.settings_troubleshoot_test_token_registration_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         // Check if we have a registered pusher for this token
         val fcmToken = FcmHelper.getFcmToken(context) ?: run {
             status = TestStatus.FAILED
@@ -59,9 +61,9 @@ class TestTokenRegistration @Inject constructor(private val context: AppCompatAc
                     WorkManager.getInstance(context).getWorkInfoByIdLiveData(workId).observe(context, Observer { workInfo ->
                         if (workInfo != null) {
                             if (workInfo.state == WorkInfo.State.SUCCEEDED) {
-                                manager?.retry()
+                                manager?.retry(activityResultLauncher)
                             } else if (workInfo.state == WorkInfo.State.FAILED) {
-                                manager?.retry()
+                                manager?.retry(activityResultLauncher)
                             }
                         }
                     })
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Activity.kt b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
index cc67f633eb..53c2b7fc6c 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Activity.kt
@@ -17,11 +17,20 @@
 package im.vector.app.core.extensions
 
 import android.app.Activity
+import android.content.Intent
 import android.os.Parcelable
+import androidx.activity.ComponentActivity
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import im.vector.app.core.platform.VectorBaseActivity
 
+fun ComponentActivity.registerStartForActivityResult(onResult: (ActivityResult) -> Unit): ActivityResultLauncher<Intent> {
+    return registerForActivityResult(ActivityResultContracts.StartActivityForResult(), onResult)
+}
+
 fun VectorBaseActivity.addFragment(
         frameId: Int,
         fragment: Fragment,
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
index 80be149711..2740d5393a 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Fragment.kt
@@ -175,19 +175,17 @@ fun Fragment.queryExportKeys(userId: String, activityResultLauncher: ActivityRes
             activity = requireActivity(),
             activityResultLauncher = activityResultLauncher,
             defaultFileName = "element-megolm-export-$userId-$timestamp.txt",
-            chooserHint = getString(R.string.keys_backup_setup_step1_manual_export),
-            requestCode = 0
+            chooserHint = getString(R.string.keys_backup_setup_step1_manual_export)
     )
 }
 
-fun Activity.queryExportKeys(userId: String, requestCode: Int) {
+fun Activity.queryExportKeys(userId: String, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val timestamp = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
 
     selectTxtFileToWrite(
             activity = this,
-            activityResultLauncher = null,
+            activityResultLauncher = activityResultLauncher,
             defaultFileName = "element-megolm-export-$userId-$timestamp.txt",
-            chooserHint = getString(R.string.keys_backup_setup_step1_manual_export),
-            requestCode = requestCode
+            chooserHint = getString(R.string.keys_backup_setup_step1_manual_export)
     )
 }
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 81f73556a5..a8e070d79c 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -60,6 +60,7 @@ import im.vector.app.core.dialogs.UnrecognizedCertificateDialog
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.observeEvent
 import im.vector.app.core.extensions.observeNotNull
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.vectorComponent
 import im.vector.app.core.utils.toast
@@ -68,7 +69,6 @@ import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.configuration.VectorConfiguration
 import im.vector.app.features.consent.ConsentNotGivenHelper
 import im.vector.app.features.navigation.Navigator
-import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.pin.PinMode
 import im.vector.app.features.pin.UnlockedActivity
@@ -206,7 +206,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         })
         pinLocker.getLiveState().observeNotNull(this) {
             if (this@VectorBaseActivity !is UnlockedActivity && it == PinLocker.State.LOCKED) {
-                navigator.openPinCode(this, PinMode.AUTH)
+                navigator.openPinCode(this, PinMode.AUTH, pinStartForActivityResult)
             }
         }
         sessionListener = vectorComponent.sessionListener()
@@ -313,22 +313,20 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         uiDisposables.dispose()
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == PinActivity.PIN_REQUEST_CODE) {
-            when (resultCode) {
-                Activity.RESULT_OK -> {
-                    Timber.v("Pin ok, unlock app")
-                    pinLocker.unlock()
+    private val pinStartForActivityResult = registerStartForActivityResult { activityResult ->
+        when (activityResult.resultCode) {
+            Activity.RESULT_OK -> {
+                Timber.v("Pin ok, unlock app")
+                pinLocker.unlock()
 
-                    // Cancel any new started PinActivity, after a screen rotation for instance
-                    finishActivity(PinActivity.PIN_REQUEST_CODE)
-                }
-                else               -> {
-                    if (pinLocker.getLiveState().value != PinLocker.State.UNLOCKED) {
-                        // Remove the task, to be sure that PIN code will be requested when resumed
-                        finishAndRemoveTask()
-                    }
+                // Cancel any new started PinActivity, after a screen rotation for instance
+                // FIXME I cannot use this anymore :/
+                // finishActivity(PinActivity.PIN_REQUEST_CODE)
+            }
+            else               -> {
+                if (pinLocker.getLiveState().value != PinLocker.State.UNLOCKED) {
+                    // Remove the task, to be sure that PIN code will be requested when resumed
+                    finishAndRemoveTask()
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 750c4e071b..8c415c7184 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -441,10 +441,9 @@ fun openPlayStore(activity: Activity, appId: String = BuildConfig.APPLICATION_ID
  */
 fun selectTxtFileToWrite(
         activity: Activity,
-        activityResultLauncher: ActivityResultLauncher<Intent>?,
+        activityResultLauncher: ActivityResultLauncher<Intent>,
         defaultFileName: String,
-        chooserHint: String,
-        requestCode: Int
+        chooserHint: String
 ) {
     val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
     intent.addCategory(Intent.CATEGORY_OPENABLE)
@@ -453,11 +452,7 @@ fun selectTxtFileToWrite(
 
     try {
         val chooserIntent = Intent.createChooser(intent, chooserHint)
-        if (activityResultLauncher != null) {
-            activityResultLauncher.launch(chooserIntent)
-        } else {
-            activity.startActivityForResult(chooserIntent, requestCode)
-        }
+        activityResultLauncher.launch(chooserIntent)
     } catch (activityNotFoundException: ActivityNotFoundException) {
         activity.toast(R.string.error_no_external_application_found)
     }
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 7c41457811..5e722ae209 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -68,15 +68,11 @@ fun isAnimationDisabled(context: Context): Boolean {
  * will return false and the notification privacy will fallback to "LOW_DETAIL".
  */
 @TargetApi(Build.VERSION_CODES.M)
-fun requestDisablingBatteryOptimization(activity: Activity, fragment: Fragment?, requestCode: Int) {
+fun requestDisablingBatteryOptimization(activity: Activity, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val intent = Intent()
     intent.action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
     intent.data = Uri.parse("package:" + activity.packageName)
-    if (fragment != null) {
-        fragment.startActivityForResult(intent, requestCode)
-    } else {
-        activity.startActivityForResult(intent, requestCode)
-    }
+    activityResultLauncher.launch(intent)
 }
 
 // ==============================================================================================================
@@ -101,7 +97,7 @@ fun copyToClipboard(context: Context, text: CharSequence, showToast: Boolean = t
  * Shows notification settings for the current app.
  * In android O will directly opens the notification settings, in lower version it will show the App settings
  */
-fun startNotificationSettingsIntent(activity: AppCompatActivity, requestCode: Int) {
+fun startNotificationSettingsIntent(activity: AppCompatActivity, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val intent = Intent()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
@@ -111,7 +107,7 @@ fun startNotificationSettingsIntent(activity: AppCompatActivity, requestCode: In
         intent.putExtra("app_package", activity.packageName)
         intent.putExtra("app_uid", activity.applicationInfo?.uid)
     }
-    activity.startActivityForResult(intent, requestCode)
+    activityResultLauncher.launch(intent)
 }
 
 /**
@@ -127,11 +123,11 @@ fun startNotificationChannelSettingsIntent(fragment: Fragment, channelID: String
     fragment.startActivity(intent)
 }
 
-fun startAddGoogleAccountIntent(context: AppCompatActivity, requestCode: Int) {
+fun startAddGoogleAccountIntent(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>) {
     try {
         val intent = Intent(Settings.ACTION_ADD_ACCOUNT)
         intent.putExtra(Settings.EXTRA_ACCOUNT_TYPES, arrayOf("com.google"))
-        context.startActivityForResult(intent, requestCode)
+        activityResultLauncher.launch(intent)
     } catch (activityNotFoundException: ActivityNotFoundException) {
         context.toast(R.string.error_no_external_application_found)
     }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
index 40953cb5f6..80ae46262d 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreActivity.kt
@@ -23,6 +23,7 @@ import androidx.lifecycle.Observer
 import im.vector.app.R
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.extensions.observeEvent
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
 import im.vector.app.core.ui.views.KeysBackupBanner
@@ -32,8 +33,6 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_S
 class KeysBackupRestoreActivity : SimpleFragmentActivity() {
 
     companion object {
-
-        private const val REQUEST_4S_SECRET = 100
         const val SECRET_ALIAS = SharedSecureStorageActivity.DEFAULT_RESULT_KEYSTORE_ALIAS
 
         fun intent(context: Context): Intent {
@@ -130,22 +129,19 @@ class KeysBackupRestoreActivity : SimpleFragmentActivity() {
                 requestedSecrets = listOf(KEYBACKUP_SECRET_SSSS_NAME),
                 resultKeyStoreAlias = SECRET_ALIAS
         ).let {
-            startActivityForResult(it, REQUEST_4S_SECRET)
+            secretStartForActivityResult.launch(it)
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_4S_SECRET) {
-            val extraResult = data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)
-            if (resultCode == Activity.RESULT_OK && extraResult != null) {
-                viewModel.handleGotSecretFromSSSS(
-                        extraResult,
-                        SECRET_ALIAS
-                )
-            } else {
-                finish()
-            }
+    private val secretStartForActivityResult = registerStartForActivityResult { activityResult ->
+        val extraResult = activityResult.data?.getStringExtra(SharedSecureStorageActivity.EXTRA_DATA_RESULT)
+        if (activityResult.resultCode == Activity.RESULT_OK && extraResult != null) {
+            viewModel.handleGotSecretFromSSSS(
+                    extraResult,
+                    SECRET_ALIAS
+            )
+        } else {
+            finish()
         }
-        super.onActivityResult(requestCode, resultCode, data)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
index 1bba2c3a39..ab8e725959 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupActivity.kt
@@ -26,6 +26,7 @@ import im.vector.app.R
 import im.vector.app.core.dialogs.ExportKeysDialog
 import im.vector.app.core.extensions.observeEvent
 import im.vector.app.core.extensions.queryExportKeys
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
 import im.vector.app.core.utils.toast
@@ -93,7 +94,7 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
                             .show()
                 }
                 KeysBackupSetupSharedViewModel.NAVIGATE_MANUAL_EXPORT  -> {
-                    queryExportKeys(session.myUserId, REQUEST_CODE_SAVE_MEGOLM_EXPORT)
+                    queryExportKeys(session.myUserId, saveStartForActivityResult)
                 }
             }
         }
@@ -125,10 +126,10 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
         })
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_CODE_SAVE_MEGOLM_EXPORT) {
-            val uri = data?.data
-            if (resultCode == Activity.RESULT_OK && uri != null) {
+    private val saveStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            val uri = activityResult.data?.data
+            if (uri != null) {
                 ExportKeysDialog().show(this, object : ExportKeysDialog.ExportKeyDialogListener {
                     override fun onPassphrase(passphrase: String) {
                         showWaitingView()
@@ -163,7 +164,6 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
                 hideWaitingView()
             }
         }
-        super.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun onBackPressed() {
@@ -198,7 +198,6 @@ class KeysBackupSetupActivity : SimpleFragmentActivity() {
         const val KEYS_VERSION = "KEYS_VERSION"
         const val MANUAL_EXPORT = "MANUAL_EXPORT"
         const val EXTRA_SHOW_MANUAL_EXPORT = "SHOW_MANUAL_EXPORT"
-        const val REQUEST_CODE_SAVE_MEGOLM_EXPORT = 101
 
         fun intent(context: Context, showManualExport: Boolean): Intent {
             val intent = Intent(context, KeysBackupSetupActivity::class.java)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index 5e7a2a738a..d357625bcc 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -137,8 +137,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment()
                     activity = requireActivity(),
                     activityResultLauncher = saveRecoveryActivityResultLauncher,
                     defaultFileName = "recovery-key-$userId-$timestamp.txt",
-                    chooserHint = getString(R.string.save_recovery_key_chooser_hint),
-                    requestCode = 0
+                    chooserHint = getString(R.string.save_recovery_key_chooser_hint)
             )
             dialog.dismiss()
         }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 237fa4f65d..2aaaf0162d 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -310,9 +310,9 @@ class DefaultNavigator @Inject constructor(
         activityResultLauncher.launch(intent)
     }
 
-    override fun openPinCode(activity: Activity, pinMode: PinMode, requestCode: Int) {
+    override fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher<Intent>) {
         val intent = PinActivity.newIntent(activity, PinArgs(pinMode))
-        activity.startActivityForResult(intent, requestCode)
+        activityResultLauncher.launch(intent)
     }
 
     override fun openMediaViewer(activity: Activity,
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 4344f918ce..81ff798ac8 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -87,7 +87,7 @@ interface Navigator {
                     activityResultLauncher: ActivityResultLauncher<Intent>,
                     pinMode: PinMode)
 
-    fun openPinCode(activity: Activity, pinMode: PinMode, requestCode: Int = PinActivity.PIN_REQUEST_CODE)
+    fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher<Intent>)
 
     fun openTerms(context: Context,
                   activityResultLauncher: ActivityResultLauncher<Intent>,
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
index 0216ec512e..2e6a0b6c08 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinActivity.kt
@@ -28,8 +28,6 @@ import im.vector.app.core.platform.VectorBaseActivity
 class PinActivity : VectorBaseActivity(), ToolbarConfigurable, UnlockedActivity {
 
     companion object {
-        const val PIN_REQUEST_CODE = 17890
-
         fun newIntent(context: Context, args: PinArgs): Intent {
             return Intent(context, PinActivity::class.java).apply {
                 putExtra(MvRx.KEY_ARG, args)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index 99a05ae6c1..5f3a0e32ca 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -115,6 +115,11 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         handleSystemPreference()
     }
 
+    private val batteryStartForActivityResult = registerStartForActivityResult {
+        // Noop
+    }
+
+
     // BackgroundSyncModeChooserDialog.InteractionListener
     override fun onOptionSelected(mode: BackgroundSyncMode) {
         // option has change, need to act
@@ -123,9 +128,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             // Even if using foreground service with foreground notif, it stops to work
             // in doze mode for certain devices :/
             if (!isIgnoringBatteryOptimizations(requireContext())) {
-                requestDisablingBatteryOptimization(requireActivity(),
-                        this@VectorSettingsNotificationPreferenceFragment,
-                        REQUEST_BATTERY_OPTIMIZATION)
+                requestDisablingBatteryOptimization(requireActivity(), batteryStartForActivityResult, 0)
             }
         }
         vectorPreferences.setFdroidSyncBackgroundMode(mode)
@@ -336,8 +339,4 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
                             })
                 }
     }
-
-    companion object {
-        private const val REQUEST_BATTERY_OPTIMIZATION = 500
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index f07d6471c9..b989ae44d0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -17,7 +17,6 @@ package im.vector.app.features.settings
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
@@ -30,6 +29,7 @@ import androidx.transition.TransitionManager
 import butterknife.BindView
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.rageshake.BugReporter
@@ -76,7 +76,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
         }
 
         mRunButton.debouncedClicks {
-            testManager?.retry()
+            testManager?.retry(testStartForActivityResult)
         }
         startUI()
     }
@@ -134,7 +134,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
             }
         }
         mRecyclerView.adapter = testManager?.adapter
-        testManager?.runDiagnostic()
+        testManager?.runDiagnostic(testStartForActivityResult)
     }
 
     override fun onDestroyView() {
@@ -142,12 +142,14 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
         super.onDestroyView()
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK && requestCode == NotificationTroubleshootTestManager.REQ_CODE_FIX) {
-            testManager?.retry()
-            return
+    private val testStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            retry()
         }
-        super.onActivityResult(requestCode, resultCode, data)
+    }
+
+    private fun retry() {
+        testManager?.retry(testStartForActivityResult)
     }
 
     override fun onDetach() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index 92e8eecb4d..e977dc5963 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -15,8 +15,10 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Intent
 import android.os.Handler
 import android.os.Looper
+import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.Fragment
 import kotlin.properties.Delegates
 
@@ -41,7 +43,7 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
         test.manager = this
     }
 
-    fun runDiagnostic() {
+    fun runDiagnostic(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (isCancelled) return
         currentTestIndex = 0
         val handler = Handler(Looper.getMainLooper())
@@ -60,7 +62,7 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
                             // Cosmetic: Start with a small delay for UI/UX reason (better animation effect) for non async tests
                             handler.postDelayed({
                                 if (fragment.isAdded) {
-                                    troubleshootTest.perform()
+                                    troubleshootTest.perform(activityResultLauncher)
                                 }
                             }, 600)
                         } else {
@@ -72,18 +74,18 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
             }
         }
         if (fragment.isAdded) {
-            testList.firstOrNull()?.perform()
+            testList.firstOrNull()?.perform(activityResultLauncher)
         }
     }
 
-    fun retry() {
+    fun retry(activityResultLauncher: ActivityResultLauncher<Intent>) {
         for (test in testList) {
             test.cancel()
             test.description = null
             test.quickFix = null
             test.status = TroubleshootTest.TestStatus.NOT_STARTED
         }
-        runDiagnostic()
+        runDiagnostic(activityResultLauncher)
     }
 
     fun cancel() {
@@ -92,8 +94,4 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
             test.cancel()
         }
     }
-
-    companion object {
-        const val REQ_CODE_FIX = 9099
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index df1ff80b31..d0415c059c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.RuleKind
@@ -30,7 +32,7 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
                                               private val activeSessionHolder: ActiveSessionHolder)
     : TroubleshootTest(R.string.settings_troubleshoot_test_account_settings_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val defaultRule = session.getPushRules().getAllRules()
                 .find { it.ruleId == RuleIds.RULE_ID_DISABLE_ALL }
@@ -49,11 +51,11 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
                         session.updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled,
                                                            object : MatrixCallback<Unit> {
                                                                override fun onSuccess(data: Unit) {
-                                                                   manager?.retry()
+                                                                   manager?.retry(activityResultLauncher)
                                                                }
 
                                                                override fun onFailure(failure: Throwable) {
-                                                                   manager?.retry()
+                                                                   manager?.retry(activityResultLauncher)
                                                                }
                                                            })
                     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
index 61c2fb120e..0d661e8b16 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestDeviceSettings.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.VectorPreferences
@@ -27,7 +29,7 @@ class TestDeviceSettings @Inject constructor(private val vectorPreferences: Vect
                                              private val stringProvider: StringProvider)
     : TroubleshootTest(R.string.settings_troubleshoot_test_device_settings_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (vectorPreferences.areNotificationEnabledForDevice()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_device_settings_success)
             quickFix = null
@@ -36,7 +38,7 @@ class TestDeviceSettings @Inject constructor(private val vectorPreferences: Vect
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_device_settings_quickfix) {
                 override fun doFix() {
                     vectorPreferences.setNotificationEnabledForDevice(true)
-                    manager?.retry()
+                    manager?.retry(activityResultLauncher)
                 }
             }
             description = stringProvider.getString(R.string.settings_troubleshoot_test_device_settings_failed)
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index 22b2331449..31b4e213ca 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import org.matrix.android.sdk.api.pushrules.RuleIds
 import org.matrix.android.sdk.api.pushrules.getActions
 import im.vector.app.R
@@ -38,7 +40,7 @@ class TestPushRulesSettings @Inject constructor(private val activeSessionHolder:
             R.string.settings_messages_in_one_to_one,
             R.string.settings_messages_in_group_chat)
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val session = activeSessionHolder.getSafeActiveSession() ?: return
         val pushRules = session.getPushRules().getAllRules()
         var oneOrMoreRuleIsOff = false
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
index 92eae017f9..8e64514e7f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationManagerCompat
 import im.vector.app.R
@@ -29,7 +31,7 @@ class TestSystemSettings @Inject constructor(private val context: AppCompatActiv
                                              private val stringProvider: StringProvider)
     : TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (NotificationManagerCompat.from(context).areNotificationsEnabled()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_system_settings_success)
             quickFix = null
@@ -39,7 +41,7 @@ class TestSystemSettings @Inject constructor(private val context: AppCompatActiv
             quickFix = object : TroubleshootQuickFix(R.string.open_settings) {
                 override fun doFix() {
                     if (manager?.diagStatus == TestStatus.RUNNING) return // wait before all is finished
-                    startNotificationSettingsIntent(context, NotificationTroubleshootTestManager.REQ_CODE_FIX)
+                    startNotificationSettingsIntent(context, activityResultLauncher)
                 }
             }
             status = TestStatus.FAILED
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
index 7abec31ae4..f894fcc0ef 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
 import kotlin.properties.Delegates
 
@@ -37,7 +39,7 @@ abstract class TroubleshootTest(@StringRes val titleResId: Int) {
 
     var manager: NotificationTroubleshootTestManager? = null
 
-    abstract fun perform()
+    abstract fun perform(activityResultLauncher: ActivityResultLauncher<Intent>)
 
     fun isFinished(): Boolean = (status == TestStatus.FAILED || status == TestStatus.SUCCESS)
 

From a80f1538c78701726bca740d60cc2ce26e4e45cb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 18:08:37 +0200
Subject: [PATCH 156/278] Cleanup

---
 .../java/im/vector/app/core/platform/VectorBaseActivity.kt   | 3 +--
 .../im/vector/app/features/navigation/DefaultNavigator.kt    | 5 -----
 .../main/java/im/vector/app/features/navigation/Navigator.kt | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index a8e070d79c..cdba5b2ef2 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -18,7 +18,6 @@ package im.vector.app.core.platform
 
 import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Parcelable
@@ -206,7 +205,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
         })
         pinLocker.getLiveState().observeNotNull(this) {
             if (this@VectorBaseActivity !is UnlockedActivity && it == PinLocker.State.LOCKED) {
-                navigator.openPinCode(this, PinMode.AUTH, pinStartForActivityResult)
+                navigator.openPinCode(this, pinStartForActivityResult, PinMode.AUTH)
             }
         }
         sessionListener = vectorComponent.sessionListener()
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 2aaaf0162d..106d804cd3 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -310,11 +310,6 @@ class DefaultNavigator @Inject constructor(
         activityResultLauncher.launch(intent)
     }
 
-    override fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher<Intent>) {
-        val intent = PinActivity.newIntent(activity, PinArgs(pinMode))
-        activityResultLauncher.launch(intent)
-    }
-
     override fun openMediaViewer(activity: Activity,
                                  roomId: String,
                                  mediaData: AttachmentData,
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 81ff798ac8..05cba654f2 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -87,8 +87,6 @@ interface Navigator {
                     activityResultLauncher: ActivityResultLauncher<Intent>,
                     pinMode: PinMode)
 
-    fun openPinCode(activity: Activity, pinMode: PinMode, activityResultLauncher: ActivityResultLauncher<Intent>)
-
     fun openTerms(context: Context,
                   activityResultLauncher: ActivityResultLauncher<Intent>,
                   serviceType: TermsService.ServiceType,

From e224ae62b4c3f00c572b41d987bcadb3ab125bec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 18:27:25 +0200
Subject: [PATCH 157/278] Do not use deprecated Activity.startActivityForResult
 anymore - step 3

---
 .../im/vector/lib/multipicker/AudioPicker.kt  |  2 +-
 .../im/vector/lib/multipicker/CameraPicker.kt | 18 +-----
 .../vector/lib/multipicker/ContactPicker.kt   |  2 +-
 .../im/vector/lib/multipicker/FilePicker.kt   |  2 +-
 .../im/vector/lib/multipicker/ImagePicker.kt  |  2 +-
 .../im/vector/lib/multipicker/MultiPicker.kt  | 21 +++----
 .../java/im/vector/lib/multipicker/Picker.kt  | 13 +----
 .../im/vector/lib/multipicker/VideoPicker.kt  |  2 +-
 .../app/features/debug/DebugMenuActivity.kt   | 41 +++++++-------
 .../preview/AttachmentsPreviewFragment.kt     |  4 ++
 .../features/media/BigImageViewerActivity.kt  | 56 +++++++++++--------
 .../features/qrcode/QrCodeScannerActivity.kt  |  7 ---
 .../roomprofile/RoomProfileFragment.kt        |  7 ++-
 .../settings/VectorSettingsGeneralFragment.kt |  2 +-
 ...rSettingsNotificationPreferenceFragment.kt |  2 +-
 15 files changed, 78 insertions(+), 103 deletions(-)

diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
index e796137af2..516022100d 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -25,7 +25,7 @@ import im.vector.lib.multipicker.entity.MultiPickerAudioType
 /**
  * Audio file picker implementation
  */
-class AudioPicker(override val requestCode: Int) : Picker<MultiPickerAudioType>(requestCode) {
+class AudioPicker : Picker<MultiPickerAudioType>() {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
index 319bc31af9..e70e3c574f 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
@@ -33,24 +33,10 @@ import java.util.Locale
 /**
  * Implementation of taking a photo with Camera
  */
-class CameraPicker(val requestCode: Int) {
+class CameraPicker {
 
     /**
-     * Start camera by using an Activity
-     * @param activity Activity to handle onActivityResult().
-     * @return Uri of taken photo or null if the operation is cancelled.
-     */
-    fun startWithExpectingFile(activity: Activity): Uri? {
-        val photoUri = createPhotoUri(activity)
-        val intent = createIntent().apply {
-            putExtra(MediaStore.EXTRA_OUTPUT, photoUri)
-        }
-        activity.startActivityForResult(intent, requestCode)
-        return photoUri
-    }
-
-    /**
-     * Start camera by using a Fragment
+     * Start camera by using a ActivityResultLauncher
      * @return Uri of taken photo or null if the operation is cancelled.
      */
     fun startWithExpectingFile(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>): Uri? {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
index 5eb8a98999..315fe6cbf2 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
@@ -25,7 +25,7 @@ import im.vector.lib.multipicker.entity.MultiPickerContactType
 /**
  * Contact Picker implementation
  */
-class ContactPicker(override val requestCode: Int) : Picker<MultiPickerContactType>(requestCode) {
+class ContactPicker : Picker<MultiPickerContactType>() {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
index 7510d06b2b..39bd93d03e 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -24,7 +24,7 @@ import im.vector.lib.multipicker.entity.MultiPickerFileType
 /**
  * Implementation of selecting any type of files
  */
-class FilePicker(override val requestCode: Int) : Picker<MultiPickerFileType>(requestCode) {
+class FilePicker : Picker<MultiPickerFileType>() {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
index 054bfba365..ce73058039 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -25,7 +25,7 @@ import im.vector.lib.multipicker.utils.ImageUtils
 /**
  * Image Picker implementation
  */
-class ImagePicker(override val requestCode: Int) : Picker<MultiPickerImageType>(requestCode) {
+class ImagePicker : Picker<MultiPickerImageType>() {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
index d28dcf9586..7e639a9bd3 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
@@ -26,23 +26,16 @@ class MultiPicker<T> {
         val CONTACT by lazy { MultiPicker<ContactPicker>() }
         val CAMERA by lazy { MultiPicker<CameraPicker>() }
 
-        const val REQUEST_CODE_PICK_IMAGE = 5000
-        const val REQUEST_CODE_PICK_VIDEO = 5001
-        const val REQUEST_CODE_PICK_FILE = 5002
-        const val REQUEST_CODE_PICK_AUDIO = 5003
-        const val REQUEST_CODE_PICK_CONTACT = 5004
-        const val REQUEST_CODE_TAKE_PHOTO = 5005
-
         @Suppress("UNCHECKED_CAST")
         fun <T> get(type: MultiPicker<T>): T {
             return when (type) {
-                IMAGE -> ImagePicker(REQUEST_CODE_PICK_IMAGE) as T
-                VIDEO -> VideoPicker(REQUEST_CODE_PICK_VIDEO) as T
-                FILE  -> FilePicker(REQUEST_CODE_PICK_FILE) as T
-                AUDIO  -> AudioPicker(REQUEST_CODE_PICK_AUDIO) as T
-                CONTACT  -> ContactPicker(REQUEST_CODE_PICK_CONTACT) as T
-                CAMERA  -> CameraPicker(REQUEST_CODE_TAKE_PHOTO) as T
-                else  -> throw IllegalArgumentException("Unsupported type $type")
+                IMAGE   -> ImagePicker() as T
+                VIDEO   -> VideoPicker() as T
+                FILE    -> FilePicker() as T
+                AUDIO   -> AudioPicker() as T
+                CONTACT -> ContactPicker() as T
+                CAMERA  -> CameraPicker() as T
+                else    -> throw IllegalArgumentException("Unsupported type $type")
             }
         }
     }
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
index 33da23e2b6..ba765a3b1d 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
@@ -27,7 +26,7 @@ import androidx.activity.result.ActivityResultLauncher
 /**
  * Abstract class to provide all types of Pickers
  */
-abstract class Picker<T>(open val requestCode: Int) {
+abstract class Picker<T> {
 
     protected var single = false
 
@@ -73,15 +72,7 @@ abstract class Picker<T>(open val requestCode: Int) {
     abstract fun createIntent(): Intent
 
     /**
-     * Start Storage Access Framework UI by using an Activity.
-     * @param activity Activity to handle onActivityResult().
-     */
-    fun startWith(activity: Activity) {
-        activity.startActivityForResult(createIntent().apply { addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) }, requestCode)
-    }
-
-    /**
-     * Start Storage Access Framework UI by using a Fragment.
+     * Start Storage Access Framework UI by using a ActivityResultLauncher.
      * @param activityResultLauncher to handle the result.
      */
     fun startWith(activityResultLauncher: ActivityResultLauncher<Intent>) {
diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
index c1d1f74aab..c7c06f795f 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -25,7 +25,7 @@ import im.vector.lib.multipicker.entity.MultiPickerVideoType
 /**
  * Video Picker implementation
  */
-class VideoPicker(override val requestCode: Int) : Picker<MultiPickerVideoType>(requestCode) {
+class VideoPicker : Picker<MultiPickerVideoType>() {
 
     /**
      * Call this function from onActivityResult(int, int, Intent).
diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 5590e19c10..9cca462d1a 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -28,6 +28,7 @@ import butterknife.OnClick
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
 import im.vector.app.core.utils.PERMISSION_REQUEST_CODE_LAUNCH_CAMERA
@@ -196,33 +197,29 @@ class DebugMenuActivity : VectorBaseActivity() {
     }
 
     private fun doScanQRCode() {
-        QrCodeScannerActivity.startForResult(this)
+        QrCodeScannerActivity.startForResult(this, qrStartForActivityResult)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                QrCodeScannerActivity.QR_CODE_SCANNER_REQUEST_CODE -> {
-                    toast("QrCode: " + QrCodeScannerActivity.getResultText(data) + " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(data))
+    private val qrStartForActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            toast("QrCode: " + QrCodeScannerActivity.getResultText(activityResult.data)
+                    + " is QRCode: " + QrCodeScannerActivity.getResultIsQrCode(activityResult.data))
 
-                    // Also update the current QR Code (reverse operation)
-                    // renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "")
-                    val result = QrCodeScannerActivity.getResultText(data)!!
+            // Also update the current QR Code (reverse operation)
+            // renderQrCode(QrCodeScannerActivity.getResultText(data) ?: "")
+            val result = QrCodeScannerActivity.getResultText(activityResult.data)!!
 
-                    val qrCodeData = result.toQrCodeData()
-                    Timber.e("qrCodeData: $qrCodeData")
+            val qrCodeData = result.toQrCodeData()
+            Timber.e("qrCodeData: $qrCodeData")
 
-                    if (result.length != buffer.size) {
-                        Timber.e("Error, length are not the same")
-                    } else {
-                        // Convert to ByteArray
-                        val byteArrayResult = result.toByteArray(Charsets.ISO_8859_1)
-                        for (i in byteArrayResult.indices) {
-                            if (buffer[i] != byteArrayResult[i]) {
-                                Timber.e("Error for byte $i, expecting ${buffer[i]} and get ${byteArrayResult[i]}")
-                            }
-                        }
+            if (result.length != buffer.size) {
+                Timber.e("Error, length are not the same")
+            } else {
+                // Convert to ByteArray
+                val byteArrayResult = result.toByteArray(Charsets.ISO_8859_1)
+                for (i in byteArrayResult.indices) {
+                    if (buffer[i] != byteArrayResult[i]) {
+                        Timber.e("Error for byte $i, expecting ${buffer[i]} and get ${byteArrayResult[i]}")
                     }
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
index 387cfb2261..f6a6e3abcf 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -81,6 +81,10 @@ class AttachmentsPreviewFragment @Inject constructor(
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // TODO handle this one (Ucrop lib)
+        @Suppress("DEPRECATION")
+        super.onActivityResult(requestCode, resultCode, data)
+
         if (resultCode == RESULT_OK) {
             if (requestCode == UCrop.REQUEST_CROP && data != null) {
                 Timber.v("Crop success")
diff --git a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
index 04fd6e3850..81d6f1f996 100644
--- a/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BigImageViewerActivity.kt
@@ -30,6 +30,7 @@ import com.yalantis.ucrop.UCrop
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
@@ -112,10 +113,10 @@ class BigImageViewerActivity : VectorBaseActivity() {
     private fun onAvatarTypeSelected(isCamera: Boolean) {
         if (isCamera) {
             if (checkPermissions(PERMISSIONS_FOR_TAKING_PHOTO, this, PERMISSION_REQUEST_CODE_LAUNCH_CAMERA)) {
-                avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this)
+                avatarCameraUri = MultiPicker.get(MultiPicker.CAMERA).startWithExpectingFile(this, takePhotoActivityResultLauncher)
             }
         } else {
-            MultiPicker.get(MultiPicker.IMAGE).single().startWith(this)
+            MultiPicker.get(MultiPicker.IMAGE).single().startWith(pickImageActivityResultLauncher)
         }
     }
 
@@ -127,30 +128,39 @@ class BigImageViewerActivity : VectorBaseActivity() {
                 .start(this)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (resultCode == Activity.RESULT_OK) {
-            when (requestCode) {
-                MultiPicker.REQUEST_CODE_TAKE_PHOTO -> {
-                    avatarCameraUri?.let { uri ->
-                        MultiPicker.get(MultiPicker.CAMERA)
-                                .getTakenPhoto(this, uri)
-                                ?.let {
-                                    onRoomAvatarSelected(it)
-                                }
-                    }
-                }
-                MultiPicker.REQUEST_CODE_PICK_IMAGE -> {
-                    MultiPicker
-                            .get(MultiPicker.IMAGE)
-                            .getSelectedFiles(this, data)
-                            .firstOrNull()?.let {
-                                onRoomAvatarSelected(it)
-                            }
-                }
-                UCrop.REQUEST_CROP                  -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
+    private val takePhotoActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            avatarCameraUri?.let { uri ->
+                MultiPicker.get(MultiPicker.CAMERA)
+                        .getTakenPhoto(this, uri)
+                        ?.let {
+                            onRoomAvatarSelected(it)
+                        }
             }
         }
+    }
+
+    private val pickImageActivityResultLauncher = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            MultiPicker
+                    .get(MultiPicker.IMAGE)
+                    .getSelectedFiles(this, activityResult.data)
+                    .firstOrNull()?.let {
+                        onRoomAvatarSelected(it)
+                    }
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // TODO handle this one (Ucrop lib)
+        @Suppress("DEPRECATION")
         super.onActivityResult(requestCode, resultCode, data)
+
+        if (resultCode == Activity.RESULT_OK) {
+            when (requestCode) {
+                UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
+            }
+        }
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
diff --git a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
index 563f9c65fa..8a5126a160 100644
--- a/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/qrcode/QrCodeScannerActivity.kt
@@ -75,13 +75,6 @@ class QrCodeScannerActivity : VectorBaseActivity() {
         private const val EXTRA_OUT_TEXT = "EXTRA_OUT_TEXT"
         private const val EXTRA_OUT_IS_QR_CODE = "EXTRA_OUT_IS_QR_CODE"
 
-        const val QR_CODE_SCANNER_REQUEST_CODE = 429
-
-        // For test only
-        fun startForResult(activity: Activity, requestCode: Int = QR_CODE_SCANNER_REQUEST_CODE) {
-            activity.startActivityForResult(Intent(activity, QrCodeScannerActivity::class.java), requestCode)
-        }
-
         fun startForResult(activity: Activity, activityResultLauncher: ActivityResultLauncher<Intent>) {
             activityResultLauncher.launch(Intent(activity, QrCodeScannerActivity::class.java))
         }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 2b67624ed1..399c1ecf32 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -345,14 +345,15 @@ class RoomProfileFragment @Inject constructor(
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // TODO handle this one (Ucrop lib)
+        @Suppress("DEPRECATION")
+        super.onActivityResult(requestCode, resultCode, data)
+
         if (resultCode == Activity.RESULT_OK) {
             when (requestCode) {
                 UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
             }
         }
-        // TODO handle this one (Ucrop lib)
-        @Suppress("DEPRECATION")
-        super.onActivityResult(requestCode, resultCode, data)
     }
 
     private fun onAvatarCropped(uri: Uri?) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 9928325289..3f7ddbb9c8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -304,12 +304,12 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        // TODO handle this one (Ucrop lib)
         @Suppress("DEPRECATION")
         super.onActivityResult(requestCode, resultCode, data)
 
         if (resultCode == Activity.RESULT_OK) {
             when (requestCode) {
-                // TODO Migrate this too
                 UCrop.REQUEST_CROP -> data?.let { onAvatarCropped(UCrop.getOutput(it)) }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index 5f3a0e32ca..fdff5253d5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -128,7 +128,7 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
             // Even if using foreground service with foreground notif, it stops to work
             // in doze mode for certain devices :/
             if (!isIgnoringBatteryOptimizations(requireContext())) {
-                requestDisablingBatteryOptimization(requireActivity(), batteryStartForActivityResult, 0)
+                requestDisablingBatteryOptimization(requireActivity(), batteryStartForActivityResult)
             }
         }
         vectorPreferences.setFdroidSyncBackgroundMode(mode)

From e67fe1476c2f401d724c1f91fce6d0c957f5a264 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 18:51:51 +0200
Subject: [PATCH 158/278] Fix the latest warning \o/

---
 .../crypto/quads/SharedSecureStorageActivity.kt | 17 ++++++++++++++---
 .../features/settings/VectorSettingsActivity.kt |  3 ++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
index 42d000ecc3..2abad9dd38 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/quads/SharedSecureStorageActivity.kt
@@ -24,6 +24,8 @@ import android.os.Parcelable
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentOnAttachListener
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
 import im.vector.app.R
@@ -38,7 +40,10 @@ import kotlinx.android.synthetic.main.activity.*
 import javax.inject.Inject
 import kotlin.reflect.KClass
 
-class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSheetDialogFragment.ResultListener {
+class SharedSecureStorageActivity :
+        SimpleFragmentActivity(),
+        VectorBaseBottomSheetDialogFragment.ResultListener,
+        FragmentOnAttachListener {
 
     @Parcelize
     data class Args(
@@ -58,6 +63,8 @@ class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSh
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        supportFragmentManager.addFragmentOnAttachListener(this)
+
         toolbar.visibility = View.GONE
 
         viewModel.observeViewEvents { observeViewEvents(it) }
@@ -65,6 +72,11 @@ class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSh
         viewModel.subscribe(this) { renderState(it) }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        supportFragmentManager.removeFragmentOnAttachListener(this)
+    }
+
     override fun onBackPressed() {
         viewModel.handle(SharedSecureStorageAction.Back)
     }
@@ -119,8 +131,7 @@ class SharedSecureStorageActivity : SimpleFragmentActivity(), VectorBaseBottomSh
         }
     }
 
-    override fun onAttachFragment(fragment: Fragment) {
-        super.onAttachFragment(fragment)
+    override fun onAttachFragment(fragmentManager: FragmentManager, fragment: Fragment) {
         if (fragment is VectorBaseBottomSheetDialogFragment) {
             fragment.resultListener = this
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 50692ef255..8bea54fcbe 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -107,7 +107,8 @@ class VectorSettingsActivity : VectorBaseActivity(),
         }
 
         if (oFragment != null) {
-            oFragment.setTargetFragment(caller, 0)
+            // Deprecated, I comment it, I think it is useless
+            // oFragment.setTargetFragment(caller, 0)
             // Replace the existing Fragment with the new Fragment
             supportFragmentManager.beginTransaction()
                     .setCustomAnimations(R.anim.right_in, R.anim.fade_out, R.anim.fade_in, R.anim.right_out)

From f7e040efd2b5287a0ba15820d8a6ad923a15fc19 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 19:08:00 +0200
Subject: [PATCH 159/278] F-Droid compilation

---
 .../features/settings/troubleshoot/TestAutoStartBoot.kt    | 6 ++++--
 .../settings/troubleshoot/TestBackgroundRestrictions.kt    | 4 +++-
 .../settings/troubleshoot/TestBatteryOptimization.kt       | 7 ++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
index b7834ecf45..e46a07f712 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.fdroid.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.VectorPreferences
@@ -28,7 +30,7 @@ class TestAutoStartBoot @Inject constructor(private val vectorPreferences: Vecto
                                             private val stringProvider: StringProvider)
     : TroubleshootTest(R.string.settings_troubleshoot_test_service_boot_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (vectorPreferences.autoStartOnBoot()) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_service_boot_success)
             status = TestStatus.SUCCESS
@@ -38,7 +40,7 @@ class TestAutoStartBoot @Inject constructor(private val vectorPreferences: Vecto
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_service_boot_quickfix) {
                 override fun doFix() {
                     vectorPreferences.setAutoStartOnBoot(true)
-                    manager?.retry()
+                    manager?.retry(activityResultLauncher)
                 }
             }
             status = TestStatus.FAILED
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
index 3e053d7fec..abdd696724 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt
@@ -15,7 +15,9 @@
  */
 package im.vector.app.fdroid.features.settings.troubleshoot
 
+import android.content.Intent
 import android.net.ConnectivityManager
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.getSystemService
 import androidx.core.net.ConnectivityManagerCompat
@@ -28,7 +30,7 @@ class TestBackgroundRestrictions @Inject constructor(private val context: AppCom
                                                      private val stringProvider: StringProvider)
     : TroubleshootTest(R.string.settings_troubleshoot_test_bg_restricted_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         context.getSystemService<ConnectivityManager>()!!.apply {
             // Checks if the device is on a metered network
             if (isActiveNetworkMetered) {
diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
index 510ade0a33..b1eeae6681 100644
--- a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
+++ b/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt
@@ -15,12 +15,13 @@
  */
 package im.vector.app.fdroid.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.isIgnoringBatteryOptimizations
 import im.vector.app.core.utils.requestDisablingBatteryOptimization
-import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import javax.inject.Inject
 
@@ -29,7 +30,7 @@ class TestBatteryOptimization @Inject constructor(
         private val stringProvider: StringProvider
 ) : TroubleshootTest(R.string.settings_troubleshoot_test_battery_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         if (isIgnoringBatteryOptimizations(context)) {
             description = stringProvider.getString(R.string.settings_troubleshoot_test_battery_success)
             status = TestStatus.SUCCESS
@@ -38,7 +39,7 @@ class TestBatteryOptimization @Inject constructor(
             description = stringProvider.getString(R.string.settings_troubleshoot_test_battery_failed)
             quickFix = object : TroubleshootQuickFix(R.string.settings_troubleshoot_test_battery_quickfix) {
                 override fun doFix() {
-                    requestDisablingBatteryOptimization(context, null, NotificationTroubleshootTestManager.REQ_CODE_FIX)
+                    requestDisablingBatteryOptimization(context, activityResultLauncher)
                 }
             }
             status = TestStatus.FAILED

From 573ec29829ffe64d3bf7acd897d7355f06a1b027 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 7 Oct 2020 19:10:53 +0200
Subject: [PATCH 160/278] ktlint cleanup

---
 .../src/main/java/im/vector/lib/multipicker/CameraPicker.kt   | 1 -
 .../gplay/features/settings/troubleshoot/TestFirebaseToken.kt | 1 -
 .../java/im/vector/app/core/utils/ExternalApplicationsUtil.kt | 1 -
 .../crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt   | 1 -
 .../features/crypto/verification/VerificationBottomSheet.kt   | 1 -
 .../app/features/discovery/DiscoverySettingsFragment.kt       | 1 -
 .../app/features/home/room/detail/RoomDetailFragment.kt       | 3 +--
 .../main/java/im/vector/app/features/navigation/Navigator.kt  | 1 -
 .../app/features/settings/VectorSettingsGeneralFragment.kt    | 4 ++--
 .../settings/VectorSettingsNotificationPreferenceFragment.kt  | 1 -
 .../settings/VectorSettingsSecurityPrivacyFragment.kt         | 3 ++-
 11 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
index e70e3c574f..3f24a28c28 100644
--- a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
+++ b/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
@@ -16,7 +16,6 @@
 
 package im.vector.lib.multipicker
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
index 46bdb7967a..32888dafd7 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
@@ -22,7 +22,6 @@ import com.google.firebase.iid.FirebaseInstanceId
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.startAddGoogleAccountIntent
-import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
 import timber.log.Timber
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 8c415c7184..1e19a1231a 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -37,7 +37,6 @@ import androidx.browser.customtabs.CustomTabsSession
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.content.getSystemService
-import androidx.fragment.app.Fragment
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index d357625bcc..78471c6848 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -16,7 +16,6 @@
 package im.vector.app.features.crypto.keysbackup.setup
 
 import android.app.Activity
-import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index d91194e002..35ea96de6f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -17,7 +17,6 @@ package im.vector.app.features.crypto.verification
 
 import android.app.Activity
 import android.app.Dialog
-import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.KeyEvent
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 7dd32a7cd0..145dfc56c3 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -36,7 +36,6 @@ import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
-import timber.log.Timber
 import javax.inject.Inject
 
 class DiscoverySettingsFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 61041aa70f..66e49cf060 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -361,7 +361,7 @@ class RoomDetailFragment @Inject constructor(
             }.exhaustive
         }
 
-        if(savedInstanceState == null) {
+        if (savedInstanceState == null) {
             handleShareData()
         }
     }
@@ -798,7 +798,6 @@ class RoomDetailFragment @Inject constructor(
         }
     }
 
-
     private fun safeStartCall2(isVideoCall: Boolean) {
         val startCallAction = RoomDetailAction.StartCall(isVideoCall)
         roomDetailViewModel.pendingAction = startCallAction
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 05cba654f2..1d01a5e4f0 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -24,7 +24,6 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.util.Pair
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.media.AttachmentData
-import im.vector.app.features.pin.PinActivity
 import im.vector.app.features.pin.PinMode
 import im.vector.app.features.roomdirectory.roompreview.RoomPreviewData
 import im.vector.app.features.settings.VectorSettingsActivity
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index 3f7ddbb9c8..dfae073e7e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -279,7 +279,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         session.integrationManagerService().removeListener(integrationServiceListener)
     }
 
-    private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult {activityResult ->
+    private val attachmentPhotoActivityResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
             avatarCameraUri?.let { uri ->
                 MultiPicker.get(MultiPicker.CAMERA)
@@ -291,7 +291,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
         }
     }
 
-    private val attachmentImageActivityResultLauncher = registerStartForActivityResult {activityResult ->
+    private val attachmentImageActivityResultLauncher = registerStartForActivityResult { activityResult ->
         val data = activityResult.data ?: return@registerStartForActivityResult
         if (activityResult.resultCode == Activity.RESULT_OK) {
             MultiPicker
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
index fdff5253d5..4bee1ac0c8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationPreferenceFragment.kt
@@ -119,7 +119,6 @@ class VectorSettingsNotificationPreferenceFragment @Inject constructor(
         // Noop
     }
 
-
     // BackgroundSyncModeChooserDialog.InteractionListener
     override fun onOptionSelected(mode: BackgroundSyncMode) {
         // option has change, need to act
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 39120f1157..457fc00273 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -322,7 +322,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
 
     private val saveMegolmStartForActivityResult = registerStartForActivityResult {
         val uri = it.data?.data ?: return@registerStartForActivityResult
-        if (it.resultCode == Activity.RESULT_OK)
+        if (it.resultCode == Activity.RESULT_OK) {
             ExportKeysDialog().show(requireActivity(), object : ExportKeysDialog.ExportKeyDialogListener {
                 override fun onPassphrase(passphrase: String) {
                     displayLoadingView()
@@ -347,6 +347,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
                                     })
                 }
             })
+        }
     }
 
     private val pinActivityResultLauncher = registerStartForActivityResult {

From efa7c66d98912f9166d6f91b9b8e8d93bb659ce4 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Thu, 8 Oct 2020 00:56:36 +0200
Subject: [PATCH 161/278] Skip conversion to radians

---
 .../room/detail/composer/rainbow/RainbowGenerator.kt  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
index 7a64d437c5..7f9e40f218 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/rainbow/RainbowGenerator.kt
@@ -31,7 +31,7 @@ class RainbowGenerator @Inject constructor() {
 
     fun generate(text: String): String {
         val split = text.splitEmoji()
-        val frequency = 360.0 / split.size
+        val frequency = 2 * Math.PI / split.size
 
         return split
                 .mapIndexed { idx, letter ->
@@ -48,21 +48,21 @@ class RainbowGenerator @Inject constructor() {
     }
 
     private fun generateAB(hue: Double, chroma: Float): Pair<Double, Double> {
-        val radians = Math.toRadians(hue)
-
-        val a = chroma * 127 * cos(radians)
-        val b = chroma * 127 * sin(radians)
+        val a = chroma * 127 * cos(hue)
+        val b = chroma * 127 * sin(hue)
 
         return Pair(a, b)
     }
 
     private fun labToRGB(l: Int, a: Double, b: Double): RgbColor {
+        // Convert CIELAB to CIEXYZ (D65)
         var y = (l + 16) / 116.0
         val x = adjustXYZ(y + a / 500) * 0.9505
         val z = adjustXYZ(y - b / 200) * 1.0890
 
         y = adjustXYZ(y)
 
+        // Linear transformation from CIEXYZ to RGB
         val red = 3.24096994 * x - 1.53738318 * y - 0.49861076 * z
         val green = -0.96924364 * x + 1.8759675 * y + 0.04155506 * z
         val blue = 0.05563008 * x - 0.20397696 * y + 1.05697151 * z
@@ -78,6 +78,7 @@ class RainbowGenerator @Inject constructor() {
     }
 
     private fun gammaCorrection(value: Double): Double {
+        // Non-linear transformation to sRGB
         if (value <= 0.0031308) {
             return 12.92 * value
         }

From e846e30905cd4df3c68517ce7e126ffbb47faf76 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 09:22:55 +0200
Subject: [PATCH 162/278] Lint: fixes 80 UseAppTint issues

---
 .../res/layout/bottom_sheet_bootstrap.xml     |  5 ++--
 .../layout/bottom_sheet_save_recovery_key.xml |  7 +++--
 ...constraint_set_composer_layout_compact.xml | 21 +++++++------
 ...onstraint_set_composer_layout_expanded.xml | 20 ++++++++-----
 .../custom_action_item_layout_badge.xml       |  5 ++--
 .../res/layout/dialog_change_password.xml     |  3 +-
 .../res/layout/dialog_disclaimer_content.xml  |  3 +-
 .../res/layout/dialog_export_e2e_keys.xml     |  6 ++--
 .../res/layout/dialog_import_e2e_keys.xml     |  5 ++--
 .../res/layout/dialog_prompt_password.xml     |  5 ++--
 .../layout/dialog_recovery_key_saved_info.xml |  4 ++-
 ...gment_bootstrap_enter_account_password.xml |  5 ++--
 .../fragment_bootstrap_enter_passphrase.xml   |  5 ++--
 .../fragment_bootstrap_migrate_backup.xml     |  5 ++--
 .../layout/fragment_deactivate_account.xml    |  5 ++--
 .../main/res/layout/fragment_home_drawer.xml  |  5 ++--
 .../fragment_keys_backup_restore_from_key.xml | 10 ++++---
 ...nt_keys_backup_restore_from_passphrase.xml | 10 ++++---
 .../fragment_keys_backup_restore_success.xml  |  5 ++--
 .../fragment_keys_backup_setup_step1.xml      |  5 ++--
 .../fragment_keys_backup_setup_step2.xml      |  5 ++--
 .../fragment_keys_backup_setup_step3.xml      |  4 ++-
 vector/src/main/res/layout/fragment_login.xml | 10 ++++---
 .../layout/fragment_login_reset_password.xml  |  5 ++--
 .../fragment_login_server_selection.xml       | 10 ++++---
 .../layout/fragment_login_server_url_form.xml |  3 +-
 ...fragment_login_signup_signin_selection.xml |  5 ++--
 .../main/res/layout/fragment_login_splash.xml | 19 +++++++-----
 .../layout/fragment_ssss_access_from_key.xml  |  5 ++--
 .../fragment_ssss_access_from_passphrase.xml  | 10 ++++---
 .../res/layout/item_bottom_sheet_action.xml   | 10 ++++---
 .../layout/item_bottom_sheet_room_preview.xml |  5 ++--
 .../layout/item_create_direct_room_user.xml   |  5 ++--
 vector/src/main/res/layout/item_group.xml     |  5 ++--
 .../src/main/res/layout/item_help_footer.xml  |  5 ++--
 .../src/main/res/layout/item_known_user.xml   |  5 ++--
 .../res/layout/item_login_password_form.xml   |  5 ++--
 vector/src/main/res/layout/item_policy.xml    |  5 ++--
 .../main/res/layout/item_profile_action.xml   |  5 ++--
 .../res/layout/item_profile_matrix_item.xml   |  5 ++--
 .../item_profile_matrix_item_progress.xml     |  5 ++--
 vector/src/main/res/layout/item_room.xml      | 10 ++++---
 .../res/layout/item_settings_three_pid.xml    | 10 ++++---
 .../main/res/layout/item_signout_action.xml   |  5 +++-
 .../item_timeline_event_poll_result_item.xml  |  4 ++-
 .../layout/item_timeline_event_poll_stub.xml  |  4 ++-
 vector/src/main/res/layout/item_tos.xml       |  5 ++--
 .../src/main/res/layout/item_uploads_file.xml | 15 ++++++----
 .../res/layout/item_verification_action.xml   | 10 ++++---
 .../res/layout/item_verification_wait.xml     | 11 ++++---
 .../main/res/layout/merge_composer_layout.xml |  4 +--
 .../layout/merge_image_attachment_overlay.xml | 15 ++++++----
 .../main/res/layout/view_call_controls.xml    | 30 +++++++++----------
 vector/src/main/res/layout/view_file_icon.xml |  6 ++--
 .../res/layout/view_keys_backup_banner.xml    |  5 ++--
 vector/src/main/res/layout/view_state.xml     |  5 ++--
 56 files changed, 251 insertions(+), 163 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 0011bf1987..d3dfe09842 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -24,9 +24,10 @@
             android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_security_key_24dp"
-            android:tint="?riotx_text_primary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/bootstrapTitleText"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 4f528e6ef4..e25b86bcd6 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -46,7 +47,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
             android:src="@drawable/ic_material_share"
-            android:tint="?colorAccent" />
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -76,7 +78,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
             android:src="@drawable/ic_material_save"
-            android:tint="?colorAccent" />
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
index 9b84f0292f..ac67db6a64 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
@@ -75,11 +75,11 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="38dp"
         android:alpha="0"
-        android:tint="?riotx_text_primary"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_edit" />
+        tools:ignore="MissingConstraints,MissingPrefix"
+        tools:src="@drawable/ic_edit"
+        app:tint="?riotx_text_primary" />
 
 
     <ImageButton
@@ -88,11 +88,12 @@
         android:layout_height="22dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_close_round"
-        android:tint="@color/riotx_notice"
+        app:tint="@color/riotx_notice"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintStart_toEndOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/composer_avatar_view"
@@ -130,10 +131,11 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_attachment"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintStart_toEndOf="@id/composerEditText" />
+        app:layout_constraintStart_toEndOf="@id/composerEditText"
+        tools:ignore="MissingPrefix" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/composer_preview_barrier"
@@ -151,10 +153,11 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_send"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/attachmentButton" />
+        app:layout_constraintStart_toEndOf="@id/attachmentButton"
+        tools:ignore="MissingPrefix" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index 00f1830b1d..cd4d48c056 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -79,12 +79,13 @@
         android:layout_marginTop="6dp"
         android:layout_marginBottom="38dp"
         android:alpha="1"
-        android:tint="?riotx_text_primary"
         android:visibility="visible"
         app:layout_constraintEnd_toEndOf="@id/composer_related_message_avatar_view"
         app:layout_constraintStart_toStartOf="@id/composer_related_message_avatar_view"
         app:layout_constraintTop_toBottomOf="@id/composer_related_message_avatar_view"
-        tools:src="@drawable/ic_edit" />
+        tools:src="@drawable/ic_edit"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 
     <ImageButton
@@ -93,10 +94,11 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_close_round"
-        android:tint="@color/riotx_notice"
+        app:tint="@color/riotx_notice"
         app:layout_constraintBottom_toBottomOf="@id/composer_related_message_preview"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/composer_related_message_preview" />
+        app:layout_constraintTop_toTopOf="@id/composer_related_message_preview"
+        tools:ignore="MissingPrefix" />
 
 
     <ImageView
@@ -136,9 +138,10 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_attachment"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintTop_toBottomOf="parent" />
+        app:layout_constraintTop_toBottomOf="parent"
+        tools:ignore="MissingPrefix" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/composer_preview_barrier"
@@ -156,12 +159,13 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_send"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/composerEditText"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
-        app:layout_constraintVertical_bias="1" />
+        app:layout_constraintVertical_bias="1"
+        tools:ignore="MissingPrefix" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index f47eaa5d1a..4d1d398559 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -13,11 +13,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_integrations"
-        android:tint="@color/riotx_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/riotx_accent"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/cart_badge"
diff --git a/vector/src/main/res/layout/dialog_change_password.xml b/vector/src/main/res/layout/dialog_change_password.xml
index c1213aacfd..afcb4047c4 100644
--- a/vector/src/main/res/layout/dialog_change_password.xml
+++ b/vector/src/main/res/layout/dialog_change_password.xml
@@ -29,7 +29,8 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?attr/colorAccent" />
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index 541b75e7c7..89fa1395b9 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -26,7 +26,8 @@
             android:layout_height="wrap_content"
             android:layout_margin="32dp"
             android:src="@drawable/ic_arrow_right"
-            android:tint="?riotx_text_secondary" />
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <ImageView
             android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 67ccd89b11..c9d0ac9c8c 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -27,10 +28,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?attr/colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/exportDialogTil"
-        app:layout_constraintTop_toTopOf="@id/exportDialogTil" />
+        app:layout_constraintTop_toTopOf="@id/exportDialogTil"
+        app:tint="?attr/colorAccent"
+        tools:ignore="MissingPrefix" />
 
 
     <com.google.android.material.textfield.TextInputLayout
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index 8648071d00..dc0e50eaff 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -52,10 +52,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?attr/colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/importDialogTil"
-        app:layout_constraintTop_toTopOf="@id/importDialogTil" />
+        app:layout_constraintTop_toTopOf="@id/importDialogTil"
+        app:tint="?attr/colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/dialog_e2e_keys_import_button"
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 081ce9cdae..8d96d8c68e 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -56,8 +56,9 @@
                 android:background="?attr/selectableItemBackground"
                 android:scaleType="center"
                 android:src="@drawable/ic_eye"
-                android:tint="?attr/colorAccent"
-                tools:contentDescription="@string/a11y_show_password" />
+                tools:contentDescription="@string/a11y_show_password"
+                app:tint="?attr/colorAccent"
+                tools:ignore="MissingPrefix" />
 
         </FrameLayout>
 
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 36c9a68077..b131d45495 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
@@ -28,7 +29,8 @@
                 android:importantForAccessibility="no"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_security_key_24dp"
-                android:tint="?riotx_text_primary" />
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index a0d4960f72..cc1e809a6c 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -51,10 +51,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bootstrapAccountPasswordTil"
-        app:layout_constraintTop_toTopOf="@+id/bootstrapAccountPasswordTil" />
+        app:layout_constraintTop_toTopOf="@+id/bootstrapAccountPasswordTil"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/bootstrapPasswordButton"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 94c8de9650..41b6c9b48c 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -71,10 +71,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
-        app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til" />
+        app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/bootstrapSubmit"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index 720dd80901..770fc405a7 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -71,10 +71,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bootstrapRecoveryKeyEnterTil"
-        app:layout_constraintTop_toTopOf="@+id/bootstrapRecoveryKeyEnterTil" />
+        app:layout_constraintTop_toTopOf="@+id/bootstrapRecoveryKeyEnterTil"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/bootstrapMigrateContinueButton"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index a03f4dba00..db85c607e1 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -86,8 +86,9 @@
                 android:background="?attr/selectableItemBackground"
                 android:scaleType="center"
                 android:src="@drawable/ic_eye"
-                android:tint="?attr/colorAccent"
-                tools:contentDescription="@string/a11y_show_password" />
+                tools:contentDescription="@string/a11y_show_password"
+                app:tint="?attr/colorAccent"
+                tools:ignore="MissingPrefix" />
 
         </FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 12562bc98a..d34ea0b815 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -24,9 +24,10 @@
             android:layout_height="@dimen/layout_touch_size"
             android:scaleType="center"
             android:src="@drawable/ic_settings_x"
-            android:tint="@color/riotx_accent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/riotx_accent"
+            tools:ignore="MissingPrefix" />
 
         <ImageView
             android:id="@+id/homeDrawerHeaderAvatarView"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index cdbc6d11de..10f953bdf5 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -17,10 +17,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
             android:src="@drawable/key_big"
-            android:tint="?riotx_text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_restore_with_key"
@@ -68,10 +69,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_import_black"
-            android:tint="?attr/colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/keys_backup_key_enter_til"
-            app:layout_constraintTop_toTopOf="@id/keys_backup_key_enter_til" />
+            app:layout_constraintTop_toTopOf="@id/keys_backup_key_enter_til"
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_restore_key_help_with_link"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 4a963c590e..ffa1296494 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -17,10 +17,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
             android:src="@drawable/key_big"
-            android:tint="?riotx_text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_backup_restore_with_passphrase"
@@ -68,10 +69,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/keys_backup_passphrase_enter_til"
-            app:layout_constraintTop_toTopOf="@+id/keys_backup_passphrase_enter_til" />
+            app:layout_constraintTop_toTopOf="@+id/keys_backup_passphrase_enter_til"
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_backup_passphrase_help_with_link"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index 9e056aacea..f5ce626c8f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -12,10 +12,11 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="36dp"
         android:src="@drawable/key_big"
-        android:tint="?riotx_text_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/keys_backup_restore_success"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index d9b6275e61..29d2137ddd 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -13,13 +13,14 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
         android:src="@drawable/backup_keys"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.1"
-        app:layout_constraintVertical_chainStyle="spread" />
+        app:layout_constraintVertical_chainStyle="spread"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index fe8db20f4e..6615b845df 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -76,10 +76,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?attr/colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til"
-            app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til" />
+            app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til"
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <im.vector.app.core.ui.views.PasswordStrengthBar
             android:id="@+id/keys_backup_passphrase_security_progress"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 7d3d821daf..2fa2f17a6a 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/keys_backup_root"
     android:layout_width="match_parent"
@@ -20,7 +21,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="60dp"
             android:src="@drawable/backup_keys"
-            android:tint="?riotx_text_primary" />
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 6300d6cb41..ca7d267c80 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -19,8 +19,9 @@
                 android:id="@+id/loginServerIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:tint="?riotx_text_primary"
-                tools:src="@drawable/ic_logo_matrix_org" />
+                tools:src="@drawable/ic_logo_matrix_org"
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
             <TextView
                 android:id="@+id/loginTitle"
@@ -94,8 +95,9 @@
                     android:background="?attr/selectableItemBackground"
                     android:scaleType="center"
                     android:src="@drawable/ic_eye"
-                    android:tint="?attr/colorAccent"
-                    tools:contentDescription="@string/a11y_show_password" />
+                    tools:contentDescription="@string/a11y_show_password"
+                    app:tint="?attr/colorAccent"
+                    tools:ignore="MissingPrefix" />
 
             </FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index 341435bdc4..5da5298b3d 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -84,8 +84,9 @@
                     android:background="?attr/selectableItemBackground"
                     android:scaleType="center"
                     android:src="@drawable/ic_eye"
-                    android:tint="?attr/colorAccent"
-                    tools:contentDescription="@string/a11y_show_password" />
+                    tools:contentDescription="@string/a11y_show_password"
+                    app:tint="?attr/colorAccent"
+                    tools:ignore="MissingPrefix" />
 
             </FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 00fcfa9183..b2046b73ee 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -62,11 +62,12 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_matrix_org"
-                    android:tint="?riotx_text_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:tint="?riotx_text_primary"
+                    tools:ignore="MissingPrefix" />
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
@@ -103,11 +104,12 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_element_matrix_services"
-                    android:tint="?riotx_text_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:tint="?riotx_text_primary"
+                    tools:ignore="MissingPrefix" />
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsText"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 94f724b12a..37122e8e43 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -22,7 +22,8 @@
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_logo_element_matrix_services"
-                android:tint="?riotx_text_primary" />
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index c0efe15074..60887e1e69 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -23,12 +23,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:importantForAccessibility="no"
-                android:tint="?riotx_text_primary"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/loginLogo"
                 tools:src="@drawable/ic_logo_matrix_org"
-                tools:visibility="visible" />
+                tools:visibility="visible"
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix,UnknownId" />
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 62e61a4219..fe845cd20e 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background"
@@ -44,7 +45,8 @@
             android:layout_height="44dp"
             android:layout_marginTop="8dp"
             android:src="@drawable/element_logotype"
-            android:tint="?colorAccent" />
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
     </LinearLayout>
 
@@ -93,9 +95,10 @@
             android:layout_marginStart="2dp"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_message_circle"
-            android:tint="?riotx_text_secondary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText1" />
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText1"
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/loginSplashText1"
@@ -116,9 +119,10 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_lock"
-            android:tint="?riotx_text_secondary"
             app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText2"
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/loginSplashText2"
@@ -139,9 +143,10 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_sliders"
-            android:tint="?riotx_text_secondary"
             app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText3"
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/loginSplashText3"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index bbe9282cc1..8f8cd59eb1 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -16,10 +16,11 @@
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
             android:src="@drawable/ic_security_key_24dp"
-            android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_key"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 09bd823257..3c5ed1c757 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -16,10 +16,11 @@
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
             android:src="@drawable/ic_security_phrase_24dp"
-            android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_passphrase"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
@@ -83,10 +84,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
-            app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til"
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <!--        -->
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 2d10d513ab..8b5716cd8e 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -30,11 +30,12 @@
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/actionStartSpace"
         android:scaleType="center"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/actionStartSpace"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_room_actions_notifications_all" />
+        tools:src="@drawable/ic_room_actions_notifications_all"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/actionTitle"
@@ -61,12 +62,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_check_white_24dp"
-        android:tint="@color/riotx_accent"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="@color/riotx_accent"
+        tools:ignore="MissingPrefix" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index bed1d5eb2f..74781468b2 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -64,9 +64,10 @@
         android:contentDescription="@string/room_list_quick_actions_settings"
         android:scaleType="centerInside"
         android:src="@drawable/ic_room_actions_settings"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar" />
+        app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index fa7e742584..108c02cd02 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -32,8 +32,9 @@
             android:layout_height="40dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_material_done"
-            android:tint="@android:color/white"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
     </FrameLayout>
 
     <TextView
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index c42d1e26e9..d99c990cc7 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -45,10 +45,11 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <View
         android:id="@+id/groupBottomSeparator"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index 7a1db62872..9ea25d99c8 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -12,12 +12,13 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:src="@drawable/ic_idea"
-        android:tint="?attr/riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemHelpText"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?attr/riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/itemHelpText"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 7a77a2667e..c539aaba2e 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -32,8 +32,9 @@
             android:layout_height="40dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_material_done"
-            android:tint="@android:color/white"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
     </FrameLayout>
 
     <TextView
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index 19b0c5452b..75ae10bc36 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -43,8 +43,9 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?attr/colorAccent"
-            tools:contentDescription="@string/a11y_show_password" />
+            tools:contentDescription="@string/a11y_show_password"
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
     </FrameLayout>
 
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index b5a14b27db..fbf5e39987 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -54,9 +54,10 @@
         android:paddingEnd="0dp"
         android:rotationY="@integer/rtl_mirror_flip"
         android:src="@drawable/ic_material_chevron_right_black"
-        android:tint="?riotx_android_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_android_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 6d3ba36d06..c928a5f59b 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -84,11 +84,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 1c84a65691..f35141576c 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -80,10 +80,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 66cff4840e..69e4b40bb4 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -92,11 +92,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_secondary"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 814ef645d7..cdbcaf5757 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -42,8 +42,9 @@
             android:layout_height="56dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_material_done"
-            android:tint="@android:color/white"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
 
     </FrameLayout>
 
@@ -105,12 +106,13 @@
         android:layout_marginEnd="4dp"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
         app:layout_constraintEnd_toStartOf="@+id/roomUnreadCounterBadgeView"
         app:layout_constraintStart_toEndOf="@+id/roomNameView"
         app:layout_constraintTop_toTopOf="@+id/roomNameView"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index fd3443ac17..a175788d86 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -13,11 +13,12 @@
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:scaleType="center"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_phone" />
+        tools:src="@drawable/ic_phone"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/item_settings_three_pid_title"
@@ -39,9 +40,10 @@
         android:layout_height="@dimen/layout_touch_size"
         android:scaleType="center"
         android:src="@drawable/ic_trash_24"
-        android:tint="@color/riotx_destructive_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/riotx_destructive_accent"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_signout_action.xml b/vector/src/main/res/layout/item_signout_action.xml
index 16d10a3ff0..10292beb55 100644
--- a/vector/src/main/res/layout/item_signout_action.xml
+++ b/vector/src/main/res/layout/item_signout_action.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/signedOutActionClickable"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -20,7 +22,8 @@
         android:layout_marginEnd="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_secure_backup"
-        android:tint="?riotx_text_primary" />
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/actionTitleText"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml b/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml
index a7b16fee54..eafd97d4e0 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="40dp"
@@ -15,7 +16,8 @@
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
         android:src="@drawable/ic_check_white_24dp"
-        android:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/pollResultItemLabel"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index ffaddd8739..598b7d2dc1 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -16,7 +17,8 @@
             android:layout_gravity="center"
             android:layout_margin="4dp"
             android:src="@drawable/ic_poll"
-            android:tint="@color/riotx_accent" />
+            app:tint="@color/riotx_accent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/pollLabelText"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index c38a71d23a..b3387991b2 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -46,9 +46,10 @@
         android:layout_height="wrap_content"
         android:rotationY="@integer/rtl_mirror_flip"
         android:src="@drawable/ic_material_chevron_right_black"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index 58edcc78a4..5c40327d95 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -13,10 +13,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:src="@drawable/ic_file"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/uploadsFileTitle"
@@ -55,10 +56,11 @@
         android:layout_height="@dimen/layout_touch_size"
         android:scaleType="center"
         android:src="@drawable/ic_download"
-        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/uploadsFileActionShare"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/uploadsFileActionShare"
@@ -67,9 +69,10 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:scaleType="center"
         android:src="@drawable/ic_material_share"
-        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 263a8ff107..ae49893792 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -20,13 +20,14 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:scaleType="center"
-        android:tint="?riotx_text_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_share"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 
     <TextView
@@ -66,10 +67,11 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:scaleType="center"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_arrow_right" />
+        tools:src="@drawable/ic_arrow_right"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 6cfc497b16..675af87cbf 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationNoticeText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,10 +29,11 @@
         android:layout_marginTop="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_monitor"
-        android:tint="?vctr_notice_secondary"
         app:layout_constraintEnd_toStartOf="@id/smartphoneIcon"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot" />
+        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot"
+        app:tint="?vctr_notice_secondary"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/smartphoneIcon"
@@ -40,10 +42,11 @@
         android:layout_marginTop="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_smartphone"
-        android:tint="?vctr_notice_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/monitorIcon"
-        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot" />
+        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot"
+        app:tint="?vctr_notice_secondary"
+        tools:ignore="MissingPrefix" />
 
 
     <TextView
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index 94a69ed1fa..908b3f009b 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -70,8 +70,8 @@
         android:id="@+id/composer_related_message_action_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:tint="?riotx_text_primary"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints,MissingPrefix"
+        app:tint="?riotx_text_primary" />
 
     <ImageButton
         android:id="@+id/composer_related_message_close"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index b0e769579c..a4bb79fd31 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -28,11 +28,12 @@
         android:focusable="true"
         android:padding="6dp"
         android:scaleType="centerInside"
-        android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
         app:layout_constraintStart_toStartOf="@id/overlayTopBackground"
         app:layout_constraintTop_toTopOf="@id/overlayTopBackground"
-        app:srcCompat="@drawable/ic_back_24dp" />
+        app:srcCompat="@drawable/ic_back_24dp"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/overlayCounterText"
@@ -77,11 +78,12 @@
         android:contentDescription="@string/share"
         android:focusable="true"
         android:padding="6dp"
-        android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
         app:layout_constraintEnd_toEndOf="@id/overlayTopBackground"
         app:layout_constraintTop_toTopOf="@id/overlayTopBackground"
-        app:srcCompat="@drawable/ic_share" />
+        app:srcCompat="@drawable/ic_share"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
 
 
     <androidx.constraintlayout.widget.Group
@@ -111,11 +113,12 @@
         android:focusable="true"
         android:padding="6dp"
         android:scaleType="centerInside"
-        android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayBottomBackground"
         app:layout_constraintStart_toStartOf="@id/overlayBottomBackground"
         app:layout_constraintTop_toTopOf="@id/overlayBottomBackground"
-        app:srcCompat="@drawable/ic_play_arrow" />
+        app:srcCompat="@drawable/ic_play_arrow"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
 
     <SeekBar
         android:id="@+id/overlaySeekBar"
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index 94757c2c72..dd04581d84 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -23,8 +23,8 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call"
-            android:tint="@color/white"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="@color/white" />
 
         <ImageView
             android:id="@+id/iv_icr_end_call"
@@ -36,8 +36,8 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call_end"
-            android:tint="@color/white"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="@color/white" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:layout_width="match_parent"
@@ -68,9 +68,9 @@
             android:focusable="true"
             android:padding="10dp"
             android:src="@drawable/ic_home_bottom_chat"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="?attr/riotx_text_primary" />
 
         <ImageView
             android:id="@+id/iv_mute_toggle"
@@ -81,11 +81,11 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_microphone_off"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
             tools:contentDescription="@string/a11y_mute_microphone"
-            tools:ignore="MissingConstraints"
-            tools:src="@drawable/ic_microphone_on" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            tools:src="@drawable/ic_microphone_on"
+            app:tint="?attr/riotx_text_primary" />
 
         <ImageView
             android:id="@+id/iv_end_call"
@@ -97,8 +97,8 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call_end"
-            android:tint="@color/white"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="@color/white" />
 
         <ImageView
             android:id="@+id/iv_video_toggle"
@@ -109,10 +109,10 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call_videocam_off_default"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
             tools:contentDescription="@string/a11y_stop_camera"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="?attr/riotx_text_primary" />
 
         <ImageView
             android:id="@+id/iv_more"
@@ -124,9 +124,9 @@
             android:focusable="true"
             android:padding="8dp"
             android:src="@drawable/ic_more_vertical"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="?attr/riotx_text_primary" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/view_file_icon.xml b/vector/src/main/res/layout/view_file_icon.xml
index 7648608f25..dab678b5c1 100644
--- a/vector/src/main/res/layout/view_file_icon.xml
+++ b/vector/src/main/res/layout/view_file_icon.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="android.widget.RelativeLayout"
     android:layout_width="50dp"
@@ -18,7 +19,8 @@
         android:layout_height="20dp"
         android:layout_centerInParent="true"
         android:src="@drawable/ic_download"
-        android:tint="?vctr_notice_secondary"
-        tools:src="@drawable/ic_paperclip" />
+        tools:src="@drawable/ic_paperclip"
+        app:tint="?vctr_notice_secondary"
+        tools:ignore="MissingPrefix" />
 
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 7e54823fae..7cd3f3d954 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -14,10 +14,11 @@
         android:layout_height="32dp"
         android:layout_marginStart="19dp"
         android:src="@drawable/ic_secure_backup"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <Space
         android:id="@+id/view_keys_backup_banner_space1"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 082a0bb24c..2d11daadbc 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -73,12 +73,13 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_gravity="center_horizontal"
-            android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_noun_party_popper" />
+            tools:src="@drawable/ic_noun_party_popper"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/emptyMessageView"

From acbd4c3aba145e8d7ab5b742ba9816f1da69b777 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 09:30:25 +0200
Subject: [PATCH 163/278] Lint: fixes UseCompatTextViewDrawableXml issues

---
 vector/lint.xml                                        |  1 +
 vector/src/main/res/layout/dialog_no_sticker_pack.xml  |  5 +++--
 .../res/layout/fragment_bootstrap_enter_passphrase.xml |  6 +++---
 .../res/layout/fragment_bootstrap_setup_recovery.xml   |  4 ++--
 vector/src/main/res/layout/fragment_ssss_reset_all.xml | 10 +++++-----
 .../res/layout/item_bottom_sheet_message_status.xml    |  5 +++--
 vector/src/main/res/layout/item_public_room.xml        |  6 +++---
 vector/src/main/res/layout/item_room_category.xml      |  5 +++--
 vector/src/main/res/layout/item_room_invitation.xml    |  4 ++--
 .../src/main/res/layout/item_timeline_event_create.xml |  5 +++--
 .../res/layout/item_timeline_event_merged_utd_stub.xml |  4 ++--
 .../res/layout/item_timeline_event_redacted_stub.xml   |  4 ++--
 .../layout/item_timeline_event_verification_stub.xml   |  5 +++--
 vector/src/main/res/layout/view_active_call_view.xml   |  4 ++--
 .../main/res/layout/view_active_conference_view.xml    |  4 ++--
 .../src/main/res/layout/view_jump_to_read_marker.xml   |  5 +++--
 16 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/vector/lint.xml b/vector/lint.xml
index bd49091a3f..4ac0f20e51 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -27,6 +27,7 @@
     <issue id="DisableBaselineAlignment" severity="error" />
     <issue id="ScrollViewSize" severity="error" />
     <issue id="NegativeMargin" severity="error" />
+    <issue id="UseCompatTextViewDrawableXml" severity="error" />
 
     <!-- RTL -->
     <issue id="RtlEnabled" severity="error" />
diff --git a/vector/src/main/res/layout/dialog_no_sticker_pack.xml b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
index 427916cd89..1cf225a30f 100644
--- a/vector/src/main/res/layout/dialog_no_sticker_pack.xml
+++ b/vector/src/main/res/layout/dialog_no_sticker_pack.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:drawableBottom="@drawable/stickerpack_rabbit"
     android:drawablePadding="16dp"
     android:gravity="center_horizontal"
     android:maxWidth="300dp"
     android:paddingTop="16dp"
-    android:text="@string/no_sticker_application_dialog_content" />
+    android:text="@string/no_sticker_application_dialog_content"
+    app:drawableBottomCompat="@drawable/stickerpack_rabbit" />
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 41b6c9b48c..5984ba8b86 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -54,12 +54,12 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
-            android:drawableStart="@drawable/ic_alert_triangle"
             android:drawablePadding="4dp"
-            android:drawableTint="@color/riotx_destructive_accent"
             android:gravity="center_vertical"
             android:text="@string/bootstrap_dont_reuse_pwd"
-            android:textSize="12sp" />
+            android:textSize="12sp"
+            app:drawableStartCompat="@drawable/ic_alert_triangle"
+            app:drawableTint="@color/riotx_destructive_accent" />
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
index 14a4b45ded..5c4590dc40 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
@@ -83,8 +83,8 @@
         android:layout_marginEnd="16dp"
         android:text="@string/reset_secure_backup_warning"
         android:textColor="@color/riotx_destructive_accent"
-        android:drawableStart="@drawable/ic_warning_badge"
         android:drawablePadding="4dp"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        app:drawableStartCompat="@drawable/ic_warning_badge" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/fragment_ssss_reset_all.xml b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
index a3b2984bce..d64750eef3 100644
--- a/vector/src/main/res/layout/fragment_ssss_reset_all.xml
+++ b/vector/src/main/res/layout/fragment_ssss_reset_all.xml
@@ -16,16 +16,16 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:drawableStart="@drawable/ic_alert_triangle"
             android:drawablePadding="8dp"
-            android:drawableTint="?riot_primary_text_color"
             android:text="@string/secure_backup_reset_all"
             android:textColor="?riotx_text_primary"
             android:textSize="20sp"
             android:textStyle="bold"
             android:tint="?riot_primary_text_color"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:drawableTint="?riot_primary_text_color"
+            app:drawableStartCompat="@drawable/ic_alert_triangle" />
 
         <TextView
             android:id="@+id/ssss_reset_all_description"
@@ -48,14 +48,14 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
-            android:drawableStart="@drawable/ic_smartphone"
             android:drawablePadding="8dp"
             android:gravity="center_vertical"
             android:textSize="17sp"
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/ssss_reset_all_description"
             tools:text="Show 2 devices you can verify with now"
-            tools:visibility="visible" />
+            tools:visibility="visible"
+            app:drawableStartCompat="@drawable/ic_smartphone" />
 
         <TextView
             android:id="@+id/ssss_reset_text3"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
index 742fa69a7b..fcb373fa0d 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_status.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/messageStatusInfo"
     android:layout_width="match_parent"
@@ -24,10 +25,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_weight="1"
-        android:drawableStart="@drawable/ic_warning_badge"
         android:drawablePadding="4dp"
         android:textColor="?riotx_text_secondary"
         android:textStyle="bold"
-        tools:text="@string/unable_to_send_message" />
+        tools:text="@string/unable_to_send_message"
+        app:drawableStartCompat="@drawable/ic_warning_badge" />
 
 </LinearLayout>
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index ae8287fdc4..bb9d379f31 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -65,9 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:layout_marginEnd="8dp"
-        android:drawableStart="@drawable/ic_user"
         android:drawablePadding="8dp"
-        android:drawableTint="?riotx_text_secondary"
         android:gravity="center_vertical"
         android:minWidth="56dp"
         android:textColor="?riotx_text_secondary"
@@ -75,7 +73,9 @@
         app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
         app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
         app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomTopic"
-        tools:text="148" />
+        tools:text="148"
+        app:drawableTint="?riotx_text_secondary"
+        app:drawableStartCompat="@drawable/ic_user" />
 
     <TextView
         android:id="@+id/itemPublicRoomAlias"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index d27aea5bcf..3454d0119d 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/roomCategoryRootView"
     android:layout_width="match_parent"
@@ -21,14 +22,14 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         tools:drawableEnd="@drawable/ic_expand_more_white"
-        android:drawableTint="?riotx_text_secondary"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:maxLines="1"
         android:textColor="?riotx_text_secondary"
         android:textSize="14sp"
         android:textStyle="bold"
-        tools:text="@string/room_participants_header_direct_chats" />
+        tools:text="@string/room_participants_header_direct_chats"
+        app:drawableTint="?riotx_text_secondary" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomCategoryUnreadCounterBadgeView"
diff --git a/vector/src/main/res/layout/item_room_invitation.xml b/vector/src/main/res/layout/item_room_invitation.xml
index 92660634e0..82b30991c7 100644
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@@ -36,7 +36,6 @@
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
-        android:drawableEnd="@drawable/ic_arrow_right"
         android:drawablePadding="8dp"
         android:duplicateParentState="true"
         android:ellipsize="end"
@@ -49,7 +48,8 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomInvitationAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/matrix.json/data/displayName"
+        app:drawableEndCompat="@drawable/ic_arrow_right" />
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
diff --git a/vector/src/main/res/layout/item_timeline_event_create.xml b/vector/src/main/res/layout/item_timeline_event_create.xml
index 0fd63515d9..adc83066a7 100644
--- a/vector/src/main/res/layout/item_timeline_event_create.xml
+++ b/vector/src/main/res/layout/item_timeline_event_create.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -12,11 +13,11 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
         android:background="?attr/riotx_keys_backup_banner_accent_color"
-        android:drawableStart="@drawable/error"
         android:drawablePadding="16dp"
         android:gravity="center|start"
         android:minHeight="80dp"
         android:padding="16dp"
-        tools:text="This room is continuation…" />
+        tools:text="This room is continuation…"
+        app:drawableStartCompat="@drawable/error" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
index 3f0c269e90..538a8930c4 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_utd_stub.xml
@@ -25,13 +25,13 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginStart="8dp"
-            android:drawableStart="@drawable/ic_clock"
             android:drawablePadding="2dp"
             android:gravity="start"
             android:text="@string/notice_crypto_unable_to_decrypt_merged"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
-            app:drawableTint="?riotx_text_secondary" />
+            app:drawableTint="?riotx_text_secondary"
+            app:drawableStartCompat="@drawable/ic_clock" />
 
 
         <TextView
diff --git a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
index acc60e6590..2e7c29a0fb 100644
--- a/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
@@ -2,10 +2,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:drawableStart="@drawable/ic_trash_16"
     android:drawablePadding="8dp"
     android:gravity="center_vertical"
     android:text="@string/event_redacted"
     android:textColor="?riotx_text_primary_body_contrast"
     android:textSize="14sp"
-    app:drawableTint="?riotx_text_primary_body_contrast" />
\ No newline at end of file
+    app:drawableTint="?riotx_text_primary_body_contrast"
+    app:drawableStartCompat="@drawable/ic_trash_16" />
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
index 41a5c37042..cdfbd0add2 100644
--- a/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_verification_stub.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -11,13 +12,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:drawableStart="@drawable/ic_shield_black"
         android:drawablePadding="6dp"
         android:gravity="center"
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        tools:text="@string/verification_request" />
+        tools:text="@string/verification_request"
+        app:drawableStartCompat="@drawable/ic_shield_black" />
 
 
     <TextView
diff --git a/vector/src/main/res/layout/view_active_call_view.xml b/vector/src/main/res/layout/view_active_call_view.xml
index 5634dcee8f..e8b21de7e8 100644
--- a/vector/src/main/res/layout/view_active_call_view.xml
+++ b/vector/src/main/res/layout/view_active_call_view.xml
@@ -14,7 +14,6 @@
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/returnToCallButton"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/ic_call"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
         android:paddingStart="16dp"
@@ -23,7 +22,8 @@
         android:paddingBottom="12dp"
         android:text="@string/active_call"
         android:textColor="@color/white"
-        app:drawableTint="@color/white" />
+        app:drawableTint="@color/white"
+        app:drawableStartCompat="@drawable/ic_call" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/returnToCallButton"
diff --git a/vector/src/main/res/layout/view_active_conference_view.xml b/vector/src/main/res/layout/view_active_conference_view.xml
index 66a47b728d..a618f36661 100644
--- a/vector/src/main/res/layout/view_active_conference_view.xml
+++ b/vector/src/main/res/layout/view_active_conference_view.xml
@@ -12,7 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/deleteWidgetButton"
-        android:drawableStart="@drawable/ic_call"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
         android:paddingStart="16dp"
@@ -22,7 +21,8 @@
         android:textColor="@color/white"
         android:textColorLink="@color/white"
         app:drawableTint="@color/white"
-        tools:text="@string/ongoing_conference_call" />
+        tools:text="@string/ongoing_conference_call"
+        app:drawableStartCompat="@drawable/ic_call" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/deleteWidgetButton"
diff --git a/vector/src/main/res/layout/view_jump_to_read_marker.xml b/vector/src/main/res/layout/view_jump_to_read_marker.xml
index 019480e6fe..06db3f7af7 100644
--- a/vector/src/main/res/layout/view_jump_to_read_marker.xml
+++ b/vector/src/main/res/layout/view_jump_to_read_marker.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -12,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/closeJumpToReadMarkerView"
         android:background="?attr/selectableItemBackground"
-        android:drawableStart="@drawable/arrow_up_circle"
         android:drawablePadding="10dp"
         android:gravity="center_vertical"
         android:paddingStart="16dp"
@@ -20,7 +20,8 @@
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         android:text="@string/room_jump_to_first_unread"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        app:drawableStartCompat="@drawable/arrow_up_circle" />
 
     <ImageView
         android:id="@+id/closeJumpToReadMarkerView"

From 2e5e072631813009fce35140365df34a7141bbe5 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 7 Oct 2020 09:12:38 +0000
Subject: [PATCH 164/278] Translated using Weblate (Swedish)

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 7915abb41c..96385b4cc3 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2560,4 +2560,9 @@
     <string name="sent_verification_conclusion">Verifieringsavslutning</string>
 
     <string name="universal_link_malformed">Länken var felformaterad</string>
-</resources>
+<string name="no_permissions_to_start_webrtc_call">Du har inte behörighet att starta ett samtal i det här rummet</string>
+    <string name="delete_account_data_warning">Radera kontodata av typen %1$s\?
+\n
+\nAnvänd varsamt, det kan leda till oväntat beteende.</string>
+
+    </resources>

From 6872a488ded562adcdee97c11c3cabbf048f01dd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 13:04:55 +0200
Subject: [PATCH 165/278] Fix the latest lint issue (will modify the pipeline
 to let the test compilation pass

---
 build.gradle                        | 3 ++-
 vector/src/main/AndroidManifest.xml | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index bd2f18d41b..e68d545c91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,8 @@ allprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
         // Warnings are potential errors, so stop ignoring them
-        kotlinOptions.allWarningsAsErrors = true
+        // You can override by passing `-PallWarningsAsErrors=false` in the command line
+        kotlinOptions.allWarningsAsErrors = project.properties['allWarningsAsErrors']?.toBoolean() ?: true
     }
 
 }
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 3f7ff8c808..3f178a3d20 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -232,9 +232,11 @@
             </intent-filter>
         </service>
 
+        <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite and for lintGplayRelease check :/ -->
         <service
             android:name=".core.services.VectorSyncService"
-            android:exported="false" />
+            android:exported="false"
+            tools:ignore="Instantiatable" />
 
         <service
             android:name=".features.call.telecom.VectorConnectionService"

From 7952e205b9abcb49358425e00e0f3aac9e564975 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 18:42:34 +0200
Subject: [PATCH 166/278] Implement "Jump to read receipt" and "Mention"
 actions on the room member profile screen

---
 CHANGES.md                                    |  1 +
 .../sdk/api/session/room/read/ReadService.kt  |  8 ++++++
 .../session/room/read/DefaultReadService.kt   | 10 ++++++++
 .../im/vector/app/core/di/VectorComponent.kt  |  3 +++
 .../vector/app/core/utils/TemporaryStore.kt   | 17 +++++++------
 .../home/room/detail/RoomDetailAction.kt      |  2 ++
 .../home/room/detail/RoomDetailFragment.kt    | 14 ++++++++++-
 .../room/detail/RoomDetailPendingAction.kt    | 22 ++++++++++++++++
 .../detail/RoomDetailPendingActionStore.kt    | 25 +++++++++++++++++++
 .../home/room/detail/RoomDetailViewModel.kt   |  6 +++++
 .../RoomMemberProfileFragment.kt              | 11 +++++---
 .../members/RoomMemberListFragment.kt         | 11 +++++++-
 12 files changed, 118 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingAction.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingActionStore.kt

diff --git a/CHANGES.md b/CHANGES.md
index ec853d96ef..05d189ed12 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Improvements 🙌:
  - Add a menu item in the timeline as a shortcut to invite user (#2171)
  - Drawer: move settings access and add sign out action (#2171)
  - Filter room member (and banned users) by name (#2184)
+ - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
index 3aa9d60e6a..8f76295fe7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
@@ -63,6 +63,14 @@ interface ReadService {
      */
     fun getMyReadReceiptLive(): LiveData<Optional<String>>
 
+    /**
+     * Get the eventId where the read receipt for the provided user is
+     * @param otherUserId the userId param to look for
+     *
+     * @return the eventId where the read receipt for the provided user is attached, or null if not found
+     */
+    fun getUserReadReceipt(otherUserId: String): String?
+
     /**
      * Returns a live list of read receipts for a given event
      * @param eventId: the event
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
index a5520972b0..162ad7d895 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@@ -107,6 +107,16 @@ internal class DefaultReadService @AssistedInject constructor(
         }
     }
 
+    override fun getUserReadReceipt(otherUserId: String): String? {
+        var eventId: String? = null
+        monarchy.doWithRealm {
+            eventId = ReadReceiptEntity.where(it, roomId = roomId, userId = otherUserId)
+                    .findFirst()
+                    ?.eventId
+        }
+        return eventId
+    }
+
     override fun getEventReadReceiptsLive(eventId: String): LiveData<List<ReadReceipt>> {
         val liveRealmData = monarchy.findAllMappedWithChanges(
                 { ReadReceiptsSummaryEntity.where(it, eventId) },
diff --git a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
index 4ba3d6ba13..28f3a52efa 100644
--- a/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
@@ -36,6 +36,7 @@ import im.vector.app.features.crypto.verification.IncomingVerificationRequestHan
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.HomeRoomListDataSource
+import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import im.vector.app.features.html.EventHtmlRenderer
 import im.vector.app.features.html.VectorHtmlCompressor
@@ -114,6 +115,8 @@ interface VectorComponent {
 
     fun selectedGroupStore(): SelectedGroupDataSource
 
+    fun roomDetailPendingActionStore(): RoomDetailPendingActionStore
+
     fun activeSessionObservableStore(): ActiveSessionDataSource
 
     fun incomingVerificationRequestHandler(): IncomingVerificationRequestHandler
diff --git a/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt b/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt
index 32b995c004..63f80341eb 100644
--- a/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/TemporaryStore.kt
@@ -23,6 +23,7 @@ const val THREE_MINUTES = 3 * 60_000L
 
 /**
  * Store an object T for a specific period of time
+ * @param delay delay to keep the data, in millis
  */
 open class TemporaryStore<T>(private val delay: Long = THREE_MINUTES) {
 
@@ -30,14 +31,16 @@ open class TemporaryStore<T>(private val delay: Long = THREE_MINUTES) {
 
     var data: T? = null
         set(value) {
-            field = value
             timer?.cancel()
-            timer = Timer().also {
-                it.schedule(object : TimerTask() {
-                    override fun run() {
-                        field = null
-                    }
-                }, delay)
+            field = value
+            if (value != null) {
+                timer = Timer().also {
+                    it.schedule(object : TimerTask() {
+                        override fun run() {
+                            field = null
+                        }
+                    }, delay)
+                }
             }
         }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index 5f851b8da7..03809d3c75 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -88,4 +88,6 @@ sealed class RoomDetailAction : VectorViewModelAction {
     data class EnsureNativeWidgetAllowed(val widget: Widget,
                                          val userJustAccepted: Boolean,
                                          val grantedEvents: RoomDetailViewEvents) : RoomDetailAction()
+
+    data class JumpToReadReceipt(val userId: String) : RoomDetailAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 66e49cf060..eadea299e6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -216,7 +216,8 @@ class RoomDetailFragment @Inject constructor(
         private val notificationUtils: NotificationUtils,
         private val webRtcPeerConnectionManager: WebRtcPeerConnectionManager,
         private val matrixItemColorProvider: MatrixItemColorProvider,
-        private val imageContentRenderer: ImageContentRenderer
+        private val imageContentRenderer: ImageContentRenderer,
+        private val roomDetailPendingActionStore: RoomDetailPendingActionStore
 ) :
         VectorBaseFragment(),
         TimelineEventController.Callback,
@@ -878,6 +879,17 @@ class RoomDetailFragment @Inject constructor(
     override fun onResume() {
         super.onResume()
         notificationDrawerManager.setCurrentRoom(roomDetailArgs.roomId)
+        roomDetailPendingActionStore.data?.let { handlePendingAction(it) }
+        roomDetailPendingActionStore.data = null
+    }
+
+    private fun handlePendingAction(roomDetailPendingAction: RoomDetailPendingAction) {
+        when (roomDetailPendingAction) {
+            is RoomDetailPendingAction.JumpToReadReceipt ->
+                roomDetailViewModel.handle(RoomDetailAction.JumpToReadReceipt(roomDetailPendingAction.userId))
+            is RoomDetailPendingAction.MentionUser       ->
+                insertUserDisplayNameInTextEditor(roomDetailPendingAction.userId)
+        }.exhaustive
     }
 
     override fun onPause() {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingAction.kt
new file mode 100644
index 0000000000..394d46ef8d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingAction.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail
+
+sealed class RoomDetailPendingAction {
+    data class JumpToReadReceipt(val userId: String) : RoomDetailPendingAction()
+    data class MentionUser(val userId: String) : RoomDetailPendingAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingActionStore.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingActionStore.kt
new file mode 100644
index 0000000000..9ffbb83a47
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailPendingActionStore.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail
+
+import im.vector.app.core.utils.TemporaryStore
+import javax.inject.Inject
+import javax.inject.Singleton
+
+// Store to keep a pending action from sub screen of a room detail
+@Singleton
+class RoomDetailPendingActionStore @Inject constructor() : TemporaryStore<RoomDetailPendingAction>(10_000)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index ebc265d935..009f8ec802 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -274,9 +274,15 @@ class RoomDetailViewModel @AssistedInject constructor(
             is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
             is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
             is RoomDetailAction.CancelSend -> handleCancel(action)
+            is RoomDetailAction.JumpToReadReceipt -> handleJumpToReadReceipt(action)
         }.exhaustive
     }
 
+    private fun handleJumpToReadReceipt(action: RoomDetailAction.JumpToReadReceipt) {
+        room.getUserReadReceipt(action.userId)
+                ?.let { handleNavigateToEvent(RoomDetailAction.NavigateToEvent(it, true)) }
+    }
+
     private fun handleSendSticker(action: RoomDetailAction.SendSticker) {
         room.sendEvent(EventType.STICKER, action.stickerContent.toContent())
     }
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index 169cba09eb..2f5b2d5387 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -43,6 +43,8 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.features.crypto.verification.VerificationBottomSheet
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.RoomDetailPendingAction
+import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.roommemberprofile.devices.DeviceListBottomSheet
 import im.vector.app.features.roommemberprofile.powerlevel.EditPowerLevelDialogs
 import kotlinx.android.parcel.Parcelize
@@ -61,7 +63,8 @@ data class RoomMemberProfileArgs(
 class RoomMemberProfileFragment @Inject constructor(
         val viewModelFactory: RoomMemberProfileViewModel.Factory,
         private val roomMemberProfileController: RoomMemberProfileController,
-        private val avatarRenderer: AvatarRenderer
+        private val avatarRenderer: AvatarRenderer,
+        private val roomDetailPendingActionStore: RoomDetailPendingActionStore
 ) : VectorBaseFragment(), RoomMemberProfileController.Callback {
 
     private val fragmentArgs: RoomMemberProfileArgs by args()
@@ -276,11 +279,13 @@ class RoomMemberProfileFragment @Inject constructor(
     }
 
     override fun onJumpToReadReceiptClicked() {
-        vectorBaseActivity.notImplemented("Jump to read receipts")
+        roomDetailPendingActionStore.data = RoomDetailPendingAction.JumpToReadReceipt(fragmentArgs.userId)
+        vectorBaseActivity.finish()
     }
 
     override fun onMentionClicked() {
-        vectorBaseActivity.notImplemented("Mention")
+        roomDetailPendingActionStore.data = RoomDetailPendingAction.MentionUser(fragmentArgs.userId)
+        vectorBaseActivity.finish()
     }
 
     private fun handleShareRoomMemberProfile(permalink: String) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 67577e866e..d6d56b8cb9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -36,6 +36,7 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import javax.inject.Inject
@@ -43,7 +44,8 @@ import javax.inject.Inject
 class RoomMemberListFragment @Inject constructor(
         val viewModelFactory: RoomMemberListViewModel.Factory,
         private val roomMemberListController: RoomMemberListController,
-        private val avatarRenderer: AvatarRenderer
+        private val avatarRenderer: AvatarRenderer,
+        private val roomDetailPendingActionStore: RoomDetailPendingActionStore
 ) : VectorBaseFragment(), RoomMemberListController.Callback {
 
     private val viewModel: RoomMemberListViewModel by fragmentViewModel()
@@ -96,6 +98,13 @@ class RoomMemberListFragment @Inject constructor(
         })
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (roomDetailPendingActionStore.data != null) {
+            vectorBaseActivity.finish()
+        }
+    }
+
     override fun onDestroyView() {
         recyclerView.cleanup()
         super.onDestroyView()

From 6325ee9310915e54df71ae6b2b9893319294b235 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 18:53:32 +0200
Subject: [PATCH 167/278] "Jump to read receipt" available only for joined
 members

---
 .../RoomMemberProfileController.kt              | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index ca9ecb62ef..776138a686 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -172,13 +172,16 @@ class RoomMemberProfileController @Inject constructor(
             val membership = state.asyncMembership() ?: return
 
             buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
-            buildProfileAction(
-                    id = "read_receipt",
-                    editable = false,
-                    title = stringProvider.getString(R.string.room_member_jump_to_read_receipt),
-                    dividerColor = dividerColor,
-                    action = { callback?.onJumpToReadReceiptClicked() }
-            )
+
+            if (membership == Membership.JOIN) {
+                buildProfileAction(
+                        id = "read_receipt",
+                        editable = false,
+                        title = stringProvider.getString(R.string.room_member_jump_to_read_receipt),
+                        dividerColor = dividerColor,
+                        action = { callback?.onJumpToReadReceiptClicked() }
+                )
+            }
 
             val ignoreActionTitle = state.buildIgnoreActionTitle()
 

From e33bc7146bd4568329eb4552f83ffef6f0cdb42f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 6 Oct 2020 10:05:20 +0200
Subject: [PATCH 168/278] Correction: "Jump to read receipt" available only for
 members with read receipt info (invited member can have read receipt info
 from a previous membership) Not live for the moment, I think it is
 acceptable. Also the Activity will finish itself instead of the Fragment

---
 .../roommemberprofile/RoomMemberProfileController.kt  |  2 +-
 .../roommemberprofile/RoomMemberProfileViewModel.kt   |  3 ++-
 .../roommemberprofile/RoomMemberProfileViewState.kt   |  1 +
 .../app/features/roomprofile/RoomProfileActivity.kt   | 11 +++++++++++
 .../roomprofile/members/RoomMemberListFragment.kt     | 11 +----------
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
index 776138a686..a3ffd80ade 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt
@@ -173,7 +173,7 @@ class RoomMemberProfileController @Inject constructor(
 
             buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
 
-            if (membership == Membership.JOIN) {
+            if (state.hasReadReceipt) {
                 buildProfileAction(
                         id = "read_receipt",
                         editable = false,
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index f2c85c96c7..78562ea351 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -85,7 +85,8 @@ class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted private v
         setState {
             copy(
                     isMine = session.myUserId == this.userId,
-                    userMatrixItem = room?.getRoomMember(initialState.userId)?.toMatrixItem()?.let { Success(it) } ?: Uninitialized
+                    userMatrixItem = room?.getRoomMember(initialState.userId)?.toMatrixItem()?.let { Success(it) } ?: Uninitialized,
+                    hasReadReceipt = room?.getUserReadReceipt(initialState.userId) != null
             )
         }
         observeIgnoredState()
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt
index dec003b37d..f943a5cf08 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt
@@ -39,6 +39,7 @@ data class RoomMemberProfileViewState(
         val allDevicesAreTrusted: Boolean = false,
         val allDevicesAreCrossSignedTrusted: Boolean = false,
         val asyncMembership: Async<Membership> = Uninitialized,
+        val hasReadReceipt: Boolean = false,
         val actionPermissions: ActionPermissions = ActionPermissions()
 ) : MvRxState {
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
index 6bcb9f9c7f..734620e378 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
@@ -29,6 +29,7 @@ import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.platform.ToolbarConfigurable
 import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.room.RequireActiveMembershipViewEvents
 import im.vector.app.features.room.RequireActiveMembershipViewModel
 import im.vector.app.features.room.RequireActiveMembershipViewState
@@ -61,6 +62,9 @@ class RoomProfileActivity :
     @Inject
     lateinit var requireActiveMembershipViewModelFactory: RequireActiveMembershipViewModel.Factory
 
+    @Inject
+    lateinit var roomDetailPendingActionStore: RoomDetailPendingActionStore
+
     override fun create(initialState: RequireActiveMembershipViewState): RequireActiveMembershipViewModel {
         return requireActiveMembershipViewModelFactory.create(initialState)
     }
@@ -97,6 +101,13 @@ class RoomProfileActivity :
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        if (roomDetailPendingActionStore.data != null) {
+            finish()
+        }
+    }
+
     private fun handleRoomLeft(roomLeft: RequireActiveMembershipViewEvents.RoomLeft) {
         if (roomLeft.leftMessage != null) {
             Toast.makeText(this, roomLeft.leftMessage, Toast.LENGTH_LONG).show()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index d6d56b8cb9..67577e866e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -36,7 +36,6 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.home.AvatarRenderer
-import im.vector.app.features.home.room.detail.RoomDetailPendingActionStore
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import javax.inject.Inject
@@ -44,8 +43,7 @@ import javax.inject.Inject
 class RoomMemberListFragment @Inject constructor(
         val viewModelFactory: RoomMemberListViewModel.Factory,
         private val roomMemberListController: RoomMemberListController,
-        private val avatarRenderer: AvatarRenderer,
-        private val roomDetailPendingActionStore: RoomDetailPendingActionStore
+        private val avatarRenderer: AvatarRenderer
 ) : VectorBaseFragment(), RoomMemberListController.Callback {
 
     private val viewModel: RoomMemberListViewModel by fragmentViewModel()
@@ -98,13 +96,6 @@ class RoomMemberListFragment @Inject constructor(
         })
     }
 
-    override fun onResume() {
-        super.onResume()
-        if (roomDetailPendingActionStore.data != null) {
-            vectorBaseActivity.finish()
-        }
-    }
-
     override fun onDestroyView() {
         recyclerView.cleanup()
         super.onDestroyView()

From 1dfc739f1970dded244786b116c97f6e3598d86f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 8 Oct 2020 14:19:56 +0200
Subject: [PATCH 169/278] Onuray's review

---
 .../matrix/android/sdk/api/session/room/read/ReadService.kt   | 4 ++--
 .../sdk/internal/session/room/read/DefaultReadService.kt      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
index 8f76295fe7..4fc13e9228 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
@@ -65,11 +65,11 @@ interface ReadService {
 
     /**
      * Get the eventId where the read receipt for the provided user is
-     * @param otherUserId the userId param to look for
+     * @param userId the id of the user to look for
      *
      * @return the eventId where the read receipt for the provided user is attached, or null if not found
      */
-    fun getUserReadReceipt(otherUserId: String): String?
+    fun getUserReadReceipt(userId: String): String?
 
     /**
      * Returns a live list of read receipts for a given event
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
index 162ad7d895..bea3d6624d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@@ -107,10 +107,10 @@ internal class DefaultReadService @AssistedInject constructor(
         }
     }
 
-    override fun getUserReadReceipt(otherUserId: String): String? {
+    override fun getUserReadReceipt(userId: String): String? {
         var eventId: String? = null
         monarchy.doWithRealm {
-            eventId = ReadReceiptEntity.where(it, roomId = roomId, userId = otherUserId)
+            eventId = ReadReceiptEntity.where(it, roomId = roomId, userId = userId)
                     .findFirst()
                     ?.eventId
         }

From bd69fd5815ca253c664d7ae2ec2bee3e569689b7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 14:42:44 +0200
Subject: [PATCH 170/278] Check copyright mention SDK side: we need Matrix
 copyright and not Element copyright on SDK source files. Next step should be
 to ensure that the copyright is present

---
 tools/check/check_code_quality.sh             | 11 ++++++-
 tools/check/forbidden_strings_in_code_sdk.txt | 29 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tools/check/forbidden_strings_in_code_sdk.txt

diff --git a/tools/check/check_code_quality.sh b/tools/check/check_code_quality.sh
index 8f850734fc..e855440e81 100755
--- a/tools/check/check_code_quality.sh
+++ b/tools/check/check_code_quality.sh
@@ -75,6 +75,15 @@ ${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_code.txt \
 
 resultForbiddenStringInCode=$?
 
+echo
+echo "Search for forbidden patterns specific for SDK code..."
+
+${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_code_sdk.txt \
+    ./matrix-sdk-android/src \
+    ./matrix-sdk-android-rx/src
+
+resultForbiddenStringInCodeSdk=$?
+
 echo
 echo "Search for forbidden patterns in resources..."
 
@@ -148,7 +157,7 @@ fi
 
 echo
 
-if [[ ${resultNbOfDrawable} -eq 0 ]] && [[ ${resultForbiddenStringInCode} -eq 0 ]] && [[ ${resultForbiddenStringInResource} -eq 0 ]] && [[ ${resultLongFiles} -eq 0 ]] && [[ ${resultPngInDrawable} -eq 0 ]]; then
+if [[ ${resultNbOfDrawable} -eq 0 ]] && [[ ${resultForbiddenStringInCode} -eq 0 ]] && [[ ${resultForbiddenStringInCodeSdk} -eq 0 ]] && [[ ${resultForbiddenStringInResource} -eq 0 ]] && [[ ${resultLongFiles} -eq 0 ]] && [[ ${resultPngInDrawable} -eq 0 ]]; then
    echo "MAIN OK"
 else
    echo "❌ MAIN ERROR"
diff --git a/tools/check/forbidden_strings_in_code_sdk.txt b/tools/check/forbidden_strings_in_code_sdk.txt
new file mode 100644
index 0000000000..9907c68080
--- /dev/null
+++ b/tools/check/forbidden_strings_in_code_sdk.txt
@@ -0,0 +1,29 @@
+#
+# Copyright 2020 New Vector Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This file list String which are not allowed in source code.
+# Use Perl regex to write forbidden strings
+# Note: line cannot start with a space. Use \s instead.
+# It is possible to specify an authorized number of occurrence with === suffix. Default is 0
+# Example:
+# AuthorizedStringThreeTimes===3
+
+# Extension:java
+# Extension:kt
+
+### "The Matrix.org Foundation C.I.C." copyright is required on this file, and not "New Vector Ltd"
+New Vector Ltd
+

From 44114e66c2772fa79a944446d168aac0dc2ac779 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 15:04:55 +0200
Subject: [PATCH 171/278] Fix Copyright mention in SDK code

---
 .../android/sdk/rx/LiveDataObservable.kt      |  1 -
 .../org/matrix/android/sdk/rx/OptionalRx.kt   |  1 -
 .../android/sdk/rx/RxCallbackBuilders.kt      |  1 -
 .../java/org/matrix/android/sdk/rx/RxRoom.kt  |  1 -
 .../org/matrix/android/sdk/rx/RxSession.kt    |  1 -
 .../sdk/rx/SecretsSynchronisationInfo.kt      |  1 -
 .../matrix/android/sdk/InstrumentedTest.kt    |  2 +-
 .../android/sdk/LiveDataTestObserver.java     |  2 +-
 .../android/sdk/MainThreadExecutor.java       |  2 +-
 .../sdk/SingleThreadCoroutineDispatcher.kt    |  2 +-
 .../sdk/account/AccountCreationTest.kt        |  2 +-
 .../android/sdk/account/ChangePasswordTest.kt |  2 +-
 .../sdk/account/DeactivateAccountTest.kt      |  2 +-
 .../java/org/matrix/android/sdk/api/Matrix.kt |  2 +-
 .../android/sdk/common/CommonTestHelper.kt    |  2 +-
 .../android/sdk/common/CryptoTestData.kt      |  2 +-
 .../android/sdk/common/CryptoTestHelper.kt    |  2 +-
 .../sdk/common/MockOkHttpInterceptor.kt       |  2 +-
 .../android/sdk/common/SessionTestParams.kt   |  2 +-
 .../android/sdk/common/TestAssertUtil.kt      |  2 +-
 .../android/sdk/common/TestConstants.kt       |  2 +-
 .../android/sdk/common/TestMatrixCallback.kt  |  2 +-
 .../android/sdk/common/TestMatrixComponent.kt |  2 +-
 .../matrix/android/sdk/common/TestModule.kt   |  2 +-
 .../android/sdk/common/TestNetworkModule.kt   |  2 +-
 .../crypto/AttachmentEncryptionTest.kt        |  2 +-
 .../sdk/internal/crypto/CryptoStoreHelper.kt  |  2 +-
 .../sdk/internal/crypto/CryptoStoreTest.kt    |  2 +-
 .../internal/crypto/ExportEncryptionTest.kt   |  2 +-
 .../sdk/internal/crypto/UnwedgingTest.kt      |  2 +-
 .../crypto/crosssigning/ExtensionsKtTest.kt   |  2 +-
 .../crypto/crosssigning/XSigningTest.kt       | 16 +++++++++++
 .../crypto/gossiping/KeyShareTests.kt         |  2 +-
 .../crypto/gossiping/WithHeldTests.kt         |  2 +-
 .../keysbackup/KeysBackupPasswordTest.kt      |  2 +-
 .../keysbackup/KeysBackupScenarioData.kt      |  2 +-
 .../crypto/keysbackup/KeysBackupTest.kt       |  2 +-
 .../keysbackup/KeysBackupTestConstants.kt     |  2 +-
 .../crypto/keysbackup/KeysBackupTestHelper.kt |  2 +-
 .../keysbackup/PrepareKeysBackupDataResult.kt |  2 +-
 .../crypto/keysbackup/StateObserver.kt        |  2 +-
 .../sdk/internal/crypto/ssss/QuadSTests.kt    |  2 +-
 .../internal/crypto/verification/SASTest.kt   |  2 +-
 .../crypto/verification/qrcode/HexParser.kt   |  2 +-
 .../crypto/verification/qrcode/QrCodeTest.kt  |  2 +-
 .../verification/qrcode/SharedSecretTest.kt   |  2 +-
 .../verification/qrcode/VerificationTest.kt   |  2 +-
 .../session/room/send/MarkdownParserTest.kt   |  2 +-
 .../internal/util/JsonCanonicalizerTest.kt    |  2 +-
 .../session/room/timeline/ChunkEntityTest.kt  |  2 +-
 .../timeline/FakeGetContextOfEventTask.kt     |  2 +-
 .../room/timeline/FakePaginationTask.kt       |  2 +-
 .../room/timeline/FakeTokenChunkEvent.kt      |  2 +-
 .../session/room/timeline/RoomDataHelper.kt   |  2 +-
 .../TimelineBackToPreviousLastForwardTest.kt  |  2 +-
 .../timeline/TimelineForwardPaginationTest.kt |  2 +-
 .../TimelinePreviousLastForwardTest.kt        |  2 +-
 .../sdk/session/room/timeline/TimelineTest.kt |  2 +-
 .../sdk/session/search/SearchMessagesTest.kt  |  1 -
 .../sdk/internal/database/RealmDebugTools.kt  |  2 +-
 .../interceptors/CurlLoggingInterceptor.kt    |  2 +-
 .../interceptors/FormattedJsonHttpLogger.kt   |  2 +-
 .../java/org/matrix/android/sdk/api/Matrix.kt |  1 -
 .../matrix/android/sdk/api/MatrixCallback.kt  |  1 -
 .../android/sdk/api/MatrixConfiguration.kt    |  1 -
 .../matrix/android/sdk/api/MatrixPatterns.kt  |  1 -
 .../sdk/api/auth/AuthenticationService.kt     |  1 -
 .../matrix/android/sdk/api/auth/Constants.kt  |  1 -
 .../android/sdk/api/auth/data/Credentials.kt  |  1 -
 .../sdk/api/auth/data/DiscoveryInformation.kt |  1 -
 .../auth/data/HomeServerConnectionConfig.kt   |  1 -
 .../sdk/api/auth/data/LoginFlowResult.kt      |  1 -
 .../sdk/api/auth/data/LoginFlowTypes.kt       |  1 -
 .../sdk/api/auth/data/SessionParams.kt        |  1 -
 .../android/sdk/api/auth/data/WellKnown.kt    |  1 -
 .../sdk/api/auth/data/WellKnownBaseConfig.kt  |  1 -
 .../android/sdk/api/auth/login/LoginWizard.kt |  1 -
 .../api/auth/registration/RegisterThreePid.kt |  1 -
 .../auth/registration/RegistrationResult.kt   |  1 -
 .../auth/registration/RegistrationWizard.kt   |  1 -
 .../sdk/api/auth/registration/Stage.kt        |  1 -
 .../sdk/api/auth/wellknown/WellknownResult.kt |  1 -
 .../api/comparators/DatedObjectComparators.kt |  1 -
 .../matrix/android/sdk/api/crypto/Emojis.kt   |  1 -
 .../android/sdk/api/crypto/MXCryptoConfig.kt  |  1 -
 .../api/crypto/RoomEncryptionTrustLevel.kt    |  1 -
 .../android/sdk/api/extensions/Booleans.kt    |  1 -
 .../sdk/api/extensions/MatrixSdkExtensions.kt |  1 -
 .../android/sdk/api/extensions/Strings.kt     |  1 -
 .../matrix/android/sdk/api/extensions/Try.kt  |  1 -
 .../android/sdk/api/failure/Extensions.kt     |  1 -
 .../matrix/android/sdk/api/failure/Failure.kt |  1 -
 .../android/sdk/api/failure/GlobalError.kt    |  1 -
 .../android/sdk/api/failure/MatrixError.kt    |  1 -
 .../android/sdk/api/interfaces/DatedObject.kt |  1 -
 .../sdk/api/legacy/LegacySessionImporter.kt   |  1 -
 .../sdk/api/listeners/ProgressListener.kt     |  1 -
 .../sdk/api/listeners/StepProgressListener.kt |  1 -
 .../android/sdk/api/pushrules/Action.kt       |  1 -
 .../android/sdk/api/pushrules/Condition.kt    |  1 -
 .../sdk/api/pushrules/ConditionResolver.kt    |  1 -
 .../pushrules/ContainsDisplayNameCondition.kt |  1 -
 .../sdk/api/pushrules/EventMatchCondition.kt  |  1 -
 .../matrix/android/sdk/api/pushrules/Kind.kt  |  1 -
 .../sdk/api/pushrules/PushRuleService.kt      |  1 -
 .../api/pushrules/RoomMemberCountCondition.kt |  1 -
 .../android/sdk/api/pushrules/RuleIds.kt      |  1 -
 .../android/sdk/api/pushrules/RuleScope.kt    |  1 -
 .../android/sdk/api/pushrules/RuleSetKey.kt   |  1 -
 .../SenderNotificationPermissionCondition.kt  |  1 -
 .../pushrules/rest/GetPushRulesResponse.kt    |  1 -
 .../sdk/api/pushrules/rest/PushCondition.kt   |  1 -
 .../sdk/api/pushrules/rest/PushRule.kt        |  1 -
 .../android/sdk/api/pushrules/rest/RuleSet.kt |  1 -
 .../android/sdk/api/query/QueryStringValue.kt |  1 -
 .../android/sdk/api/raw/RawCacheStrategy.kt   |  1 -
 .../matrix/android/sdk/api/raw/RawService.kt  |  1 -
 .../api/session/InitialSyncProgressService.kt |  1 -
 .../matrix/android/sdk/api/session/Session.kt |  1 -
 .../sdk/api/session/account/AccountService.kt |  1 -
 .../session/accountdata/AccountDataService.kt |  1 -
 .../accountdata/UserAccountDataEvent.kt       |  1 -
 .../accountdata/UserAccountDataTypes.kt       |  1 -
 .../sdk/api/session/cache/CacheService.kt     |  1 -
 .../api/session/call/CallSignalingService.kt  |  1 -
 .../android/sdk/api/session/call/CallState.kt |  1 -
 .../sdk/api/session/call/CallsListener.kt     |  1 -
 .../android/sdk/api/session/call/EglUtils.kt  |  1 -
 .../android/sdk/api/session/call/MxCall.kt    |  1 -
 .../api/session/call/TurnServerResponse.kt    |  1 -
 .../session/content/ContentAttachmentData.kt  |  1 -
 .../content/ContentUploadStateTracker.kt      |  1 -
 .../api/session/content/ContentUrlResolver.kt |  1 -
 .../sdk/api/session/crypto/CryptoService.kt   |  1 -
 .../sdk/api/session/crypto/MXCryptoError.kt   |  1 -
 .../crosssigning/CrossSigningService.kt       |  1 -
 .../CrossSigningSsssSecretConstants.kt        |  1 -
 .../crypto/crosssigning/MXCrossSigningInfo.kt |  1 -
 .../crypto/keysbackup/KeysBackupService.kt    |  1 -
 .../crypto/keysbackup/KeysBackupState.kt      |  1 -
 .../keysbackup/KeysBackupStateListener.kt     |  1 -
 .../keyshare/GossipingRequestListener.kt      |  1 -
 .../session/crypto/verification/CancelCode.kt |  1 -
 .../verification/EmojiRepresentation.kt       |  1 -
 .../IncomingSasVerificationTransaction.kt     |  1 -
 .../OutgoingSasVerificationTransaction.kt     |  1 -
 .../PendingVerificationRequest.kt             |  1 -
 .../QrCodeVerificationTransaction.kt          |  1 -
 .../session/crypto/verification/SasMode.kt    |  1 -
 .../SasVerificationTransaction.kt             |  1 -
 .../ValidVerificationInfoReady.kt             |  1 -
 .../ValidVerificationInfoRequest.kt           |  1 -
 .../crypto/verification/VerificationMethod.kt |  1 -
 .../verification/VerificationService.kt       |  1 -
 .../verification/VerificationTransaction.kt   |  1 -
 .../verification/VerificationTxState.kt       |  1 -
 .../events/model/AggregatedAnnotation.kt      |  1 -
 .../events/model/AggregatedRelations.kt       |  1 -
 .../model/DefaultUnsignedRelationInfo.kt      |  1 -
 .../sdk/api/session/events/model/Event.kt     |  1 -
 .../sdk/api/session/events/model/EventType.kt |  1 -
 .../sdk/api/session/events/model/LocalEcho.kt |  1 -
 .../session/events/model/RelationChunkInfo.kt |  1 -
 .../api/session/events/model/RelationType.kt  |  1 -
 .../api/session/events/model/UnsignedData.kt  |  1 -
 .../events/model/UnsignedRelationInfo.kt      |  1 -
 .../file/ContentDownloadStateTracker.kt       |  1 -
 .../sdk/api/session/file/FileService.kt       |  3 +--
 .../api/session/file/MatrixSDKFileProvider.kt |  1 -
 .../android/sdk/api/session/group/Group.kt    |  1 -
 .../sdk/api/session/group/GroupService.kt     |  1 -
 .../session/group/GroupSummaryQueryParams.kt  |  1 -
 .../api/session/group/model/GroupSummary.kt   |  1 -
 .../homeserver/HomeServerCapabilities.kt      |  1 -
 .../HomeServerCapabilitiesService.kt          |  1 -
 .../sdk/api/session/identity/FoundThreePid.kt |  1 -
 .../api/session/identity/IdentityService.kt   |  1 -
 .../session/identity/IdentityServiceError.kt  |  1 -
 .../identity/IdentityServiceListener.kt       |  1 -
 .../sdk/api/session/identity/SharedState.kt   |  1 -
 .../sdk/api/session/identity/ThreePid.kt      |  1 -
 .../IntegrationManagerConfig.kt               |  1 -
 .../IntegrationManagerService.kt              |  1 -
 .../api/session/permalinks/MatrixLinkify.kt   |  1 -
 .../session/permalinks/MatrixPermalinkSpan.kt |  1 -
 .../api/session/permalinks/PermalinkData.kt   |  1 -
 .../api/session/permalinks/PermalinkParser.kt |  1 -
 .../session/permalinks/PermalinkService.kt    |  1 -
 .../sdk/api/session/profile/ProfileService.kt |  1 -
 .../android/sdk/api/session/pushers/Pusher.kt |  1 -
 .../sdk/api/session/pushers/PushersService.kt |  1 -
 .../android/sdk/api/session/room/Room.kt      |  1 -
 .../api/session/room/RoomDirectoryService.kt  |  1 -
 .../sdk/api/session/room/RoomService.kt       |  1 -
 .../session/room/RoomSummaryQueryParams.kt    |  1 -
 .../api/session/room/call/RoomCallService.kt  |  1 -
 .../session/room/crypto/RoomCryptoService.kt  |  1 -
 .../session/room/failure/CreateRoomFailure.kt |  1 -
 .../session/room/failure/JoinRoomFailure.kt   |  1 -
 .../room/members/ChangeMembershipState.kt     |  1 -
 .../session/room/members/MembershipService.kt |  1 -
 .../room/members/RoomMemberQueryParams.kt     |  1 -
 .../room/model/EditAggregatedSummary.kt       |  1 -
 .../room/model/EventAnnotationsSummary.kt     |  1 -
 .../sdk/api/session/room/model/Invite.kt      |  1 -
 .../sdk/api/session/room/model/Membership.kt  |  1 -
 .../model/PollResponseAggregatedSummary.kt    |  1 -
 .../session/room/model/PollSummaryContent.kt  |  1 -
 .../session/room/model/PowerLevelsContent.kt  |  1 -
 .../room/model/ReactionAggregatedSummary.kt   |  1 -
 .../sdk/api/session/room/model/ReadReceipt.kt |  1 -
 .../room/model/ReferencesAggregatedContent.kt |  1 -
 .../room/model/ReferencesAggregatedSummary.kt |  1 -
 .../session/room/model/RoomAliasesContent.kt  |  1 -
 .../session/room/model/RoomAvatarContent.kt   |  1 -
 .../room/model/RoomCanonicalAliasContent.kt   |  1 -
 .../room/model/RoomDirectoryVisibility.kt     |  1 -
 .../room/model/RoomGuestAccessContent.kt      |  1 -
 .../room/model/RoomHistoryVisibility.kt       |  1 -
 .../model/RoomHistoryVisibilityContent.kt     |  1 -
 .../api/session/room/model/RoomJoinRules.kt   |  1 -
 .../room/model/RoomJoinRulesContent.kt        |  1 -
 .../session/room/model/RoomMemberContent.kt   |  1 -
 .../session/room/model/RoomMemberSummary.kt   |  1 -
 .../api/session/room/model/RoomNameContent.kt |  1 -
 .../sdk/api/session/room/model/RoomSummary.kt |  1 -
 .../room/model/RoomThirdPartyInviteContent.kt |  1 -
 .../session/room/model/RoomTopicContent.kt    |  1 -
 .../sdk/api/session/room/model/Signed.kt      |  1 -
 .../api/session/room/model/VersioningState.kt |  1 -
 .../room/model/call/CallAnswerContent.kt      |  1 -
 .../room/model/call/CallCandidatesContent.kt  |  1 -
 .../room/model/call/CallHangupContent.kt      |  1 -
 .../room/model/call/CallInviteContent.kt      |  1 -
 .../api/session/room/model/call/SdpType.kt    |  1 -
 .../room/model/create/CreateRoomParams.kt     |  1 -
 .../room/model/create/CreateRoomPreset.kt     |  1 -
 .../session/room/model/create/Predecessor.kt  |  1 -
 .../room/model/create/RoomCreateContent.kt    |  1 -
 .../session/room/model/message/AudioInfo.kt   |  1 -
 .../session/room/model/message/FileInfo.kt    |  1 -
 .../session/room/model/message/ImageInfo.kt   |  1 -
 .../room/model/message/LocationInfo.kt        |  1 -
 .../room/model/message/MessageAudioContent.kt |  1 -
 .../room/model/message/MessageContent.kt      |  1 -
 .../MessageContentWithFormattedBody.kt        |  1 -
 .../model/message/MessageDefaultContent.kt    |  1 -
 .../room/model/message/MessageEmoteContent.kt |  1 -
 .../room/model/message/MessageFileContent.kt  |  1 -
 .../room/model/message/MessageFormat.kt       |  1 -
 .../room/model/message/MessageImageContent.kt |  1 -
 .../model/message/MessageImageInfoContent.kt  |  1 -
 .../model/message/MessageLocationContent.kt   |  1 -
 .../model/message/MessageNoticeContent.kt     |  1 -
 .../model/message/MessageOptionsContent.kt    |  1 -
 .../message/MessagePollResponseContent.kt     |  1 -
 .../model/message/MessageRelationContent.kt   |  1 -
 .../model/message/MessageStickerContent.kt    |  1 -
 .../room/model/message/MessageTextContent.kt  |  1 -
 .../session/room/model/message/MessageType.kt |  1 -
 .../MessageVerificationAcceptContent.kt       |  1 -
 .../MessageVerificationCancelContent.kt       |  1 -
 .../message/MessageVerificationDoneContent.kt |  1 -
 .../message/MessageVerificationKeyContent.kt  |  1 -
 .../message/MessageVerificationMacContent.kt  |  1 -
 .../MessageVerificationReadyContent.kt        |  1 -
 .../MessageVerificationRequestContent.kt      |  1 -
 .../MessageVerificationStartContent.kt        |  1 -
 .../room/model/message/MessageVideoContent.kt |  1 -
 .../message/MessageWithAttachmentContent.kt   |  1 -
 .../session/room/model/message/OptionItem.kt  |  1 -
 .../room/model/message/ThumbnailInfo.kt       |  1 -
 .../session/room/model/message/VideoInfo.kt   |  1 -
 .../room/model/relation/ReactionContent.kt    |  1 -
 .../room/model/relation/ReactionInfo.kt       |  1 -
 .../room/model/relation/RelationContent.kt    |  1 -
 .../model/relation/RelationDefaultContent.kt  |  1 -
 .../room/model/relation/RelationService.kt    |  1 -
 .../room/model/relation/ReplyToContent.kt     |  1 -
 .../sdk/api/session/room/model/tag/RoomTag.kt |  1 -
 .../session/room/model/tag/RoomTagContent.kt  |  1 -
 .../room/model/thirdparty/FieldType.kt        |  1 -
 .../model/thirdparty/RoomDirectoryData.kt     |  1 -
 .../model/thirdparty/ThirdPartyProtocol.kt    |  1 -
 .../thirdparty/ThirdPartyProtocolInstance.kt  |  1 -
 .../model/tombstone/RoomTombstoneContent.kt   |  1 -
 .../notification/RoomNotificationState.kt     |  1 -
 .../room/notification/RoomPushRuleService.kt  |  1 -
 .../room/powerlevels/PowerLevelsHelper.kt     |  1 -
 .../sdk/api/session/room/powerlevels/Role.kt  |  1 -
 .../sdk/api/session/room/read/ReadService.kt  |  1 -
 .../room/reporting/ReportingService.kt        |  1 -
 .../sdk/api/session/room/send/DraftService.kt |  1 -
 .../api/session/room/send/MatrixItemSpan.kt   |  1 -
 .../sdk/api/session/room/send/SendService.kt  |  1 -
 .../sdk/api/session/room/send/SendState.kt    |  1 -
 .../sdk/api/session/room/send/UserDraft.kt    |  1 -
 .../sdk/api/session/room/sender/SenderInfo.kt |  1 -
 .../api/session/room/state/StateService.kt    |  1 -
 .../room/summary/RoomSummaryConstants.kt      |  2 +-
 .../sdk/api/session/room/tags/TagsService.kt  |  1 -
 .../sdk/api/session/room/timeline/Timeline.kt |  1 -
 .../session/room/timeline/TimelineEvent.kt    |  1 -
 .../room/timeline/TimelineEventFilters.kt     |  2 +-
 .../session/room/timeline/TimelineService.kt  |  1 -
 .../session/room/timeline/TimelineSettings.kt |  1 -
 .../api/session/room/typing/TypingService.kt  |  1 -
 .../session/room/uploads/GetUploadsResult.kt  |  1 -
 .../api/session/room/uploads/UploadEvent.kt   |  1 -
 .../session/room/uploads/UploadsService.kt    |  1 -
 .../sdk/api/session/search/SearchResult.kt    |  1 -
 .../sdk/api/session/search/SearchService.kt   |  1 -
 .../securestorage/EncryptedSecretContent.kt   |  1 -
 .../session/securestorage/IntegrityResult.kt  |  1 -
 .../session/securestorage/KeyInfoResult.kt    |  1 -
 .../api/session/securestorage/KeySigner.kt    |  1 -
 .../securestorage/SecretStorageKeyContent.kt  |  1 -
 .../securestorage/SecureStorageService.kt     |  1 -
 .../securestorage/SharedSecretStorageError.kt |  1 -
 .../SharedSecretStorageService.kt             |  1 -
 .../securestorage/SsssKeyCreationInfo.kt      |  1 -
 .../api/session/securestorage/SsssKeySpec.kt  |  1 -
 .../sdk/api/session/signout/SignOutService.kt |  1 -
 .../sdk/api/session/sync/FilterService.kt     |  1 -
 .../android/sdk/api/session/sync/SyncState.kt |  1 -
 .../sdk/api/session/terms/GetTermsResponse.kt |  1 -
 .../sdk/api/session/terms/TermsService.kt     |  1 -
 .../api/session/typing/TypingUsersTracker.kt  |  1 -
 .../sdk/api/session/user/UserService.kt       |  1 -
 .../sdk/api/session/user/model/User.kt        |  1 -
 .../widgets/WidgetManagementFailure.kt        |  1 -
 .../session/widgets/WidgetPostAPIMediator.kt  |  1 -
 .../sdk/api/session/widgets/WidgetService.kt  |  1 -
 .../api/session/widgets/WidgetURLFormatter.kt |  1 -
 .../sdk/api/session/widgets/model/Widget.kt   |  1 -
 .../session/widgets/model/WidgetContent.kt    |  1 -
 .../api/session/widgets/model/WidgetType.kt   |  1 -
 .../matrix/android/sdk/api/util/Cancelable.kt |  1 -
 .../android/sdk/api/util/CancelableBag.kt     |  1 -
 .../android/sdk/api/util/ContentUtils.kt      |  1 -
 .../sdk/api/util/MatrixCallbackDelegate.kt    |  1 -
 .../matrix/android/sdk/api/util/MatrixItem.kt |  1 -
 .../matrix/android/sdk/api/util/Optional.kt   | 27 +++++++++----------
 .../org/matrix/android/sdk/api/util/Types.kt  |  1 -
 .../android/sdk/internal/SessionManager.kt    |  1 -
 .../android/sdk/internal/auth/AuthAPI.kt      |  1 -
 .../android/sdk/internal/auth/AuthModule.kt   |  1 -
 .../auth/DefaultAuthenticationService.kt      |  1 -
 .../sdk/internal/auth/PendingSessionStore.kt  |  1 -
 .../sdk/internal/auth/SessionCreator.kt       |  1 -
 .../sdk/internal/auth/SessionParamsStore.kt   |  1 -
 .../data/InteractiveAuthenticationFlow.kt     |  1 -
 .../internal/auth/data/LoginFlowResponse.kt   |  1 -
 .../sdk/internal/auth/data/LoginParams.kt     |  1 -
 .../internal/auth/data/PasswordLoginParams.kt |  1 -
 .../sdk/internal/auth/data/RiotConfig.kt      |  1 -
 .../sdk/internal/auth/data/ThreePidMedium.kt  |  1 -
 .../internal/auth/data/TokenLoginParams.kt    |  1 -
 .../internal/auth/db/AuthRealmMigration.kt    |  1 -
 .../sdk/internal/auth/db/AuthRealmModule.kt   |  1 -
 .../internal/auth/db/PendingSessionData.kt    |  1 -
 .../internal/auth/db/PendingSessionEntity.kt  |  1 -
 .../internal/auth/db/PendingSessionMapper.kt  |  1 -
 .../auth/db/RealmPendingSessionStore.kt       |  1 -
 .../auth/db/RealmSessionParamsStore.kt        |  1 -
 .../internal/auth/db/SessionParamsEntity.kt   |  1 -
 .../internal/auth/db/SessionParamsMapper.kt   |  1 -
 .../internal/auth/login/DefaultLoginWizard.kt |  1 -
 .../internal/auth/login/DirectLoginTask.kt    |  1 -
 .../internal/auth/login/ResetPasswordData.kt  |  1 -
 .../auth/login/ResetPasswordMailConfirmed.kt  |  1 -
 .../AddThreePidRegistrationParams.kt          |  1 -
 .../AddThreePidRegistrationResponse.kt        |  1 -
 .../internal/auth/registration/AuthParams.kt  |  1 -
 .../registration/DefaultRegistrationWizard.kt |  1 -
 .../LocalizedFlowDataLoginTerms.kt            |  1 -
 .../registration/RegisterAddThreePidTask.kt   |  1 -
 .../auth/registration/RegisterTask.kt         |  1 -
 .../registration/RegistrationFlowResponse.kt  |  1 -
 .../auth/registration/RegistrationParams.kt   |  1 -
 .../auth/registration/SuccessResult.kt        |  1 -
 .../auth/registration/ThreePidData.kt         |  1 -
 .../auth/registration/ValidateCodeTask.kt     |  1 -
 .../auth/registration/ValidationCodeBody.kt   |  1 -
 .../auth/version/HomeServerVersion.kt         |  1 -
 .../sdk/internal/auth/version/Versions.kt     |  1 -
 .../crypto/CancelGossipRequestWorker.kt       |  1 -
 .../sdk/internal/crypto/CryptoConstants.kt    |  1 -
 .../sdk/internal/crypto/CryptoModule.kt       |  1 -
 .../internal/crypto/DefaultCryptoService.kt   |  1 -
 .../sdk/internal/crypto/DeviceListManager.kt  |  1 -
 .../internal/crypto/GossipingRequestState.kt  |  1 -
 .../internal/crypto/GossipingWorkManager.kt   |  1 -
 .../crypto/IncomingGossipingRequestManager.kt |  1 -
 .../internal/crypto/IncomingRoomKeyRequest.kt |  1 -
 .../crypto/IncomingSecretShareRequest.kt      |  1 -
 .../crypto/IncomingShareRequestCommon.kt      |  1 -
 .../sdk/internal/crypto/MXCryptoAlgorithms.kt |  1 -
 .../sdk/internal/crypto/MXOlmDevice.kt        |  1 -
 .../sdk/internal/crypto/MegolmSessionData.kt  |  1 -
 .../sdk/internal/crypto/MyDeviceInfoHolder.kt |  1 -
 .../sdk/internal/crypto/NewSessionListener.kt |  1 -
 .../sdk/internal/crypto/ObjectSigner.kt       |  1 -
 .../internal/crypto/OneTimeKeysUploader.kt    |  1 -
 .../crypto/OutgoingGossipingRequest.kt        |  1 -
 .../crypto/OutgoingGossipingRequestManager.kt |  1 -
 .../internal/crypto/OutgoingRoomKeyRequest.kt |  1 -
 .../internal/crypto/OutgoingSecretRequest.kt  |  1 -
 .../internal/crypto/RoomDecryptorProvider.kt  |  1 -
 .../internal/crypto/RoomEncryptorsStore.kt    |  1 -
 .../crypto/SendGossipRequestWorker.kt         |  1 -
 .../sdk/internal/crypto/SendGossipWorker.kt   |  1 -
 .../EnsureOlmSessionsForDevicesAction.kt      |  1 -
 .../EnsureOlmSessionsForUsersAction.kt        |  1 -
 .../actions/MegolmSessionDataImporter.kt      |  1 -
 .../crypto/actions/MessageEncrypter.kt        |  1 -
 .../actions/SetDeviceVerificationAction.kt    |  1 -
 .../crypto/algorithms/IMXDecrypting.kt        |  1 -
 .../crypto/algorithms/IMXWithHeldExtension.kt |  1 -
 .../algorithms/megolm/MXMegolmDecryption.kt   |  1 -
 .../megolm/MXMegolmDecryptionFactory.kt       |  1 -
 .../algorithms/megolm/MXMegolmEncryption.kt   |  1 -
 .../megolm/MXMegolmEncryptionFactory.kt       |  1 -
 .../algorithms/megolm/SharedWithHelper.kt     |  1 -
 .../crypto/algorithms/olm/MXOlmDecryption.kt  |  1 -
 .../algorithms/olm/MXOlmDecryptionFactory.kt  |  1 -
 .../crypto/algorithms/olm/MXOlmEncryption.kt  |  1 -
 .../algorithms/olm/MXOlmEncryptionFactory.kt  |  1 -
 .../crypto/attachments/EncryptionResult.kt    |  1 -
 .../MatrixDigestCheckInputStream.kt           |  2 +-
 .../crypto/crosssigning/ComputeTrustTask.kt   |  1 -
 .../DefaultCrossSigningService.kt             |  1 -
 .../crypto/crosssigning/DeviceTrustLevel.kt   |  1 -
 .../crypto/crosssigning/DeviceTrustResult.kt  |  1 -
 .../crypto/crosssigning/Extensions.kt         |  1 -
 .../SessionToCryptoRoomMembersUpdate.kt       |  1 -
 .../crypto/crosssigning/ShieldTrustUpdater.kt |  1 -
 .../crypto/crosssigning/UserTrustResult.kt    |  1 -
 .../keysbackup/DefaultKeysBackupService.kt    |  1 -
 .../crypto/keysbackup/KeysBackupPassword.kt   |  1 -
 .../keysbackup/KeysBackupStateManager.kt      |  1 -
 .../crypto/keysbackup/api/RoomKeysApi.kt      |  1 -
 .../keysbackup/model/KeyBackupVersionTrust.kt |  1 -
 .../model/KeyBackupVersionTrustSignature.kt   |  1 -
 .../model/KeysBackupVersionTrust.kt           |  1 -
 .../model/KeysBackupVersionTrustSignature.kt  |  1 -
 .../keysbackup/model/MegolmBackupAuthData.kt  |  1 -
 .../model/MegolmBackupCreationInfo.kt         |  1 -
 .../keysbackup/model/rest/BackupKeysResult.kt |  1 -
 .../model/rest/CreateKeysBackupVersionBody.kt |  1 -
 .../keysbackup/model/rest/KeyBackupData.kt    |  1 -
 .../model/rest/KeysAlgorithmAndData.kt        |  1 -
 .../keysbackup/model/rest/KeysBackupData.kt   |  1 -
 .../keysbackup/model/rest/KeysVersion.kt      |  1 -
 .../model/rest/KeysVersionResult.kt           |  1 -
 .../model/rest/RoomKeysBackupData.kt          |  1 -
 .../model/rest/UpdateKeysBackupVersionBody.kt |  1 -
 .../tasks/CreateKeysBackupVersionTask.kt      |  1 -
 .../keysbackup/tasks/DeleteBackupTask.kt      |  1 -
 .../tasks/DeleteRoomSessionDataTask.kt        |  1 -
 .../tasks/DeleteRoomSessionsDataTask.kt       |  1 -
 .../tasks/DeleteSessionsDataTask.kt           |  1 -
 .../tasks/GetKeysBackupLastVersionTask.kt     |  1 -
 .../tasks/GetKeysBackupVersionTask.kt         |  1 -
 .../tasks/GetRoomSessionDataTask.kt           |  1 -
 .../tasks/GetRoomSessionsDataTask.kt          |  1 -
 .../keysbackup/tasks/GetSessionsDataTask.kt   |  1 -
 .../tasks/StoreRoomSessionDataTask.kt         |  1 -
 .../tasks/StoreRoomSessionsDataTask.kt        |  1 -
 .../keysbackup/tasks/StoreSessionsDataTask.kt |  1 -
 .../tasks/UpdateKeysBackupVersionTask.kt      |  1 -
 .../internal/crypto/keysbackup/util/Base58.kt |  1 -
 .../crypto/keysbackup/util/RecoveryKey.kt     |  1 -
 .../crypto/model/CryptoCrossSigningKey.kt     |  1 -
 .../internal/crypto/model/CryptoDeviceInfo.kt |  1 -
 .../sdk/internal/crypto/model/CryptoInfo.kt   |  1 -
 .../internal/crypto/model/CryptoInfoMapper.kt |  1 -
 .../crypto/model/ImportRoomKeysResult.kt      |  1 -
 .../sdk/internal/crypto/model/MXDeviceInfo.kt |  1 -
 .../sdk/internal/crypto/model/MXKey.kt        |  1 -
 .../crypto/model/MXUsersDevicesMap.kt         |  1 -
 .../model/OlmInboundGroupSessionWrapper.kt    |  1 -
 .../model/OlmInboundGroupSessionWrapper2.kt   |  1 -
 .../crypto/model/OlmSessionWrapper.kt         |  1 -
 .../model/event/RoomKeyWithHeldContent.kt     |  1 -
 .../model/event/SecretSendEventContent.kt     |  1 -
 .../internal/crypto/model/rest/DeviceInfo.kt  |  1 -
 .../internal/crypto/model/rest/DeviceKeys.kt  |  1 -
 .../model/rest/DeviceKeysWithUnsigned.kt      |  1 -
 .../crypto/model/rest/DummyContent.kt         |  1 -
 .../model/rest/EncryptedBodyFileInfo.kt       |  1 -
 .../crypto/model/rest/EncryptedMessage.kt     |  1 -
 .../model/rest/GossipingToDeviceObject.kt     |  1 -
 .../model/rest/KeyVerificationAccept.kt       |  1 -
 .../model/rest/KeyVerificationCancel.kt       |  1 -
 .../crypto/model/rest/KeyVerificationDone.kt  |  1 -
 .../crypto/model/rest/KeyVerificationKey.kt   |  1 -
 .../crypto/model/rest/KeyVerificationMac.kt   |  1 -
 .../crypto/model/rest/KeyVerificationReady.kt |  1 -
 .../model/rest/KeyVerificationRequest.kt      |  1 -
 .../crypto/model/rest/KeyVerificationStart.kt |  1 -
 .../crypto/model/rest/KeysUploadBody.kt       |  1 -
 .../internal/crypto/model/rest/RestKeyInfo.kt |  1 -
 .../crypto/model/rest/RoomKeyRequestBody.kt   |  1 -
 .../crypto/model/rest/RoomKeyShareRequest.kt  |  1 -
 .../crypto/model/rest/SecretShareRequest.kt   |  1 -
 .../crypto/model/rest/SendToDeviceBody.kt     |  1 -
 .../crypto/model/rest/SendToDeviceObject.kt   |  1 -
 .../model/rest/ShareRequestCancellation.kt    |  1 -
 .../crypto/model/rest/UnsignedDeviceInfo.kt   |  1 -
 .../model/rest/UploadSignatureQueryBuilder.kt |  1 -
 .../model/rest/UploadSigningKeysBody.kt       |  1 -
 .../crypto/model/rest/UserPasswordAuth.kt     |  1 -
 .../model/rest/VerificationMethodValues.kt    |  1 -
 .../WarnOnUnknownDeviceRepository.kt          |  1 -
 .../DefaultSharedSecretStorageService.kt      |  1 -
 .../internal/crypto/store/IMXCryptoStore.kt   |  1 -
 .../internal/crypto/store/PrivateKeysInfo.kt  |  1 -
 .../crypto/store/SavedKeyBackupKeyInfo.kt     |  1 -
 .../sdk/internal/crypto/store/db/Helper.kt    |  1 -
 .../crypto/store/db/RealmCryptoStore.kt       |  1 -
 .../store/db/RealmCryptoStoreMigration.kt     |  1 -
 .../crypto/store/db/RealmCryptoStoreModule.kt |  1 -
 .../crypto/store/db/SafeObjectInputStream.kt  |  1 -
 .../store/db/mapper/CrossSigningKeysMapper.kt |  1 -
 .../store/db/model/CrossSigningInfoEntity.kt  |  1 -
 .../crypto/store/db/model/CryptoMapper.kt     |  1 -
 .../store/db/model/CryptoMetadataEntity.kt    |  1 -
 .../crypto/store/db/model/CryptoRoomEntity.kt |  1 -
 .../crypto/store/db/model/DeviceInfoEntity.kt |  1 -
 .../store/db/model/GossipingEventEntity.kt    |  1 -
 .../model/IncomingGossipingRequestEntity.kt   |  1 -
 .../crypto/store/db/model/KeyInfoEntity.kt    |  1 -
 .../store/db/model/KeysBackupDataEntity.kt    |  1 -
 .../db/model/MyDeviceLastSeenInfoEntity.kt    |  1 -
 .../db/model/OlmInboundGroupSessionEntity.kt  |  1 -
 .../crypto/store/db/model/OlmSessionEntity.kt |  1 -
 .../model/OutgoingGossipingRequestEntity.kt   |  1 -
 .../store/db/model/SharedSessionEntity.kt     |  1 -
 .../crypto/store/db/model/TrustLevelEntity.kt |  1 -
 .../crypto/store/db/model/UserEntity.kt       |  1 -
 .../store/db/model/WithHeldSessionEntity.kt   |  1 -
 .../db/query/CrossSigningInfoEntityQueries.kt |  1 -
 .../store/db/query/CryptoRoomEntityQueries.kt |  1 -
 .../store/db/query/DeviceInfoEntityQueries.kt |  1 -
 .../store/db/query/SharedSessionQueries.kt    |  1 -
 .../store/db/query/UserEntitiesQueries.kt     |  1 -
 .../store/db/query/WithHeldSessionQueries.kt  |  1 -
 .../ClaimOneTimeKeysForUsersDeviceTask.kt     |  1 -
 .../internal/crypto/tasks/DeleteDeviceTask.kt |  1 -
 .../tasks/DeleteDeviceWithUserPasswordTask.kt |  1 -
 .../crypto/tasks/DownloadKeysForUsersTask.kt  |  1 -
 .../internal/crypto/tasks/EncryptEventTask.kt |  1 -
 .../crypto/tasks/GetDeviceInfoTask.kt         |  1 -
 .../internal/crypto/tasks/GetDevicesTask.kt   |  1 -
 .../crypto/tasks/GetKeyChangesTask.kt         |  1 -
 .../tasks/InitializeCrossSigningTask.kt       |  1 -
 .../internal/crypto/tasks/SendEventTask.kt    |  1 -
 .../internal/crypto/tasks/SendToDeviceTask.kt |  1 -
 .../tasks/SendVerificationMessageTask.kt      |  1 -
 .../crypto/tasks/SetDeviceNameTask.kt         |  1 -
 .../internal/crypto/tasks/UploadKeysTask.kt   |  1 -
 .../crypto/tasks/UploadSignaturesTask.kt      |  1 -
 .../crypto/tasks/UploadSigningKeysTask.kt     |  1 -
 .../sdk/internal/crypto/tools/HkdfSha256.kt   |  1 -
 .../sdk/internal/crypto/tools/Tools.kt        |  1 -
 ...comingSASDefaultVerificationTransaction.kt |  1 -
 ...tgoingSASDefaultVerificationTransaction.kt |  1 -
 .../DefaultVerificationService.kt             |  1 -
 .../DefaultVerificationTransaction.kt         |  1 -
 .../SASDefaultVerificationTransaction.kt      |  1 -
 .../SendVerificationMessageWorker.kt          |  1 -
 .../crypto/verification/VerificationEmoji.kt  |  1 -
 .../crypto/verification/VerificationInfo.kt   |  1 -
 .../verification/VerificationInfoAccept.kt    |  1 -
 .../verification/VerificationInfoCancel.kt    |  1 -
 .../verification/VerificationInfoDone.kt      |  1 -
 .../verification/VerificationInfoKey.kt       |  1 -
 .../verification/VerificationInfoMac.kt       |  1 -
 .../verification/VerificationInfoReady.kt     |  1 -
 .../verification/VerificationInfoRequest.kt   |  1 -
 .../verification/VerificationInfoStart.kt     |  1 -
 .../VerificationMessageProcessor.kt           |  1 -
 .../verification/VerificationTransport.kt     |  1 -
 .../VerificationTransportRoomMessage.kt       |  1 -
 .../VerificationTransportToDevice.kt          |  1 -
 .../DefaultQrCodeVerificationTransaction.kt   |  1 -
 .../crypto/verification/qrcode/Extensions.kt  |  1 -
 .../crypto/verification/qrcode/QrCodeData.kt  |  1 -
 .../verification/qrcode/SharedSecret.kt       |  1 -
 .../sdk/internal/database/AsyncTransaction.kt | 25 +++++++++--------
 .../sdk/internal/database/DBConstants.kt      |  1 -
 .../sdk/internal/database/DatabaseCleaner.kt  |  1 -
 .../database/EventInsertLiveObserver.kt       |  1 -
 .../internal/database/RealmInstanceWrapper.kt |  2 +-
 .../sdk/internal/database/RealmKeysUtils.kt   |  1 -
 .../database/RealmLiveEntityObserver.kt       |  1 -
 .../sdk/internal/database/RealmQueryLatch.kt  |  1 -
 .../internal/database/RealmSessionProvider.kt |  2 +-
 .../database/RealmSessionStoreMigration.kt    |  1 -
 .../SessionRealmConfigurationFactory.kt       |  1 -
 .../database/helper/ChunkEntityHelper.kt      |  1 -
 .../database/helper/RoomEntityHelper.kt       |  1 -
 .../helper/TimelineEventEntityHelper.kt       |  1 -
 .../database/mapper/AccountDataMapper.kt      |  1 -
 .../internal/database/mapper/ContentMapper.kt |  1 -
 .../internal/database/mapper/DraftMapper.kt   |  1 -
 .../mapper/EventAnnotationsSummaryMapper.kt   |  1 -
 .../internal/database/mapper/EventMapper.kt   |  1 -
 .../database/mapper/GroupSummaryMapper.kt     |  1 -
 .../mapper/HomeServerCapabilitiesMapper.kt    |  1 -
 .../database/mapper/IsUselessResolver.kt      |  1 -
 ...llResponseAggregatedSummaryEntityMapper.kt |  1 -
 .../database/mapper/PushConditionMapper.kt    |  1 -
 .../database/mapper/PushRulesMapper.kt        |  1 -
 .../internal/database/mapper/PushersMapper.kt |  1 -
 .../mapper/ReadReceiptsSummaryMapper.kt       |  1 -
 .../mapper/RoomMemberSummaryMapper.kt         |  1 -
 .../database/mapper/RoomSummaryMapper.kt      |  1 -
 .../database/mapper/TimelineEventMapper.kt    |  1 -
 .../internal/database/mapper/UserMapper.kt    |  1 -
 .../database/model/BreadcrumbsEntity.kt       |  1 -
 .../internal/database/model/ChunkEntity.kt    |  1 -
 .../database/model/CurrentStateEventEntity.kt |  1 -
 .../internal/database/model/DraftEntity.kt    |  1 -
 .../model/EditAggregatedSummaryEntity.kt      |  1 -
 .../model/EventAnnotationsSummaryEntity.kt    |  1 -
 .../internal/database/model/EventEntity.kt    |  1 -
 .../database/model/EventInsertEntity.kt       |  1 -
 .../database/model/EventInsertType.java       |  1 -
 .../internal/database/model/FilterEntity.kt   |  1 -
 .../internal/database/model/GroupEntity.kt    |  1 -
 .../database/model/GroupSummaryEntity.kt      |  1 -
 .../model/HomeServerCapabilitiesEntity.kt     |  1 -
 .../database/model/IgnoredUserEntity.kt       |  1 -
 .../database/model/PendingThreePidEntity.kt   |  1 -
 .../PollResponseAggregatedSummaryEntity.kt    |  1 -
 .../database/model/PushConditionEntity.kt     |  1 -
 .../internal/database/model/PushRuleEntity.kt |  1 -
 .../database/model/PushRulesEntity.kt         |  1 -
 .../database/model/PusherDataEntity.kt        |  1 -
 .../internal/database/model/PusherEntity.kt   |  1 -
 .../internal/database/model/RawCacheEntity.kt |  1 -
 .../model/ReactionAggregatedSummaryEntity.kt  |  1 -
 .../database/model/ReadMarkerEntity.kt        |  1 -
 .../database/model/ReadReceiptEntity.kt       |  1 -
 .../model/ReadReceiptsSummaryEntity.kt        |  1 -
 .../ReferencesAggregatedSummaryEntity.kt      |  1 -
 .../sdk/internal/database/model/RoomEntity.kt |  1 -
 .../database/model/RoomMemberSummaryEntity.kt |  1 -
 .../database/model/RoomSummaryEntity.kt       |  1 -
 .../internal/database/model/RoomTagEntity.kt  |  1 -
 .../database/model/ScalarTokenEntity.kt       |  1 -
 .../database/model/SessionRealmModule.kt      |  1 -
 .../sdk/internal/database/model/SyncEntity.kt |  1 -
 .../database/model/TimelineEventEntity.kt     |  1 -
 .../database/model/UserAccountDataEntity.kt   |  1 -
 .../database/model/UserDraftsEntity.kt        |  1 -
 .../sdk/internal/database/model/UserEntity.kt |  1 -
 .../database/model/UserThreePidEntity.kt      |  1 -
 ...WellknownIntegrationManagerConfigEntity.kt |  1 -
 .../database/query/BreadcrumbsEntityQuery.kt  |  1 -
 .../database/query/ChunkEntityQueries.kt      |  1 -
 .../query/CurrentStateEventEntityQueries.kt   |  1 -
 .../EventAnnotationsSummaryEntityQuery.kt     |  1 -
 .../database/query/EventEntityQueries.kt      |  1 -
 .../database/query/FilterEntityQueries.kt     |  1 -
 .../database/query/GroupEntityQueries.kt      |  1 -
 .../query/GroupSummaryEntityQueries.kt        |  1 -
 .../query/HomeServerCapabilitiesQueries.kt    |  1 -
 .../internal/database/query/PushersQueries.kt |  1 -
 .../database/query/RawCacheQueries.kt         |  1 -
 .../database/query/ReadMarkerEntityQueries.kt |  1 -
 .../internal/database/query/ReadQueries.kt    |  1 -
 .../query/ReadReceiptEntityQueries.kt         |  1 -
 .../query/ReadReceiptsSummaryEntityQueries.kt |  1 -
 ...eferencesAggregatedSummaryEntityQueries.kt |  1 -
 .../database/query/RoomEntityQueries.kt       |  1 -
 .../database/query/RoomMemberEntityQueries.kt |  1 -
 .../query/RoomSummaryEntityQueries.kt         |  1 -
 .../database/query/ScalarTokenQuery.kt        |  1 -
 .../query/TimelineEventEntityQueries.kt       |  1 -
 .../database/query/TimelineEventFilter.kt     |  1 -
 .../database/query/UserDraftsEntityQueries.kt |  1 -
 .../database/query/UserEntityQueries.kt       |  1 -
 .../android/sdk/internal/di/AuthQualifiers.kt |  1 -
 .../android/sdk/internal/di/DbQualifiers.kt   |  1 -
 .../android/sdk/internal/di/FileQualifiers.kt |  1 -
 .../sdk/internal/di/MatrixComponent.kt        |  1 -
 .../android/sdk/internal/di/MatrixModule.kt   |  1 -
 .../android/sdk/internal/di/MatrixScope.kt    |  1 -
 .../android/sdk/internal/di/MoshiProvider.kt  |  1 -
 .../android/sdk/internal/di/NetworkModule.kt  |  1 -
 .../android/sdk/internal/di/NoOpTestModule.kt |  1 -
 .../android/sdk/internal/di/SerializeNulls.kt |  1 -
 .../di/SessionAssistedInjectModule.kt         |  1 -
 .../sdk/internal/di/StringQualifiers.kt       |  1 -
 .../sdk/internal/di/WorkManagerProvider.kt    |  1 -
 .../internal/eventbus/EventBusTimberLogger.kt |  1 -
 .../sdk/internal/extensions/LiveData.kt       |  1 -
 .../sdk/internal/extensions/Primitives.kt     |  1 -
 .../internal/extensions/RealmExtensions.kt    |  1 -
 .../android/sdk/internal/extensions/Result.kt | 27 +++++++++----------
 .../android/sdk/internal/extensions/Try.kt    |  1 -
 .../legacy/DefaultLegacySessionImporter.kt    |  1 -
 .../sdk/internal/legacy/riot/Credentials.java |  1 -
 .../sdk/internal/legacy/riot/Fingerprint.java |  1 -
 .../riot/HomeServerConnectionConfig.java      |  1 -
 .../internal/legacy/riot/LoginStorage.java    |  1 -
 .../sdk/internal/legacy/riot/WellKnown.kt     |  1 -
 .../legacy/riot/WellKnownBaseConfig.kt        |  1 -
 .../legacy/riot/WellKnownManagerConfig.kt     |  1 -
 .../legacy/riot/WellKnownPreferredConfig.kt   |  1 -
 .../network/AccessTokenInterceptor.kt         |  1 -
 .../sdk/internal/network/HttpHeaders.kt       |  1 -
 .../network/NetworkCallbackStrategy.kt        |  1 -
 .../network/NetworkConnectivityChecker.kt     |  1 -
 .../sdk/internal/network/NetworkConstants.kt  |  1 -
 .../internal/network/NetworkInfoReceiver.kt   |  1 -
 .../internal/network/ProgressRequestBody.kt   |  1 -
 .../android/sdk/internal/network/Request.kt   |  1 -
 .../internal/network/RetrofitExtensions.kt    |  1 -
 .../sdk/internal/network/RetrofitFactory.kt   |  1 -
 .../internal/network/TimeOutInterceptor.kt    |  1 -
 .../internal/network/UnitConverterFactory.kt  |  1 -
 .../sdk/internal/network/UserAgentHolder.kt   |  1 -
 .../internal/network/UserAgentInterceptor.kt  |  1 -
 .../network/httpclient/OkHttpClientUtil.kt    |  1 -
 .../network/parsing/CheckNumberType.kt        |  2 +-
 .../parsing/CipherSuiteMoshiAdapter.kt        |  1 -
 .../network/parsing/ForceToBoolean.kt         |  1 -
 .../parsing/RuntimeJsonAdapterFactory.java    |  1 -
 .../network/parsing/TlsVersionMoshiAdapter.kt |  1 -
 .../network/parsing/UriMoshiAdapter.kt        |  1 -
 .../sdk/internal/network/ssl/CertUtil.kt      |  1 -
 .../sdk/internal/network/ssl/Fingerprint.kt   |  1 -
 .../network/ssl/PinnedTrustManager.kt         |  1 -
 .../network/ssl/PinnedTrustManagerApi24.kt    |  1 -
 .../network/ssl/PinnedTrustManagerProvider.kt |  1 -
 .../internal/network/ssl/TLSSocketFactory.kt  |  1 -
 .../ssl/UnrecognizedCertificateException.kt   |  1 -
 .../network/token/AccessTokenProvider.kt      |  1 -
 .../token/HomeserverAccessTokenProvider.kt    |  1 -
 .../internal/query/QueryEnumListProcessor.kt  |  1 -
 .../query/QueryStringValueProcessor.kt        |  1 -
 .../internal/raw/DefaultCleanRawCacheTask.kt  |  1 -
 .../sdk/internal/raw/DefaultGetUrlTask.kt     |  1 -
 .../sdk/internal/raw/DefaultRawService.kt     |  2 +-
 .../sdk/internal/raw/GlobalRealmModule.kt     |  1 -
 .../matrix/android/sdk/internal/raw/RawAPI.kt |  1 -
 .../android/sdk/internal/raw/RawModule.kt     |  1 -
 .../internal/session/DefaultFileService.kt    |  1 -
 .../DefaultInitialSyncProgressService.kt      |  1 -
 .../sdk/internal/session/DefaultSession.kt    |  1 -
 .../session/EventInsertLiveProcessor.kt       |  1 -
 .../sdk/internal/session/SessionComponent.kt  |  1 -
 .../session/SessionLifecycleObserver.kt       |  1 -
 .../sdk/internal/session/SessionListeners.kt  |  1 -
 .../sdk/internal/session/SessionModule.kt     |  1 -
 .../sdk/internal/session/SessionScope.kt      |  1 -
 .../sdk/internal/session/TestInterceptor.kt   |  1 -
 .../internal/session/account/AccountAPI.kt    |  1 -
 .../internal/session/account/AccountModule.kt |  1 -
 .../session/account/ChangePasswordParams.kt   |  1 -
 .../session/account/ChangePasswordTask.kt     |  1 -
 .../account/DeactivateAccountParams.kt        |  1 -
 .../session/account/DeactivateAccountTask.kt  |  1 -
 .../session/account/DefaultAccountService.kt  |  1 -
 .../sdk/internal/session/cache/CacheModule.kt |  1 -
 .../internal/session/cache/ClearCacheTask.kt  |  1 -
 .../session/cache/DefaultCacheService.kt      |  1 -
 .../session/call/ActiveCallHandler.kt         |  2 +-
 .../session/call/CallEventProcessor.kt        |  1 -
 .../sdk/internal/session/call/CallModule.kt   |  1 -
 .../call/DefaultCallSignalingService.kt       |  1 -
 .../session/call/GetTurnServerTask.kt         |  1 -
 .../sdk/internal/session/call/VoipApi.kt      |  1 -
 .../internal/session/call/model/MxCallImpl.kt |  1 -
 .../session/cleanup/CleanupSession.kt         |  1 -
 .../internal/session/content/ContentModule.kt |  1 -
 .../session/content/ContentUploadResponse.kt  |  1 -
 .../DefaultContentUploadStateTracker.kt       |  1 -
 .../content/DefaultContentUrlResolver.kt      |  1 -
 .../internal/session/content/FileUploader.kt  |  1 -
 .../session/content/ImageCompressor.kt        |  1 -
 .../session/content/ThumbnailExtractor.kt     |  1 -
 .../session/content/UploadContentWorker.kt    |  1 -
 .../DefaultContentDownloadStateTracker.kt     |  1 -
 .../download/DownloadProgressInterceptor.kt   |  1 -
 .../session/download/ProgressResponseBody.kt  |  1 -
 .../session/filter/DefaultFilterRepository.kt |  1 -
 .../session/filter/DefaultFilterService.kt    |  1 -
 .../session/filter/DefaultSaveFilterTask.kt   |  1 -
 .../internal/session/filter/EventFilter.kt    |  1 -
 .../sdk/internal/session/filter/Filter.kt     |  1 -
 .../sdk/internal/session/filter/FilterApi.kt  |  1 -
 .../internal/session/filter/FilterFactory.kt  |  1 -
 .../internal/session/filter/FilterModule.kt   |  1 -
 .../session/filter/FilterRepository.kt        |  1 -
 .../internal/session/filter/FilterResponse.kt |  1 -
 .../sdk/internal/session/filter/FilterUtil.kt |  1 -
 .../session/filter/RoomEventFilter.kt         |  1 -
 .../sdk/internal/session/filter/RoomFilter.kt |  1 -
 .../session/group/DefaultGetGroupDataTask.kt  |  1 -
 .../internal/session/group/DefaultGroup.kt    |  1 -
 .../session/group/DefaultGroupService.kt      |  1 -
 .../session/group/GetGroupDataWorker.kt       |  1 -
 .../sdk/internal/session/group/GroupAPI.kt    |  1 -
 .../internal/session/group/GroupFactory.kt    |  1 -
 .../sdk/internal/session/group/GroupModule.kt |  1 -
 .../session/group/model/GroupProfile.kt       |  1 -
 .../internal/session/group/model/GroupRoom.kt |  1 -
 .../session/group/model/GroupRooms.kt         |  1 -
 .../group/model/GroupSummaryResponse.kt       |  1 -
 .../group/model/GroupSummaryRoomsSection.kt   |  1 -
 .../session/group/model/GroupSummaryUser.kt   |  1 -
 .../group/model/GroupSummaryUsersSection.kt   |  1 -
 .../internal/session/group/model/GroupUser.kt |  1 -
 .../session/group/model/GroupUsers.kt         |  1 -
 .../session/homeserver/CapabilitiesAPI.kt     |  1 -
 .../DefaultGetHomeServerCapabilitiesTask.kt   |  1 -
 .../DefaultHomeServerCapabilitiesService.kt   |  1 -
 .../homeserver/GetCapabilitiesResult.kt       |  1 -
 .../homeserver/GetUploadCapabilitiesResult.kt |  1 -
 .../HomeServerCapabilitiesModule.kt           |  1 -
 .../session/homeserver/HomeServerPinger.kt    |  1 -
 .../identity/DefaultIdentityService.kt        |  1 -
 .../session/identity/EnsureIdentityToken.kt   |  1 -
 .../internal/session/identity/IdentityAPI.kt  |  1 -
 .../identity/IdentityAccessTokenProvider.kt   |  1 -
 .../session/identity/IdentityApiProvider.kt   |  1 -
 .../session/identity/IdentityAuthAPI.kt       |  1 -
 .../identity/IdentityBulkLookupTask.kt        |  1 -
 .../identity/IdentityDisconnectTask.kt        |  1 -
 .../session/identity/IdentityModule.kt        |  1 -
 .../session/identity/IdentityPingTask.kt      |  1 -
 .../session/identity/IdentityRegisterTask.kt  |  1 -
 .../IdentityRequestTokenForBindingTask.kt     |  1 -
 .../IdentitySubmitTokenForBindingTask.kt      |  1 -
 .../session/identity/IdentityTaskHelper.kt    |  1 -
 .../session/identity/data/IdentityData.kt     |  1 -
 .../identity/data/IdentityPendingBinding.kt   |  1 -
 .../session/identity/data/IdentityStore.kt    |  1 -
 .../session/identity/db/IdentityDataEntity.kt |  1 -
 .../identity/db/IdentityDataEntityQuery.kt    |  1 -
 .../session/identity/db/IdentityMapper.kt     |  1 -
 .../db/IdentityPendingBindingEntity.kt        |  1 -
 .../db/IdentityPendingBindingEntityQuery.kt   |  1 -
 .../identity/db/IdentityRealmModule.kt        |  1 -
 .../session/identity/db/RealmIdentityStore.kt |  1 -
 .../identity/model/IdentityAccountResponse.kt |  1 -
 .../model/IdentityHashDetailResponse.kt       |  1 -
 .../identity/model/IdentityLookUpParams.kt    |  1 -
 .../identity/model/IdentityLookUpResponse.kt  |  1 -
 .../model/IdentityRegisterResponse.kt         |  1 -
 .../model/IdentityRequestOwnershipParams.kt   |  1 -
 .../model/IdentityRequestTokenBody.kt         |  1 -
 .../model/IdentityRequestTokenResponse.kt     |  1 -
 .../AllowedWidgetsContent.kt                  |  1 -
 .../DefaultIntegrationManagerService.kt       |  1 -
 .../integrationmanager/IntegrationManager.kt  |  1 -
 .../IntegrationManagerConfigExtractor.kt      |  1 -
 .../IntegrationManagerModule.kt               |  1 -
 .../IntegrationManagerWidgetData.kt           |  1 -
 .../IntegrationProvisioningContent.kt         |  1 -
 .../notification/DefaultPushRuleService.kt    |  1 -
 .../notification/ProcessEventForPushTask.kt   |  1 -
 .../session/openid/GetOpenIdTokenTask.kt      |  1 -
 .../sdk/internal/session/openid/OpenIdAPI.kt  |  1 -
 .../internal/session/openid/OpenIdModule.kt   |  1 -
 .../openid/RequestOpenIdTokenResponse.kt      |  1 -
 .../permalinks/DefaultPermalinkService.kt     |  1 -
 .../session/permalinks/PermalinkFactory.kt    |  1 -
 .../profile/AccountThreePidsResponse.kt       |  1 -
 .../internal/session/profile/AddEmailBody.kt  |  1 -
 .../session/profile/AddEmailResponse.kt       |  1 -
 .../internal/session/profile/AddMsisdnBody.kt |  1 -
 .../session/profile/AddMsisdnResponse.kt      |  1 -
 .../session/profile/AddThreePidTask.kt        |  1 -
 .../session/profile/BindThreePidBody.kt       |  1 -
 .../session/profile/BindThreePidsTask.kt      |  1 -
 .../session/profile/DefaultProfileService.kt  |  1 -
 .../session/profile/DeleteThreePidBody.kt     |  1 -
 .../session/profile/DeleteThreePidResponse.kt |  1 -
 .../session/profile/DeleteThreePidTask.kt     |  1 -
 .../profile/FinalizeAddThreePidBody.kt        |  1 -
 .../profile/FinalizeAddingThreePidTask.kt     |  1 -
 .../session/profile/GetProfileInfoTask.kt     |  1 -
 .../session/profile/PendingThreePid.kt        |  2 +-
 .../session/profile/PendingThreePidMapper.kt  |  2 +-
 .../internal/session/profile/ProfileAPI.kt    |  1 -
 .../internal/session/profile/ProfileModule.kt |  1 -
 .../profile/RefreshUserThreePidsTask.kt       |  1 -
 .../session/profile/SetAvatarUrlBody.kt       |  1 -
 .../session/profile/SetAvatarUrlTask.kt       |  1 -
 .../session/profile/SetDisplayNameBody.kt     |  1 -
 .../session/profile/SetDisplayNameTask.kt     |  1 -
 .../session/profile/ThirdPartyIdentifier.kt   |  1 -
 .../session/profile/UnbindThreePidBody.kt     |  1 -
 .../session/profile/UnbindThreePidResponse.kt |  1 -
 .../session/profile/UnbindThreePidsTask.kt    |  1 -
 .../session/profile/ValidateSmsCodeTask.kt    |  1 -
 .../session/pushers/AddHttpPusherWorker.kt    |  1 -
 .../session/pushers/AddPushRuleTask.kt        |  1 -
 .../pushers/DefaultConditionResolver.kt       |  1 -
 .../session/pushers/DefaultPushersService.kt  |  1 -
 .../session/pushers/GetPushRulesTask.kt       |  1 -
 .../session/pushers/GetPushersResponse.kt     |  1 -
 .../session/pushers/GetPushersTask.kt         |  1 -
 .../internal/session/pushers/JsonPusher.kt    |  1 -
 .../session/pushers/JsonPusherData.kt         |  1 -
 .../internal/session/pushers/PushRulesApi.kt  |  1 -
 .../internal/session/pushers/PushersAPI.kt    |  1 -
 .../internal/session/pushers/PushersModule.kt |  1 -
 .../session/pushers/RemovePushRuleTask.kt     |  1 -
 .../session/pushers/RemovePusherTask.kt       |  1 -
 .../session/pushers/SavePushRulesTask.kt      |  1 -
 .../pushers/UpdatePushRuleActionsTask.kt      |  1 -
 .../pushers/UpdatePushRuleEnableStatusTask.kt |  1 -
 .../sdk/internal/session/room/DefaultRoom.kt  |  1 -
 .../room/DefaultRoomDirectoryService.kt       |  1 -
 .../session/room/DefaultRoomService.kt        |  1 -
 .../EventRelationsAggregationProcessor.kt     |  1 -
 .../sdk/internal/session/room/RoomAPI.kt      |  1 -
 .../session/room/RoomAvatarResolver.kt        |  1 -
 .../sdk/internal/session/room/RoomFactory.kt  |  1 -
 .../sdk/internal/session/room/RoomGetter.kt   |  1 -
 .../sdk/internal/session/room/RoomModule.kt   |  1 -
 .../session/room/alias/AddRoomAliasBody.kt    |  1 -
 .../session/room/alias/AddRoomAliasTask.kt    |  1 -
 .../room/alias/GetRoomIdByAliasTask.kt        |  1 -
 .../room/alias/RoomAliasDescription.kt        |  1 -
 .../room/call/DefaultRoomCallService.kt       |  1 -
 .../session/room/create/CreateRoomBody.kt     |  1 -
 .../room/create/CreateRoomBodyBuilder.kt      |  1 -
 .../session/room/create/CreateRoomResponse.kt |  1 -
 .../session/room/create/CreateRoomTask.kt     |  1 -
 .../room/create/RoomCreateEventProcessor.kt   |  1 -
 .../room/directory/GetPublicRoomTask.kt       |  1 -
 .../directory/GetThirdPartyProtocolsTask.kt   |  1 -
 .../session/room/draft/DefaultDraftService.kt |  1 -
 .../session/room/draft/DraftRepository.kt     |  1 -
 .../membership/DefaultMembershipService.kt    |  1 -
 .../room/membership/LoadRoomMembersTask.kt    |  1 -
 .../RoomChangeMembershipStateDataSource.kt    |  1 -
 .../membership/RoomDisplayNameResolver.kt     |  1 -
 .../membership/RoomMemberEntityFactory.kt     |  1 -
 .../room/membership/RoomMemberEventHandler.kt |  1 -
 .../room/membership/RoomMemberHelper.kt       |  1 -
 .../room/membership/RoomMembersResponse.kt    |  1 -
 .../membership/admin/MembershipAdminTask.kt   |  1 -
 .../room/membership/admin/UserIdAndReason.kt  |  1 -
 .../room/membership/joining/InviteBody.kt     |  1 -
 .../room/membership/joining/InviteTask.kt     |  1 -
 .../room/membership/joining/JoinRoomTask.kt   |  1 -
 .../room/membership/leaving/LeaveRoomTask.kt  |  1 -
 .../membership/threepid/InviteThreePidTask.kt |  1 -
 .../membership/threepid/ThreePidInviteBody.kt |  1 -
 .../DefaultRoomPushRuleService.kt             |  1 -
 .../session/room/notification/RoomPushRule.kt |  1 -
 .../room/notification/RoomPushRuleMapper.kt   |  1 -
 .../SetRoomNotificationStateTask.kt           |  1 -
 .../room/prune/RedactionEventProcessor.kt     |  1 -
 .../session/room/read/DefaultReadService.kt   |  1 -
 .../session/room/read/FullyReadContent.kt     |  1 -
 .../session/room/read/MarkAllRoomsReadTask.kt |  1 -
 .../session/room/read/SetReadMarkersTask.kt   |  1 -
 .../room/relation/DefaultRelationService.kt   |  1 -
 .../room/relation/FetchEditHistoryTask.kt     |  1 -
 .../relation/FindReactionEventForUndoTask.kt  |  1 -
 .../room/relation/RelationsResponse.kt        |  1 -
 .../room/relation/SendRelationWorker.kt       |  1 -
 .../room/relation/UpdateQuickReactionTask.kt  |  1 -
 .../room/reporting/DefaultReportingService.kt |  1 -
 .../room/reporting/ReportContentBody.kt       |  1 -
 .../room/reporting/ReportContentTask.kt       |  1 -
 .../session/room/send/CancelSendTracker.kt    |  1 -
 .../session/room/send/DefaultSendService.kt   |  1 -
 .../session/room/send/EncryptEventWorker.kt   |  1 -
 .../room/send/LocalEchoEventFactory.kt        |  1 -
 .../session/room/send/LocalEchoIdentifiers.kt |  2 +-
 .../session/room/send/LocalEchoRepository.kt  |  1 -
 .../session/room/send/MarkdownParser.kt       |  1 -
 .../MultipleEventSendingDispatcherWorker.kt   |  1 -
 .../internal/session/room/send/NoMerger.kt    |  1 -
 .../session/room/send/RedactEventWorker.kt    |  1 -
 .../session/room/send/RoomEventSender.kt      |  1 -
 .../session/room/send/SendEventWorker.kt      |  1 -
 .../session/room/send/SendResponse.kt         |  1 -
 .../internal/session/room/send/TextContent.kt |  1 -
 .../room/send/pills/MentionLinkSpec.kt        |  1 -
 .../send/pills/MentionLinkSpecComparator.kt   |  1 -
 .../session/room/send/pills/TextPillsUtils.kt |  1 -
 .../session/room/state/DefaultStateService.kt |  1 -
 .../session/room/state/SendStateTask.kt       |  1 -
 .../room/state/StateEventDataSource.kt        |  1 -
 .../room/summary/RoomSummaryDataSource.kt     |  1 -
 .../room/summary/RoomSummaryEventsHelper.kt   |  2 +-
 .../room/summary/RoomSummaryUpdater.kt        |  1 -
 .../session/room/tags/AddTagToRoomTask.kt     |  1 -
 .../session/room/tags/DefaultTagsService.kt   |  1 -
 .../room/tags/DeleteTagFromRoomTask.kt        |  1 -
 .../sdk/internal/session/room/tags/TagBody.kt |  1 -
 .../timeline/DefaultGetContextOfEventTask.kt  |  1 -
 .../room/timeline/DefaultPaginationTask.kt    |  1 -
 .../session/room/timeline/DefaultTimeline.kt  |  1 -
 .../room/timeline/DefaultTimelineService.kt   |  1 -
 .../room/timeline/EventContextResponse.kt     |  1 -
 .../timeline/FetchTokenAndPaginateTask.kt     |  1 -
 .../session/room/timeline/GetEventTask.kt     |  1 -
 .../room/timeline/PaginationDirection.kt      |  1 -
 .../room/timeline/PaginationResponse.kt       |  1 -
 .../room/timeline/TimelineEventDecryptor.kt   |  1 -
 .../timeline/TimelineHiddenReadReceipts.kt    |  1 -
 .../timeline/TimelineSendEventWorkCommon.kt   |  1 -
 .../session/room/timeline/TokenChunkEvent.kt  |  1 -
 .../room/timeline/TokenChunkEventPersistor.kt |  1 -
 .../tombstone/RoomTombstoneEventProcessor.kt  |  1 -
 .../room/typing/DefaultTypingService.kt       |  1 -
 .../session/room/typing/SendTypingTask.kt     |  1 -
 .../session/room/typing/TypingBody.kt         |  1 -
 .../session/room/typing/TypingEventContent.kt |  1 -
 .../room/uploads/DefaultUploadsService.kt     |  1 -
 .../session/room/uploads/GetUploadsTask.kt    |  1 -
 .../session/search/DefaultSearchService.kt    |  1 -
 .../sdk/internal/session/search/SearchAPI.kt  |  2 +-
 .../internal/session/search/SearchModule.kt   |  2 +-
 .../sdk/internal/session/search/SearchTask.kt |  1 -
 .../search/request/SearchRequestBody.kt       |  1 -
 .../search/request/SearchRequestCategories.kt |  1 -
 .../request/SearchRequestEventContext.kt      |  1 -
 .../search/request/SearchRequestFilter.kt     |  1 -
 .../search/request/SearchRequestOrder.kt      |  1 -
 .../search/request/SearchRequestRoomEvents.kt |  1 -
 .../session/search/response/SearchResponse.kt |  1 -
 .../response/SearchResponseCategories.kt      |  1 -
 .../response/SearchResponseEventContext.kt    |  1 -
 .../search/response/SearchResponseItem.kt     |  1 -
 .../response/SearchResponseRoomEvents.kt      |  1 -
 .../DefaultSecureStorageService.kt            |  1 -
 .../securestorage/SecretStoringUtils.kt       |  1 -
 .../session/signout/DefaultSignOutService.kt  |  1 -
 .../session/signout/SignInAgainTask.kt        |  1 -
 .../internal/session/signout/SignOutAPI.kt    |  1 -
 .../internal/session/signout/SignOutModule.kt |  1 -
 .../internal/session/signout/SignOutTask.kt   |  1 -
 .../session/sync/CryptoSyncHandler.kt         |  1 -
 .../internal/session/sync/GroupSyncHandler.kt |  1 -
 .../session/sync/ReadReceiptHandler.kt        |  1 -
 .../session/sync/RoomFullyReadHandler.kt      |  1 -
 .../internal/session/sync/RoomSyncHandler.kt  |  1 -
 .../internal/session/sync/RoomTagHandler.kt   |  1 -
 .../session/sync/RoomTypingUsersHandler.kt    |  1 -
 .../sdk/internal/session/sync/SyncAPI.kt      |  1 -
 .../sdk/internal/session/sync/SyncModule.kt   |  1 -
 .../session/sync/SyncResponseHandler.kt       |  1 -
 .../sdk/internal/session/sync/SyncTask.kt     |  1 -
 .../session/sync/SyncTaskSequencer.kt         |  1 -
 .../internal/session/sync/SyncTokenStore.kt   |  1 -
 .../sync/UserAccountDataSyncHandler.kt        |  1 -
 .../internal/session/sync/job/SyncService.kt  |  1 -
 .../internal/session/sync/job/SyncThread.kt   |  1 -
 .../internal/session/sync/job/SyncWorker.kt   |  1 -
 .../internal/session/sync/model/DeviceInfo.kt |  1 -
 .../session/sync/model/DeviceListResponse.kt  |  1 -
 .../DeviceOneTimeKeysCountSyncResponse.kt     |  1 -
 .../session/sync/model/DevicesListResponse.kt |  1 -
 .../session/sync/model/GroupSyncProfile.kt    |  1 -
 .../session/sync/model/GroupsSyncResponse.kt  |  1 -
 .../session/sync/model/InvitedGroupSync.kt    |  1 -
 .../session/sync/model/InvitedRoomSync.kt     |  1 -
 .../sync/model/PresenceSyncResponse.kt        |  1 -
 .../session/sync/model/RoomInviteState.kt     |  1 -
 .../session/sync/model/RoomResponse.kt        |  1 -
 .../internal/session/sync/model/RoomSync.kt   |  1 -
 .../session/sync/model/RoomSyncAccountData.kt |  1 -
 .../session/sync/model/RoomSyncEphemeral.kt   |  1 -
 .../session/sync/model/RoomSyncState.kt       |  1 -
 .../session/sync/model/RoomSyncSummary.kt     |  1 -
 .../session/sync/model/RoomSyncTimeline.kt    |  1 -
 .../sync/model/RoomSyncUnreadNotifications.kt |  1 -
 .../session/sync/model/RoomsSyncResponse.kt   |  1 -
 .../session/sync/model/SyncResponse.kt        |  1 -
 .../sync/model/ToDeviceSyncResponse.kt        |  1 -
 .../session/sync/model/TokensChunkResponse.kt |  1 -
 .../model/accountdata/AcceptedTermsContent.kt |  1 -
 .../model/accountdata/BreadcrumbsContent.kt   |  1 -
 .../accountdata/DirectMessagesContent.kt      |  1 -
 .../accountdata/IdentityServerContent.kt      |  1 -
 .../model/accountdata/IgnoredUsersContent.kt  |  1 -
 .../model/accountdata/UserAccountDataSync.kt  |  1 -
 .../internal/session/terms/AcceptTermsBody.kt |  1 -
 .../session/terms/DefaultTermsService.kt      |  1 -
 .../sdk/internal/session/terms/TermsAPI.kt    |  1 -
 .../sdk/internal/session/terms/TermsModule.kt |  1 -
 .../internal/session/terms/TermsResponse.kt   |  1 -
 .../typing/DefaultTypingUsersTracker.kt       |  1 -
 .../session/user/DefaultUserService.kt        |  1 -
 .../internal/session/user/SearchUserAPI.kt    |  1 -
 .../internal/session/user/UserDataSource.kt   |  1 -
 .../session/user/UserEntityFactory.kt         |  1 -
 .../sdk/internal/session/user/UserModule.kt   |  1 -
 .../sdk/internal/session/user/UserStore.kt    |  1 -
 .../user/accountdata/AccountDataAPI.kt        |  1 -
 .../user/accountdata/AccountDataContent.kt    |  1 -
 .../user/accountdata/AccountDataDataSource.kt |  1 -
 .../user/accountdata/AccountDataModule.kt     |  1 -
 .../accountdata/DefaultAccountDataService.kt  |  1 -
 .../user/accountdata/DirectChatsHelper.kt     |  1 -
 .../user/accountdata/SaveBreadcrumbsTask.kt   |  1 -
 .../user/accountdata/SaveIgnoredUsersTask.kt  |  1 -
 .../user/accountdata/UpdateBreadcrumbsTask.kt |  1 -
 .../accountdata/UpdateIgnoredUserIdsTask.kt   |  1 -
 .../accountdata/UpdateUserAccountDataTask.kt  |  1 -
 .../internal/session/user/model/SearchUser.kt |  1 -
 .../session/user/model/SearchUserTask.kt      |  1 -
 .../session/user/model/SearchUsersParams.kt   |  1 -
 .../session/user/model/SearchUsersResponse.kt |  1 -
 .../session/widgets/CreateWidgetTask.kt       |  1 -
 .../widgets/DefaultWidgetPostAPIMediator.kt   |  1 -
 .../session/widgets/DefaultWidgetService.kt   |  1 -
 .../widgets/DefaultWidgetURLFormatter.kt      |  1 -
 .../session/widgets/RegisterWidgetResponse.kt |  1 -
 .../internal/session/widgets/WidgetManager.kt |  1 -
 .../internal/session/widgets/WidgetModule.kt  |  1 -
 .../widgets/WidgetPostMessageAPIProvider.kt   |  1 -
 .../internal/session/widgets/WidgetsAPI.kt    |  1 -
 .../session/widgets/WidgetsAPIProvider.kt     |  1 -
 .../widgets/helper/UserAccountWidgets.kt      |  1 -
 .../session/widgets/helper/WidgetFactory.kt   |  1 -
 .../widgets/token/GetScalarTokenTask.kt       |  1 -
 .../session/widgets/token/ScalarTokenStore.kt |  1 -
 .../sdk/internal/task/ConfigurableTask.kt     |  1 -
 .../sdk/internal/task/CoroutineSequencer.kt   |  1 -
 .../sdk/internal/task/CoroutineToCallback.kt  |  1 -
 .../matrix/android/sdk/internal/task/Task.kt  |  1 -
 .../android/sdk/internal/task/TaskExecutor.kt |  1 -
 .../android/sdk/internal/task/TaskThread.kt   |  1 -
 .../util/BackgroundDetectionObserver.kt       |  1 -
 .../android/sdk/internal/util/Base64.kt       |  1 -
 .../sdk/internal/util/CancelableCoroutine.kt  |  1 -
 .../sdk/internal/util/CancelableWork.kt       |  1 -
 .../android/sdk/internal/util/CompatUtil.kt   |  1 -
 .../android/sdk/internal/util/Debouncer.kt    |  1 -
 .../android/sdk/internal/util/Exhaustive.kt   |  1 -
 .../android/sdk/internal/util/FileSaver.kt    |  1 -
 .../matrix/android/sdk/internal/util/Glob.kt  |  1 -
 .../android/sdk/internal/util/Handler.kt      |  1 -
 .../matrix/android/sdk/internal/util/Hash.kt  |  1 -
 .../sdk/internal/util/JsonCanonicalizer.kt    |  1 -
 .../sdk/internal/util/LiveDataUtils.kt        |  1 -
 .../util/MatrixCoroutineDispatchers.kt        |  1 -
 .../android/sdk/internal/util/Monarchy.kt     |  1 -
 .../sdk/internal/util/SecretKeyAndVersion.kt  |  1 -
 .../sdk/internal/util/StringProvider.kt       |  1 -
 .../android/sdk/internal/util/StringUtils.kt  |  1 -
 .../internal/util/SuspendMatrixCallback.kt    | 27 +++++++++----------
 .../android/sdk/internal/util/UrlUtils.kt     |  1 -
 .../internal/wellknown/GetWellknownTask.kt    |  1 -
 .../sdk/internal/wellknown/WellKnownAPI.kt    |  1 -
 .../sdk/internal/wellknown/WellknownModule.kt |  1 -
 .../internal/worker/AlwaysSuccessfulWorker.kt |  1 -
 .../internal/worker/DelegateWorkerFactory.kt  |  1 -
 .../android/sdk/internal/worker/Extensions.kt |  1 -
 .../internal/worker/MatrixWorkerFactory.kt    |  1 -
 .../worker/SessionSafeCoroutineWorker.kt      |  2 +-
 .../internal/worker/SessionWorkerParams.kt    |  1 -
 .../android/sdk/internal/worker/Worker.kt     |  1 -
 .../internal/worker/WorkerParamsFactory.kt    |  1 -
 .../androidsdk/crypto/data/MXDeviceInfo.java  |  1 -
 .../data/MXOlmInboundGroupSession2.java       |  1 -
 .../interceptors/CurlLoggingInterceptor.kt    |  2 +-
 .../interceptors/FormattedJsonHttpLogger.kt   |  2 +-
 .../android/sdk/test/shared/TestRules.kt      |  2 +-
 .../java/org/matrix/android/sdk/MatrixTest.kt |  2 +-
 .../sdk/api/auth/data/VersionsKtTest.kt       |  2 +-
 .../sdk/api/pushrules/PushRuleActionsTest.kt  |  2 +-
 .../api/pushrules/PushRulesConditionTest.kt   |  2 +-
 .../crypto/keysbackup/util/Base58Test.kt      |  2 +-
 .../crypto/keysbackup/util/RecoveryKeyTest.kt |  2 +-
 .../internal/crypto/store/db/HelperTest.kt    |  2 +-
 .../verification/qrcode/BinaryStringTest.kt   |  2 +-
 .../internal/task/CoroutineSequencersTest.kt  |  2 +-
 1183 files changed, 146 insertions(+), 1237 deletions(-)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
index ec0d0cd288..2174c6f118 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/LiveDataObservable.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
index 551e277353..ff4b0d755c 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/OptionalRx.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
index 793d4694ce..f6dbe3d160 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index 2bb6c0ff69..228e83faff 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 55ede52c0c..03df708c0c 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
index e80bca1d7d..6da3217070 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/SecretsSynchronisationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
index cb6e624bce..b784884363 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/InstrumentedTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
index a09a655008..26920fbb35 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/LiveDataTestObserver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
index d26782d538..7ef2534037 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/MainThreadExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
index 4316b09b89..9942ea9db3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/SingleThreadCoroutineDispatcher.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
index cbb5af5911..5dede9dcfd 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/AccountCreationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
index e2140328e6..ec5477f976 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/ChangePasswordTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
index 36d09fb497..a6fbfd9b7a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/account/DeactivateAccountTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
index 751b2a708c..053b4e19bd 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index 84e76cbe52..9986315c65 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
index 283ddd6fde..76e59d9a90 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
index 9765d35bc5..370b416f54 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
index a9bd9403d2..e7978a9cb2 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/MockOkHttpInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
index 287cafcdfd..428d44b666 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/SessionTestParams.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
index d972ad621c..2253360adc 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestAssertUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
index cbfc9bbbf6..8eb7e251e2 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
index 800c6ae7e0..c2e1ec0f92 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixCallback.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
index e2ab16cad3..33de345630 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrixComponent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
index c3b11d65cc..3e4d5fe08e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
index 80467d91f4..4cd92ca272 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestNetworkModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
index 1e109f11ae..b6cb7f9e79 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/AttachmentEncryptionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
index 261c0903f0..6e6a11d568 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index 79477e3a4d..1d838b5c84 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
index 0ee79c2e1e..17664c78aa 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ExportEncryptionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index e9a1775ac3..0e3b29118c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
index 9467e861db..9fa7458ea7 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/ExtensionsKtTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index 09f14032d0..38c57bd22a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.matrix.android.sdk.internal.crypto.crosssigning
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 7c1a88dc75..197e36df06 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 03f9de2894..80cc14fcb6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
index f38b55beba..cc71f88fc0 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
index 29a0b5ffd6..864f3c12e4 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupScenarioData.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index aef97d5687..ca8993fb00 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
index f31e67b0e8..1248c8f07d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestConstants.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
index f84a90708c..944d1036d3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTestHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
index c28b7990e0..6aefe98f86 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/PrepareKeysBackupDataResult.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
index 90d2fd7812..ff8ce43b55 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/StateObserver.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index 42cee74334..0489ee179f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index a6beeb123c..75c7ad4d53 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
index cd5aa32d59..29d4e7850a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/HexParser.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
index 54a0f7e771..92afd3ee47 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
index 4032890723..97b93dcf5a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecretTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index 0c003215ee..1385dac1ec 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
index eebaa93415..1713578932 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParserTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
index 854d420a82..b5ab6589ff 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/util/JsonCanonicalizerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index a2a1586864..237386832c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
index 9a133032b6..b86c86c0c7 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeGetContextOfEventTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
index 06828ef3d1..d09bfb18c6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakePaginationTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
index 0301157d09..657f622c5b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/FakeTokenChunkEvent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
index a6fe675218..0dace9bd4c 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
index 8c5e7f17f2..3774e6f513 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineBackToPreviousLastForwardTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
index facb905b35..34edf37733 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineForwardPaginationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
index 28ce75c221..9ebac8766a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelinePreviousLastForwardTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
index b0da49cdbb..91016f7d01 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
index 8ae8ef1b44..7db159cd0b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/search/SearchMessagesTest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
index 324a3c1062..e5f4af2377 100644
--- a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/database/RealmDebugTools.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index ee2c6076cc..2103dc954d 100644
--- a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 Jeff Gilfelt.
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
index 349110aff8..5c03e8a855 100644
--- a/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/matrix-sdk-android/src/debug/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
index e6f982682b..cf6f37cec8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/Matrix.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
index e20d9074a8..5dede5abdd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index bfcc9105eb..725fd08d3b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
index f6e9a33aee..d8532c77c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixPatterns.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 91e2845cd2..360b955869 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
index 590b84f35b..6cacf55a38 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/Constants.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
index 6dfa56f16a..434e4a6e2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/Credentials.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt
index d5d732ccc2..384dcdce45 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/DiscoveryInformation.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
index 02fab04067..e1c5171bfc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/HomeServerConnectionConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
index 13693e5bf1..64d3ddcca5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt
index 64a1fd88d1..f2cebff199 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/LoginFlowTypes.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt
index cbeece7e03..b2a57c7f5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/SessionParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt
index 4f7bc75556..4bcef60605 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnown.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt
index f0b252f973..ad6b9970de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/data/WellKnownBaseConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
index 25cf8209fe..645fb55bb9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/login/LoginWizard.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt
index 3dd2b460b2..8fb318d77d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegisterThreePid.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
index 544cbf63cc..439b4beb41 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
index 0629915a42..ed7b249f1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/RegistrationWizard.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
index 2635adc733..c21b667cf7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/registration/Stage.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
index ec2dfd214c..c68a9e9699 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/wellknown/WellknownResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt
index 409fec4437..d762b7961e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/comparators/DatedObjectComparators.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt
index 97454684a3..9c0eb10970 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/Emojis.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
index 9eae1265f0..9a686de2e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/MXCryptoConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt
index 23f21f8829..f381ae8455 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/crypto/RoomEncryptionTrustLevel.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt
index 606f321196..6a5d9c93bf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Booleans.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt
index 2f3c8c13c5..1cdb6d49a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MatrixSdkExtensions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
index f25898077a..a17e65b8e0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Strings.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt
index 555909aef9..0e35d36d03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/Try.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index e27eaa2921..4711f7957d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
index a930d7d633..de881b9e02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Failure.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
index 053ad670b9..ef770ea1d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/GlobalError.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
index 77a5dc4f85..c6ef33327a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt
index b1296c8aa3..0d636b58aa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/interfaces/DatedObject.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt
index 05128005cc..57de3f5ac0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/legacy/LegacySessionImporter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt
index 9d6c9387f1..02ebd7f784 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/ProgressListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt
index afe6ac51bd..0fabfed2ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/listeners/StepProgressListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
index ff58650781..34cdab58af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
index 3b1082ea0a..04cccf7319 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Condition.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
index dc92ce8d29..0a7366e5d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ConditionResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
index 72eda20679..7f43023873 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/ContainsDisplayNameCondition.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
index c9aa0d001a..eec5b0a402 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
index 78f3a8a156..293a06af9f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Kind.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
index 64ccdcdece..880a7be9ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/PushRuleService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
index ba36c54fb4..328e6dae11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RoomMemberCountCondition.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
index 2353d06252..4c01588b03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleIds.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
index d94026f438..7c1edc1aca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleScope.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
index f716b33f23..5b6f6713f8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/RuleSetKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
index aeb2f01c80..4f9c84a47c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/SenderNotificationPermissionCondition.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
index f83d893c0a..35b4d77c0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/GetPushRulesResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
index 29466ca33b..b31a1e6343 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushCondition.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
index bdb4f2cf29..3a9fc4fb83 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/PushRule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
index a8708819f5..46f5148714 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/rest/RuleSet.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
index 21ff3aebca..8f83beface 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/query/QueryStringValue.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt
index 06657a9869..944f458b6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt
index 5c96d175cb..4e24a17047 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
index 42bb29efca..09c6b8e94c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/InitialSyncProgressService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
index 226a793bf4..f8dc906502 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/Session.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
index 40c373820c..b05f0036b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/account/AccountService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
index a90a34de4b..f5d2a7df3e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/AccountDataService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt
index 57eda657ac..744e3e5379 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataEvent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
index 2414e4a1fb..69b15ff7d4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/accountdata/UserAccountDataTypes.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt
index a36856a7e6..c1c5663227 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/cache/CacheService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
index 382ab54248..494c1afd1a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
index 60268abf70..e55546e12d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt
index 81430c71ea..37ab198487 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallsListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt
index 6b70d8500f..131779a4dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/EglUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
index 04af588b93..2c115a63f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt
index f63a1a0d28..d6e65dd669 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/TurnServerResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
index b89dfee77f..4677c2be32 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentAttachmentData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
index a216770939..924da6c19b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUploadStateTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
index 890e72edd9..36c471bb2b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/content/ContentUrlResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index 726f9b624a..c6e5056198 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
index 53bee09f11..d0d36ec953 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
index 490b1d19c1..6a646cd4c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
index bc85254f69..04af85b091 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/CrossSigningSsssSecretConstants.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
index 0212dee36c..6327dd92fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/crosssigning/MXCrossSigningInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
index ceeb87c128..fb6bb74454 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
index 9ab190ac98..1dc75ce687 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt
index 10cfe6ce85..a6f4bd0ec7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupStateListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
index 3daee31bcf..491d42cd05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt
index acd0866401..5a025f37e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/CancelCode.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
index 6b568ee143..2c1bf9ff4d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/EmojiRepresentation.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
index 45d04e66f0..db2ea72e88 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/IncomingSasVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
index c6be940cde..38ee5dc7e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/OutgoingSasVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt
index 8da60976ac..1ee161724a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/PendingVerificationRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt
index e4956aaabb..37855099be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/QrCodeVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt
index 2dc5c308ee..eff56f6f29 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasMode.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt
index 00da238bd2..da546be68f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/SasVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt
index 68c1bb7bb0..46924a95a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoReady.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt
index 431c9728ee..9a41b35f33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/ValidVerificationInfoRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
index 15a728ccf2..c4432f3a8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
index 623f9e5c0e..65c6a1f1f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt
index 7e7dcb6d90..4d35bc44ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
index a8ae81bc30..39de2cc712 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationTxState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
index 30a1e29d81..239f749993 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedAnnotation.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
index 8bc1af25e0..34096d603f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/AggregatedRelations.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt
index f8be9e26a0..242d01555c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/DefaultUnsignedRelationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 1068b92019..6a119319e9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
index f9f2e10af4..82dea81a5b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/EventType.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt
index aa3726d49e..a7d7cf4ebd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/LocalEcho.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt
index 72ab3e5c0e..a8a8d48a95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationChunkInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
index 2c18bd6c8a..83f3931b1f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt
index a16d9ec5bd..dfe1db7b1c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
index 04371ae54b..0eba953c8e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt
index 52bf0ed05c..169947e2f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/ContentDownloadStateTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
index da42bfa485..31f016be14 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@@ -1,12 +1,11 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt
index b456626ef7..ee1550d1db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/MatrixSDKFileProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt
index 10435ee054..a4186b5a32 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/Group.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt
index 6858db4646..a96466603c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt
index bf9535f271..0761a22c77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/GroupSummaryQueryParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt
index 2633bdcdeb..ef50fce82f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/group/model/GroupSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index e12d99d6b8..da99ab8d54 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
index bcf1052b98..2c9121ce4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilitiesService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt
index 2ac1720400..d921072df4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/FoundThreePid.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
index 2a4054114e..537104a084 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt
index a9f8ccb9d3..72bb72cc2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceError.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt
index f01d4e97c3..f0c00bb185 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/IdentityServiceListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt
index 3dae4b43ee..92ebdc3e92 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/SharedState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
index de4e0a9a5a..42d777849b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/identity/ThreePid.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
index 0bee245537..171d7d6b16 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt
index 003e8bc9aa..e27d81edb7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
index 8927f06c77..7f264c6228 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixLinkify.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
index a660930646..2f8f5f99a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/MatrixPermalinkSpan.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
index 1da65b3002..b3fbdcf1a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
index 59e289ffd7..dc47c81a5f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkParser.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
index 804cde5b30..ac1d726d03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/permalinks/PermalinkService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
index 15066cc4a6..1fd8360253 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/profile/ProfileService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
index 6cc089e152..eed75c9daf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/Pusher.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index f42721f485..0e33be400c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
index 9afff5f59c..837bda031b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/Room.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
index 17d3a2a95a..dc5b3d55f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomDirectoryService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
index 1161dce518..965e7e23bb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
index 5af23f8e24..f859d74a6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/RoomSummaryQueryParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt
index 0ec27fdd5d..cac5217dd6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/call/RoomCallService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
index b7f018bda8..e7e6bacc22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
index 508cf5ea1d..b0df2963f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/CreateRoomFailure.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt
index ef15fbc7c1..510c760f4f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/failure/JoinRoomFailure.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
index 6d13b0bf94..2f366d0a9e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
index 5c9a50dc0c..2c3ffac687 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/MembershipService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt
index 39fc7598f6..c2c5a7f804 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/RoomMemberQueryParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
index 721dcf4f2e..10fb81dc7f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EditAggregatedSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
index d1b0c89410..3a4912e457 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/EventAnnotationsSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt
index 6b3a333672..2841da35d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Invite.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
index fc89ff06df..5844aead8d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt
index 695a3353d5..a15d8be084 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollResponseAggregatedSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
index 07d62a173c..3ae8783edd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
index e55508c9db..696b612389 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PowerLevelsContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt
index 97fd0a16ab..76ed6d0a30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReactionAggregatedSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
index d6ced198d7..67cb9600c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReadReceipt.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
index 82291fa062..0947c96bb0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
index 298567262a..31ac09efb8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/ReferencesAggregatedSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt
index 94628e6987..f70e013786 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAliasesContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt
index ded2e49657..8c1c9e6b12 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomAvatarContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt
index d5f41b66dc..5487b2ff82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomCanonicalAliasContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt
index bd37884407..a98f47f7c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomDirectoryVisibility.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index d2b944c0eb..beae8834de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
index d6546b1065..0b628649f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
index 8955320d89..31493be7ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibilityContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
index d6c947b753..09aacfabbe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
index 14a88885b6..3be2d38be7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRulesContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt
index 278db67a0e..f29dd6a3e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt
index 17b0cf30b1..fba3a1dd71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomMemberSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt
index c3d93a5a16..a0b45e881b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomNameContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 0df86e09d7..f170c098bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
index f8372f3142..776acbd8ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomThirdPartyInviteContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt
index 38d3ca93f4..b97ee44dee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomTopicContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
index 9f0e0c17ff..98101b9b1e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Signed.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
index 202d64d621..b4e7b10d44 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
index 2e21ebea86..c4d1f6486f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallAnswerContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt
index 6a6f1c82c3..cad2356c2d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallCandidatesContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt
index aef774008c..d30441df4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallHangupContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
index 6baef034c2..b961a6f654 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/CallInviteContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt
index a760e6ef93..ff393135ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/call/SdpType.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
index 2e78ae10f9..0860b25d69 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt
index 7bc4f664c5..c9a905e032 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/CreateRoomPreset.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt
index fb726808e9..f48beb299a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/Predecessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
index 2a9b4ca9cf..0b595b1b2b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/create/RoomCreateContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt
index 7b0097db2c..b72c8e5dfd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/AudioInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
index 290909ded1..e85bb0800a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/FileInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
index 26c196bb14..048febec39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ImageInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
index 258fd75c94..a6908dce5b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/LocationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
index 14022075c2..952d65eb15 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt
index 8b5c98d250..df5641a622 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt
index 15609dca3b..aabf6173d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageContentWithFormattedBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt
index 2b033755bd..65e89cdfee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageDefaultContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt
index 36ec85ebf0..77983a031e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEmoteContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt
index bbdb2835b1..d93f115322 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFileContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt
index c32b0586ea..a34b5df126 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageFormat.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
index 48e30508bc..8255934546 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt
index e14d531a4f..369a1a1a46 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageInfoContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
index 3452e291eb..bdb54910dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt
index 7c2dd2a196..b2fd8cb0c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageNoticeContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt
index caaf5151af..7924469884 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageOptionsContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt
index a7dd0160cb..d827475277 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessagePollResponseContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt
index a97c0f86e3..33846b47c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageRelationContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
index fad04941f7..92d9220893 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt
index ea8685ae71..e45245a9bf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageTextContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
index 026132b7c5..fa889a3e17 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
index d7a8a4a6f8..27619cf0a9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationAcceptContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt
index 944599a153..687e5362d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationCancelContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt
index 13593b60b8..a7f05009b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationDoneContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt
index 00d4e2cd0b..1a15e056ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationKeyContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt
index 9ac43e49d0..3bb3338491 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationMacContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt
index eafdb30ecf..72bf6e6ff7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationReadyContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
index b89ff07552..25b5f44815 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationRequestContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt
index c6c5cb6208..8f23a9e150 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVerificationStartContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
index 02456e6b0f..127ca7f82c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt
index af07d37efd..7870db4f65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageWithAttachmentContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt
index b6e7979040..625043df87 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/OptionItem.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt
index bedbe52641..632914ae96 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/ThumbnailInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
index b16c3dd823..8379ee9338 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/VideoInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt
index 8f2b2c7fac..34fb23106e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt
index 97577c90d1..5b5c9e6886 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReactionInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt
index a3822118c0..e2080bb437 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
index eedc23518f..10b071a601 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationDefaultContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
index b3d739fc62..49aa95924c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
index 57d8adb6d6..251328bea2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/ReplyToContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt
index f5303773bc..a7d82eeb02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTag.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt
index 15b83a4af1..d0044d44ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tag/RoomTagContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt
index 36bc949606..5e0b7e871c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/FieldType.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt
index e2cdd25b7c..91f429d773 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/RoomDirectoryData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
index ebc147e69f..4d9e6d9c24 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocol.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
index 04e5481259..0ca0444589 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/thirdparty/ThirdPartyProtocolInstance.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt
index 43b56c8b9d..9b607aa712 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/tombstone/RoomTombstoneContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt
index 42971e874a..ea59ff4d48 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomNotificationState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt
index 79070adea3..32d6033578 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/notification/RoomPushRuleService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
index 34e3168ce1..47922f6968 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/PowerLevelsHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
index 5ac479786e..ecfddad0a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/powerlevels/Role.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
index 3aa9d60e6a..8d78809e02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/read/ReadService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt
index 42a21fab90..0ccdfd1d3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/reporting/ReportingService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
index 6ef73d6486..116a60e323 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/DraftService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt
index a96339a111..1810dd9faf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/MatrixItemSpan.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
index b8e536cb33..36f6e538a9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
index be8849b20e..2555fd4e5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
index b5542b7d63..9471b3dbcb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/UserDraft.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt
index b2836ecaae..1b4368e3da 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/sender/SenderInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
index f887a8b854..8c08743972 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/state/StateService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
index 2b0132817d..dcaf5f3276 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt
index 62f9560315..3278c640de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/tags/TagsService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
index 8920689d97..18c795bc87 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
index 1f3c85afe6..73cb94b417 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt
index eccc46b5d8..c751632286 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEventFilters.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
index 473e505302..07a2a9742e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
index ab98208eed..25c63d6fbc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineSettings.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt
index eaa8d5c3df..e69afa4fc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/typing/TypingService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt
index 09b885e24d..09a69ea983 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/GetUploadsResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt
index 16423cf3c5..d7be9f8744 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadEvent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
index 1cabdfc92a..c3cc1eb9ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/uploads/UploadsService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
index e95d7fab19..c46d8f9b44 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index a8c9e79ba9..ef2eec433f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt
index 8c062b4203..42682efb12 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/EncryptedSecretContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt
index 096f9f34a2..1f4c0eb56f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/IntegrityResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt
index 287555ae95..512d6f48e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeyInfoResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt
index 2d56fb81f3..c06f87a976 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/KeySigner.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt
index f960a43675..f7725be007 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecretStorageKeyContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt
index 89095268b3..6b75c94cb2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SecureStorageService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
index 79e7fa51fe..59325f9903 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageError.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
index ffc7e3889d..37ecf99f9a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SharedSecretStorageService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt
index 17f0366d16..eeb1b31f9c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeyCreationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt
index 9ae181a44e..f791ea4e86 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/securestorage/SsssKeySpec.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt
index d4061c5c7c..ebbbac527a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/signout/SignOutService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
index 0389969948..68cc1143dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt
index 08d8be699a..6fb13e8be1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/SyncState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt
index 685f4ba9c3..e6d33cade6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/GetTermsResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
index 3e2201cb29..2d88125662 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/terms/TermsService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt
index e51fa45d72..ff1b306389 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/typing/TypingUsersTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
index b5617a206f..2cfc4b731f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/UserService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt
index bf8551588e..7cd939a5c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/user/model/User.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt
index abbbf040ab..88cf7c0e48 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetManagementFailure.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt
index 4dba2a10e1..d8fd00d9e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetPostAPIMediator.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
index 444708d992..037cd22b87 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt
index ad01679ee5..d4720d345a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/WidgetURLFormatter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt
index 9da2f224f7..c8465d4d2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/Widget.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
index 1a3d397376..2c4c03b7d4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt
index 278a123699..ee098f9bf2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/widgets/model/WidgetType.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt
index b1976f3921..cf38ff036a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Cancelable.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt
index bc44e08c02..9111973cfb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/CancelableBag.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
index a11be96297..c82a929ee0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
index c72ae3d051..63d37f409f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixCallbackDelegate.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
index 3e99ae52b4..db229a6453 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/MatrixItem.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
index 159f7149b9..02d2cbd682 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
@@ -1,20 +1,17 @@
 /*
-
-  * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.matrix.android.sdk.api.util
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt
index 7344dab8d4..8d08b96943 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Types.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
index 24f5558b26..441232f57f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/SessionManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
index d0c02b6027..f92ae7e0ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
index 229baac052..c6d610188e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 3313a3e86f..3d5a0efcd4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt
index 3b1c61e272..06954fa5c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/PendingSessionStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
index a44cda5b57..6743e7336e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionCreator.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt
index eb038ecffb..0dd67ad6a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt
index 7a631a5677..d66bcfb274 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/InteractiveAuthenticationFlow.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt
index 9fb7eb5f3a..8acdee3608 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginFlowResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
index fc7206779e..ea8578ed8c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
index 60eebea57d..d4b14f1ca9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt
index 9fb8963812..e61358a67b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/RiotConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt
index d47eca8c9f..e67a5ffb31 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/ThreePidMedium.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index 3d9f58f048..0c6fb45e78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
index 88e2804798..bb2667228b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmMigration.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
index 282d0df75d..a92384b4ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/AuthRealmModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt
index ad51f63ee8..6e13e947f4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt
index 2ee342d02c..0798411528 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
index d357221f82..8e4043c11b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/PendingSessionMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
index 41851fc2c6..968ae22eda 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmPendingSessionStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
index 57f1c23e99..edd3e2bed5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/RealmSessionParamsStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt
index 81202d2f52..ba1ab8147b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
index 78324b6916..147c0e8be0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/db/SessionParamsMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
index 71b8f64069..108d0d4a42 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DefaultLoginWizard.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
index f759dc4235..be6ff38931 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/DirectLoginTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
index a6f621c2db..06fcacd514 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
index c291c78882..49682b2ce5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
index 3e6e3054b5..f8d17b406a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt
index 2d60724e99..c1f9fe16e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AddThreePidRegistrationResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt
index f3136526da..23fdbc613a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/AuthParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 676f40a918..9c6b942a4f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
index 45e2f80fcc..1e18887008 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/LocalizedFlowDataLoginTerms.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
index 3ad15822ca..57c4b72b8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterAddThreePidTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
index 2b3924138e..bf5d899276 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegisterTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt
index 267e50eeb9..5b105c4d40 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationFlowResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
index ca475566f1..08d7b48447 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt
index bfebc57884..9b158cce90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/SuccessResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
index 25a7fa3ab2..43167062d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ThreePidData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
index 470faae710..b297c9849d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidateCodeTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt
index ad4a3d4609..b6f3e83929 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/ValidationCodeBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
index 9a02bc62e9..0a9b8b73cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index 6f0c756127..4e599516ed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
index 3b5f91a201..c2c81894fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
index 3c8b525b96..a7a3734855 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
index e5496a6fd1..a8580bab8e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index c9d09ead5d..c2e8e34166 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index bb41edefe1..3590b8072e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
index 9c2e498863..56fabbbcf0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
index 50e11e40b8..c9451aa002 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingWorkManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
index 18356ffbb0..8869e73432 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingGossipingRequestManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
index 04e18bf7f9..c832ff160d 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
index c376a66f09..d2ee69196c 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingSecretShareRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt
index d57584f49f..86e9610148 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingShareRequestCommon.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
index 90b0b318b9..45c8d23219 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index cfdd050801..fdb0f02f92 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt
index 9991115f28..caff2d76f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MegolmSessionData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt
index 092ab672a6..70846515a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MyDeviceInfoHolder.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt
index 19a8468e9c..301729680c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/NewSessionListener.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
index e59fe10c82..68dd17324b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/ObjectSigner.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
index e37c2df69e..6695234d62 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt
index 34661fcc21..8e13daec94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
index d1aeed7da1..b7f5c33e5d 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
index f27338b712..e043d976a1 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt
index 6b51b42b53..def7a1567a 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingSecretRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt
index e574627d39..89fb43ef2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomDecryptorProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt
index aabe2aedec..ba97d96133 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RoomEncryptorsStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
index 1cbf0dd436..085469e9d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
index 1c28dc6fbb..f0a3413978 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
index e69cac5a5e..b05f2cd592 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
index 270240f912..a276394eaf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
index 997a0d7658..0d78f68e5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MegolmSessionDataImporter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
index c654622ffb..165f200bac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/MessageEncrypter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
index a5c00c3632..40eddc82bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/actions/SetDeviceVerificationAction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
index 76efc4d77f..8ea731e3f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2015 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt
index 844cb38858..91f10adf4c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXWithHeldExtension.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 423c883927..3f1d8e1f5f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index b7b2919dbe..95a4342dbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 8c2dfc9e5d..a7de65099b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
index ca7b9657ae..8f651692fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryptionFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
index c018f6e275..921f9b2cdc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/SharedWithHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index a4e3ee950d..d90de0c4ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2015 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
index 17c743fc08..972176e25b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index f253ce005a..f471a67af6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2015 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
index d80c344854..68a95e395b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt
index 721ee0639d..ba5baba60d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/EncryptionResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt
index 7ca5158f64..2cbe0e3702 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MatrixDigestCheckInputStream.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt
index 3bcbeefa91..ee5aab977b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ComputeTrustTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
index 8cd4a6b8e8..b5056a0efd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DefaultCrossSigningService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt
index c371c84ade..fa0098e4a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustLevel.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt
index cabfae1748..6e7c620a03 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/DeviceTrustResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
index 8178a8810d..e494cb5b31 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/Extensions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
index 9b06d79693..271b9e52d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/SessionToCryptoRoomMembersUpdate.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
index e8c1317604..2ac5a25c14 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt
index 878cbd0b32..20e7ca09ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/UserTrustResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index 949677182c..64579c1b67 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
index e796514cf4..24c3942055 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPassword.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
index 19a1f08177..7c0c741a2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupStateManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
index de59aa8ae7..ed5383d6eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/api/RoomKeysApi.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
index 871874bc9a..07ca87fe33 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrust.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
index 955bd5e531..5256c78176 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeyBackupVersionTrustSignature.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
index a7d23c42dd..497cb0eb49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrust.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
index 8382fff6f2..1e3db28882 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/KeysBackupVersionTrustSignature.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
index aa5629e6d9..9df5f29294 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupAuthData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
index 25b191e5bd..1414d0e0d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/MegolmBackupCreationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
index 4903372abd..a84ba7427b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/BackupKeysResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
index 1f493571d3..a7831b38f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/CreateKeysBackupVersionBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
index b03d51894c..46eaa586a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeyBackupData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
index 99031ca458..117d4dce70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysAlgorithmAndData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
index 34c5d1c531..6b55f20020 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysBackupData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
index 115e7814d6..146c98b017 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersion.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
index fd5d926871..0844c58d2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/KeysVersionResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
index 7564e54fc0..ce42a3bc35 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/RoomKeysBackupData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
index 6de374d380..65f0c1a845 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/model/rest/UpdateKeysBackupVersionBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
index 3b11e91716..36b667911d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
index 25417ef4fe..d174be20a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
index 12042f6459..6826596ba4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
index 92e5153d41..5c9aacc1ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
index 66e1fa0203..3c9cab3fa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
index afd0e85f59..25f8f85448 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
index b454a83b89..dd2dd70e4d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
index 5c5d3c3afa..8ca03491a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
index d8b49d49d4..d4c28418b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
index c0a05eaff9..c5df82b5ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
index 31a464dc38..588a861a8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
index 057198aaf9..b77e31e387 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
index 33f6a0862d..3a8198073e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
index 68725b1eb1..50726c66ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt
index adbcd18d12..def9c1b675 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2011 Google Inc.
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt
index 78697ca9ce..44774fd5a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
index 168258acd2..202aa55624 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoCrossSigningKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
index b4bba72718..7eebbd9b2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoDeviceInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt
index 116205dce4..39981e01f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt
index ead1dd5457..6cc6f5400f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/CryptoInfoMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt
index 0ecda951df..e9d2a1bcd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/ImportRoomKeysResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
index 1733cc3913..6024795085 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2016 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
index 8808c83985..f71c5079b3 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt
index aa0d9a2e6d..9d7f2d9883 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXUsersDevicesMap.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
index 1621db380d..6d2430ce5c 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
index 091106c161..803f82a5b5 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
index 448043024d..15b92f105a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmSessionWrapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
index 5d9a1937af..077a53136c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt
index 5b7a139488..4dcca04e94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/SecretSendEventContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
index 0c6d03613a..3a4abd8cf8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
@@ -1,7 +1,6 @@
 /*
  * Copyright 2014 OpenMarket Ltd
  * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt
index efc036c4d8..3a845b1f2a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeys.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
index c0f900f6c0..35fce32394 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceKeysWithUnsigned.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt
index 8464566d7c..53d6e4a80a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DummyContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
index 56156cf749..90f97b65eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedBodyFileInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt
index d044815542..f32676a919 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedMessage.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt
index c3b156084d..e2ae9d1d6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/GossipingToDeviceObject.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
index c4e3dd9297..f695425c2a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationAccept.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt
index ea2cbf214b..4dfa5984df 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationCancel.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt
index e4d75a0de6..96afba060b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationDone.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt
index bf1ded002e..7ded437cea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt
index 001cabaa4e..6c055aee2a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationMac.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt
index 25d6984560..3562613c2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationReady.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt
index 1bf1d1a5c2..c30b2a306f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt
index bc99c71f09..52a66a9db6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyVerificationStart.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt
index 3d9652e328..69b3992374 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt
index cfdb300f16..0d41e5b648 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RestKeyInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
index e3a65df5d0..ae82a384e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
index 299c084819..259f256f50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt
index 98a586d136..a4eeb50d8b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SecretShareRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
index e7df20ee5e..e252abfb04 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt
index a018d62ab4..b3a76b2a7c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceObject.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt
index b6449fe8ed..820ff69746 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ShareRequestCancellation.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt
index 1fc0d417e8..5f316486b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UnsignedDeviceInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
index dbb2822cdd..1347c2f4b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSignatureQueryBuilder.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt
index a7a61b282f..3418bb327d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UploadSigningKeysBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
index 018f707105..e4002b5c52 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt
index 99bbebf7eb..c07434f586 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/VerificationMethodValues.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
index 20b8ff1840..deec8b1b3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/repository/WarnOnUnknownDeviceRepository.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
index 1cae1a4e2b..82b5185fe8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/secrets/DefaultSharedSecretStorageService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index 491a69a1de..898ffc303c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2016 OpenMarket Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt
index 5c8476ea1f..04793f185a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/PrivateKeysInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
index 2d0c53a584..689f9c911d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
index 67e06b5455..493e7fbc39 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/Helper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 4f63ddc238..394b93306c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
index 96125f5d81..c106c82538 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
index 1103e69bbc..a453fc3ed0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
index 3f811ed7d2..5897869a97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/SafeObjectInputStream.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
index 4a303de81c..8e6143f301 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/mapper/CrossSigningKeysMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
index 94db368e05..fdd3e94754 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CrossSigningInfoEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
index 3e3c12f20b..37d1441690 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt
index eb79af4747..5166f6c31f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoMetadataEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
index e1881e9157..4c19b5eb0e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/CryptoRoomEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt
index d0f4d49545..571b9bb05f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/DeviceInfoEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt
index c0a4625826..b8675d0823 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/GossipingEventEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
index d7c1844d53..df45568d18 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/IncomingGossipingRequestEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt
index 125fbd8118..8f2357223e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeyInfoEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt
index 0155ed9cce..99b9e0ccdf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/KeysBackupDataEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
index 64b04827d6..222711f9ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/MyDeviceLastSeenInfoEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
index 7d20b7582d..d0e16bbe11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
index f804a64182..44e70f7ff8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
index 5b32e9077d..442dda1d71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OutgoingGossipingRequestEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt
index aa647d02c1..c0ed1ac409 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/SharedSessionEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt
index cb2933e3c4..5647eb8aa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/TrustLevelEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt
index 2820f72ef4..52c30a27cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/UserEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt
index 36ffe85183..2864ab768d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/WithHeldSessionEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
index 5864455027..eea2f6f31b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CrossSigningInfoEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
index f65b1a3c71..5ebf8b1ed5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/CryptoRoomEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
index b0e677e078..1d5ca2d3cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
index 885cadb5e5..fa37734fe5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/SharedSessionQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt
index e64dcb815d..a1f8bd7262 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/UserEntitiesQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt
index b3a5560dd4..3c6c594a70 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/query/WithHeldSessionQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
index f5ee6aa9bf..ae72c7198a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
index 1f0d9eaaf9..e5078d5b4e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
index 0f67ec666d..38eee7f932 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
index f053900598..7268c48113 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/DownloadKeysForUsersTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
index e0a85d50c0..75f4c1730f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/EncryptEventTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
index e1db5e0c98..6bd69c6a07 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDeviceInfoTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
index ea8be725f0..731e1ca031 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetDevicesTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
index 57a4881a51..289a5226f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/GetKeyChangesTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
index d2c7e87b67..6c0a76fa7d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/InitializeCrossSigningTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
index 870980bde2..10b0823c65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendEventTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
index 20153ef460..37e0bbc887 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendToDeviceTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
index 09baf88e59..b48f84ac91 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SendVerificationMessageTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
index d3900550c5..51b9624554 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/SetDeviceNameTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
index b41dcf6dd0..6216a3a305 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadKeysTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
index 255d06ea7c..a4e10ddbfc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSignaturesTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
index c7844fbfe4..038ef9dbd3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/UploadSigningKeysTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
index f93dc7126a..6d52e682bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/HkdfSha256.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  * Copyright (C) 2015 Square, Inc.
  *
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
index 1bd9e1282f..4c1e896a21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tools/Tools.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
index 009979db49..fde9f70e7b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
index 07e98f52b7..b7f4d5ad2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
index e61497fd31..c0f4671046 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
index e4f559767c..b55b1d1f36 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 17eb33c886..6c23562d88 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
index 2200b5c300..fa7cd2e6f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SendVerificationMessageWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
index ae5852452a..eb1819fe6a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationEmoji.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt
index 2f4c4e9c93..368a9b6b54 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
index 5c6435c1cd..79aabba59d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoAccept.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt
index 68282cb925..35c05ac058 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoCancel.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt
index 7dce847e30..dfbe45a64f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoDone.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt
index 745309df79..23c117d844 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt
index 6ffd0556f5..5515acc2f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoMac.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt
index 6617b6b7c2..327c09dabf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoReady.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt
index 43843d8e29..1cf72308b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
index 9ac15a1056..21a6ba41b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationInfoStart.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
index 0c16fd970f..4994325625 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
index ffe0709932..b0fab6213e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransport.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index 3b2589d995..ba5257f26a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
index 1dbcf31c78..5fd1c5d650 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportToDevice.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
index f0db2e0fee..829e066bf3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/DefaultQrCodeVerificationTransaction.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
index 5e799f63cc..6bc3483e65 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/Extensions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
index 9ae0c136f4..25c04efde7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt
index edff103820..858c0ab6af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/SharedSecret.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
index eec4fa2f88..d5a96f5ba1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/AsyncTransaction.kt
@@ -1,18 +1,17 @@
 /*
-  * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.matrix.android.sdk.internal.database
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt
index 0f735eb558..7bd68b607f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DBConstants.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
index d12f8628b1..e305c7ea38 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/DatabaseCleaner.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
index 1834961ff2..11a877e7c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/EventInsertLiveObserver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstanceWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstanceWrapper.kt
index e2ddbcbca8..097fbc9478 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstanceWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmInstanceWrapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
index 453cbae325..f0f9f66cc3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
index adf77840ae..3e2160e666 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmLiveEntityObserver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
index 712b01a69a..704a3d196f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
index a7f934ffc0..1947cc83e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionProvider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
index 26ce38e322..973388da49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
index d5c259050f..3324520d29 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/SessionRealmConfigurationFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
index afe228a240..f764c4da4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/ChunkEntityHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt
index 4874a1742b..a4108f0966 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/RoomEntityHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
index 95ae59f80f..6f4dac182c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/helper/TimelineEventEntityHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt
index 9811afab8e..54315a1835 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/AccountDataMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt
index 5002a1b225..06658cecfe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ContentMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt
index bc22c7ed3c..148f727ba7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/DraftMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
index 2f697d53ca..9ed2664068 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventAnnotationsSummaryMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
index d7226a2a0b..66eccdfba0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/EventMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt
index 09c96215b4..13c3a796c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/GroupSummaryMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
index 4eb9b4b47f..b18c67294f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt
index 5dde01e15c..5d7afc50d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/IsUselessResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
index 18c774ac40..b26e7e88e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PollResponseAggregatedSummaryEntityMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
index cce780bad8..5c0a2ba902 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushConditionMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
index 3bcc3d2ea7..12eff8efa1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushRulesMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
index 9912bcd4f6..2dba2c228b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/PushersMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
index 6b9c0e7a45..5413dd3d71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/ReadReceiptsSummaryMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt
index 65ea7fa7c6..2365a39567 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomMemberSummaryMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index bd2aba3e54..2e54a4cd52 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
index 71c586cffe..a2b36ce590 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/TimelineEventMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt
index 5f5c541585..0c40ba85b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/UserMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt
index 94306fadc8..07554d859b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/BreadcrumbsEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
index a1f7fda7cf..14a5200857 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
index bdd86cec7b..251b057722 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/CurrentStateEventEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
index 7254e6241d..15a5d37963 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/DraftEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
index 5f98d2218a..604afc1ab1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EditAggregatedSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
index 140058fbaf..3e5e277613 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventAnnotationsSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
index c76e1402ac..fe59f4fceb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
index 16ae051952..f4426207be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
index 41ecad003f..05153c5734 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventInsertType.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt
index b7a2f90521..96014d29ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/FilterEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
index 76ddb31678..25a041e3d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
index 00c39d4ee4..8982436ccc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/GroupSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
index a905dc9535..763dcf80a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt
index d2b7e0492d..d16bf89da2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/IgnoredUserEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
index 2f5643d7bc..98c38c8969 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PendingThreePidEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt
index 267675ef8a..0000a558ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PollResponseAggregatedSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt
index 2fdcaa250f..7485680c49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushConditionEntity.kt
@@ -1,5 +1,4 @@
 /*
- * copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * licensed under the apache license, version 2.0 (the "license");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt
index 118d394e06..85375c8064 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRuleEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
index e4a7ef5e0f..21e3510cd2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PushRulesEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt
index 9fff183b96..f12cf70db5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherDataEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
index 7b299d4f33..f85c01c48a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/PusherEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RawCacheEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RawCacheEntity.kt
index 3c0a280476..4f271a9ab7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RawCacheEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RawCacheEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt
index 7da933c6e4..ae916ae579 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReactionAggregatedSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt
index 739c0b9e88..965665c581 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadMarkerEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
index f1e3bc4e65..e01d849cc2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt
index 8445abdb4c..98b4329076 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReadReceiptsSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt
index 327648abbc..979ef4d0d3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ReferencesAggregatedSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
index ae1e7865d2..9af1646a4c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
index f2ea5a5f16..a48b081f02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomMemberSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index d6859f1d3f..37696c9082 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt
index 8fdae3205d..a7fe71f3e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomTagEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt
index a8fc454720..9beab4b579 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ScalarTokenEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
index 2c45cfcdbf..f62312f8fc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SessionRealmModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
index 5a1bcbc8d0..a097b8eac8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
index 36f6041fe6..7bd0dbbb8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/TimelineEventEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt
index 75aacd8dda..cfdb84d033 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserAccountDataEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
index f84a7b930f..06a6349350 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserDraftsEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
index e2150103d9..bd6e73582d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt
index c7337f6a42..444ba94d2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/UserThreePidEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
index fdabed3c23..65d640647e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/WellknownIntegrationManagerConfigEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt
index e711e30188..0463d52fff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/BreadcrumbsEntityQuery.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
index 79b611115c..6028697054 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ChunkEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
index ac00f791b8..9a3622e2dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/CurrentStateEventEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
index 9fa710a94b..c51c5aa09f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
index ee41729e2a..0bf62a19fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt
index 33a7bff606..c76e606805 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/FilterEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt
index 1097cce463..9a1f2b3782 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt
index 650558ee2f..fbfd8bd19e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/GroupSummaryEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt
index 1ebe276fbe..b0b4f5a83d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/HomeServerCapabilitiesQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
index cf34bc0cd1..d78bda2317 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/PushersQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RawCacheQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RawCacheQueries.kt
index 93753ff24b..ac5e29e1de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RawCacheQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RawCacheQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt
index 636fc9ac73..35fb2b068b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadMarkerEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
index 8ccc12a514..a3c741ad55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
index 1eb438190a..1a5e8fcf89 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
index 1d384a1de6..97f8418403 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReadReceiptsSummaryEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
index 60f665d460..8b3929cd60 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ReferencesAggregatedSummaryEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
index 35d21f8f5f..27e8d9d8d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt
index ae1d42772d..0747b12665 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomMemberEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
index 7eee63c7d5..7430b7822f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/RoomSummaryEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt
index 24387856b6..53fd525092 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/ScalarTokenQuery.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
index d49b64c432..41a13c785d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
index 068ec0eb8e..10a0d1dcec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventFilter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
index 6c3bc70787..35f317f192 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserDraftsEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt
index 5566028d60..6a5528e3db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/UserEntityQueries.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt
index 237eae38ec..fc00d9310c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/AuthQualifiers.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt
index 2380ea68b8..49e155add8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/DbQualifiers.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt
index 5d140232df..74dbd647ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/FileQualifiers.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
index e51d8f3ad3..d3f08fde36 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixComponent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
index be3175c22f..71cbd8f1a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt
index 8cfa48f26c..b027d47144 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MatrixScope.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
index 5921e28f59..48fa41b350 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/MoshiProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
index 1c11ef79f9..f4688411ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NetworkModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt
index d74c6055b1..210eadeff7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/NoOpTestModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt
index a66c7ff713..0d8fdde813 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SerializeNulls.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt
index b9ea7a0ad8..da3ecfb907 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/SessionAssistedInjectModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt
index 10a523bbf7..d74a8dce57 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/StringQualifiers.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
index 737b5335d4..4c9d06f7a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/di/WorkManagerProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt
index b60d60a61b..2cbd7ba7f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/eventbus/EventBusTimberLogger.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt
index 64fb72e537..718e7869dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/LiveData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt
index ab45f08e42..855e7edac3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Primitives.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
index ebe9ab7ecb..0718096fd5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/RealmExtensions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt
index 0b812736cb..3734c5dc1d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Result.kt
@@ -1,20 +1,17 @@
 /*
-
-  * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.matrix.android.sdk.internal.extensions
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
index 1030d6717b..8786321464 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/extensions/Try.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
index 1741ca4845..e0e2f96fa9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/DefaultLegacySessionImporter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java
index 59ad3be4c5..6844744044 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Credentials.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java
index 3975618f39..74a3f1ac55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/Fingerprint.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
index 6732a2cd92..b6bbebdd71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
index 672053d4cc..516007524e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/LoginStorage.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
index 234cd72689..56d372faa5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnown.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt
index e9efccce3c..7bbdda5eaa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownBaseConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
index f93d90af26..e9ef9e4393 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt
index 5a918d6f0d..feefdf920d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownPreferredConfig.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
index 6f5b07b229..b11fb6a5ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/AccessTokenInterceptor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt
index f15b0353e2..26bdd90507 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/HttpHeaders.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
index caf5090ad6..8e18d2d850 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkCallbackStrategy.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
index ae55324d53..c149ed2591 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConnectivityChecker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index eb8ea2dc68..1154d1967c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt
index 85a69c853e..62f4f64a80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkInfoReceiver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
index 83f2d13459..818d7d6af3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ProgressRequestBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
index 52556e4c2d..e6cec7f7ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/Request.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
index b7eacfb4f5..c54af571d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitExtensions.kt
@@ -1,6 +1,5 @@
 /*
  *
- *  * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *  *
  *  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
index 89a0ce597a..0a797c8bc0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/RetrofitFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt
index 4fb8f513d0..6c604f232f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/TimeOutInterceptor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
index dfcf041261..a4a9dfe686 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
index 9a5451bdde..973c120f59 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentHolder.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt
index 1099751112..256346a738 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UserAgentInterceptor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
index 94d1d95857..b4a2d191e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/httpclient/OkHttpClientUtil.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt
index 40ba02ef6d..14d275e021 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CheckNumberType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt
index ad5821cb0f..3cb11dc45b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/CipherSuiteMoshiAdapter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt
index 42a63e0c56..f3b4cff34c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/ForceToBoolean.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java
index a49660523e..c9bf6cc662 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/RuntimeJsonAdapterFactory.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt
index 75301521d5..771dc40134 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/TlsVersionMoshiAdapter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt
index f45c89304b..bdfc3519c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/parsing/UriMoshiAdapter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt
index 40a8e29829..9d7263f56a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/CertUtil.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt
index f1280b879b..b096bd6c87 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/Fingerprint.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
index 289a4ee04f..b1001bd39c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
index ed5a099ee4..4e58a0f2e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerApi24.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
index 7dcff0294f..57b97c75c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/PinnedTrustManagerProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
index 4ebeafd0c3..a5c711a3f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
index ba68a51344..ca841f0ffb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/UnrecognizedCertificateException.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt
index c1e20aaa58..c0e08b5ad8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/AccessTokenProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt
index 1bb0f34222..82cde2399f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/token/HomeserverAccessTokenProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
index 6e0cb3e677..5653d7171d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryEnumListProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
index fadea5ada7..899024458a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/query/QueryStringValueProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultCleanRawCacheTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultCleanRawCacheTask.kt
index 7ab6645244..9d7efb7a7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultCleanRawCacheTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultCleanRawCacheTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt
index 1733abccd4..e0fe410096 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt
index 792a0b3aa7..be01366efa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultRawService.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
index 4df5edae88..e4e4160193 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/GlobalRealmModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt
index f7aa738e90..4b08afd711 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
index 95de057f04..aee2a52818 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/RawModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
index ff12030961..861ae7c7ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
index ff1f44341b..9918e83fbc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultInitialSyncProgressService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
index d1c0844caa..679a24be0c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultSession.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
index 85d714698f..53b1a73544 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/EventInsertLiveProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
index 123b87748f..ffa7c841cf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionComponent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
index 3cc73599ff..d26e9861d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionLifecycleObserver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
index 36242616ff..64f2d249f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionListeners.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index 5397b8d9bd..355a152c82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt
index 1fb950bad4..f897c96717 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionScope.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt
index cf8701ab86..fad68afd8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/TestInterceptor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
index be25c680a5..1db9d121a6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt
index 50469f99b0..7cf4f53adb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/AccountModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt
index 347e39ae39..70cdbda399 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
index 9338f58e6f..869d3f516c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/ChangePasswordTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt
index a8fa999c98..6c2e8b4a4e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
index b31a0a4c97..ac5febcdae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DeactivateAccountTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
index 892d91fe34..31a39d45e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/account/DefaultAccountService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt
index b6e2a8d0c4..83c7d2b0b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/CacheModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt
index 9b968f3d03..894c3a4723 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/ClearCacheTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt
index ab53e87067..19365fce0a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cache/DefaultCacheService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt
index 40f5a56c33..952f115633 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/ActiveCallHandler.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
index 5d1d5808e3..f789a64500 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallEventProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt
index 60887db497..efacca229d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/CallModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
index a314b5fc3c..519beaf2ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/DefaultCallSignalingService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
index c38a00d1bd..1cedee3374 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/GetTurnServerTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
index ea2f55cf67..72c6c58f27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/VoipApi.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
index 1e724706f3..7edb375d8e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
index 427fb59898..b5c1e6a282 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/cleanup/CleanupSession.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt
index ba87d06097..10c1614050 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt
index cb0c11d1b8..b5de26b39d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ContentUploadResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
index 951c24ccb7..754f12bd68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUploadStateTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
index 80f69f8890..f765056496 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
index bb62b02112..4fc1d67c05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/FileUploader.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
index a125c0aea4..39b0e60203 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
index 05558fcf4c..8c3aad6a1f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ThumbnailExtractor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 0b517e014f..dd630cd3d4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
index a1f305fb06..3a02d00aa4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DefaultContentDownloadStateTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt
index d8ef0c3323..e357d4434c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/DownloadProgressInterceptor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
index 8bfe74862d..f4cb1a80e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/download/ProgressResponseBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
index e07778b536..095c39a485 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterRepository.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
index d120312a1f..9a16b8fd4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultFilterService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt
index b5c214dbaa..69ced92fe5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/DefaultSaveFilterTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt
index fdfda09633..1be62304a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/EventFilter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt
index 4c4a4d6181..f1414e907e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/Filter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
index 8a45a6d66f..285bd51d38 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterApi.kt
@@ -1,6 +1,5 @@
 /*
  * Copyright 2018 Matthias Kesler
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 12764248ef..2eac0a5059 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
index f5052d57ac..8531bed1ff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
index b19478c42f..df61539547 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterRepository.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt
index 951b7e8ca2..b2d5429216 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt
index 3a030cc470..bd7f0ad402 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterUtil.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index cefa9e8ece..d6089f9f5b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt
index c0694aee51..fbf22fde51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomFilter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt
index c91bd381a4..dd703a5e93 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGetGroupDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
index 3fbed5d992..01b57767b3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroup.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt
index 25c9d1dff7..425d6a9aca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/DefaultGroupService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt
index ac72b8ebfb..d6b9363d54 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GetGroupDataWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
index f5156017ea..004112578c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt
index d9566fe5f1..31450763d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt
index b47bb0a5ad..4dd61aa914 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/GroupModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt
index 9990e3d821..30eeb74b2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupProfile.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt
index c93878a0d4..86e64f6797 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRoom.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt
index f7e36ad8bc..9e5d18225b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupRooms.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt
index a11ba1ecdc..bf287e982c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt
index 428caaa209..8f9b29ed0a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryRoomsSection.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt
index f61160fb1a..121ae6fd7d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUser.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt
index a8ade1ab5e..799aa8a5b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupSummaryUsersSection.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt
index d9a9631ef7..a54c66535e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUser.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt
index 1ce283756d..9dd1339157 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/group/model/GroupUsers.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
index 33ebf3e548..39b6608de3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/CapabilitiesAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
index 7e1ad600e3..8d289dfda5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultGetHomeServerCapabilitiesTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
index 0989d6c191..27396aac80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/DefaultHomeServerCapabilitiesService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
index 54d8cc7839..ab029a0fce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetCapabilitiesResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt
index 43395aae3e..92903bf96e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetUploadCapabilitiesResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt
index 240839cf7b..2a1573dd98 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerCapabilitiesModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
index dee73f08f1..522097acbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/HomeServerPinger.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
index fc841af2d9..20f8b7f868 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/DefaultIdentityService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt
index 838b9975b7..5e1434403e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/EnsureIdentityToken.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
index f2c889f024..7e2702e70d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt
index cf9ba0ee89..492c3a5d0c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAccessTokenProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt
index 09922cb475..b2e1f2d7cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityApiProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
index 7ebe775ce5..fd6e1163ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityAuthAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
index 45d7d48a18..3b0d514cf3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityBulkLookupTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
index 0e68689ce7..50e24f1245 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityDisconnectTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
index 0c35eef642..1bb57b47cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
index 6994ef1bce..b0d33811bd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityPingTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
index bba6f99178..19215f353a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRegisterTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
index 3155e19943..bd4cd763f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityRequestTokenForBindingTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
index 7b25986ae3..ebc71c715d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentitySubmitTokenForBindingTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
index 52f29c857b..d3aecce381 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/IdentityTaskHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt
index 4574d9d598..0f04f2fe1a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt
index 85bf65d741..41988a4ec6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityPendingBinding.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt
index 61334f188d..3a905833d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/data/IdentityStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt
index 41645bc07b..cc03465cc8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
index 1c612d6bf4..062c28ea55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityDataEntityQuery.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt
index 4b99ba17d3..98207f1b38 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt
index 94a359f4d1..be68e17a49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntity.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
index 30de96e557..aa2f4dd5b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityPendingBindingEntityQuery.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
index 85ea903ab6..1f2cfad33c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/IdentityRealmModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt
index 244f09f06a..0352e9b936 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt
index f23c493206..5d01b9b760 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityAccountResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt
index 04ed62bddd..306e423053 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityHashDetailResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt
index f737e4742c..9742506cae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt
index 0a274ebe44..19c1835d22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityLookUpResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt
index 1769b3654e..ad7b3f655e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRegisterResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt
index bd263e1dc6..c6c5513191 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestOwnershipParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt
index b93a3f43ae..3c7e997cc6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt
index 5f4209cac8..513c5eaa0c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/model/IdentityRequestTokenResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt
index 5ea6e4d4d7..8d0e8c930d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/AllowedWidgetsContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
index 4f1185929f..753e865b4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
index 0f7b3f85c7..df4e407415 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
index 78edc59fca..f7a8b68515 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt
index fb7f835d9b..eb8418237d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
index c592237a1f..77423d441b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManagerWidgetData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt
index e48a6fd84f..9a8b80764d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationProvisioningContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
index ffe11ee04b..217da269f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/DefaultPushRuleService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
index a0667cc4a3..7763251a01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/notification/ProcessEventForPushTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
index 3da6fdca93..5d7cfd1719 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/GetOpenIdTokenTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
index e56e2e630e..4614d82453 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt
index 60ee7fb747..a462c29f8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/OpenIdModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt
index 8103efb895..3bf84bfd8b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/openid/RequestOpenIdTokenResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
index cef1fce05c..7db9d8f68a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/DefaultPermalinkService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
index 3ec8fe8397..71a6e224bf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/permalinks/PermalinkFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt
index 185294fd3b..0a792397f8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AccountThreePidsResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
index ff81ad6a5c..f6fa705158 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
index 8654d7c5ba..81f5b7c698 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddEmailResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
index 64c53f6729..1695e42e82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
index b4c137b3a1..347522ac12 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddMsisdnResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index c844c8ca6f..8942f2fdbe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt
index dff246e6f1..fa45ae9940 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
index 52fbcb5185..dbe6bff508 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/BindThreePidsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
index 97212a8687..8d09277295 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DefaultProfileService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
index e7d4568f8b..220ef7d2b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
index 3817277a9d..dea3e30268 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
index 69ff7d82da..3f43cbe599 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/DeleteThreePidTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
index 73e9b39cea..4e46dd096d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddThreePidBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
index 3886b926ba..0b1bf88280 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/FinalizeAddingThreePidTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
index 7889dbf240..5f1f621ddb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/GetProfileInfoTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
index af7e217d47..d309930c3d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePid.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
index b1877027ed..0b1ed4c272 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/PendingThreePidMapper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
index 4e2f518c5a..7794f578b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
index ae7ae7a6f3..3dec63f198 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ProfileModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
index bf09e52284..5dd092cceb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/RefreshUserThreePidsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt
index 25d995fbdf..57d6c72215 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
index 1eaedb0220..4b863c2098 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetAvatarUrlTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt
index 306aca6f44..47b8f23f59 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
index 66406a480c..1fa84f98c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/SetDisplayNameTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt
index b7c756cbb7..80c41d1a07 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ThirdPartyIdentifier.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt
index 1a91245894..f91eb412b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt
index df31efdb6c..1ebaf78314 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
index b08c283765..96b0717edb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/UnbindThreePidsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
index b11955b96a..36804e06fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/ValidateSmsCodeTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
index 62bb2ba7dd..31c5cda5ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddHttpPusherWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
index 1c8f11a12d..28ac5db52e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/AddPushRuleTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
index 0d3ad340f5..84a05067be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultConditionResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 3ef46785b2..8f80ac46e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
index de96db01dd..0c532cedbc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushRulesTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
index a36705cc57..d8f0ce12d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
index bad507555d..39e970f4a8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/GetPushersTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
index 89dae0c7e9..a594675e28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusher.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
index d2520a915b..c8d4d77fb1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/JsonPusherData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
index 166e8ac3be..cbcb7d2b37 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushRulesApi.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
index 6ad70db5e4..ed4fb73e1b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
index 9569574fce..a6042b27a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
index cb46c1342d..2fc97cf023 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePushRuleTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
index cf8cd1e10b..1f10863799 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/RemovePusherTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
index 7761544d48..6ba769a3b7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/SavePushRulesTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
index d68888a3f5..c2dca8a9a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleActionsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
index 2f9ac3edc0..4100071c90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
index 0eb64af8a0..1338df6878 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoom.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
index 12d9d5bcdc..a091b5f85e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomDirectoryService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
index 17c724368d..171e90703c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
index 4a196193ba..9ff0deec89 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/EventRelationsAggregationProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 35c20cf5cb..fc80842f73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
index 6851780a62..90ee99a919 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
index 28eb17314a..d4fa040d06 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt
index 985cf80e97..2947518605 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomGetter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
index 700507735b..30e3337a68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt
index b5938d592a..1cea75f04c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
index 510bd25d9c..695be3f633 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/AddRoomAliasTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
index e1d119c432..8b011980d0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/GetRoomIdByAliasTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt
index ac0b59c916..ada3839fa0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/alias/RoomAliasDescription.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt
index 3d764e001c..205a085df6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/call/DefaultRoomCallService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
index e9ae5e7a6b..c30f11b9af 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
index 0a814a4c93..7e28200ccd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomBodyBuilder.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt
index cfc63bcb7e..a29e29dc91 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
index 6738c7d881..4f0aaf083d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/CreateRoomTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
index e6de3fbd71..95572c203c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/create/RoomCreateEventProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
index 4d760d1b09..f2bd0c5f69 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetPublicRoomTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
index 39f1c60829..5e08284706 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/directory/GetThirdPartyProtocolsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
index 0426ee13e1..92e16a3501 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DefaultDraftService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
index 5cc6c990d9..c8c52c4b23 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/draft/DraftRepository.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
index 91039f4c0f..4fc865304b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/DefaultMembershipService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index e51a4605c8..627f927ad8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
index 00d54a62e7..b9c547d4fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomChangeMembershipStateDataSource.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index 942da9995e..bfedd3afd1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt
index f526550918..f78b5d7992 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEntityFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
index 2821eb2fb9..89fe2901c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberEventHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
index 4ef2d973c0..7105a2cc22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMemberHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt
index d8ac0983eb..018d81929c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomMembersResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
index 948bab39fb..4654a28536 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/MembershipAdminTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt
index 4589b5e4bc..fe3637636a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/admin/UserIdAndReason.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt
index 6fad0b10b7..06b75709a2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
index 4b9935d2fa..854a332679 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/InviteTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
index f3e2efcde3..dd1dc5fa8a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/joining/JoinRoomTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
index 2a3e6c0aaa..58e34a15ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/leaving/LeaveRoomTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
index 88809fec13..80af00fc78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/InviteThreePidTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
index 5b0098dc9b..3141c052c3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/threepid/ThreePidInviteBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
index 93e2881c13..8797b0c764 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/DefaultRoomPushRuleService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
index a7c7719342..d2c0d13b51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
index 86a9500339..86d2e6c619 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/RoomPushRuleMapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
index 5a1b8d2a65..de049d7538 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/notification/SetRoomNotificationStateTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
index 5ff7ae69bb..95fb6b1495 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/prune/RedactionEventProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
index a5520972b0..62dc001755 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt
index d2b216d625..9b4db795ec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/FullyReadContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt
index b06b83aac3..ebf034a775 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/MarkAllRoomsReadTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
index f750735bbb..a98bb02c83 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
index 204a7f8aba..a151a16383 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/DefaultRelationService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
index 28cdd9a72b..51eecb8c2a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FetchEditHistoryTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
index 86fe75d9ed..fa6db2ee37 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/FindReactionEventForUndoTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
index 24fcf89bde..a65165d457 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/RelationsResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
index cd828f7b30..25dfe32cbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/SendRelationWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
index d235cdba3b..1f68a700ad 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/UpdateQuickReactionTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
index 1117ed1c29..384c544ee0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/DefaultReportingService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt
index bd9f09f4fd..4c40376ab8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
index b13c21fa2a..bd11937676 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/reporting/ReportContentTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt
index 0b79b93cf6..5f6ebc68c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/CancelSendTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index 98b793923c..b357e6905a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
index 8781f75ee8..73b4c48e14 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/EncryptEventWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index ac92e526a8..aaf2f9fd30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoIdentifiers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoIdentifiers.kt
index 391fa2a3bd..88dfbb90c1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoIdentifiers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoIdentifiers.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
index 50f5e13980..9e1de291c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoRepository.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index f80285574e..e3ae6e4870 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
index a5b6e3bfb0..ba69a8751b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MultipleEventSendingDispatcherWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt
index 7b9e1ec9d8..b56b283171 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/NoMerger.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
index d3b4c1f97d..682865eaee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
index 4ac8d87550..8f783d7478 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RoomEventSender.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
index 96b33ce74f..0014213b3f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendEventWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt
index d9ba553ce5..13f0f3c16f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/SendResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
index 33490a4a03..efc0b55abf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/TextContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt
index 18063bbc1e..57c3eacb0c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpec.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt
index e6bc19f3ae..3d235ec4d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/MentionLinkSpecComparator.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
index e0fe580cba..faf966edf4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/pills/TextPillsUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
index 0150acd1e2..d21805f4f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/DefaultStateService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
index 52e865c4e2..642f68c15b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/SendStateTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
index 65d30868d8..d0f6f8050e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/state/StateEventDataSource.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index a43241a657..107055b8c3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt
index dd71bff436..a3862b001b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 0aac30654a..f58059d6f2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
index d78a7f338a..013fc86d5c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/AddTagToRoomTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt
index 141adad643..932cb5d67e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DefaultTagsService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
index 9017338503..b22355d431 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/DeleteTagFromRoomTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt
index 33d39ba4d1..c30ef8e3be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tags/TagBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
index 9d880c0428..7a611dd350 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultGetContextOfEventTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt
index 55b8fb6ff4..b663d03bd7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultPaginationTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index 3873a43cf5..cf2ff38d90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
index c60a944409..df2d238c05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt
index 27006c8183..bce03354d7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/EventContextResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
index 23a32996fa..d1bfa1adcb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/FetchTokenAndPaginateTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
index 531fac4a57..acac3929ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/GetEventTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt
index 581f23c403..930d01759e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationDirection.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt
index b0f2e693dc..ed384d3b3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/PaginationResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
index 0ca0d19b5e..94625704e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
index f2c520a50f..3dcc5e21b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineHiddenReadReceipts.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
index 3bc6a85cfb..e30d1b5b44 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineSendEventWorkCommon.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt
index 655af7c4e1..08b20f1701 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEvent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
index 1fefdf9b50..2a532c6bf5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
index 8707eb2429..8022d98975 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/tombstone/RoomTombstoneEventProcessor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
index b8db9ce69c..5d88dbca15 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
index 719fffbb4e..c8cbb08e2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/SendTypingTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt
index 8ed77a4829..973870bb47 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt
index f616bfefd0..488d38d762 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/TypingEventContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
index 76fb18b130..824bd23c01 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/DefaultUploadsService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
index be53b8afe1..d0439ce7f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/uploads/GetUploadsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 0b380f4d35..2ba1eebe61 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
index a903cd8cc8..4a74b0a023 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchAPI.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt
index 50cf8b8d84..ae808107e8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index c90068e507..4f574e5ead 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
index 7cf86457d6..c8d21dba28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
index 9d87114237..452cf5aed1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestCategories.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt
index 9db97295dc..5c5c335c08 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestEventContext.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt
index 196d49346c..8d733968ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestFilter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
index f0b6f7bc31..1cbcdb7824 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
index c5234b1052..6064381808 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
index 8e11ba1468..1afb985f3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
index 8e46502e27..03a41c0e4f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseCategories.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
index f4d8699b2d..aeeb602635 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseEventContext.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
index 5b0806ce85..2c5f842f11 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseItem.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
index 2aac427232..56e3738a9a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/response/SearchResponseRoomEvents.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt
index 4ac796791a..ef8133dd15 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/DefaultSecureStorageService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
index 8eab44366c..c3b2d7f161 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/securestorage/SecretStoringUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
index 0fdecc8d21..ea3730b195 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/DefaultSignOutService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
index 6f26fb25cd..3bed0bdbff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignInAgainTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
index e4b05bfc67..4c92938b77 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt
index c482200030..cdf13329a1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
index ef507477cd..153ea5a6fd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/signout/SignOutTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
index 5c855e190c..da28199f1b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/CryptoSyncHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
index c3dd9fd577..135f711a6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/GroupSyncHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index 5fe23e1b69..085a66d37c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt
index b0c44ef4f0..e8934fdf21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomFullyReadHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
index 64c30825fc..8589889b30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
index 8dbd77f3fd..c18bfc7784 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
index 71a4d33d3f..1655e551f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTypingUsersHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
index db14c53456..427a8896c9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
index 87afe78e70..010c029c97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
index 764087a7b8..a80b062427 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 9924d44764..9393d4703f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt
index 4b29a82ad4..17d465114d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTaskSequencer.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt
index e001e61149..cf061586b7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTokenStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
index 4ef6a5a3e1..0e549172f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/UserAccountDataSyncHandler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
index 485eca6f74..ccd7f770fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 9fd9c313db..4aaca991dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index e64e0b7933..17baa91cec 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
index 0e7fbf492f..fdb9916190 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt
index df79060192..bfa8c342b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceListResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
index 36fe4acfa1..d5b435ac27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DeviceOneTimeKeysCountSyncResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt
index ec59e8f2c8..3dc71a355d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/DevicesListResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt
index 5a7ed53cae..ee6aabb0a9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupSyncProfile.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt
index 68557d1d9a..4c2dce3ba8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/GroupsSyncResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt
index cae6bc36a4..148c2aeab9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedGroupSync.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt
index efd1b50b3b..c21a73abc2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/InvitedRoomSync.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt
index 2c6057d152..92d09aa4f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/PresenceSyncResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt
index e37d4f58c7..ded9e2a350 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomInviteState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt
index df53eabd80..4b5785113a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
index 08556e800d..212d319139 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSync.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
index 13ea47a505..1c35d812ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncAccountData.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
index 6d0e9e825f..d59dddb3ea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncEphemeral.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
index f30e5a082d..5355b7eef1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncState.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt
index a2dddb9e8c..228a71ec28 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncSummary.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
index 29e5d2089b..ddf430099a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncTimeline.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt
index bbcec474e2..f01534b884 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomSyncUnreadNotifications.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
index 79000edf40..dd2f96c988 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/RoomsSyncResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt
index e57c6cd1f8..f2b2fb7e8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/SyncResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt
index 1bc9f0a3fa..8f3af56cde 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/ToDeviceSyncResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
index 813c300ec9..533ba70b05 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/TokensChunkResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
index 57cd387243..0fd2035449 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/AcceptedTermsContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
index 54aa5cb0b9..caba96742b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/BreadcrumbsContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
index fbaccf08c6..c406f3acf1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/DirectMessagesContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt
index 5328525c53..ddda82fbd5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IdentityServerContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
index 1095d2e76d..c660d8f379 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/IgnoredUsersContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt
index 358f090bbd..05b50ab2c5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/model/accountdata/UserAccountDataSync.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt
index 497d30fdca..ee23c9e6bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/AcceptTermsBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
index f887754b6b..5eb97cee3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/DefaultTermsService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
index 950c0a151b..4c97f462eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
index 7aa97cd1cc..b7cd7a4a97 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt
index 240291c09f..a185e0b80f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/terms/TermsResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt
index 0fa557467c..2b7ff2624a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/typing/DefaultTypingUsersTracker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
index e79893e752..d2eb7a14ef 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/DefaultUserService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
index 2b9a5f4aa4..c5c546bbed 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/SearchUserAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
index f6cb86c0ed..e83725b10d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserDataSource.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt
index 6333a87a0b..9a9458e84b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserEntityFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
index 51e4339061..4dfc7586ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt
index ea64cb9a2c..5c8cbd08b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/UserStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
index 25336cacf7..3de484fab3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt
index 5384a1ba9c..5f9f0777d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt
index a9261eddab..d145c008ba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataDataSource.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
index 291d0bfaf7..3173686a27 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
index 2bf1705855..1f1e987ebf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DefaultAccountDataService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
index 8bec45a203..e297f59b96 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/DirectChatsHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
index 6ef28954e0..d6c95d6b52 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveBreadcrumbsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
index 9141aabc80..63c0ce645e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/SaveIgnoredUsersTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
index ab602dd603..874c2741de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateBreadcrumbsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
index b47a25187b..d1393c8b37 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateIgnoredUserIdsTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
index a68d76f25b..80ab79b228 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/UpdateUserAccountDataTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt
index 4299794c16..78981c53be 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUser.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
index 5f587d7f8d..cd9be0e7dd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUserTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt
index b8e855a004..46285965b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt
index 646d8e63bf..e2a93abde0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/model/SearchUsersResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
index 9f7981a95b..422615af2d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/CreateWidgetTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
index 395484433b..566b752df8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
index 049b368fe5..3e4e430e3b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetService.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
index 28bcf0021c..94dba75205 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetURLFormatter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt
index b1d08ab295..9654215f80 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/RegisterWidgetResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
index b167b5ca0c..22bdd2c6e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt
index 56b2d94701..98bcd0c01c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt
index 5b26415ce5..3a47c7bdcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetPostMessageAPIProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
index bfcd27b28a..1fece8b580 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
index cbbc11bb93..7f79f44767 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/WidgetsAPIProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt
index f6dafd0553..6f423b38a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/UserAccountWidgets.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
index 992dbf16df..c41f1df0de 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/helper/WidgetFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
index 58b0c61060..6db79da35f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/GetScalarTokenTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt
index a6f8b3c890..896fb44c6b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/token/ScalarTokenStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
index 050f0ba295..97f9a0dd51 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/ConfigurableTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt
index 2fde8478ec..80081e3186 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineSequencer.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt
index 233d50c695..ca4b092e07 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/CoroutineToCallback.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
index a9e7ab2d73..a6c80a0b1a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/Task.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
index a3c815bbe8..478a356432 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskExecutor.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt
index 3b9c69bccb..2ad01add78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/task/TaskThread.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
index 0a15f09719..7cc00d023f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/BackgroundDetectionObserver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt
index 76e24c4e31..aae8bf1967 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Base64.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt
index beede69759..860cf66c78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableCoroutine.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
index fccfda15e5..6b04cea936 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CancelableWork.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
index 6a5cfec095..81d601f6f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/CompatUtil.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt
index 46ba75968c..1732ed18c6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Debouncer.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt
index eaf17b9ae0..097bdaf153 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Exhaustive.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
index da524cc1b2..4dc54d3b19 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/FileSaver.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt
index 129bf0dec4..60f9609586 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Glob.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt
index 7d103e1031..6529742c55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Handler.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
index f8c22afb30..3d80ad01d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Hash.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt
index 4a15f2ff98..7b45bab365 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/JsonCanonicalizer.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt
index 9c38729fe4..80c3b83226 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/LiveDataUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt
index d66a38d346..b44a543c1c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/MatrixCoroutineDispatchers.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
index 91127790ca..afe77d76d5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/Monarchy.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt
index d96be91618..40aead5d63 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SecretKeyAndVersion.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
index 9233b2b807..69d50680a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringProvider.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
index 681e7e5fed..32997e2064 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/StringUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2018 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt
index 0595d68c3b..145fc92fea 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/SuspendMatrixCallback.kt
@@ -1,20 +1,17 @@
 /*
-
-  * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.matrix.android.sdk.internal.util
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt
index da155c8bdd..d13753b5ee 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/UrlUtils.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
index 80ede5e884..3f0e27f410 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/GetWellknownTask.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
index 7d88614809..981d013f49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellKnownAPI.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt
index ab42223755..2eaf1ac765 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/wellknown/WellknownModule.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
index d0fc7df098..3506a76f75 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/AlwaysSuccessfulWorker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt
index e711b0d686..68e1953eff 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/DelegateWorkerFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt
index 8f824a76b8..d36e164713 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Extensions.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
index 509cecf022..c6647f7572 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt
index dd662f5e6e..d4179e2272 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionSafeCoroutineWorker.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt
index 840cda3dec..c6c038d2d2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/SessionWorkerParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt
index 9f40d6aa05..24035355f7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/Worker.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
index 6921a539f1..7aed74d2ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2019 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
index 3811cf65cd..393c633c6a 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXDeviceInfo.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java
index 51c1fe2f1e..7277a86e9a 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/androidsdk/crypto/data/MXOlmInboundGroupSession2.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
index c4fed36216..f46e2ca35b 100644
--- a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
+++ b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/CurlLoggingInterceptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
index 69b15a1fa5..a815cec353 100644
--- a/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
+++ b/matrix-sdk-android/src/release/java/org/matrix/android/sdk/internal/network/interceptors/FormattedJsonHttpLogger.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt b/matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt
index 52aa7ea0c7..662656ae5e 100644
--- a/matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt
+++ b/matrix-sdk-android/src/sharedTest/java/org/matrix/android/sdk/test/shared/TestRules.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt
index b0933c7106..f6a7f525db 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/MatrixTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt
index 69e2f12eb7..c413d9ccae 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/auth/data/VersionsKtTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
index f213e1b1c1..b734444990 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRuleActionsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
index b2c8d3bda8..c0b869a90e 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/api/pushrules/PushRulesConditionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
index b2d10968b6..2f01a43a67 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/Base58Test.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
index 6b9d388623..64ffe52acd 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/keysbackup/util/RecoveryKeyTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt
index cac2d1cba9..0bcc7983c5 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/store/db/HelperTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
index 0f8fe58b7f..a56426688d 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
index 7bef439417..667e0b2471 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/task/CoroutineSequencersTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From bc339191eaf3b6d03eeeba079f025464501d11ab Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 15:11:01 +0200
Subject: [PATCH 172/278] Fix Copyright mention

---
 .../java/org/matrix/android/sdk/common/CommonTestHelper.kt  | 1 -
 .../matrix/android/sdk/api/session/crypto/MXCryptoError.kt  | 2 --
 .../sdk/api/session/room/model/roomdirectory/PublicRoom.kt  | 1 -
 .../session/room/model/roomdirectory/PublicRoomsFilter.kt   | 1 -
 .../session/room/model/roomdirectory/PublicRoomsParams.kt   | 2 --
 .../session/room/model/roomdirectory/PublicRoomsResponse.kt | 1 -
 .../sdk/internal/auth/login/ResetPasswordMailConfirmed.kt   | 2 --
 .../sdk/internal/auth/registration/RegistrationParams.kt    | 2 --
 .../android/sdk/internal/crypto/DefaultCryptoService.kt     | 2 --
 .../matrix/android/sdk/internal/crypto/DeviceListManager.kt | 1 -
 .../sdk/internal/crypto/IncomingRequestCancellation.kt      | 1 -
 .../android/sdk/internal/crypto/IncomingRoomKeyRequest.kt   | 1 -
 .../android/sdk/internal/crypto/MXCryptoAlgorithms.kt       | 1 -
 .../android/sdk/internal/crypto/MXEventDecryptionResult.kt  | 1 -
 .../android/sdk/internal/crypto/MXMegolmExportEncryption.kt | 1 -
 .../org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt   | 1 -
 .../sdk/internal/crypto/OutgoingGossipingRequestManager.kt  | 1 -
 .../android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt   | 1 -
 .../android/sdk/internal/crypto/algorithms/IMXDecrypting.kt | 1 -
 .../android/sdk/internal/crypto/algorithms/IMXEncrypting.kt | 2 --
 .../internal/crypto/algorithms/megolm/MXMegolmDecryption.kt | 1 -
 .../internal/crypto/algorithms/megolm/MXMegolmEncryption.kt | 2 --
 .../crypto/algorithms/megolm/MXOutboundSessionInfo.kt       | 2 --
 .../sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt   | 1 -
 .../sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt   | 2 --
 .../internal/crypto/algorithms/olm/OlmDecryptionResult.kt   | 1 -
 .../org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt | 2 --
 .../sdk/internal/crypto/attachments/ElementToDecrypt.kt     | 1 -
 .../internal/crypto/attachments/MXEncryptedAttachments.kt   | 1 -
 .../android/sdk/internal/crypto/model/MXDeviceInfo.kt       | 2 --
 .../internal/crypto/model/MXEncryptEventContentResult.kt    | 1 -
 .../android/sdk/internal/crypto/model/MXOlmSessionResult.kt | 1 -
 .../android/sdk/internal/crypto/model/MXQueuedEncryption.kt | 1 -
 .../internal/crypto/model/OlmInboundGroupSessionWrapper.kt  | 1 -
 .../internal/crypto/model/event/EncryptedEventContent.kt    | 1 -
 .../internal/crypto/model/event/EncryptionEventContent.kt   | 1 -
 .../sdk/internal/crypto/model/event/NewDeviceContent.kt     | 1 -
 .../sdk/internal/crypto/model/event/OlmEventContent.kt      | 1 -
 .../sdk/internal/crypto/model/event/OlmPayloadContent.kt    | 1 -
 .../sdk/internal/crypto/model/event/RoomKeyContent.kt       | 1 -
 .../sdk/internal/crypto/model/rest/DeleteDeviceParams.kt    | 1 -
 .../android/sdk/internal/crypto/model/rest/DeviceInfo.kt    | 2 --
 .../sdk/internal/crypto/model/rest/DevicesListResponse.kt   | 1 -
 .../sdk/internal/crypto/model/rest/EncryptedFileInfo.kt     | 1 -
 .../sdk/internal/crypto/model/rest/EncryptedFileKey.kt      | 1 -
 .../internal/crypto/model/rest/ForwardedRoomKeyContent.kt   | 1 -
 .../sdk/internal/crypto/model/rest/KeyChangesResponse.kt    | 1 -
 .../android/sdk/internal/crypto/model/rest/KeysClaimBody.kt | 1 -
 .../sdk/internal/crypto/model/rest/KeysClaimResponse.kt     | 1 -
 .../android/sdk/internal/crypto/model/rest/KeysQueryBody.kt | 2 --
 .../sdk/internal/crypto/model/rest/KeysUploadResponse.kt    | 1 -
 .../sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt    | 1 -
 .../sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt   | 1 -
 .../internal/crypto/model/rest/SignatureUploadResponse.kt   | 2 --
 .../sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt  | 1 -
 .../sdk/internal/crypto/model/rest/UserPasswordAuth.kt      | 1 -
 .../android/sdk/internal/crypto/store/IMXCryptoStore.kt     | 1 -
 tools/check/forbidden_strings_in_code_sdk.txt               | 1 -
 vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt  | 1 -
 vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt   | 2 --
 vector/src/main/assets/open_source_licenses.html            | 6 ------
 .../app/features/crypto/keysrequest/KeyRequestHandler.kt    | 3 ---
 .../java/im/vector/app/features/rageshake/BugReporter.kt    | 2 --
 .../app/features/rageshake/BugReporterMultipartBody.java    | 1 -
 .../im/vector/app/features/settings/VectorPreferences.kt    | 2 --
 65 files changed, 89 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index 9986315c65..1c912b365f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
index d0d36ec953..4956278a10 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/MXCryptoError.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt
index 0429eba1b0..01f5d9cde8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoom.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
index 041b804576..66ebc59464 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsFilter.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt
index c69cde72b7..3af354a01d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsParams.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
index 39f24d658c..82da8bc49b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/roomdirectory/PublicRoomsResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
index 49682b2ce5..4e0c000f87 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/ResetPasswordMailConfirmed.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
index 08d7b48447..3d20b6bde3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/RegistrationParams.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index c2e8e34166..37886a7d77 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 3590b8072e..8e0d7407c6 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt
index 04b78fc89f..181bc0c1b1 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRequestCancellation.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
index c832ff160d..babc6008a2 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/IncomingRoomKeyRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
index 45c8d23219..07881c7d79 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXCryptoAlgorithms.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt
index f094b5c656..c66c37574a 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXEventDecryptionResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
index 85ecc540cd..5409202b9e 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2017 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index fdb0f02f92..7a546993b8 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
index b7f5c33e5d..69f5838315 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
index e043d976a1..88025952db 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingRoomKeyRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
index 8ea731e3f0..680ac7fbb5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
index 60a5d7be7a..fc3ea08a21 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXEncrypting.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2015 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index 3f1d8e1f5f..ad0def541f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index a7de65099b..1185ea7962 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2015 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
index 9bdebdf24f..9244b4d5e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXOutboundSessionInfo.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2015 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
index d90de0c4ba..541f62de2c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmDecryption.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2015 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
index f471a67af6..9acc9bc1b2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/MXOlmEncryption.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2015 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
index ba627d4c30..955f57afba 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/olm/OlmDecryptionResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
index a12b725efd..5604e97152 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/api/CryptoApi.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt
index 21f7c209ef..b77006aa3a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/ElementToDecrypt.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
index 11d5b4796a..5a9852b6db 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/attachments/MXEncryptedAttachments.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
index 6024795085..3c651c27a0 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXDeviceInfo.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt
index 0f0b289bc6..524bc80843 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXEncryptEventContentResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt
index 30f4a6bba1..b07a08c30f 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXOlmSessionResult.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
index 598f16bdf3..fe6b3a74bb 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/MXQueuedEncryption.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
index 6d2430ce5c..086a236a2b 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt
index 79f86bd28c..93a6377bbb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptedEventContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt
index 255e5e8d81..b64cd97ff6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/EncryptionEventContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt
index 27ccc2d041..2a63b4bee8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/NewDeviceContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt
index f9de805962..6fd0627022 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmEventContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
index bf18cad0f4..3ce9d36f90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/OlmPayloadContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt
index eeaf52f0e1..7fa0e83725 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
index 4b1530c9c6..0ce6f1f41c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeleteDeviceParams.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
index 3a4abd8cf8..c5cd400342 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DeviceInfo.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt
index 934a0cf43c..eb325f332e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/DevicesListResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
index 65455e9fa3..0ed6c0dac9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileInfo.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
index 077fd4451f..71f266d7a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/EncryptedFileKey.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
index 927828c4a0..bbc24f0447 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/ForwardedRoomKeyContent.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt
index 5c677c7123..f0ed77a1e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeyChangesResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt
index f48936a80e..6937d2beb6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt
index a1eebcb694..22f4ce5a59 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysClaimResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt
index 4232225cbe..4f98be9da3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysQueryBody.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt
index 07904969f0..3d0ea8677f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/KeysUploadResponse.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
index ae82a384e3..3eae2585a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyRequestBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
index 259f256f50..68fbf0b805 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/RoomKeyShareRequest.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt
index e21fd8fbd4..fb92b67fc4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SignatureUploadResponse.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
index ac691e6e6e..7d11c5730f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UpdateDeviceInfoBody.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
index e4002b5c52..ba8b34096c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/UserPasswordAuth.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
index 898ffc303c..0ae1e69124 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/IMXCryptoStore.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
  * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/check/forbidden_strings_in_code_sdk.txt b/tools/check/forbidden_strings_in_code_sdk.txt
index 9907c68080..270efef459 100644
--- a/tools/check/forbidden_strings_in_code_sdk.txt
+++ b/tools/check/forbidden_strings_in_code_sdk.txt
@@ -26,4 +26,3 @@
 
 ### "The Matrix.org Foundation C.I.C." copyright is required on this file, and not "New Vector Ltd"
 New Vector Ltd
-
diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
index 5f0ee396ee..7603e738d7 100755
--- a/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -1,5 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
  * Copyright 2018 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
index d139cad9d3..913eab211d 100755
--- a/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2014 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/vector/src/main/assets/open_source_licenses.html b/vector/src/main/assets/open_source_licenses.html
index 376745e6f7..ac80b0d691 100755
--- a/vector/src/main/assets/open_source_licenses.html
+++ b/vector/src/main/assets/open_source_licenses.html
@@ -239,12 +239,6 @@ SOFTWARE.
     <li>
         <b>Matrix SDK</b>
         <br/>
-        Copyright (c) 2016 OpenMarket Ltd
-        <br/>
-        Copyright (c) 2016-2017 Vector Creations Ltd
-        <br/>
-        Copyright (c) 2018-2019 New Vector Ltd
-        <br/>
         Copyright (c) 2019 The Matrix.org Foundation C.I.C
     </li>
     <li>
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
index 4268317700..8a02b8deac 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysrequest/KeyRequestHandler.kt
@@ -1,7 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
- * Copyright 2018 New Vector Ltd
  * Copyright 2019 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 7bbc001f0a..0d92d170a5 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
index 878b9f7171..7a29bf12e4 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporterMultipartBody.java
@@ -1,5 +1,4 @@
 /*
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 5e9d8d1ac0..295bb01265 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -1,6 +1,4 @@
 /*
- * Copyright 2016 OpenMarket Ltd
- * Copyright 2017 Vector Creations Ltd
  * Copyright 2018 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

From 7b89f1bea7f4f4505b2fba3812a1db321c53ce95 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 15:14:22 +0200
Subject: [PATCH 173/278] Add missing Copyright

---
 .../vector/app/core/ui/list/GenericLoaderItem.kt | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt
index 634e58e943..b458f10680 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericLoaderItem.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package im.vector.app.core.ui.list
 
 import com.airbnb.epoxy.EpoxyModelClass

From cb33b9f15847f3d100ccd8e4b965242abeb08e87 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 1 Oct 2020 21:18:18 +0200
Subject: [PATCH 174/278] cleanup

---
 .../sdk/internal/network/ssl/TLSSocketFactory.kt     |  4 ----
 .../gplay/push/fcm/VectorFirebaseMessagingService.kt | 12 +++++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
index a5c711a3f0..c4dbce6240 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/ssl/TLSSocketFactory.kt
@@ -113,8 +113,4 @@ constructor(trustPinned: Array<TrustManager>, acceptedTlsVersions: List<TlsVersi
         }
         return socket
     }
-
-    companion object {
-        private val LOG_TAG = TLSSocketFactory::class.java.simpleName
-    }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 8fdb65c8d0..ba58ef6677 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -60,11 +60,13 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
 
     override fun onCreate() {
         super.onCreate()
-        notificationDrawerManager = vectorComponent().notificationDrawerManager()
-        notifiableEventResolver = vectorComponent().notifiableEventResolver()
-        pusherManager = vectorComponent().pusherManager()
-        activeSessionHolder = vectorComponent().activeSessionHolder()
-        vectorPreferences = vectorComponent().vectorPreferences()
+        with(vectorComponent()) {
+            notificationDrawerManager = notificationDrawerManager()
+            notifiableEventResolver = notifiableEventResolver()
+            pusherManager = pusherManager()
+            activeSessionHolder = activeSessionHolder()
+            vectorPreferences = vectorPreferences()
+        }
     }
 
     /**

From 3133cbcc3e9e88e36e0512844ff2a2af3cbd6e8f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 2 Oct 2020 11:55:41 +0200
Subject: [PATCH 175/278] Add script to test PUSH token

---
 tools/tests/test_push.sh        | 46 ++++++++++++++++++++++++++++
 tools/tests/test_push_unsafe.sh | 53 +++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100755 tools/tests/test_push.sh
 create mode 100755 tools/tests/test_push_unsafe.sh

diff --git a/tools/tests/test_push.sh b/tools/tests/test_push.sh
new file mode 100755
index 0000000000..0da02e2d0a
--- /dev/null
+++ b/tools/tests/test_push.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+# Some doc
+# https://firebase.google.com/docs/cloud-messaging/android/first-message
+# http://bulkpush.com/pushnotification/guidedetail/s-4/android-gcm-api-configuration
+# http://www.feelzdroid.com/2016/02/android-google-cloud-messaging-push-notifications-gcm-tutorial.html
+
+# Ask for parameter
+read -p "Enter the server API key: " SERVER_KEY
+
+echo
+echo "Check validity of API key, InvalidRegistration error is OK"
+# https://developers.google.com/cloud-messaging/http
+
+curl -H "Authorization: key=$SERVER_KEY" \
+     -H Content-Type:"application/json" \
+     -d "{\"registration_ids\":[\"ABC\"]}" \
+     -s \
+     https://fcm.googleapis.com/fcm/send \
+     | python -m json.tool
+
+# should obtain something like this:
+# {"multicast_id":5978845027639121780,"success":0,"failure":1,"canonical_ids":0,"results":[{"error":"InvalidRegistration"}]}
+
+read -p "Enter the FCM token: " FCM_TOKEN
+
+# content of the notification
+DATA="{\"message\":\"Message of PUSH!\"}"
+
+echo
+echo
+echo "Send a push, you should see success:1..."
+
+curl -H "Authorization: key=$SERVER_KEY" \
+     -H Content-Type:"application/json" \
+     -d "{ \"data\" : $DATA, \"to\":\"$FCM_TOKEN\" }" \
+     -s \
+     https://fcm.googleapis.com/fcm/send \
+     | python -m json.tool
+
+echo
+echo
+
+# should obtain something like this:
+# {"multicast_id":7967233883611790812,"success":1,"failure":0,"canonical_ids":0,"results":[{"message_id":"0:1472636210339069%84ac25d9f9fd7ecd"}]}
+
diff --git a/tools/tests/test_push_unsafe.sh b/tools/tests/test_push_unsafe.sh
new file mode 100755
index 0000000000..62ec3759f4
--- /dev/null
+++ b/tools/tests/test_push_unsafe.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+# Copy and adaptation of ./test_push.sh, which takes 2 params: server key and fcm token.
+# It's unsafe to use it because it takes server key as parameter, that will remain in the terminal history.
+
+# Some doc
+# https://firebase.google.com/docs/cloud-messaging/android/first-message
+# http://bulkpush.com/pushnotification/guidedetail/s-4/android-gcm-api-configuration
+# http://www.feelzdroid.com/2016/02/android-google-cloud-messaging-push-notifications-gcm-tutorial.html
+
+if [[ "$#" -ne 2 ]]; then
+  echo "Usage: $0 SERVER_KEY FCM_TOKEN" >&2
+  exit 1
+fi
+
+# Get the command line parameters
+SERVER_KEY=$1
+FCM_TOKEN=$2
+
+echo
+echo "Check validity of API key, InvalidRegistration error is OK"
+# https://developers.google.com/cloud-messaging/http
+
+curl -H "Authorization: key=$SERVER_KEY" \
+     -H Content-Type:"application/json" \
+     -d "{\"registration_ids\":[\"ABC\"]}" \
+     -s \
+     https://fcm.googleapis.com/fcm/send \
+     | python -m json.tool
+
+# should obtain something like this:
+# {"multicast_id":5978845027639121780,"success":0,"failure":1,"canonical_ids":0,"results":[{"error":"InvalidRegistration"}]}
+
+# content of the notification
+DATA="{\"message\":\"Message of PUSH!\"}"
+
+echo
+echo
+echo "Send a push, you should see success:1..."
+
+curl -H "Authorization: key=$SERVER_KEY" \
+     -H Content-Type:"application/json" \
+     -d "{ \"data\" : $DATA, \"to\":\"$FCM_TOKEN\" }" \
+     -s \
+     https://fcm.googleapis.com/fcm/send \
+     | python -m json.tool
+
+echo
+echo
+
+# should obtain something like this:
+# {"multicast_id":7967233883611790812,"success":1,"failure":0,"canonical_ids":0,"results":[{"message_id":"0:1472636210339069%84ac25d9f9fd7ecd"}]}
+

From 7d53dfeca45d2ac590c1d0f6739bf89ecf5c4bb4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 12:06:06 +0200
Subject: [PATCH 176/278] Add Sygnal API implementation to test is Push are
 correctly received

---
 .idea/dictionaries/bmarty.xml                 |  1 +
 CHANGES.md                                    |  1 +
 .../sdk/api/session/pushers/PushersService.kt | 13 ++++
 .../sdk/internal/network/NetworkConstants.kt  |  6 +-
 .../session/pushers/DefaultPushersService.kt  | 13 ++++
 .../internal/session/pushers/PushersModule.kt |  5 ++
 .../session/pushers/sygnal/SygnalAPI.kt       | 32 +++++++++
 .../session/pushers/sygnal/SygnalDevice.kt    | 34 ++++++++++
 .../pushers/sygnal/SygnalNotification.kt      | 29 +++++++++
 .../pushers/sygnal/SygnalNotifyBody.kt        | 29 +++++++++
 .../pushers/sygnal/SygnalNotifyResponse.kt    | 26 ++++++++
 .../pushers/sygnal/SygnalNotifyTask.kt        | 65 +++++++++++++++++++
 .../troubleshoot/TestPushFromSygnal.kt        | 52 +++++++++++++++
 ...ificationTroubleshootTestManagerFactory.kt | 19 ++++--
 .../vector/app/core/pushers/PushersManager.kt | 10 +++
 vector/src/main/res/values/strings.xml        |  4 ++
 16 files changed, 331 insertions(+), 8 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
 create mode 100644 vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt

diff --git a/.idea/dictionaries/bmarty.xml b/.idea/dictionaries/bmarty.xml
index 5c27da044e..d13e40248f 100644
--- a/.idea/dictionaries/bmarty.xml
+++ b/.idea/dictionaries/bmarty.xml
@@ -29,6 +29,7 @@
       <w>signout</w>
       <w>signup</w>
       <w>ssss</w>
+      <w>sygnal</w>
       <w>threepid</w>
       <w>unwedging</w>
     </words>
diff --git a/CHANGES.md b/CHANGES.md
index 05d189ed12..e365768f86 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Improvements 🙌:
  - Drawer: move settings access and add sign out action (#2171)
  - Filter room member (and banned users) by name (#2184)
  - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
+ - Add Sygnal API implementation to test is Push are correctly received
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 0e33be400c..8284b50332 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -66,6 +66,19 @@ interface PushersService {
                       append: Boolean,
                       withEventIdOnly: Boolean): UUID
 
+    /**
+     * Directly ask Sygnal to send a push to this device
+     * @param url the Sygnal url (full path)
+     * @param appId the application id
+     * @param pushkey the FCM token
+     * @param callback callback to know if Sygnal has accepted the request. In this case, the app should receive a Push with the provided data (TODO)
+     *
+     */
+    fun testPush(url: String,
+                 appId: String,
+                 pushkey: String,
+                 callback: MatrixCallback<Unit>)
+
     /**
      * Remove the http pusher
      */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index 1154d1967c..0dfdec1804 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -17,7 +17,7 @@
 package org.matrix.android.sdk.internal.network
 
 internal object NetworkConstants {
-
+    // Homeserver
     private const val URI_API_PREFIX_PATH = "_matrix/client"
     const val URI_API_PREFIX_PATH_ = "$URI_API_PREFIX_PATH/"
     const val URI_API_PREFIX_PATH_R0 = "$URI_API_PREFIX_PATH/r0/"
@@ -31,5 +31,9 @@ internal object NetworkConstants {
     const val URI_IDENTITY_PREFIX_PATH = "_matrix/identity/v2"
     const val URI_IDENTITY_PATH_V2 = "$URI_IDENTITY_PREFIX_PATH/"
 
+    // Sygnal
+    const val URI_SYGNAL_PREFIX_PATH = "_matrix/push/v1/"
+
+    // Integration
     const val URI_INTEGRATION_MANAGER_PATH = "_matrix/integrations/v1/"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 8f80ac46e4..c7d5e1f8b8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -28,6 +28,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
+import org.matrix.android.sdk.internal.session.pushers.sygnal.SygnalNotifyTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
@@ -41,10 +42,22 @@ internal class DefaultPushersService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         @SessionId private val sessionId: String,
         private val getPusherTask: GetPushersTask,
+        private val sygnalNotifyTask: SygnalNotifyTask,
         private val removePusherTask: RemovePusherTask,
         private val taskExecutor: TaskExecutor
 ) : PushersService {
 
+    override fun testPush(url: String,
+                          appId: String,
+                          pushkey: String,
+                          callback: MatrixCallback<Unit>) {
+        sygnalNotifyTask
+                .configureWith(SygnalNotifyTask.Params(url, appId, pushkey)) {
+                    this.callback = callback
+                }
+                .executeBy(taskExecutor)
+    }
+
     override fun refreshPushers() {
         getPusherTask
                 .configureWith()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
index a6042b27a2..5810f26c85 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
@@ -25,6 +25,8 @@ import org.matrix.android.sdk.api.session.pushers.PushersService
 import org.matrix.android.sdk.internal.session.notification.DefaultProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.notification.DefaultPushRuleService
 import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
+import org.matrix.android.sdk.internal.session.pushers.sygnal.DefaultSygnalNotifyTask
+import org.matrix.android.sdk.internal.session.pushers.sygnal.SygnalNotifyTask
 import org.matrix.android.sdk.internal.session.room.notification.DefaultSetRoomNotificationStateTask
 import org.matrix.android.sdk.internal.session.room.notification.SetRoomNotificationStateTask
 import retrofit2.Retrofit
@@ -86,4 +88,7 @@ internal abstract class PushersModule {
 
     @Binds
     abstract fun bindProcessEventForPushTask(task: DefaultProcessEventForPushTask): ProcessEventForPushTask
+
+    @Binds
+    abstract fun bindSygnalNotifyTask(task: DefaultSygnalNotifyTask): SygnalNotifyTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt
new file mode 100644
index 0000000000..7550e14a97
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.pushers.sygnal
+
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+internal interface SygnalAPI {
+    /**
+     * Ask Sygnal to send a push to the current device.
+     *
+     * Ref: https://matrix.org/docs/spec/push_gateway/r0.1.1#post-matrix-push-v1-notify
+     */
+    @POST(NetworkConstants.URI_SYGNAL_PREFIX_PATH + "notify")
+    fun notify(@Body body: SygnalNotifyBody): Call<SygnalNotifyResponse>
+}
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt
new file mode 100644
index 0000000000..a5cfe389cc
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers.sygnal
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SygnalDevice(
+        /**
+         * Required. The app_id given when the pusher was created.
+         */
+        @Json(name = "app_id")
+        val appId: String,
+        /**
+         * Required. The pushkey given when the pusher was created.
+         */
+        @Json(name = "pushkey")
+        val pushKey: String
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
new file mode 100644
index 0000000000..b28449a481
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers.sygnal
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SygnalNotification(
+        /**
+         * Required. This is an array of devices that the notification should be sent to.
+         */
+        @Json(name = "devices")
+        val devices: List<SygnalDevice>
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt
new file mode 100644
index 0000000000..7b13d8ff79
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers.sygnal
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SygnalNotifyBody(
+        /**
+         * Required. Information about the push notification
+         */
+        @Json(name = "notification")
+        val notification: SygnalNotification
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt
new file mode 100644
index 0000000000..73d5aa1e2c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.pushers.sygnal
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SygnalNotifyResponse(
+        @Json(name = "rejected")
+        val rejectedPushKey: List<String>
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
new file mode 100644
index 0000000000..eb3cd433a9
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.matrix.android.sdk.internal.session.pushers.sygnal
+
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.NetworkConstants
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface SygnalNotifyTask : Task<SygnalNotifyTask.Params, Unit> {
+    data class Params(
+            val url: String,
+            val appId: String,
+            val pushKey: String
+    )
+}
+
+internal class DefaultSygnalNotifyTask @Inject constructor(
+        private val retrofitFactory: RetrofitFactory,
+        @Unauthenticated private val unauthenticatedOkHttpClient: OkHttpClient
+) : SygnalNotifyTask {
+
+    override suspend fun execute(params: SygnalNotifyTask.Params) {
+        val sygnalApi = retrofitFactory.create(
+                unauthenticatedOkHttpClient,
+                params.url.substringBefore(NetworkConstants.URI_SYGNAL_PREFIX_PATH)
+        )
+                .create(SygnalAPI::class.java)
+
+        val response = executeRequest<SygnalNotifyResponse>(null) {
+            apiCall = sygnalApi.notify(
+                    SygnalNotifyBody(
+                            SygnalNotification(
+                                    devices = listOf(
+                                            SygnalDevice(
+                                                    params.appId,
+                                                    params.pushKey
+                                            )
+                                    )
+                            )
+                    )
+            )
+        }
+
+        if (response.rejectedPushKey.contains(params.pushKey)) {
+            throw IllegalStateException("Failure")
+        }
+    }
+}
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
new file mode 100644
index 0000000000..b291b750b4
--- /dev/null
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.gplay.features.settings.troubleshoot
+
+import androidx.appcompat.app.AppCompatActivity
+import im.vector.app.R
+import im.vector.app.core.pushers.PushersManager
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.settings.troubleshoot.TroubleshootTest
+import im.vector.app.push.fcm.FcmHelper
+import org.matrix.android.sdk.api.MatrixCallback
+import javax.inject.Inject
+
+/**
+ * Test Push by asking Sygnal to send a Push back
+ */
+class TestPushFromSygnal @Inject constructor(private val context: AppCompatActivity,
+                                             private val stringProvider: StringProvider,
+                                             private val pushersManager: PushersManager)
+    : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
+
+    override fun perform() {
+        val fcmToken = FcmHelper.getFcmToken(context) ?: run {
+            status = TestStatus.FAILED
+            return
+        }
+        pushersManager.testPush(fcmToken, object : MatrixCallback<Unit> {
+            override fun onFailure(failure: Throwable) {
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
+                status = TestStatus.FAILED
+            }
+
+            override fun onSuccess(data: Unit) {
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
+                status = TestStatus.SUCCESS
+            }
+        })
+    }
+}
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index b2dad09483..06d3283afa 100644
--- a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -23,16 +23,20 @@ import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
 import im.vector.app.features.settings.troubleshoot.TestSystemSettings
 import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken
 import im.vector.app.gplay.features.settings.troubleshoot.TestPlayServices
+import im.vector.app.gplay.features.settings.troubleshoot.TestPushFromSygnal
 import im.vector.app.gplay.features.settings.troubleshoot.TestTokenRegistration
 import javax.inject.Inject
 
-class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,
-                                                                     private val testAccountSettings: TestAccountSettings,
-                                                                     private val testDeviceSettings: TestDeviceSettings,
-                                                                     private val testBingRulesSettings: TestPushRulesSettings,
-                                                                     private val testPlayServices: TestPlayServices,
-                                                                     private val testFirebaseToken: TestFirebaseToken,
-                                                                     private val testTokenRegistration: TestTokenRegistration) {
+class NotificationTroubleshootTestManagerFactory @Inject constructor(
+        private val testSystemSettings: TestSystemSettings,
+        private val testAccountSettings: TestAccountSettings,
+        private val testDeviceSettings: TestDeviceSettings,
+        private val testBingRulesSettings: TestPushRulesSettings,
+        private val testPlayServices: TestPlayServices,
+        private val testFirebaseToken: TestFirebaseToken,
+        private val testTokenRegistration: TestTokenRegistration,
+        private val testPushFromSygnal: TestPushFromSygnal
+) {
 
     fun create(fragment: Fragment): NotificationTroubleshootTestManager {
         val mgr = NotificationTroubleshootTestManager(fragment)
@@ -43,6 +47,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(private val
         mgr.addTest(testPlayServices)
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
+        mgr.addTest(testPushFromSygnal)
         return mgr
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index f0d27182e7..e86ff104b7 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -34,6 +34,16 @@ class PushersManager @Inject constructor(
         private val stringProvider: StringProvider,
         private val appNameProvider: AppNameProvider
 ) {
+    fun testPush(pushKey: String, callback: MatrixCallback<Unit>) {
+        val currentSession = activeSessionHolder.getActiveSession()
+
+        currentSession.testPush(
+                stringProvider.getString(R.string.pusher_http_url),
+                stringProvider.getString(R.string.pusher_app_id),
+                pushKey,
+                callback
+        )
+    }
 
     fun registerPusherWithFcmKey(pushKey: String): UUID {
         val currentSession = activeSessionHolder.getActiveSession()
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d48162de29..be83a6dc50 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -749,6 +749,10 @@
     <string name="settings_troubleshoot_test_token_registration_success">FCM token successfully registered to HomeServer.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Failed to register FCM token to HomeServer:\n%1$s</string>
 
+    <string name="settings_troubleshoot_test_push_loop_title">Test Push</string>
+    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, you should see a notification.</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Failed to receive push. Solution could be to reinstall the application.</string>
+
     <string name="settings_troubleshoot_test_foreground_service_started_title">Notifications Service</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Notifications Service is running.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Notifications Service is not running.\nTry to restart the application.</string>

From 02f1dab9b2ee71fb17630869ced03c9d62bd93fe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 15:23:42 +0200
Subject: [PATCH 177/278] Push test: better error handling

---
 .../sdk/api/session/pushers/PushersService.kt |  6 ++--
 .../sdk/api/session/pushers/SygnalFailure.kt  | 23 +++++++++++++
 .../session/pushers/DefaultPushersService.kt  |  3 +-
 .../pushers/sygnal/SygnalNotification.kt      |  3 ++
 .../pushers/sygnal/SygnalNotifyTask.kt        |  7 ++--
 .../troubleshoot/TestPushFromSygnal.kt        |  9 +++++-
 .../fcm/VectorFirebaseMessagingService.kt     |  7 ++++
 .../vector/app/core/pushers/PushersManager.kt |  5 +++
 .../NotificationDrawerManager.kt              |  4 +++
 .../notifications/NotificationUtils.kt        | 32 +++++++++++++++++--
 vector/src/main/res/values/strings.xml        |  1 +
 11 files changed, 92 insertions(+), 8 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 8284b50332..3832bc5af4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -71,12 +71,14 @@ interface PushersService {
      * @param url the Sygnal url (full path)
      * @param appId the application id
      * @param pushkey the FCM token
-     * @param callback callback to know if Sygnal has accepted the request. In this case, the app should receive a Push with the provided data (TODO)
-     *
+     * @param eventId the eventId which will be sent in the Push message. Use a fake eventId.
+     * @param callback callback to know if Sygnal has accepted the request. In this case, the app should receive a Push with the provided eventId.
+     *                 In case of error, PusherRejected failure can happen. In this case it means that the pushkey is not valid.
      */
     fun testPush(url: String,
                  appId: String,
                  pushkey: String,
+                 eventId: String,
                  callback: MatrixCallback<Unit>)
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt
new file mode 100644
index 0000000000..ebedba9d92
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.pushers
+
+import org.matrix.android.sdk.api.failure.Failure
+
+sealed class SygnalFailure : Failure.FeatureFailure() {
+    object PusherRejected : SygnalFailure()
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index c7d5e1f8b8..02f147f815 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -50,9 +50,10 @@ internal class DefaultPushersService @Inject constructor(
     override fun testPush(url: String,
                           appId: String,
                           pushkey: String,
+                          eventId: String,
                           callback: MatrixCallback<Unit>) {
         sygnalNotifyTask
-                .configureWith(SygnalNotifyTask.Params(url, appId, pushkey)) {
+                .configureWith(SygnalNotifyTask.Params(url, appId, pushkey, eventId)) {
                     this.callback = callback
                 }
                 .executeBy(taskExecutor)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
index b28449a481..a2c016feb8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
@@ -21,6 +21,9 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class SygnalNotification(
+        @Json(name = "event_id")
+        val eventId: String,
+
         /**
          * Required. This is an array of devices that the notification should be sent to.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
index eb3cd433a9..663d0cd3c2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
@@ -16,6 +16,7 @@
 package org.matrix.android.sdk.internal.session.pushers.sygnal
 
 import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.session.pushers.SygnalFailure
 import org.matrix.android.sdk.internal.di.Unauthenticated
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.network.RetrofitFactory
@@ -27,7 +28,8 @@ internal interface SygnalNotifyTask : Task<SygnalNotifyTask.Params, Unit> {
     data class Params(
             val url: String,
             val appId: String,
-            val pushKey: String
+            val pushKey: String,
+            val eventId: String
     )
 }
 
@@ -47,6 +49,7 @@ internal class DefaultSygnalNotifyTask @Inject constructor(
             apiCall = sygnalApi.notify(
                     SygnalNotifyBody(
                             SygnalNotification(
+                                    eventId = params.eventId,
                                     devices = listOf(
                                             SygnalDevice(
                                                     params.appId,
@@ -59,7 +62,7 @@ internal class DefaultSygnalNotifyTask @Inject constructor(
         }
 
         if (response.rejectedPushKey.contains(params.pushKey)) {
-            throw IllegalStateException("Failure")
+            throw SygnalFailure.PusherRejected
         }
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
index b291b750b4..105c54c64f 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
@@ -17,11 +17,13 @@ package im.vector.app.gplay.features.settings.troubleshoot
 
 import androidx.appcompat.app.AppCompatActivity
 import im.vector.app.R
+import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.pushers.SygnalFailure
 import javax.inject.Inject
 
 /**
@@ -29,6 +31,7 @@ import javax.inject.Inject
  */
 class TestPushFromSygnal @Inject constructor(private val context: AppCompatActivity,
                                              private val stringProvider: StringProvider,
+                                             private val errorFormatter: ErrorFormatter,
                                              private val pushersManager: PushersManager)
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
@@ -39,7 +42,11 @@ class TestPushFromSygnal @Inject constructor(private val context: AppCompatActiv
         }
         pushersManager.testPush(fcmToken, object : MatrixCallback<Unit> {
             override fun onFailure(failure: Throwable) {
-                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
+                description = if (failure is SygnalFailure.PusherRejected) {
+                    stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
+                } else {
+                    errorFormatter.toHumanReadable(failure)
+                }
                 status = TestStatus.FAILED
             }
 
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index ba58ef6677..801b85ce0c 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -75,6 +75,13 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
      * @param message the message
      */
     override fun onMessageReceived(message: RemoteMessage) {
+        // Diagnostic Push
+        if (message.data["event_id"] == PushersManager.TEST_EVENT_ID) {
+            // Display the notification right now
+            notificationDrawerManager.displayDiagnosticNotification()
+            return
+        }
+
         if (!vectorPreferences.areNotificationEnabledForDevice()) {
             Timber.i("Notification are disabled for this device")
             return
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index e86ff104b7..cfdc61a045 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -41,6 +41,7 @@ class PushersManager @Inject constructor(
                 stringProvider.getString(R.string.pusher_http_url),
                 stringProvider.getString(R.string.pusher_app_id),
                 pushKey,
+                TEST_EVENT_ID,
                 callback
         )
     }
@@ -66,4 +67,8 @@ class PushersManager @Inject constructor(
         val currentSession = activeSessionHolder.getSafeActiveSession() ?: return
         currentSession.removeHttpPusher(pushKey, stringProvider.getString(R.string.pusher_app_id), callback)
     }
+
+    companion object {
+        const val TEST_EVENT_ID = "\$THIS_IS_A_FAKE_EVENT_ID"
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 26f00fcef9..7147968d49 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -590,6 +590,10 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
         }
     }
 
+    fun displayDiagnosticNotification() {
+        notificationUtils.displayDiagnosticNotification()
+    }
+
     companion object {
         private const val SUMMARY_NOTIFICATION_ID = 0
         private const val ROOM_MESSAGES_NOTIFICATION_ID = 1
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 9d89168bb8..7e7fd60b59 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -27,8 +27,10 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.net.Uri
 import android.os.Build
+import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -36,6 +38,7 @@ import androidx.core.app.RemoteInput
 import androidx.core.app.TaskStackBuilder
 import androidx.core.content.ContextCompat
 import androidx.core.content.getSystemService
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.fragment.app.Fragment
 import im.vector.app.BuildConfig
@@ -47,7 +50,6 @@ import im.vector.app.features.call.service.CallHeadsUpActionReceiver
 import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
-import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.settings.VectorPreferences
 import timber.log.Timber
 import javax.inject.Inject
@@ -61,7 +63,6 @@ import kotlin.random.Random
 @Singleton
 class NotificationUtils @Inject constructor(private val context: Context,
                                             private val stringProvider: StringProvider,
-                                            private val pinLocker: PinLocker,
                                             private val vectorPreferences: VectorPreferences) {
 
     companion object {
@@ -845,6 +846,33 @@ class NotificationUtils @Inject constructor(private val context: Context,
         }
     }
 
+    fun displayDiagnosticNotification() {
+        notificationManager.notify(
+                "DIAGNOSTIC",
+                888,
+                NotificationCompat.Builder(context, NOISY_NOTIFICATION_CHANNEL_ID)
+                        .setContentTitle(stringProvider.getString(R.string.app_name))
+                        .setContentText(stringProvider.getString(R.string.settings_troubleshoot_test_push_notification_content))
+                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setLargeIcon(getBitmap(context, R.drawable.element_logo_green))
+                        .setColor(ContextCompat.getColor(context, R.color.notification_accent_color))
+                        .setPriority(NotificationCompat.PRIORITY_MAX)
+                        .setCategory(NotificationCompat.CATEGORY_STATUS)
+                        .setAutoCancel(true)
+                        .build()
+        )
+    }
+
+    private fun getBitmap(context: Context, @DrawableRes drawableRes: Int): Bitmap? {
+        val drawable = ResourcesCompat.getDrawable(context.resources, drawableRes, null) ?: return null
+        val canvas = Canvas()
+        val bitmap = Bitmap.createBitmap(drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888)
+        canvas.setBitmap(bitmap)
+        drawable.setBounds(0, 0, drawable.intrinsicWidth, drawable.intrinsicHeight)
+        drawable.draw(canvas)
+        return bitmap
+    }
+
     /**
      * Return true it the user has enabled the do not disturb mode
      */
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index be83a6dc50..d5e590375c 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -752,6 +752,7 @@
     <string name="settings_troubleshoot_test_push_loop_title">Test Push</string>
     <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, you should see a notification.</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Failed to receive push. Solution could be to reinstall the application.</string>
+    <string name="settings_troubleshoot_test_push_notification_content">You are receiving PUSH!</string>
 
     <string name="settings_troubleshoot_test_foreground_service_started_title">Notifications Service</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Notifications Service is running.</string>

From e926326fcafd1bfeaf09a01dd491b7078e25e536 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 15:32:29 +0200
Subject: [PATCH 178/278] Better handling of network error. Entering a wrong
 homeserver URL is now a specific error.

---
 .../java/im/vector/app/core/error/ErrorFormatter.kt    |  5 +----
 .../app/features/login/LoginServerUrlFormFragment.kt   | 10 +++++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 43395b97f7..790f19a133 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -45,15 +45,12 @@ class DefaultErrorFormatter @Inject constructor(
                 when (throwable.ioException) {
                     is SocketTimeoutException     ->
                         stringProvider.getString(R.string.error_network_timeout)
-                    is UnknownHostException       ->
-                        // Invalid homeserver?
-                        // TODO Check network state, airplane mode, etc.
-                        stringProvider.getString(R.string.login_error_unknown_host)
                     is SSLPeerUnverifiedException ->
                         stringProvider.getString(R.string.login_error_ssl_peer_unverified)
                     is SSLException               ->
                         stringProvider.getString(R.string.login_error_ssl_other)
                     else                          ->
+                        // TODO Check network state, airplane mode, etc.
                         stringProvider.getString(R.string.error_no_network)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index 4b9f528254..af959fecd4 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -28,6 +28,8 @@ import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import kotlinx.android.synthetic.main.fragment_login_server_url_form.*
+import org.matrix.android.sdk.api.failure.Failure
+import java.net.UnknownHostException
 import javax.inject.Inject
 
 /**
@@ -115,7 +117,13 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment()
     }
 
     override fun onError(throwable: Throwable) {
-        loginServerUrlFormHomeServerUrlTil.error = errorFormatter.toHumanReadable(throwable)
+        loginServerUrlFormHomeServerUrlTil.error = if (throwable is Failure.NetworkConnection
+                && throwable.ioException is UnknownHostException) {
+            // Invalid homeserver?
+            getString(R.string.login_error_homeserver_not_found)
+        } else {
+            errorFormatter.toHumanReadable(throwable)
+        }
     }
 
     override fun updateWithState(state: LoginViewState) {

From d1fb1614a3c523fc226a5896be7e936a06d2b330 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 16:13:14 +0200
Subject: [PATCH 179/278] Make the app react to test push

---
 tools/tests/test_push.sh        | 2 +-
 tools/tests/test_push_unsafe.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/tests/test_push.sh b/tools/tests/test_push.sh
index 0da02e2d0a..08348497ae 100755
--- a/tools/tests/test_push.sh
+++ b/tools/tests/test_push.sh
@@ -25,7 +25,7 @@ curl -H "Authorization: key=$SERVER_KEY" \
 read -p "Enter the FCM token: " FCM_TOKEN
 
 # content of the notification
-DATA="{\"message\":\"Message of PUSH!\"}"
+DATA='{"event_id":"$THIS_IS_A_FAKE_EVENT_ID"}'
 
 echo
 echo
diff --git a/tools/tests/test_push_unsafe.sh b/tools/tests/test_push_unsafe.sh
index 62ec3759f4..77c198197f 100755
--- a/tools/tests/test_push_unsafe.sh
+++ b/tools/tests/test_push_unsafe.sh
@@ -32,7 +32,7 @@ curl -H "Authorization: key=$SERVER_KEY" \
 # {"multicast_id":5978845027639121780,"success":0,"failure":1,"canonical_ids":0,"results":[{"error":"InvalidRegistration"}]}
 
 # content of the notification
-DATA="{\"message\":\"Message of PUSH!\"}"
+DATA='{"event_id":"$THIS_IS_A_FAKE_EVENT_ID"}'
 
 echo
 echo

From 48ca1384f8af1affa113b1c6249d256a269c5731 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Oct 2020 16:46:40 +0200
Subject: [PATCH 180/278] Do some renaming, Sygnal is an implementation of a
 PushGateway.

---
 CHANGES.md                                    |  1 +
 ...SygnalFailure.kt => PushGatewayFailure.kt} |  4 +--
 .../sdk/api/session/pushers/PushersService.kt |  6 ++--
 .../sdk/internal/network/NetworkConstants.kt  |  4 +--
 .../session/pushers/DefaultPushersService.kt  |  8 +++---
 .../internal/session/pushers/PushersModule.kt |  6 ++--
 .../PushGatewayAPI.kt}                        | 10 +++----
 .../PushGatewayDevice.kt}                     |  4 +--
 .../PushGatewayNotification.kt}               |  6 ++--
 .../PushGatewayNotifyBody.kt}                 |  6 ++--
 .../PushGatewayNotifyResponse.kt}             |  6 ++--
 .../PushGatewayNotifyTask.kt}                 | 28 +++++++++----------
 ...omSygnal.kt => TestPushFromPushGateway.kt} | 14 +++++-----
 ...ificationTroubleshootTestManagerFactory.kt |  6 ++--
 14 files changed, 55 insertions(+), 54 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/{SygnalFailure.kt => PushGatewayFailure.kt} (86%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{sygnal/SygnalAPI.kt => gateway/PushGatewayAPI.kt} (73%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{sygnal/SygnalDevice.kt => gateway/PushGatewayDevice.kt} (90%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{sygnal/SygnalNotification.kt => gateway/PushGatewayNotification.kt} (85%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{sygnal/SygnalNotifyBody.kt => gateway/PushGatewayNotifyBody.kt} (84%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{sygnal/SygnalNotifyResponse.kt => gateway/PushGatewayNotifyResponse.kt} (82%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/{sygnal/SygnalNotifyTask.kt => gateway/PushGatewayNotifyTask.kt} (69%)
 rename vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/{TestPushFromSygnal.kt => TestPushFromPushGateway.kt} (76%)

diff --git a/CHANGES.md b/CHANGES.md
index e365768f86..6c6a0d6dd8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Improvements 🙌:
  - Filter room member (and banned users) by name (#2184)
  - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
  - Add Sygnal API implementation to test is Push are correctly received
+ - Add PushGateway API implementation to test if Push are correctly received
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt
index ebedba9d92..f5b9d7ea8d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/SygnalFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt
@@ -18,6 +18,6 @@ package org.matrix.android.sdk.api.session.pushers
 
 import org.matrix.android.sdk.api.failure.Failure
 
-sealed class SygnalFailure : Failure.FeatureFailure() {
-    object PusherRejected : SygnalFailure()
+sealed class PushGatewayFailure : Failure.FeatureFailure() {
+    object PusherRejected : PushGatewayFailure()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 3832bc5af4..09cbe5a89b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -67,12 +67,12 @@ interface PushersService {
                       withEventIdOnly: Boolean): UUID
 
     /**
-     * Directly ask Sygnal to send a push to this device
-     * @param url the Sygnal url (full path)
+     * Directly ask the push gateway to send a push to this device
+     * @param url the push gateway url (full path)
      * @param appId the application id
      * @param pushkey the FCM token
      * @param eventId the eventId which will be sent in the Push message. Use a fake eventId.
-     * @param callback callback to know if Sygnal has accepted the request. In this case, the app should receive a Push with the provided eventId.
+     * @param callback callback to know if the push gateway has accepted the request. In this case, the app should receive a Push with the provided eventId.
      *                 In case of error, PusherRejected failure can happen. In this case it means that the pushkey is not valid.
      */
     fun testPush(url: String,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
index 0dfdec1804..a14c86efb6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/NetworkConstants.kt
@@ -31,8 +31,8 @@ internal object NetworkConstants {
     const val URI_IDENTITY_PREFIX_PATH = "_matrix/identity/v2"
     const val URI_IDENTITY_PATH_V2 = "$URI_IDENTITY_PREFIX_PATH/"
 
-    // Sygnal
-    const val URI_SYGNAL_PREFIX_PATH = "_matrix/push/v1/"
+    // Push Gateway
+    const val URI_PUSH_GATEWAY_PREFIX_PATH = "_matrix/push/v1/"
 
     // Integration
     const val URI_INTEGRATION_MANAGER_PATH = "_matrix/integrations/v1/"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 02f147f815..1ded11de8f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -28,7 +28,7 @@ import org.matrix.android.sdk.internal.database.query.where
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.di.SessionId
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
-import org.matrix.android.sdk.internal.session.pushers.sygnal.SygnalNotifyTask
+import org.matrix.android.sdk.internal.session.pushers.gateway.PushGatewayNotifyTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.task.configureWith
 import org.matrix.android.sdk.internal.worker.WorkerParamsFactory
@@ -42,7 +42,7 @@ internal class DefaultPushersService @Inject constructor(
         @SessionDatabase private val monarchy: Monarchy,
         @SessionId private val sessionId: String,
         private val getPusherTask: GetPushersTask,
-        private val sygnalNotifyTask: SygnalNotifyTask,
+        private val pushGatewayNotifyTask: PushGatewayNotifyTask,
         private val removePusherTask: RemovePusherTask,
         private val taskExecutor: TaskExecutor
 ) : PushersService {
@@ -52,8 +52,8 @@ internal class DefaultPushersService @Inject constructor(
                           pushkey: String,
                           eventId: String,
                           callback: MatrixCallback<Unit>) {
-        sygnalNotifyTask
-                .configureWith(SygnalNotifyTask.Params(url, appId, pushkey, eventId)) {
+        pushGatewayNotifyTask
+                .configureWith(PushGatewayNotifyTask.Params(url, appId, pushkey, eventId)) {
                     this.callback = callback
                 }
                 .executeBy(taskExecutor)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
index 5810f26c85..4030c63514 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/PushersModule.kt
@@ -25,8 +25,8 @@ import org.matrix.android.sdk.api.session.pushers.PushersService
 import org.matrix.android.sdk.internal.session.notification.DefaultProcessEventForPushTask
 import org.matrix.android.sdk.internal.session.notification.DefaultPushRuleService
 import org.matrix.android.sdk.internal.session.notification.ProcessEventForPushTask
-import org.matrix.android.sdk.internal.session.pushers.sygnal.DefaultSygnalNotifyTask
-import org.matrix.android.sdk.internal.session.pushers.sygnal.SygnalNotifyTask
+import org.matrix.android.sdk.internal.session.pushers.gateway.DefaultPushGatewayNotifyTask
+import org.matrix.android.sdk.internal.session.pushers.gateway.PushGatewayNotifyTask
 import org.matrix.android.sdk.internal.session.room.notification.DefaultSetRoomNotificationStateTask
 import org.matrix.android.sdk.internal.session.room.notification.SetRoomNotificationStateTask
 import retrofit2.Retrofit
@@ -90,5 +90,5 @@ internal abstract class PushersModule {
     abstract fun bindProcessEventForPushTask(task: DefaultProcessEventForPushTask): ProcessEventForPushTask
 
     @Binds
-    abstract fun bindSygnalNotifyTask(task: DefaultSygnalNotifyTask): SygnalNotifyTask
+    abstract fun bindPushGatewayNotifyTask(task: DefaultPushGatewayNotifyTask): PushGatewayNotifyTask
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
similarity index 73%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
index 7550e14a97..75946780f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.internal.session.pushers.sygnal
+package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-internal interface SygnalAPI {
+internal interface PushGatewayAPI {
     /**
-     * Ask Sygnal to send a push to the current device.
+     * Ask the Push Gateway to send a push to the current device.
      *
      * Ref: https://matrix.org/docs/spec/push_gateway/r0.1.1#post-matrix-push-v1-notify
      */
-    @POST(NetworkConstants.URI_SYGNAL_PREFIX_PATH + "notify")
-    fun notify(@Body body: SygnalNotifyBody): Call<SygnalNotifyResponse>
+    @POST(NetworkConstants.URI_PUSH_GATEWAY_PREFIX_PATH + "notify")
+    fun notify(@Body body: PushGatewayNotifyBody): Call<PushGatewayNotifyResponse>
 }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt
index a5cfe389cc..a513448014 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.pushers.sygnal
+package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal data class SygnalDevice(
+internal data class PushGatewayDevice(
         /**
          * Required. The app_id given when the pusher was created.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt
similarity index 85%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt
index a2c016feb8..aa6519e216 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotification.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.pushers.sygnal
+package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal data class SygnalNotification(
+internal data class PushGatewayNotification(
         @Json(name = "event_id")
         val eventId: String,
 
@@ -28,5 +28,5 @@ internal data class SygnalNotification(
          * Required. This is an array of devices that the notification should be sent to.
          */
         @Json(name = "devices")
-        val devices: List<SygnalDevice>
+        val devices: List<PushGatewayDevice>
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt
index 7b13d8ff79..112267aeba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.pushers.sygnal
+package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal data class SygnalNotifyBody(
+internal data class PushGatewayNotifyBody(
         /**
          * Required. Information about the push notification
          */
         @Json(name = "notification")
-        val notification: SygnalNotification
+        val notification: PushGatewayNotification
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt
similarity index 82%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt
index 73d5aa1e2c..bad1c08465 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.session.pushers.sygnal
+package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-internal data class SygnalNotifyResponse(
+internal data class PushGatewayNotifyResponse(
         @Json(name = "rejected")
-        val rejectedPushKey: List<String>
+        val rejectedPushKeys: List<String>
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
similarity index 69%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
index 663d0cd3c2..fba3a881d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/sygnal/SygnalNotifyTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.matrix.android.sdk.internal.session.pushers.sygnal
+package org.matrix.android.sdk.internal.session.pushers.gateway
 
 import okhttp3.OkHttpClient
-import org.matrix.android.sdk.api.session.pushers.SygnalFailure
+import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
 import org.matrix.android.sdk.internal.di.Unauthenticated
 import org.matrix.android.sdk.internal.network.NetworkConstants
 import org.matrix.android.sdk.internal.network.RetrofitFactory
@@ -24,7 +24,7 @@ import org.matrix.android.sdk.internal.network.executeRequest
 import org.matrix.android.sdk.internal.task.Task
 import javax.inject.Inject
 
-internal interface SygnalNotifyTask : Task<SygnalNotifyTask.Params, Unit> {
+internal interface PushGatewayNotifyTask : Task<PushGatewayNotifyTask.Params, Unit> {
     data class Params(
             val url: String,
             val appId: String,
@@ -33,25 +33,25 @@ internal interface SygnalNotifyTask : Task<SygnalNotifyTask.Params, Unit> {
     )
 }
 
-internal class DefaultSygnalNotifyTask @Inject constructor(
+internal class DefaultPushGatewayNotifyTask @Inject constructor(
         private val retrofitFactory: RetrofitFactory,
         @Unauthenticated private val unauthenticatedOkHttpClient: OkHttpClient
-) : SygnalNotifyTask {
+) : PushGatewayNotifyTask {
 
-    override suspend fun execute(params: SygnalNotifyTask.Params) {
+    override suspend fun execute(params: PushGatewayNotifyTask.Params) {
         val sygnalApi = retrofitFactory.create(
                 unauthenticatedOkHttpClient,
-                params.url.substringBefore(NetworkConstants.URI_SYGNAL_PREFIX_PATH)
+                params.url.substringBefore(NetworkConstants.URI_PUSH_GATEWAY_PREFIX_PATH)
         )
-                .create(SygnalAPI::class.java)
+                .create(PushGatewayAPI::class.java)
 
-        val response = executeRequest<SygnalNotifyResponse>(null) {
+        val response = executeRequest<PushGatewayNotifyResponse>(null) {
             apiCall = sygnalApi.notify(
-                    SygnalNotifyBody(
-                            SygnalNotification(
+                    PushGatewayNotifyBody(
+                            PushGatewayNotification(
                                     eventId = params.eventId,
                                     devices = listOf(
-                                            SygnalDevice(
+                                            PushGatewayDevice(
                                                     params.appId,
                                                     params.pushKey
                                             )
@@ -61,8 +61,8 @@ internal class DefaultSygnalNotifyTask @Inject constructor(
             )
         }
 
-        if (response.rejectedPushKey.contains(params.pushKey)) {
-            throw SygnalFailure.PusherRejected
+        if (response.rejectedPushKeys.contains(params.pushKey)) {
+            throw PushGatewayFailure.PusherRejected
         }
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
similarity index 76%
rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
rename to vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 105c54c64f..21bbc96f08 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromSygnal.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -23,16 +23,16 @@ import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.pushers.SygnalFailure
+import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
 import javax.inject.Inject
 
 /**
- * Test Push by asking Sygnal to send a Push back
+ * Test Push by asking the Push Gateway to send a Push back
  */
-class TestPushFromSygnal @Inject constructor(private val context: AppCompatActivity,
-                                             private val stringProvider: StringProvider,
-                                             private val errorFormatter: ErrorFormatter,
-                                             private val pushersManager: PushersManager)
+class TestPushFromPushGateway @Inject constructor(private val context: AppCompatActivity,
+                                                  private val stringProvider: StringProvider,
+                                                  private val errorFormatter: ErrorFormatter,
+                                                  private val pushersManager: PushersManager)
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
     override fun perform() {
@@ -42,7 +42,7 @@ class TestPushFromSygnal @Inject constructor(private val context: AppCompatActiv
         }
         pushersManager.testPush(fcmToken, object : MatrixCallback<Unit> {
             override fun onFailure(failure: Throwable) {
-                description = if (failure is SygnalFailure.PusherRejected) {
+                description = if (failure is PushGatewayFailure.PusherRejected) {
                     stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
                 } else {
                     errorFormatter.toHumanReadable(failure)
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index 06d3283afa..46c78a9872 100644
--- a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -23,7 +23,7 @@ import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
 import im.vector.app.features.settings.troubleshoot.TestSystemSettings
 import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken
 import im.vector.app.gplay.features.settings.troubleshoot.TestPlayServices
-import im.vector.app.gplay.features.settings.troubleshoot.TestPushFromSygnal
+import im.vector.app.gplay.features.settings.troubleshoot.TestPushFromPushGateway
 import im.vector.app.gplay.features.settings.troubleshoot.TestTokenRegistration
 import javax.inject.Inject
 
@@ -35,7 +35,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         private val testPlayServices: TestPlayServices,
         private val testFirebaseToken: TestFirebaseToken,
         private val testTokenRegistration: TestTokenRegistration,
-        private val testPushFromSygnal: TestPushFromSygnal
+        private val testPushFromPushGateway: TestPushFromPushGateway
 ) {
 
     fun create(fragment: Fragment): NotificationTroubleshootTestManager {
@@ -47,7 +47,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         mgr.addTest(testPlayServices)
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
-        mgr.addTest(testPushFromSygnal)
+        mgr.addTest(testPushFromPushGateway)
         return mgr
     }
 }

From 5397700ab4fcf4ab15ef9451b3d0a183cf6c4156 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Oct 2020 15:54:42 +0200
Subject: [PATCH 181/278] cleanup

---
 .../sdk/internal/session/pushers/gateway/PushGatewayAPI.kt       | 1 -
 vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
index 75946780f6..a031a8a307 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
@@ -29,4 +29,3 @@ internal interface PushGatewayAPI {
     @POST(NetworkConstants.URI_PUSH_GATEWAY_PREFIX_PATH + "notify")
     fun notify(@Body body: PushGatewayNotifyBody): Call<PushGatewayNotifyResponse>
 }
-
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 790f19a133..1e7d662793 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -24,7 +24,6 @@ import org.matrix.android.sdk.api.failure.isInvalidPassword
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import java.net.HttpURLConnection
 import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.net.ssl.SSLException
 import javax.net.ssl.SSLPeerUnverifiedException

From f860cfd8a3111fab584ea9e7b6220349b83c0794 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 8 Oct 2020 14:08:35 +0200
Subject: [PATCH 182/278] Fix compilation issue after rebase

---
 .../features/settings/troubleshoot/TestPushFromPushGateway.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 21bbc96f08..d52f41dacf 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -15,6 +15,8 @@
  */
 package im.vector.app.gplay.features.settings.troubleshoot
 
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.app.AppCompatActivity
 import im.vector.app.R
 import im.vector.app.core.error.ErrorFormatter
@@ -35,7 +37,7 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
                                                   private val pushersManager: PushersManager)
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
-    override fun perform() {
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val fcmToken = FcmHelper.getFcmToken(context) ?: run {
             status = TestStatus.FAILED
             return

From be62d65c98170afc898107d66074fe52075cf4ed Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 8 Oct 2020 14:09:19 +0200
Subject: [PATCH 183/278] Some cleanup on the layout

---
 vector/src/main/res/layout/activity_jitsi.xml |  6 +-
 .../main/res/layout/view_avatar_selector.xml  | 68 -------------------
 2 files changed, 4 insertions(+), 70 deletions(-)
 delete mode 100644 vector/src/main/res/layout/view_avatar_selector.xml

diff --git a/vector/src/main/res/layout/activity_jitsi.xml b/vector/src/main/res/layout/activity_jitsi.xml
index e0359d220d..de0c0271bc 100644
--- a/vector/src/main/res/layout/activity_jitsi.xml
+++ b/vector/src/main/res/layout/activity_jitsi.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/jitsi_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/black">
 
-    <!-- Note: A org.jitsi.meet.sdk.JitsiMeetView will be added here -->
+    <!-- Note: A org.jitsi.meet.sdk.JitsiMeetView will be added here and so add tools:ignore="UselessParent" -->
 
     <LinearLayout
         android:id="@+id/jitsi_progress_layout"
@@ -13,7 +14,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        tools:ignore="UselessParent">
 
         <ProgressBar
             android:layout_width="40dp"
diff --git a/vector/src/main/res/layout/view_avatar_selector.xml b/vector/src/main/res/layout/view_avatar_selector.xml
deleted file mode 100644
index c303347960..0000000000
--- a/vector/src/main/res/layout/view_avatar_selector.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
-    android:background="@drawable/bg_attachment_type_selector"
-    android:orientation="vertical"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="16dp"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:weightSum="2">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/avatarCameraButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_camera"
-                android:src="@drawable/ic_attachment_camera_white_24dp"
-                tools:background="@color/riotx_accent" />
-
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_camera" />
-
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <ImageButton
-                android:id="@+id/avatarGalleryButton"
-                style="@style/AttachmentTypeSelectorButton"
-                android:contentDescription="@string/attachment_type_gallery"
-                android:src="@drawable/ic_attachment_gallery_white_24dp"
-                tools:background="@color/riotx_accent" />
-
-            <TextView
-                style="@style/AttachmentTypeSelectorLabel"
-                android:importantForAccessibility="no"
-                android:text="@string/attachment_type_gallery" />
-
-        </LinearLayout>
-
-
-    </LinearLayout>
-
-
-</LinearLayout>

From 5e45f5c3eacf71c7e071830795506f082f4a6ef3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 8 Oct 2020 15:22:02 +0200
Subject: [PATCH 184/278] Copyright for SDK

---
 .../android/sdk/api/session/pushers/PushGatewayFailure.kt       | 2 +-
 .../sdk/internal/session/pushers/gateway/PushGatewayAPI.kt      | 2 +-
 .../sdk/internal/session/pushers/gateway/PushGatewayDevice.kt   | 2 +-
 .../internal/session/pushers/gateway/PushGatewayNotification.kt | 2 +-
 .../internal/session/pushers/gateway/PushGatewayNotifyBody.kt   | 2 +-
 .../session/pushers/gateway/PushGatewayNotifyResponse.kt        | 2 +-
 .../internal/session/pushers/gateway/PushGatewayNotifyTask.kt   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt
index f5b9d7ea8d..b15147161f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushGatewayFailure.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
index a031a8a307..d95587fc22 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayAPI.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt
index a513448014..5490fed7a7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayDevice.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt
index aa6519e216..b9c8a35afc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotification.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt
index 112267aeba..751414d2fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyBody.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt
index bad1c08465..50401ef6e9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyResponse.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
index fba3a881d8..df6f46fa81 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/gateway/PushGatewayNotifyTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From dbb77d9dc12e42e69f0133a3c2f358346f1d6e29 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 17:46:21 +0200
Subject: [PATCH 185/278] Push test: success if user click on the notification

---
 .../troubleshoot/TestPushFromPushGateway.kt   |  8 ++++-
 vector/src/main/AndroidManifest.xml           |  4 +++
 .../notifications/NotificationUtils.kt        | 12 ++++++++
 ...ttingsNotificationsTroubleshootFragment.kt | 30 +++++++++++++++++++
 .../NotificationTroubleshootTestManager.kt    |  6 ++++
 .../troubleshoot/TestNotificationReceiver.kt  | 30 +++++++++++++++++++
 .../settings/troubleshoot/TroubleshootTest.kt |  3 ++
 vector/src/main/res/values/strings.xml        |  5 ++--
 8 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotificationReceiver.kt

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index d52f41dacf..19a4e3a841 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -53,9 +53,15 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
             }
 
             override fun onSuccess(data: Unit) {
+                // Wait for user to click on the notification
                 description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
-                status = TestStatus.SUCCESS
+                status = TestStatus.RUNNING
             }
         })
     }
+
+    override fun onNotificationClicked() {
+        description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_notification_clicked)
+        status = TestStatus.SUCCESS
+    }
 }
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 3f178a3d20..d8ae90a33c 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -252,6 +252,10 @@
             android:name=".features.call.service.CallHeadsUpActionReceiver"
             android:exported="false" />
 
+        <receiver
+            android:name=".features.settings.troubleshoot.TestNotificationReceiver"
+            android:exported="false" />
+
         <!-- Exported false, should only be accessible from this app!! -->
         <receiver
             android:name=".features.notifications.NotificationBroadcastReceiver"
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 7e7fd60b59..a30d4302f2 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -51,6 +51,7 @@ import im.vector.app.features.home.HomeActivity
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.troubleshoot.TestNotificationReceiver
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -90,6 +91,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         const val DISMISS_SUMMARY_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DISMISS_SUMMARY_ACTION"
         const val DISMISS_ROOM_NOTIF_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DISMISS_ROOM_NOTIF_ACTION"
         private const val TAP_TO_VIEW_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.TAP_TO_VIEW_ACTION"
+        const val DIAGNOSTIC_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DIAGNOSTIC"
 
         /* ==========================================================================================
          * IDs for channels
@@ -847,6 +849,15 @@ class NotificationUtils @Inject constructor(private val context: Context,
     }
 
     fun displayDiagnosticNotification() {
+        val testActionIntent = Intent(context, TestNotificationReceiver::class.java)
+        testActionIntent.action = DIAGNOSTIC_ACTION
+        val testPendingIntent = PendingIntent.getBroadcast(
+                context,
+                0,
+                testActionIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+        )
+
         notificationManager.notify(
                 "DIAGNOSTIC",
                 888,
@@ -859,6 +870,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
                         .setPriority(NotificationCompat.PRIORITY_MAX)
                         .setCategory(NotificationCompat.CATEGORY_STATUS)
                         .setAutoCancel(true)
+                        .setContentIntent(testPendingIntent)
                         .build()
         )
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index b989ae44d0..2adc6ccdcf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -16,12 +16,16 @@
 package im.vector.app.features.settings
 
 import android.app.Activity
+import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -32,10 +36,12 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.rageshake.BugReporter
 import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.NotificationTroubleshootTestManagerFactory
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
 class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
@@ -45,12 +51,16 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
 
     @BindView(R.id.troubleshoot_test_recycler_view)
     lateinit var mRecyclerView: RecyclerView
+
     @BindView(R.id.troubleshoot_bottom_view)
     lateinit var mBottomView: ViewGroup
+
     @BindView(R.id.toubleshoot_summ_description)
     lateinit var mSummaryDescription: TextView
+
     @BindView(R.id.troubleshoot_summ_button)
     lateinit var mSummaryButton: Button
+
     @BindView(R.id.troubleshoot_run_button)
     lateinit var mRunButton: Button
 
@@ -108,6 +118,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                     }
                     TroubleshootTest.TestStatus.FAILED      -> {
                         // check if there are quick fixes
+                        // TODO Rewrite using firstOrNull
                         var hasQuickFix = false
                         testManager?.testList?.let {
                             for (test in it) {
@@ -161,6 +172,25 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
     override fun onResume() {
         super.onResume()
         (activity as? VectorBaseActivity)?.supportActionBar?.setTitle(R.string.settings_notification_troubleshoot)
+
+        tryOrNull("Unable to register the receiver") {
+            LocalBroadcastManager.getInstance(requireContext())
+                    .registerReceiver(broadcastReceiver, IntentFilter(NotificationUtils.DIAGNOSTIC_ACTION))
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        tryOrNull {
+           LocalBroadcastManager.getInstance(requireContext())
+                   .unregisterReceiver(broadcastReceiver)
+        }
+    }
+
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            testManager?.onDiagnosticNotificationClicked()
+        }
     }
 
     override fun onAttach(context: Context) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index e977dc5963..0c77caf635 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -94,4 +94,10 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
             test.cancel()
         }
     }
+
+    fun onDiagnosticNotificationClicked() {
+        testList.forEach {
+            it.onNotificationClicked()
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotificationReceiver.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotificationReceiver.kt
new file mode 100644
index 0000000000..7dec870d3d
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotificationReceiver.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.settings.troubleshoot
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+
+class TestNotificationReceiver : BroadcastReceiver() {
+
+    override fun onReceive(context: Context, intent: Intent) {
+        // Internal broadcast to any one interested
+        LocalBroadcastManager.getInstance(context).sendBroadcast(intent)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
index f894fcc0ef..aedca5e356 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
@@ -51,4 +51,7 @@ abstract class TroubleshootTest(@StringRes val titleResId: Int) {
 
     open fun cancel() {
     }
+
+    open fun onNotificationClicked() {
+    }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d5e590375c..004da5e15e 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -750,9 +750,10 @@
     <string name="settings_troubleshoot_test_token_registration_failed">Failed to register FCM token to HomeServer:\n%1$s</string>
 
     <string name="settings_troubleshoot_test_push_loop_title">Test Push</string>
-    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, you should see a notification.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, please click on the test notification you just receive.</string>
+    <string name="settings_troubleshoot_test_push_loop_notification_clicked">The notification has been clicked!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Failed to receive push. Solution could be to reinstall the application.</string>
-    <string name="settings_troubleshoot_test_push_notification_content">You are receiving PUSH!</string>
+    <string name="settings_troubleshoot_test_push_notification_content">You are receiving PUSH! Click me!</string>
 
     <string name="settings_troubleshoot_test_foreground_service_started_title">Notifications Service</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Notifications Service is running.</string>

From ab9bbe9a4862b8450ec90803325ee76341056b02 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 21:40:53 +0200
Subject: [PATCH 186/278] Cleanup and cancel request properly

---
 .../sdk/api/session/pushers/PushersService.kt |  2 +-
 .../session/pushers/DefaultPushersService.kt  |  4 +--
 .../troubleshoot/TestPushFromPushGateway.kt   |  9 ++++-
 .../vector/app/core/pushers/PushersManager.kt |  5 +--
 ...ttingsNotificationsTroubleshootFragment.kt | 20 +++--------
 .../NotificationTroubleshootTestManager.kt    | 35 ++++++++++++-------
 6 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
index 09cbe5a89b..3993422b1d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/pushers/PushersService.kt
@@ -79,7 +79,7 @@ interface PushersService {
                  appId: String,
                  pushkey: String,
                  eventId: String,
-                 callback: MatrixCallback<Unit>)
+                 callback: MatrixCallback<Unit>): Cancelable
 
     /**
      * Remove the http pusher
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
index 1ded11de8f..e239182b4a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/pushers/DefaultPushersService.kt
@@ -51,8 +51,8 @@ internal class DefaultPushersService @Inject constructor(
                           appId: String,
                           pushkey: String,
                           eventId: String,
-                          callback: MatrixCallback<Unit>) {
-        pushGatewayNotifyTask
+                          callback: MatrixCallback<Unit>): Cancelable {
+        return pushGatewayNotifyTask
                 .configureWith(PushGatewayNotifyTask.Params(url, appId, pushkey, eventId)) {
                     this.callback = callback
                 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index 19a4e3a841..bbe3f35fb5 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -26,6 +26,7 @@ import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.FcmHelper
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.pushers.PushGatewayFailure
+import org.matrix.android.sdk.api.util.Cancelable
 import javax.inject.Inject
 
 /**
@@ -37,12 +38,14 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
                                                   private val pushersManager: PushersManager)
     : TroubleshootTest(R.string.settings_troubleshoot_test_push_loop_title) {
 
+    private var action: Cancelable? = null
+
     override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
         val fcmToken = FcmHelper.getFcmToken(context) ?: run {
             status = TestStatus.FAILED
             return
         }
-        pushersManager.testPush(fcmToken, object : MatrixCallback<Unit> {
+        action = pushersManager.testPush(fcmToken, object : MatrixCallback<Unit> {
             override fun onFailure(failure: Throwable) {
                 description = if (failure is PushGatewayFailure.PusherRejected) {
                     stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_failed)
@@ -64,4 +67,8 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
         description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_notification_clicked)
         status = TestStatus.SUCCESS
     }
+
+    override fun cancel() {
+        action?.cancel()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
index cfdc61a045..5fe30141d9 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
@@ -22,6 +22,7 @@ import im.vector.app.core.resources.AppNameProvider
 import im.vector.app.core.resources.LocaleProvider
 import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.util.Cancelable
 import java.util.UUID
 import javax.inject.Inject
 import kotlin.math.abs
@@ -34,10 +35,10 @@ class PushersManager @Inject constructor(
         private val stringProvider: StringProvider,
         private val appNameProvider: AppNameProvider
 ) {
-    fun testPush(pushKey: String, callback: MatrixCallback<Unit>) {
+    fun testPush(pushKey: String, callback: MatrixCallback<Unit>): Cancelable {
         val currentSession = activeSessionHolder.getActiveSession()
 
-        currentSession.testPush(
+        return currentSession.testPush(
                 stringProvider.getString(R.string.pusher_http_url),
                 stringProvider.getString(R.string.pusher_app_id),
                 pushKey,
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index 2adc6ccdcf..ea9e73f160 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -41,6 +41,7 @@ import im.vector.app.features.rageshake.BugReporter
 import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
 import im.vector.app.features.settings.troubleshoot.TroubleshootTest
 import im.vector.app.push.fcm.NotificationTroubleshootTestManagerFactory
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import javax.inject.Inject
 
@@ -92,8 +93,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
     }
 
     private fun startUI() {
-        mSummaryDescription.text = getString(R.string.settings_troubleshoot_diagnostic_running_status,
-                0, 0)
+        mSummaryDescription.text = getString(R.string.settings_troubleshoot_diagnostic_running_status, 0, 0)
         testManager = testManagerFactory.create(this)
         testManager?.statusListener = { troubleshootTestManager ->
             if (isAdded) {
@@ -105,9 +105,8 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                         mRunButton.visibility = View.VISIBLE
                     }
                     TroubleshootTest.TestStatus.RUNNING     -> {
-                        // Forces int type because it's breaking lint
-                        val size: Int = troubleshootTestManager.testList.size
-                        val currentTestIndex: Int = troubleshootTestManager.currentTestIndex
+                        val size = troubleshootTestManager.testListSize
+                        val currentTestIndex = troubleshootTestManager.currentTestIndex
                         mSummaryDescription.text = getString(
                                 R.string.settings_troubleshoot_diagnostic_running_status,
                                 currentTestIndex,
@@ -118,16 +117,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                     }
                     TroubleshootTest.TestStatus.FAILED      -> {
                         // check if there are quick fixes
-                        // TODO Rewrite using firstOrNull
-                        var hasQuickFix = false
-                        testManager?.testList?.let {
-                            for (test in it) {
-                                if (test.status == TroubleshootTest.TestStatus.FAILED && test.quickFix != null) {
-                                    hasQuickFix = true
-                                    break
-                                }
-                            }
-                        }
+                        val hasQuickFix = testManager?.hasQuickFix().orFalse()
                         if (hasQuickFix) {
                             mSummaryDescription.text = getString(R.string.settings_troubleshoot_diagnostic_failure_status_with_quickfix)
                         } else {
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index 0c77caf635..566cb6d846 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -23,13 +23,19 @@ import androidx.fragment.app.Fragment
 import kotlin.properties.Delegates
 
 class NotificationTroubleshootTestManager(val fragment: Fragment) {
+    private val testList = ArrayList<TroubleshootTest>()
+
+    val testListSize: Int
+        get() = testList.size
 
-    val testList = ArrayList<TroubleshootTest>()
     var isCancelled = false
+        private set
 
     var currentTestIndex by Delegates.observable(0) { _, _, _ ->
         statusListener?.invoke(this)
     }
+        private set
+
     val adapter = NotificationTroubleshootRecyclerViewAdapter(testList)
 
     var statusListener: ((NotificationTroubleshootTestManager) -> Unit)? = null
@@ -37,6 +43,7 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
     var diagStatus: TroubleshootTest.TestStatus by Delegates.observable(TroubleshootTest.TestStatus.NOT_STARTED) { _, _, _ ->
         statusListener?.invoke(this)
     }
+        private set
 
     fun addTest(test: TroubleshootTest) {
         testList.add(test)
@@ -79,25 +86,27 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
     }
 
     fun retry(activityResultLauncher: ActivityResultLauncher<Intent>) {
-        for (test in testList) {
-            test.cancel()
-            test.description = null
-            test.quickFix = null
-            test.status = TroubleshootTest.TestStatus.NOT_STARTED
+        testList.forEach {
+            it.cancel()
+            it.description = null
+            it.quickFix = null
+            it.status = TroubleshootTest.TestStatus.NOT_STARTED
         }
         runDiagnostic(activityResultLauncher)
     }
 
-    fun cancel() {
-        isCancelled = true
-        for (test in testList) {
-            test.cancel()
+    fun hasQuickFix(): Boolean {
+        return testList.any { test ->
+            test.status == TroubleshootTest.TestStatus.FAILED && test.quickFix != null
         }
     }
 
+    fun cancel() {
+        isCancelled = true
+        testList.forEach { it.cancel() }
+    }
+
     fun onDiagnosticNotificationClicked() {
-        testList.forEach {
-            it.onNotificationClicked()
-        }
+        testList.forEach { it.onNotificationClicked() }
     }
 }

From 3714e4e7874f0f68e9225c5ef3ca99c92ad11200 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 8 Oct 2020 21:55:16 +0200
Subject: [PATCH 187/278] Add a Waiting for user state

---
 .../settings/troubleshoot/TestPushFromPushGateway.kt   |  2 +-
 .../VectorSettingsNotificationsTroubleshootFragment.kt |  3 ++-
 .../NotificationTroubleshootRecyclerViewAdapter.kt     | 10 ++++++++++
 .../features/settings/troubleshoot/TroubleshootTest.kt |  1 +
 vector/src/main/res/values/strings.xml                 |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index bbe3f35fb5..ce94244ee6 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -58,7 +58,7 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
             override fun onSuccess(data: Unit) {
                 // Wait for user to click on the notification
                 description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
-                status = TestStatus.RUNNING
+                status = TestStatus.WAITING_FOR_USER
             }
         })
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index ea9e73f160..4843c1446a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -104,7 +104,8 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                         mSummaryButton.visibility = View.GONE
                         mRunButton.visibility = View.VISIBLE
                     }
-                    TroubleshootTest.TestStatus.RUNNING     -> {
+                    TroubleshootTest.TestStatus.RUNNING,
+                    TroubleshootTest.TestStatus.WAITING_FOR_USER -> {
                         val size = troubleshootTestManager.testListSize
                         val currentTestIndex = troubleshootTestManager.currentTestIndex
                         mSummaryDescription.text = getString(
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index 1ccd7b6735..633d9d05fe 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -77,6 +77,16 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
                     statusIconImage.visibility = View.VISIBLE
                     statusIconImage.setImageResource(R.drawable.unit_test)
                 }
+                TroubleshootTest.TestStatus.WAITING_FOR_USER -> {
+                    progressBar.visibility = View.INVISIBLE
+                    statusIconImage.visibility = View.VISIBLE
+                    val infoColor = ContextCompat.getColor(context, R.color.vector_info_color)
+                    val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_notification_privacy_warning)?.apply {
+                        ThemeUtils.tintDrawableWithColor(this, infoColor)
+                    }
+                    statusIconImage.setImageDrawable(drawable)
+                    descriptionText.setTextColor(infoColor)
+                }
                 TroubleshootTest.TestStatus.RUNNING     -> {
                     progressBar.visibility = View.VISIBLE
                     statusIconImage.visibility = View.INVISIBLE
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
index aedca5e356..c775c8c827 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
@@ -25,6 +25,7 @@ abstract class TroubleshootTest(@StringRes val titleResId: Int) {
     enum class TestStatus {
         NOT_STARTED,
         RUNNING,
+        WAITING_FOR_USER,
         FAILED,
         SUCCESS
     }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 004da5e15e..ef6b63aeb0 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -750,7 +750,7 @@
     <string name="settings_troubleshoot_test_token_registration_failed">Failed to register FCM token to HomeServer:\n%1$s</string>
 
     <string name="settings_troubleshoot_test_push_loop_title">Test Push</string>
-    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, please click on the test notification you just receive.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, please click on the test notification you just received.</string>
     <string name="settings_troubleshoot_test_push_loop_notification_clicked">The notification has been clicked!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Failed to receive push. Solution could be to reinstall the application.</string>
     <string name="settings_troubleshoot_test_push_notification_content">You are receiving PUSH! Click me!</string>

From 4f92db76511a0b63d2555bc85d7abc8a9c141aa7 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 9 Oct 2020 14:45:36 +0300
Subject: [PATCH 188/278] Make long topic expandable.

---
 .../app/core/epoxy/ExpandableTextItem.kt      | 86 +++++++++++++++++++
 .../roomprofile/RoomProfileController.kt      | 15 ++++
 .../roomprofile/RoomProfileFragment.kt        |  2 -
 .../src/main/res/drawable/ic_expand_less.xml  |  9 ++
 .../src/main/res/drawable/ic_expand_more.xml  |  9 ++
 .../res/layout/item_expandable_textview.xml   | 33 +++++++
 .../layout/view_stub_room_profile_header.xml  | 18 ----
 vector/src/main/res/values/strings.xml        |  1 +
 8 files changed, 153 insertions(+), 20 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
 create mode 100644 vector/src/main/res/drawable/ic_expand_less.xml
 create mode 100644 vector/src/main/res/drawable/ic_expand_more.xml
 create mode 100644 vector/src/main/res/layout/item_expandable_textview.xml

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
new file mode 100644
index 0000000000..b55861571b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.epoxy
+
+import android.animation.ObjectAnimator
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.doOnPreDraw
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.extensions.copyOnLongClick
+
+@EpoxyModelClass(layout = R.layout.item_expandable_textview)
+abstract class ExpandableTextItem : VectorEpoxyModel<ExpandableTextItem.Holder>() {
+
+    @EpoxyAttribute
+    lateinit var content: String
+
+    @EpoxyAttribute
+    var maxLines: Int = 3
+
+    private var isExpanded = false
+    private var expandedLines = 0
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        holder.content.text = content
+        holder.content.copyOnLongClick()
+
+        holder.content.doOnPreDraw {
+            if (holder.content.lineCount > maxLines) {
+                expandedLines = holder.content.lineCount
+                holder.content.maxLines = maxLines
+
+                holder.view.setOnClickListener {
+                    if (isExpanded) {
+                        collapse(holder)
+                    } else {
+                        expand(holder)
+                    }
+                }
+            } else {
+                holder.arrow.isVisible = false
+            }
+        }
+    }
+
+    private fun expand(holder: Holder) {
+        ObjectAnimator.ofInt(holder.content, "maxLines", expandedLines)
+                .apply { duration = 500 }
+                .also { it.start() }
+
+        holder.arrow.setImageResource(R.drawable.ic_expand_less)
+        isExpanded = true
+    }
+
+    private fun collapse(holder: Holder) {
+        ObjectAnimator.ofInt(holder.content, "maxLines", maxLines)
+                .apply { duration = 500 }
+                .also { it.start() }
+
+        holder.arrow.setImageResource(R.drawable.ic_expand_more)
+        isExpanded = false
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val content by bind<TextView>(R.id.expandableContent)
+        val arrow by bind<ImageView>(R.id.expandableArrow)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 160ebd56be..ad774fbeef 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.roomprofile
 
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.app.R
+import im.vector.app.core.epoxy.expandableTextItem
 import im.vector.app.core.epoxy.profiles.buildProfileAction
 import im.vector.app.core.epoxy.profiles.buildProfileSection
 import im.vector.app.core.resources.ColorProvider
@@ -57,6 +58,20 @@ class RoomProfileController @Inject constructor(
             return
         }
         val roomSummary = data.roomSummary() ?: return
+
+        // Topic
+        roomSummary
+                .topic
+                .takeIf { it.isNotBlank() }
+                ?.let {
+                    buildProfileSection(stringProvider.getString(R.string.room_profile_section_topic))
+                    expandableTextItem {
+                        id("topic")
+                        content(roomSummary.topic)
+                        maxLines(2)
+                    }
+                }
+
         // Security
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_security))
         val learnMoreSubtitle = if (roomSummary.isEncrypted) {
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 399c1ecf32..c2f25c08d3 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -129,7 +129,6 @@ class RoomProfileFragment @Inject constructor(
     private fun setupLongClicks() {
         roomProfileNameView.copyOnLongClick()
         roomProfileAliasView.copyOnLongClick()
-        roomProfileTopicView.copyOnLongClick()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -187,7 +186,6 @@ class RoomProfileFragment @Inject constructor(
                 roomProfileNameView.text = it.displayName
                 matrixProfileToolbarTitleView.text = it.displayName
                 roomProfileAliasView.setTextOrHide(it.canonicalAlias)
-                roomProfileTopicView.setTextOrHide(it.topic)
                 val matrixItem = it.toMatrixItem()
                 avatarRenderer.render(matrixItem, roomProfileAvatarView)
                 avatarRenderer.render(matrixItem, matrixProfileToolbarAvatarImageView)
diff --git a/vector/src/main/res/drawable/ic_expand_less.xml b/vector/src/main/res/drawable/ic_expand_less.xml
new file mode 100644
index 0000000000..92bc86da08
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_expand_less.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_expand_more.xml b/vector/src/main/res/drawable/ic_expand_more.xml
new file mode 100644
index 0000000000..22c401f0c3
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_expand_more.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
+</vector>
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
new file mode 100644
index 0000000000..34fbaf7ec0
--- /dev/null
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/expandableContent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        app:layout_constraintBottom_toTopOf="@+id/expandableArrow"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:maxLines="2"
+        tools:text="@sample/matrix.json/data/roomTopic" />
+
+    <ImageView
+        android:id="@+id/expandableArrow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:src="@drawable/ic_expand_more"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/expandableContent"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_stub_room_profile_header.xml b/vector/src/main/res/layout/view_stub_room_profile_header.xml
index f7ae1c77a5..ecb7174f0e 100644
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@@ -54,27 +54,9 @@
         android:textAppearance="@style/Vector.Toolbar.Title"
         android:textSize="14sp"
         android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/roomProfileTopicView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/roomProfileNameView"
         tools:text="@sample/matrix.json/data/roomAlias" />
 
-    <TextView
-        android:id="@+id/roomProfileTopicView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="40dp"
-        android:autoLink="web"
-        android:fontFamily="sans-serif"
-        android:gravity="center"
-        android:textSize="14sp"
-        android:textStyle="normal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomProfileAliasView"
-        tools:text="@sample/matrix.json/data/roomTopic" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index d48162de29..709bf4f4a1 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2124,6 +2124,7 @@
     <string name="direct_room_profile_not_encrypted_subtitle">Messages here are not end-to-end encrypted.</string>
     <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
+    <string name="room_profile_section_topic">Topic</string>
     <string name="room_profile_section_security">Security</string>
     <string name="room_profile_section_security_learn_more">Learn more</string>
     <string name="room_profile_section_more">More</string>

From c3a423fdbe1c5e388174d76ee19be60559760972 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 9 Oct 2020 14:53:02 +0300
Subject: [PATCH 189/278] Changelog added.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index ec853d96ef..0762a207ce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,7 @@ Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
  - Fix Splash layout on small screens
  - Simplifies draft management and should fix bunch of draft issues (#952, #683)
+ - Very long topic cannot be fully visible (#1957)
 
 Translations 🗣:
  -

From beeb84043620fb39a876f582e44cca2996395884 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Fri, 9 Oct 2020 15:06:54 +0300
Subject: [PATCH 190/278] Do not ellipsize content while expanding.

---
 .../java/im/vector/app/core/epoxy/ExpandableTextItem.kt  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
index b55861571b..7e1114660f 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
@@ -17,6 +17,7 @@
 package im.vector.app.core.epoxy
 
 import android.animation.ObjectAnimator
+import android.text.TextUtils
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.doOnPreDraw
@@ -63,19 +64,21 @@ abstract class ExpandableTextItem : VectorEpoxyModel<ExpandableTextItem.Holder>(
 
     private fun expand(holder: Holder) {
         ObjectAnimator.ofInt(holder.content, "maxLines", expandedLines)
-                .apply { duration = 500 }
+                .apply { duration = 200 }
                 .also { it.start() }
 
+        holder.content.ellipsize = null
         holder.arrow.setImageResource(R.drawable.ic_expand_less)
         isExpanded = true
     }
 
     private fun collapse(holder: Holder) {
         ObjectAnimator.ofInt(holder.content, "maxLines", maxLines)
-                .apply { duration = 500 }
+                .apply { duration = 200 }
                 .also { it.start() }
 
-        holder.arrow.setImageResource(R.drawable.ic_expand_more)
+        holder.content.ellipsize = TextUtils.TruncateAt.END
+                holder.arrow.setImageResource(R.drawable.ic_expand_more)
         isExpanded = false
     }
 

From b12c4f854c63180a57944be3dd2223877e4e5c4e Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 9 Oct 2020 15:40:30 +0200
Subject: [PATCH 191/278] Fix / Moshi Cannot serialize kotlin

---
 .../android/sdk/internal/crypto/DefaultCryptoService.kt       | 4 ++--
 .../sdk/internal/crypto/model/rest/SendToDeviceBody.kt        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 37886a7d77..c77ac70124 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -50,7 +50,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.internal.crypto.actions.EnsureOlmSessionsForDevicesAction
 import org.matrix.android.sdk.internal.crypto.actions.MegolmSessionDataImporter
 import org.matrix.android.sdk.internal.crypto.actions.MessageEncrypter
@@ -953,7 +953,7 @@ internal class DefaultCryptoService @Inject constructor(
         roomEncryptorsStore.get(roomId) ?: /* No encrypting in this room */ return
 
         event.stateKey?.let { userId ->
-            val roomMember: RoomMemberSummary? = event.content.toModel()
+            val roomMember: RoomMemberContent? = event.content.toModel()
             val membership = roomMember?.membership
             if (membership == Membership.JOIN) {
                 // make sure we are tracking the deviceList for this user.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
index e252abfb04..868f7aa943 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/rest/SendToDeviceBody.kt
@@ -16,6 +16,9 @@
 
 package org.matrix.android.sdk.internal.crypto.model.rest
 
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
 internal data class SendToDeviceBody(
         /**
          * `Any` should implement [SendToDeviceObject], but we cannot use interface here because of Json serialization

From cb1addd5e3d77e1c9bcef19a7290e1c6a2956f62 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 9 Oct 2020 18:33:32 +0200
Subject: [PATCH 192/278] Push test now does not display notification anymore.
 Add a dedicated test to do it

---
 ...ificationTroubleshootTestManagerFactory.kt | 19 ++++---
 .../troubleshoot/TestPushFromPushGateway.kt   | 10 ++--
 .../fcm/VectorFirebaseMessagingService.kt     |  7 ++-
 ...ificationTroubleshootTestManagerFactory.kt |  5 +-
 .../im/vector/app/core/utils/SystemUtils.kt   |  8 +--
 .../notifications/NotificationUtils.kt        |  1 +
 ...ttingsNotificationsTroubleshootFragment.kt | 20 +++++--
 .../NotificationTroubleshootTestManager.kt    |  4 ++
 .../settings/troubleshoot/TestNotification.kt | 54 +++++++++++++++++++
 .../troubleshoot/TestSystemSettings.kt        |  4 +-
 .../settings/troubleshoot/TroubleshootTest.kt |  3 ++
 vector/src/main/res/values/strings.xml        |  9 ++--
 12 files changed, 117 insertions(+), 27 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt

diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index 65b8609446..6236aad65c 100644
--- a/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/fdroid/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -22,17 +22,21 @@ import im.vector.app.fdroid.features.settings.troubleshoot.TestBatteryOptimizati
 import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
 import im.vector.app.features.settings.troubleshoot.TestAccountSettings
 import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.app.features.settings.troubleshoot.TestNotification
 import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
 import im.vector.app.features.settings.troubleshoot.TestSystemSettings
 import javax.inject.Inject
 
-class NotificationTroubleshootTestManagerFactory @Inject constructor(private val testSystemSettings: TestSystemSettings,
-                                                                     private val testAccountSettings: TestAccountSettings,
-                                                                     private val testDeviceSettings: TestDeviceSettings,
-                                                                     private val testPushRulesSettings: TestPushRulesSettings,
-                                                                     private val testAutoStartBoot: TestAutoStartBoot,
-                                                                     private val testBackgroundRestrictions: TestBackgroundRestrictions,
-                                                                     private val testBatteryOptimization: TestBatteryOptimization) {
+class NotificationTroubleshootTestManagerFactory @Inject constructor(
+        private val testSystemSettings: TestSystemSettings,
+        private val testAccountSettings: TestAccountSettings,
+        private val testDeviceSettings: TestDeviceSettings,
+        private val testPushRulesSettings: TestPushRulesSettings,
+        private val testAutoStartBoot: TestAutoStartBoot,
+        private val testBackgroundRestrictions: TestBackgroundRestrictions,
+        private val testBatteryOptimization: TestBatteryOptimization,
+        private val testNotification: TestNotification
+) {
 
     fun create(fragment: Fragment): NotificationTroubleshootTestManager {
         val mgr = NotificationTroubleshootTestManager(fragment)
@@ -43,6 +47,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(private val
         mgr.addTest(testAutoStartBoot)
         mgr.addTest(testBackgroundRestrictions)
         mgr.addTest(testBatteryOptimization)
+        mgr.addTest(testNotification)
         return mgr
     }
 }
diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
index ce94244ee6..da93d54075 100644
--- a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPushFromPushGateway.kt
@@ -56,15 +56,15 @@ class TestPushFromPushGateway @Inject constructor(private val context: AppCompat
             }
 
             override fun onSuccess(data: Unit) {
-                // Wait for user to click on the notification
-                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
-                status = TestStatus.WAITING_FOR_USER
+                // Wait for the push to be received
+                description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_waiting_for_push)
+                status = TestStatus.RUNNING
             }
         })
     }
 
-    override fun onNotificationClicked() {
-        description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_notification_clicked)
+    override fun onPushReceived() {
+        description = stringProvider.getString(R.string.settings_troubleshoot_test_push_loop_success)
         status = TestStatus.SUCCESS
     }
 
diff --git a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
index 801b85ce0c..cfd241d4f9 100755
--- a/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
+++ b/vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
@@ -19,10 +19,12 @@
 
 package im.vector.app.gplay.push.fcm
 
+import android.content.Intent
 import android.os.Handler
 import android.os.Looper
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import im.vector.app.BuildConfig
@@ -34,6 +36,7 @@ import im.vector.app.features.badge.BadgeProxy
 import im.vector.app.features.notifications.NotifiableEventResolver
 import im.vector.app.features.notifications.NotifiableMessageEvent
 import im.vector.app.features.notifications.NotificationDrawerManager
+import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.notifications.SimpleNotifiableEvent
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.push.fcm.FcmHelper
@@ -77,8 +80,8 @@ class VectorFirebaseMessagingService : FirebaseMessagingService() {
     override fun onMessageReceived(message: RemoteMessage) {
         // Diagnostic Push
         if (message.data["event_id"] == PushersManager.TEST_EVENT_ID) {
-            // Display the notification right now
-            notificationDrawerManager.displayDiagnosticNotification()
+            val intent = Intent(NotificationUtils.PUSH_ACTION)
+            LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
             return
         }
 
diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
index 46c78a9872..e96c603e60 100644
--- a/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
+++ b/vector/src/gplay/java/im/vector/app/push/fcm/NotificationTroubleshootTestManagerFactory.kt
@@ -19,6 +19,7 @@ import androidx.fragment.app.Fragment
 import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
 import im.vector.app.features.settings.troubleshoot.TestAccountSettings
 import im.vector.app.features.settings.troubleshoot.TestDeviceSettings
+import im.vector.app.features.settings.troubleshoot.TestNotification
 import im.vector.app.features.settings.troubleshoot.TestPushRulesSettings
 import im.vector.app.features.settings.troubleshoot.TestSystemSettings
 import im.vector.app.gplay.features.settings.troubleshoot.TestFirebaseToken
@@ -35,7 +36,8 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         private val testPlayServices: TestPlayServices,
         private val testFirebaseToken: TestFirebaseToken,
         private val testTokenRegistration: TestTokenRegistration,
-        private val testPushFromPushGateway: TestPushFromPushGateway
+        private val testPushFromPushGateway: TestPushFromPushGateway,
+        private val testNotification: TestNotification
 ) {
 
     fun create(fragment: Fragment): NotificationTroubleshootTestManager {
@@ -48,6 +50,7 @@ class NotificationTroubleshootTestManagerFactory @Inject constructor(
         mgr.addTest(testFirebaseToken)
         mgr.addTest(testTokenRegistration)
         mgr.addTest(testPushFromPushGateway)
+        mgr.addTest(testNotification)
         return mgr
     }
 }
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 5e722ae209..2b8df67012 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -97,15 +97,15 @@ fun copyToClipboard(context: Context, text: CharSequence, showToast: Boolean = t
  * Shows notification settings for the current app.
  * In android O will directly opens the notification settings, in lower version it will show the App settings
  */
-fun startNotificationSettingsIntent(activity: AppCompatActivity, activityResultLauncher: ActivityResultLauncher<Intent>) {
+fun startNotificationSettingsIntent(context: Context, activityResultLauncher: ActivityResultLauncher<Intent>) {
     val intent = Intent()
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
         intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-        intent.putExtra(Settings.EXTRA_APP_PACKAGE, activity.packageName)
+        intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
     } else {
         intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-        intent.putExtra("app_package", activity.packageName)
-        intent.putExtra("app_uid", activity.applicationInfo?.uid)
+        intent.putExtra("app_package", context.packageName)
+        intent.putExtra("app_uid", context.applicationInfo?.uid)
     }
     activityResultLauncher.launch(intent)
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index a30d4302f2..44eb278c64 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -92,6 +92,7 @@ class NotificationUtils @Inject constructor(private val context: Context,
         const val DISMISS_ROOM_NOTIF_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DISMISS_ROOM_NOTIF_ACTION"
         private const val TAP_TO_VIEW_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.TAP_TO_VIEW_ACTION"
         const val DIAGNOSTIC_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DIAGNOSTIC"
+        const val PUSH_ACTION = "${BuildConfig.APPLICATION_ID}.PUSH"
 
         /* ==========================================================================================
          * IDs for channels
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index 4843c1446a..9dc6dc1751 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -166,7 +166,11 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
 
         tryOrNull("Unable to register the receiver") {
             LocalBroadcastManager.getInstance(requireContext())
-                    .registerReceiver(broadcastReceiver, IntentFilter(NotificationUtils.DIAGNOSTIC_ACTION))
+                    .registerReceiver(broadcastReceiverPush, IntentFilter(NotificationUtils.PUSH_ACTION))
+        }
+        tryOrNull("Unable to register the receiver") {
+            LocalBroadcastManager.getInstance(requireContext())
+                    .registerReceiver(broadcastReceiverNotification, IntentFilter(NotificationUtils.DIAGNOSTIC_ACTION))
         }
     }
 
@@ -174,11 +178,21 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
         super.onPause()
         tryOrNull {
            LocalBroadcastManager.getInstance(requireContext())
-                   .unregisterReceiver(broadcastReceiver)
+                   .unregisterReceiver(broadcastReceiverPush)
+        }
+        tryOrNull {
+           LocalBroadcastManager.getInstance(requireContext())
+                   .unregisterReceiver(broadcastReceiverNotification)
         }
     }
 
-    private val broadcastReceiver = object : BroadcastReceiver() {
+    private val broadcastReceiverPush = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            testManager?.onDiagnosticPushReceived()
+        }
+    }
+
+    private val broadcastReceiverNotification = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             testManager?.onDiagnosticNotificationClicked()
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
index 566cb6d846..7e7ca57243 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootTestManager.kt
@@ -106,6 +106,10 @@ class NotificationTroubleshootTestManager(val fragment: Fragment) {
         testList.forEach { it.cancel() }
     }
 
+    fun onDiagnosticPushReceived() {
+        testList.forEach { it.onPushReceived() }
+    }
+
     fun onDiagnosticNotificationClicked() {
         testList.forEach { it.onNotificationClicked() }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
new file mode 100644
index 0000000000..6f25ecfe39
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestNotification.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2018 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.app.features.settings.troubleshoot
+
+import android.content.Context
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.utils.startNotificationSettingsIntent
+import im.vector.app.features.notifications.NotificationUtils
+import javax.inject.Inject
+
+/**
+ * Checks if notifications can be displayed and clicked by the user
+ */
+class TestNotification @Inject constructor(private val context: Context,
+                                           private val notificationUtils: NotificationUtils,
+                                           private val stringProvider: StringProvider)
+    : TroubleshootTest(R.string.settings_troubleshoot_test_notification_title) {
+
+    override fun perform(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        // Display the notification right now
+        notificationUtils.displayDiagnosticNotification()
+        description = stringProvider.getString(R.string.settings_troubleshoot_test_notification_notice)
+
+        quickFix = object : TroubleshootQuickFix(R.string.open_settings) {
+            override fun doFix() {
+                startNotificationSettingsIntent(context, activityResultLauncher)
+            }
+        }
+
+        status = TestStatus.WAITING_FOR_USER
+    }
+
+    override fun onNotificationClicked() {
+        description = stringProvider.getString(R.string.settings_troubleshoot_test_notification_notification_clicked)
+        quickFix = null
+        status = TestStatus.SUCCESS
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
index 8e64514e7f..ee652288be 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestSystemSettings.kt
@@ -15,9 +15,9 @@
  */
 package im.vector.app.features.settings.troubleshoot
 
+import android.content.Context
 import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.NotificationManagerCompat
 import im.vector.app.R
 import im.vector.app.core.resources.StringProvider
@@ -27,7 +27,7 @@ import javax.inject.Inject
 /**
  * Checks if notifications are enable in the system settings for this app.
  */
-class TestSystemSettings @Inject constructor(private val context: AppCompatActivity,
+class TestSystemSettings @Inject constructor(private val context: Context,
                                              private val stringProvider: StringProvider)
     : TroubleshootTest(R.string.settings_troubleshoot_test_system_settings_title) {
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
index c775c8c827..76ba2378a0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TroubleshootTest.kt
@@ -53,6 +53,9 @@ abstract class TroubleshootTest(@StringRes val titleResId: Int) {
     open fun cancel() {
     }
 
+    open fun onPushReceived() {
+    }
+
     open fun onNotificationClicked() {
     }
 }
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index ef6b63aeb0..e400f7fe64 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -750,10 +750,13 @@
     <string name="settings_troubleshoot_test_token_registration_failed">Failed to register FCM token to HomeServer:\n%1$s</string>
 
     <string name="settings_troubleshoot_test_push_loop_title">Test Push</string>
-    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH, please click on the test notification you just received.</string>
-    <string name="settings_troubleshoot_test_push_loop_notification_clicked">The notification has been clicked!</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">The application is waiting for the PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_success">The application is receiving PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Failed to receive push. Solution could be to reinstall the application.</string>
-    <string name="settings_troubleshoot_test_push_notification_content">You are receiving PUSH! Click me!</string>
+    <string name="settings_troubleshoot_test_push_notification_content">You are viewing the notification! Click me!</string>
+    <string name="settings_troubleshoot_test_notification_title">Notification Display</string>
+    <string name="settings_troubleshoot_test_notification_notice">Please click on the notification. If you do not see the notification, please check the system settings.</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">The notification has been clicked!</string>
 
     <string name="settings_troubleshoot_test_foreground_service_started_title">Notifications Service</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Notifications Service is running.</string>

From b00fa6958522a2a5f31550ae31986deeaaf32cac Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Sun, 11 Oct 2020 20:09:35 +0200
Subject: [PATCH 193/278] Ability to share text

---
 .../core/utils/ExternalApplicationsUtil.kt    | 25 +++++++++++----
 .../home/room/detail/RoomDetailFragment.kt    | 31 +++++++++++--------
 .../timeline/action/EventSharedAction.kt      |  3 +-
 .../action/MessageActionsViewModel.kt         |  8 +++--
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index d28f6749a6..f962c6dda2 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -40,13 +40,13 @@ import androidx.fragment.app.Fragment
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import okio.buffer
 import okio.sink
 import okio.source
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
@@ -300,11 +300,24 @@ fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
         sendIntent.type = mediaMimeType
         sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri)
 
-        try {
-            context.startActivity(sendIntent)
-        } catch (activityNotFoundException: ActivityNotFoundException) {
-            context.toast(R.string.error_no_external_application_found)
-        }
+        sendShareIntent(context, sendIntent)
+    }
+}
+
+fun shareText(context: Context, text: String) {
+    val sendIntent = Intent()
+    sendIntent.action = Intent.ACTION_SEND
+    sendIntent.type = "text/plain"
+    sendIntent.putExtra(Intent.EXTRA_TEXT, text)
+
+    sendShareIntent(context, sendIntent)
+}
+
+private fun sendShareIntent(context: Context, intent: Intent) {
+    try {
+        context.startActivity(Intent.createChooser(intent, context.getString(R.string.share)))
+    } catch (activityNotFoundException: ActivityNotFoundException) {
+        context.toast(R.string.error_no_external_application_found)
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 51aeda2aab..0a16191dd1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -106,6 +106,7 @@ import im.vector.app.core.utils.onPermissionResultVideoIpCall
 import im.vector.app.core.utils.openUrlInExternalBrowser
 import im.vector.app.core.utils.saveMedia
 import im.vector.app.core.utils.shareMedia
+import im.vector.app.core.utils.shareText
 import im.vector.app.core.utils.toast
 import im.vector.app.features.attachments.AttachmentTypeSelectorView
 import im.vector.app.features.attachments.AttachmentsHelper
@@ -1556,21 +1557,25 @@ class RoomDetailFragment @Inject constructor(
     }
 
     private fun onShareActionClicked(action: EventSharedAction.Share) {
-        session.fileService().downloadFile(
-                downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE,
-                id = action.eventId,
-                fileName = action.messageContent.body,
-                mimeType = action.messageContent.mimeType,
-                url = action.messageContent.getFileUrl(),
-                elementToDecrypt = action.messageContent.encryptedFileInfo?.toElementToDecrypt(),
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        if (isAdded) {
-                            shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri()))
+        if (action.messageContent is MessageTextContent) {
+            shareText(requireContext(), action.messageContent.body)
+        } else if (action.messageContent is MessageWithAttachmentContent) {
+            session.fileService().downloadFile(
+                    downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE,
+                    id = action.eventId,
+                    fileName = action.messageContent.body,
+                    mimeType = action.messageContent.mimeType,
+                    url = action.messageContent.getFileUrl(),
+                    elementToDecrypt = action.messageContent.encryptedFileInfo?.toElementToDecrypt(),
+                    callback = object : MatrixCallback<File> {
+                        override fun onSuccess(data: File) {
+                            if (isAdded) {
+                                shareMedia(requireContext(), data, getMimeTypeFromUri(requireContext(), data.toUri()))
+                            }
                         }
                     }
-                }
-        )
+            )
+        }
     }
 
     private fun onSaveActionClicked(action: EventSharedAction.Save) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
index 7693d97c35..c21d552409 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@@ -21,6 +21,7 @@ import androidx.annotation.StringRes
 import im.vector.app.R
 import im.vector.app.core.platform.VectorSharedAction
 import im.vector.app.features.home.room.detail.timeline.item.MessageInformationData
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageWithAttachmentContent
 
 sealed class EventSharedAction(@StringRes val titleRes: Int,
@@ -47,7 +48,7 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
     data class Reply(val eventId: String) :
             EventSharedAction(R.string.reply, R.drawable.ic_reply)
 
-    data class Share(val eventId: String, val messageContent: MessageWithAttachmentContent) :
+    data class Share(val eventId: String, val messageContent: MessageContent) :
             EventSharedAction(R.string.share, R.drawable.ic_share)
 
     data class Save(val eventId: String, val messageContent: MessageWithAttachmentContent) :
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 8a25e5fc93..0d1e2261cd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -275,8 +275,8 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                         add(EventSharedAction.ViewEditHistory(informationData))
                     }
 
-                    if (canShare(msgType) && messageContent is MessageWithAttachmentContent) {
-                        add(EventSharedAction.Share(timelineEvent.eventId, messageContent))
+                    if (canShare(msgType)) {
+                        add(EventSharedAction.Share(timelineEvent.eventId, messageContent!!))
                     }
 
                     if (canSave(msgType) && messageContent is MessageWithAttachmentContent) {
@@ -409,6 +409,10 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
 
     private fun canShare(msgType: String?): Boolean {
         return when (msgType) {
+            MessageType.MSGTYPE_TEXT,
+            MessageType.MSGTYPE_NOTICE,
+            MessageType.MSGTYPE_EMOTE,
+            MessageType.MSGTYPE_LOCATION,
             MessageType.MSGTYPE_IMAGE,
             MessageType.MSGTYPE_AUDIO,
             MessageType.MSGTYPE_VIDEO,

From 0ae7242e17c780d8af35f8acc55c4468b2bc4ce8 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Sun, 11 Oct 2020 21:09:36 +0200
Subject: [PATCH 194/278] Added direct share

---
 CHANGES.md                                    |  1 +
 vector/src/main/AndroidManifest.xml           |  4 +++
 .../app/features/home/ShortcutCreator.kt      |  5 ++++
 .../app/features/share/IncomingShareAction.kt |  3 ++-
 .../features/share/IncomingShareFragment.kt   | 25 +++++++++++++------
 .../features/share/IncomingShareViewModel.kt  | 16 ++++++++----
 vector/src/main/res/xml/shortcuts.xml         |  7 ++++++
 7 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 vector/src/main/res/xml/shortcuts.xml

diff --git a/CHANGES.md b/CHANGES.md
index 05d189ed12..d064cc5f39 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Improvements 🙌:
  - Drawer: move settings access and add sign out action (#2171)
  - Filter room member (and banned users) by name (#2184)
  - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
+ - Direct share (#2029)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 3f178a3d20..723bf2f0e2 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -74,6 +74,10 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity-alias>
 
         <activity android:name=".features.home.HomeActivity" />
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
index 171cc7b3d9..1edfbff64f 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
@@ -33,6 +33,7 @@ import javax.inject.Inject
 private val useAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 private const val adaptiveIconSizeDp = 108
 private const val adaptiveIconOuterSidesDp = 18
+private const val directShareCategory = "im.vector.app.SHORTCUT_SHARE"
 
 class ShortcutCreator @Inject constructor(
         private val context: Context,
@@ -65,6 +66,10 @@ class ShortcutCreator @Inject constructor(
                 .setShortLabel(roomSummary.displayName)
                 .setIcon(bitmap?.toProfileImageIcon())
                 .setIntent(intent)
+
+                // Make it show up in the direct share menu
+                .setCategories(setOf(directShareCategory))
+
                 .build()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
index eef4e32dff..4e9f024b15 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
@@ -16,12 +16,13 @@
 
 package im.vector.app.features.share
 
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class IncomingShareAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary, val enableMultiSelect: Boolean) : IncomingShareAction()
     object ShareToSelectedRooms : IncomingShareAction()
+    data class ShareToRoom(val roomSummary: RoomSummary) : IncomingShareAction()
     data class ShareMedia(val keepOriginalSize: Boolean) : IncomingShareAction()
     data class FilterWith(val filter: String) : IncomingShareAction()
     data class UpdateSharedData(val sharedData: SharedData) : IncomingShareAction()
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index 5e776fb17a..c9a8ec51c2 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.share
 import android.app.Activity
 import android.content.ClipDescription
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -71,13 +72,28 @@ class IncomingShareFragment @Inject constructor(
         setupToolbar(incomingShareToolbar)
         attachmentsHelper = AttachmentsHelper(requireContext(), this).register()
 
+        viewModel.observeViewEvents {
+            when (it) {
+                is IncomingShareViewEvents.ShareToRoom            -> handleShareToRoom(it)
+                is IncomingShareViewEvents.EditMediaBeforeSending -> handleEditMediaBeforeSending(it)
+                is IncomingShareViewEvents.MultipleRoomsShareDone -> handleMultipleRoomsShareDone(it)
+            }.exhaustive
+        }
+
         val intent = vectorBaseActivity.intent
         val isShareManaged = when (intent?.action) {
-            Intent.ACTION_SEND -> {
+            Intent.ACTION_SEND          -> {
                 var isShareManaged = attachmentsHelper.handleShareIntent(requireContext(), intent)
                 if (!isShareManaged) {
                     isShareManaged = handleTextShare(intent)
                 }
+
+                // Direct share
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && intent.hasExtra(Intent.EXTRA_SHORTCUT_ID)) {
+                    val roomId = intent.getStringExtra(Intent.EXTRA_SHORTCUT_ID)!!
+                    sessionHolder.getSafeActiveSession()?.getRoomSummary(roomId)?.let { viewModel.handle(IncomingShareAction.ShareToRoom(it)) }
+                }
+
                 isShareManaged
             }
             Intent.ACTION_SEND_MULTIPLE -> attachmentsHelper.handleShareIntent(requireContext(), intent)
@@ -101,13 +117,6 @@ class IncomingShareFragment @Inject constructor(
         sendShareButton.setOnClickListener { _ ->
             handleSendShare()
         }
-        viewModel.observeViewEvents {
-            when (it) {
-                is IncomingShareViewEvents.ShareToRoom -> handleShareToRoom(it)
-                is IncomingShareViewEvents.EditMediaBeforeSending -> handleEditMediaBeforeSending(it)
-                is IncomingShareViewEvents.MultipleRoomsShareDone -> handleMultipleRoomsShareDone(it)
-            }.exhaustive
-        }
     }
 
     private fun handleMultipleRoomsShareDone(viewEvent: IncomingShareViewEvents.MultipleRoomsShareDone) {
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
index aa4d8ad03e..9014565e08 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
@@ -22,17 +22,17 @@ import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.query.QueryStringValue
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.content.ContentAttachmentData
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.toggle
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.attachments.isPreviewable
 import im.vector.app.features.attachments.toGroupedContentAttachmentData
 import im.vector.app.features.home.room.list.BreadcrumbsRoomComparator
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
@@ -96,6 +96,7 @@ class IncomingShareViewModel @AssistedInject constructor(
         when (action) {
             is IncomingShareAction.SelectRoom           -> handleSelectRoom(action)
             is IncomingShareAction.ShareToSelectedRooms -> handleShareToSelectedRooms()
+            is IncomingShareAction.ShareToRoom          -> handleShareToRoom(action)
             is IncomingShareAction.ShareMedia           -> handleShareMediaToSelectedRooms(action)
             is IncomingShareAction.FilterWith           -> handleFilter(action)
             is IncomingShareAction.UpdateSharedData     -> handleUpdateSharedData(action)
@@ -134,6 +135,11 @@ class IncomingShareViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleShareToRoom(action: IncomingShareAction.ShareToRoom) = withState { state ->
+        val sharedData = state.sharedData ?: return@withState
+        _viewEvents.post(IncomingShareViewEvents.ShareToRoom(action.roomSummary, sharedData, showAlert = false))
+    }
+
     private fun handleShareMediaToSelectedRooms(action: IncomingShareAction.ShareMedia) = withState { state ->
         (state.sharedData as? SharedData.Attachments)?.let {
             shareAttachments(it.attachmentData, state.selectedRoomIds, proposeMediaEdition = false, compressMediaBeforeSending = !action.keepOriginalSize)
diff --git a/vector/src/main/res/xml/shortcuts.xml b/vector/src/main/res/xml/shortcuts.xml
new file mode 100644
index 0000000000..a005de24a2
--- /dev/null
+++ b/vector/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <share-target android:targetClass="im.vector.app.features.share.IncomingShareActivity">
+        <data android:mimeType="*/*" />
+        <category android:name="im.vector.app.SHORTCUT_SHARE" />
+    </share-target>
+</shortcuts>
\ No newline at end of file

From 7e5ee8f951e098e1baad16308afad83ea86bdb72 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Sun, 11 Oct 2020 22:09:19 +0200
Subject: [PATCH 195/278] Made it backwards compatible

---
 vector/build.gradle                 | 1 +
 vector/src/main/AndroidManifest.xml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/vector/build.gradle b/vector/build.gradle
index 3b43aa12e1..00f3f26545 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -315,6 +315,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     // Keep at 2.0.0-beta4 at the moment, as updating is breaking some UI
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation "androidx.sharetarget:sharetarget:1.0.0"
     implementation 'androidx.core:core-ktx:1.3.2'
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 723bf2f0e2..7810d4861e 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -176,6 +176,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.OPENABLE" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
         </activity>
 
         <activity android:name=".features.roomprofile.RoomProfileActivity" />

From f82aee608920d5a9b1bf4f2eebca01bdcc37640d Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 12 Oct 2020 13:35:34 +0300
Subject: [PATCH 196/278] Add fab to the member list screen to invite users.

---
 CHANGES.md                                    |  1 +
 .../members/RoomMemberListFragment.kt         | 51 +++++++++++--------
 .../main/res/drawable/ic_fab_add_members.xml  | 30 +++++++++++
 .../src/main/res/drawable/ic_invite_users.xml | 18 -------
 .../res/layout/fragment_room_member_list.xml  | 24 +++++++++
 .../main/res/menu/menu_room_member_list.xml   | 12 -----
 6 files changed, 84 insertions(+), 52 deletions(-)
 create mode 100644 vector/src/main/res/drawable/ic_fab_add_members.xml
 delete mode 100644 vector/src/main/res/drawable/ic_invite_users.xml
 create mode 100644 vector/src/main/res/layout/fragment_room_member_list.xml
 delete mode 100644 vector/src/main/res/menu/menu_room_member_list.xml

diff --git a/CHANGES.md b/CHANGES.md
index 05d189ed12..187d9ad8f4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Improvements 🙌:
  - Drawer: move settings access and add sign out action (#2171)
  - Filter room member (and banned users) by name (#2184)
  - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
+ - Add FAB to room members list (#2226)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 67577e866e..f38877ca6b 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -17,12 +17,11 @@
 package im.vector.app.features.roomprofile.members
 
 import android.os.Bundle
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -37,6 +36,7 @@ import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.RoomProfileArgs
+import kotlinx.android.synthetic.main.fragment_room_member_list.*
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import javax.inject.Inject
 
@@ -49,38 +49,44 @@ class RoomMemberListFragment @Inject constructor(
     private val viewModel: RoomMemberListViewModel by fragmentViewModel()
     private val roomProfileArgs: RoomProfileArgs by args()
 
-    override fun getLayoutResId() = R.layout.fragment_room_setting_generic
-
-    override fun getMenuRes() = R.menu.menu_room_member_list
-
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        val canInvite = withState(viewModel) {
-            it.actionsPermissions.canInvite
-        }
-        menu.findItem(R.id.menu_room_member_list_add_member).isVisible = canInvite
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_room_member_list_add_member -> {
-                navigator.openInviteUsersToRoom(requireContext(), roomProfileArgs.roomId)
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
+    override fun getLayoutResId() = R.layout.fragment_room_member_list
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         roomMemberListController.callback = this
         setupToolbar(roomSettingsToolbar)
         setupSearchView()
+        setupInviteUsersButton()
         recyclerView.configureWith(roomMemberListController, hasFixedSize = true)
+        // Hide FAB when list is scrolling
+        recyclerView.addOnScrollListener(
+                object : RecyclerView.OnScrollListener() {
+                    override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                        when (newState) {
+                            RecyclerView.SCROLL_STATE_IDLE     -> {
+                                if (withState(viewModel) { it.actionsPermissions.canInvite }) {
+                                    inviteUsersButton.show()
+                                }
+                            }
+                            RecyclerView.SCROLL_STATE_DRAGGING,
+                            RecyclerView.SCROLL_STATE_SETTLING -> {
+                                inviteUsersButton.hide()
+                            }
+                        }
+                    }
+                }
+        )
         viewModel.selectSubscribe(this, RoomMemberListViewState::actionsPermissions) {
             invalidateOptionsMenu()
         }
     }
 
+    private fun setupInviteUsersButton() {
+        inviteUsersButton.debouncedClicks {
+            navigator.openInviteUsersToRoom(requireContext(), roomProfileArgs.roomId)
+        }
+    }
+
     private fun setupSearchView() {
         searchViewAppBarLayout.isVisible = true
         searchView.queryHint = getString(R.string.search_members_hint)
@@ -131,5 +137,6 @@ class RoomMemberListFragment @Inject constructor(
             roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), roomSettingsToolbarAvatarImageView)
         }
+        inviteUsersButton.isVisible = state.actionsPermissions.canInvite
     }
 }
diff --git a/vector/src/main/res/drawable/ic_fab_add_members.xml b/vector/src/main/res/drawable/ic_fab_add_members.xml
new file mode 100644
index 0000000000..50768871ab
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_fab_add_members.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="37dp"
+    android:height="36dp"
+    android:viewportWidth="37"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M17.5911,26.2922C15.9951,27.3704 14.0711,28 12,28C9.7488,28 7.6713,27.2561 6,26.0007C3.5711,24.1763 2,21.2716 2,18C2,12.4772 6.4771,8 12,8C17.5228,8 22,12.4772 22,18C22,21.4518 20.2511,24.4951 17.5911,26.2922ZM12,18.5C13.6569,18.5 15,17.0449 15,15.25C15,13.4551 13.6569,12 12,12C10.3431,12 9,13.4551 9,15.25C9,17.0449 10.3431,18.5 12,18.5ZM12,26C14.162,26 16.1236,25.1424 17.5634,23.7488C16.673,21.5506 14.5176,20 12,20C9.4824,20 7.327,21.5506 6.4366,23.7488C7.8763,25.1424 9.838,26 12,26Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+  <group>
+    <clip-path
+        android:pathData="M17.5911,26.2922C15.9951,27.3704 14.0711,28 12,28C9.7488,28 7.6713,27.2561 6,26.0007C3.5711,24.1763 2,21.2716 2,18C2,12.4772 6.4771,8 12,8C17.5228,8 22,12.4772 22,18C22,21.4518 20.2511,24.4951 17.5911,26.2922ZM12,18.5C13.6569,18.5 15,17.0449 15,15.25C15,13.4551 13.6569,12 12,12C10.3431,12 9,13.4551 9,15.25C9,17.0449 10.3431,18.5 12,18.5ZM12,26C14.162,26 16.1236,25.1424 17.5634,23.7488C16.673,21.5506 14.5176,20 12,20C9.4824,20 7.327,21.5506 6.4366,23.7488C7.8763,25.1424 9.838,26 12,26Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M17.5911,26.2922L16.4715,24.6349L17.5911,26.2922ZM6,26.0007L4.7989,27.5999L4.7989,27.5999L6,26.0007ZM17.5634,23.7488L18.9544,25.1859L19.9234,24.2479L19.4171,22.998L17.5634,23.7488ZM6.4366,23.7488L4.5829,22.998L4.0766,24.2479L5.0456,25.1859L6.4366,23.7488ZM12,30C14.4825,30 16.7945,29.244 18.7107,27.9494L16.4715,24.6349C15.1957,25.4968 13.6596,26 12,26V30ZM4.7989,27.5999C6.8046,29.1065 9.3008,30 12,30V26C10.1967,26 8.538,25.4058 7.2011,24.4016L4.7989,27.5999ZM0,18C0,21.9273 1.8887,25.414 4.7989,27.5999L7.2011,24.4016C5.2535,22.9387 4,20.616 4,18H0ZM12,6C5.3726,6 0,11.3726 0,18H4C4,13.5817 7.5817,10 12,10V6ZM24,18C24,11.3726 18.6274,6 12,6V10C16.4183,10 20,13.5817 20,18H24ZM18.7107,27.9494C21.8977,25.7963 24,22.144 24,18H20C20,20.7596 18.6045,23.1939 16.4715,24.6349L18.7107,27.9494ZM13,15.25C13,16.0941 12.4046,16.5 12,16.5V20.5C14.9091,20.5 17,17.9958 17,15.25H13ZM12,14C12.4046,14 13,14.4059 13,15.25H17C17,12.5042 14.9091,10 12,10V14ZM11,15.25C11,14.4059 11.5954,14 12,14V10C9.0909,10 7,12.5042 7,15.25H11ZM12,16.5C11.5954,16.5 11,16.0941 11,15.25H7C7,17.9958 9.0909,20.5 12,20.5V16.5ZM16.1724,22.3118C15.0906,23.3588 13.6223,24 12,24V28C14.7017,28 17.1567,26.926 18.9544,25.1859L16.1724,22.3118ZM12,22C13.6752,22 15.1146,23.0305 15.7097,24.4996L19.4171,22.998C18.2314,20.0707 15.3599,18 12,18V22ZM8.2903,24.4996C8.8854,23.0305 10.3248,22 12,22V18C8.6401,18 5.7686,20.0707 4.5829,22.998L8.2903,24.4996ZM12,24C10.3777,24 8.9094,23.3588 7.8276,22.3118L5.0456,25.1859C6.8433,26.926 9.2983,28 12,28V24Z"
+        android:fillColor="#000000"/>
+  </group>
+  <path
+      android:pathData="M27,18H35"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M31,14L31,22"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_invite_users.xml b/vector/src/main/res/drawable/ic_invite_users.xml
deleted file mode 100644
index 64e5a3788d..0000000000
--- a/vector/src/main/res/drawable/ic_invite_users.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000"
-        android:pathData="M16,21V19C16,16.7909 14.2091,15 12,15H5C2.7909,15 1,16.7909 1,19V21"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M8.5,11C10.7091,11 12.5,9.2091 12.5,7C12.5,4.7909 10.7091,3 8.5,3C6.2909,3 4.5,4.7909 4.5,7C4.5,9.2091 6.2909,11 8.5,11Z"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
-    <path android:fillColor="#00000000" android:pathData="M20,8V14"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
-    <path android:fillColor="#00000000" android:pathData="M23,11H17"
-        android:strokeColor="#03B381" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="2"/>
-</vector>
diff --git a/vector/src/main/res/layout/fragment_room_member_list.xml b/vector/src/main/res/layout/fragment_room_member_list.xml
new file mode 100644
index 0000000000..cfc7e2a891
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_room_member_list.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/fragment_room_setting_generic" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/inviteUsersButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:contentDescription="@string/add_members_to_room"
+        android:scaleType="center"
+        android:src="@drawable/ic_fab_add_members"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:maxImageSize="36dp"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/menu_room_member_list.xml b/vector/src/main/res/menu/menu_room_member_list.xml
deleted file mode 100644
index ef452de70f..0000000000
--- a/vector/src/main/res/menu/menu_room_member_list.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_room_member_list_add_member"
-        android:title="@string/add_members_to_room"
-        android:icon="@drawable/ic_invite_users"
-        app:iconTint="?attr/colorAccent"
-        app:showAsAction="always" />
-
-</menu>
\ No newline at end of file

From f8f091fa280926b394e34089d1f5117f741bef8c Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 12 Oct 2020 14:26:06 +0300
Subject: [PATCH 197/278] Benoit code review fixes.

---
 .../app/core/epoxy/ExpandableTextItem.kt      | 19 ++++++++++++-------
 .../roomprofile/RoomProfileController.kt      |  6 +++---
 .../res/layout/item_expandable_textview.xml   |  5 +++++
 vector/src/main/res/values/strings.xml        |  1 -
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
index 7e1114660f..3dceec48ef 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/ExpandableTextItem.kt
@@ -56,6 +56,7 @@ abstract class ExpandableTextItem : VectorEpoxyModel<ExpandableTextItem.Holder>(
                         expand(holder)
                     }
                 }
+                holder.arrow.isVisible = true
             } else {
                 holder.arrow.isVisible = false
             }
@@ -63,22 +64,26 @@ abstract class ExpandableTextItem : VectorEpoxyModel<ExpandableTextItem.Holder>(
     }
 
     private fun expand(holder: Holder) {
-        ObjectAnimator.ofInt(holder.content, "maxLines", expandedLines)
-                .apply { duration = 200 }
-                .also { it.start() }
+        ObjectAnimator
+                .ofInt(holder.content, "maxLines", expandedLines)
+                .setDuration(200)
+                .start()
 
         holder.content.ellipsize = null
         holder.arrow.setImageResource(R.drawable.ic_expand_less)
+        holder.arrow.contentDescription = holder.view.context.getString(R.string.merged_events_collapse)
         isExpanded = true
     }
 
     private fun collapse(holder: Holder) {
-        ObjectAnimator.ofInt(holder.content, "maxLines", maxLines)
-                .apply { duration = 200 }
-                .also { it.start() }
+        ObjectAnimator
+                .ofInt(holder.content, "maxLines", maxLines)
+                .setDuration(200)
+                .start()
 
         holder.content.ellipsize = TextUtils.TruncateAt.END
-                holder.arrow.setImageResource(R.drawable.ic_expand_more)
+        holder.arrow.setImageResource(R.drawable.ic_expand_more)
+        holder.arrow.contentDescription = holder.view.context.getString(R.string.merged_events_expand)
         isExpanded = false
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index ad774fbeef..7dc744da31 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -62,12 +62,12 @@ class RoomProfileController @Inject constructor(
         // Topic
         roomSummary
                 .topic
-                .takeIf { it.isNotBlank() }
+                .takeIf { it.isNotEmpty() }
                 ?.let {
-                    buildProfileSection(stringProvider.getString(R.string.room_profile_section_topic))
+                    buildProfileSection(stringProvider.getString(R.string.room_settings_topic))
                     expandableTextItem {
                         id("topic")
-                        content(roomSummary.topic)
+                        content(it)
                         maxLines(2)
                     }
                 }
diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 34fbaf7ec0..b0c232d77e 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -23,7 +23,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
+        android:autoLink="web"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
         android:src="@drawable/ic_expand_more"
+        android:textSize="14sp"
+        android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/expandableContent"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 709bf4f4a1..d48162de29 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2124,7 +2124,6 @@
     <string name="direct_room_profile_not_encrypted_subtitle">Messages here are not end-to-end encrypted.</string>
     <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
-    <string name="room_profile_section_topic">Topic</string>
     <string name="room_profile_section_security">Security</string>
     <string name="room_profile_section_security_learn_more">Learn more</string>
     <string name="room_profile_section_more">More</string>

From 17f0c2926409fee6ce33530d30f23bea6f553d34 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 14:12:44 +0200
Subject: [PATCH 198/278] Fix lint false positive

---
 vector/src/main/AndroidManifest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 3f178a3d20..bc5577b467 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -94,9 +94,11 @@
         </activity>
         <activity android:name=".features.media.ImageMediaViewerActivity" />
 
+        <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite :/ -->
         <activity
             android:name=".features.media.VectorAttachmentViewerActivity"
-            android:theme="@style/AppTheme.Transparent" />
+            android:theme="@style/AppTheme.Transparent"
+            tools:ignore="Instantiatable" />
 
         <activity android:name=".features.media.BigImageViewerActivity" />
         <activity

From ff78f378b557af3fcf7311348bdea07b9f253200 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 14:49:04 +0200
Subject: [PATCH 199/278] ktlint

---
 vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index 2b8df67012..d228adab12 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -30,7 +30,6 @@ import android.provider.Settings
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.StringRes
-import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.getSystemService
 import androidx.fragment.app.Fragment
 import im.vector.app.R

From 69e624df4151a9dc66f0a474e093c4b37b2fa519 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Mon, 12 Oct 2020 17:10:22 +0200
Subject: [PATCH 200/278] Cross signing: we should not show the verify with
 other sessions when there is not

---
 .../VerificationBottomSheetViewModel.kt       | 12 +++++--
 .../request/VerificationRequestController.kt  | 32 ++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index 3c00478ab0..e65fb6042b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -76,7 +76,8 @@ data class VerificationBottomSheetViewState(
         val userWantsToCancel: Boolean = false,
         val userThinkItsNotHim: Boolean = false,
         val quadSContainsSecrets: Boolean = true,
-        val quadSHasBeenReset: Boolean = false
+        val quadSHasBeenReset: Boolean = false,
+        val hasAnyOtherSession: Boolean = false
 ) : MvRxState
 
 class VerificationBottomSheetViewModel @AssistedInject constructor(
@@ -119,6 +120,12 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
             session.cryptoService().verificationService().getExistingTransaction(args.otherUserId, it) as? QrCodeVerificationTransaction
         }
 
+        val hasAnyOtherSession = session.cryptoService()
+                .getCryptoDeviceInfo(session.myUserId)
+                .any {
+                    it.deviceId != session.sessionParams.deviceId
+                }
+
         setState {
             copy(
                     otherUserMxItem = userItem?.toMatrixItem(),
@@ -130,7 +137,8 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
                     roomId = args.roomId,
                     isMe = args.otherUserId == session.myUserId,
                     currentDeviceCanCrossSign = session.cryptoService().crossSigningService().canCrossSign(),
-                    quadSContainsSecrets = session.sharedSecretStorageService.isRecoverySetup()
+                    quadSContainsSecrets = session.sharedSecretStorageService.isRecoverySetup(),
+                    hasAnyOtherSession = hasAnyOtherSession
             )
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index 3f4c3120e7..1b2c32a7e4 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -52,25 +52,33 @@ class VerificationRequestController @Inject constructor(
         val matrixItem = viewState?.otherUserMxItem ?: return
 
         if (state.selfVerificationMode) {
-            bottomSheetVerificationNoticeItem {
-                id("notice")
-                notice(stringProvider.getString(R.string.verification_open_other_to_verify))
-            }
+            if (state.hasAnyOtherSession) {
 
-            bottomSheetSelfWaitItem {
-                id("waiting")
-            }
+                bottomSheetVerificationNoticeItem {
+                    id("notice")
+                    notice(stringProvider.getString(R.string.verification_open_other_to_verify))
+                }
 
-            dividerItem {
-                id("sep")
+                bottomSheetSelfWaitItem {
+                    id("waiting")
+                }
+
+                dividerItem {
+                    id("sep")
+                }
             }
 
             if (state.quadSContainsSecrets) {
+                val subtitle = if (state.hasAnyOtherSession) {
+                    stringProvider.getString(R.string.verification_use_passphrase)
+                } else {
+                    null
+                }
                 bottomSheetVerificationActionItem {
                     id("passphrase")
                     title(stringProvider.getString(R.string.verification_cannot_access_other_session))
                     titleColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
-                    subTitle(stringProvider.getString(R.string.verification_use_passphrase))
+                    subTitle(subtitle)
                     iconRes(R.drawable.ic_arrow_right)
                     iconColor(colorProvider.getColorFromAttribute(R.attr.riotx_text_primary))
                     listener { listener?.onClickRecoverFromPassphrase() }
@@ -122,13 +130,13 @@ class VerificationRequestController @Inject constructor(
                         listener { listener?.onClickOnVerificationStart() }
                     }
                 }
-                is Loading       -> {
+                is Loading -> {
                     bottomSheetVerificationWaitingItem {
                         id("waiting")
                         title(stringProvider.getString(R.string.verification_request_waiting_for, matrixItem.getBestName()))
                     }
                 }
-                is Success       -> {
+                is Success -> {
                     if (!pr.invoke().isReady) {
                         if (state.isMe) {
                             bottomSheetVerificationWaitingItem {

From 840c8e0b91d64272622e459844c90159faa6dd60 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 12 Oct 2020 17:03:28 +0200
Subject: [PATCH 201/278] Fix / reset cross signing not well supported

---
 CHANGES.md                                    |  1 +
 .../sdk/internal/crypto/DeviceListManager.kt  |  1 -
 .../crypto/store/db/RealmCryptoStore.kt       | 41 ++++++++++++++++++-
 .../vector/app/features/home/HomeActivity.kt  | 12 ++++++
 .../features/home/HomeActivityViewEvents.kt   |  1 +
 .../features/home/HomeActivityViewModel.kt    | 35 ++++++++++++++--
 .../UnknownDeviceDetectorSharedViewModel.kt   |  4 +-
 7 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 74aaa8cee3..afe6fa8461 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@ Bugfix 🐛:
  - Invalid popup when pressing back (#1635)
  - Simplifies draft management and should fix bunch of draft issues (#952, #683)
  - Very long topic cannot be fully visible (#1957)
+ - Properly detect cross signing keys reset
 
 Translations 🗣:
  -
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 8e0d7407c6..ab30d3052d 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -359,7 +359,6 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
                 cryptoStore.storeUserDevices(userId, workingCopy)
             }
 
-            // Handle cross signing keys update
             val masterKey = response.masterKeys?.get(userId)?.toCryptoModel().also {
                 Timber.v("## CRYPTO | CrossSigning : Got keys for $userId : MSK ${it?.unpaddedBase64PublicKey}")
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 394b93306c..9065da47b9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -302,22 +302,42 @@ internal class RealmCryptoStore @Inject constructor(
                             userEntity.crossSigningInfoEntity?.deleteFromRealm()
                             userEntity.crossSigningInfoEntity = null
                         } else {
+                            var shouldResetMyDevicesLocalTrust = false
                             CrossSigningInfoEntity.getOrCreate(realm, userId).let { signingInfo ->
                                 // What should we do if we detect a change of the keys?
                                 val existingMaster = signingInfo.getMasterKey()
                                 if (existingMaster != null && existingMaster.publicKeyBase64 == masterKey.unpaddedBase64PublicKey) {
                                     crossSigningKeysMapper.update(existingMaster, masterKey)
                                 } else {
+                                    Timber.d("## CrossSigning  MSK change for $userId")
                                     val keyEntity = crossSigningKeysMapper.map(masterKey)
                                     signingInfo.setMasterKey(keyEntity)
+                                    if (userId == credentials.userId) {
+                                        shouldResetMyDevicesLocalTrust = true
+                                        // my msk has changed! clear my private key
+                                        // Could we have some race here? e.g I am the one that did change the keys
+                                        // could i get this update to early and clear the private keys?
+                                        // -> initializeCrossSigning is guarding for that by storing all at once
+                                        realm.where<CryptoMetadataEntity>().findFirst()?.apply {
+                                            xSignMasterPrivateKey = null
+                                        }
+                                    }
                                 }
 
                                 val existingSelfSigned = signingInfo.getSelfSignedKey()
                                 if (existingSelfSigned != null && existingSelfSigned.publicKeyBase64 == selfSigningKey.unpaddedBase64PublicKey) {
                                     crossSigningKeysMapper.update(existingSelfSigned, selfSigningKey)
                                 } else {
+                                    Timber.d("## CrossSigning  SSK change for $userId")
                                     val keyEntity = crossSigningKeysMapper.map(selfSigningKey)
                                     signingInfo.setSelfSignedKey(keyEntity)
+                                    if (userId == credentials.userId) {
+                                        shouldResetMyDevicesLocalTrust = true
+                                        // my ssk has changed! clear my private key
+                                        realm.where<CryptoMetadataEntity>().findFirst()?.apply {
+                                            xSignSelfSignedPrivateKey = null
+                                        }
+                                    }
                                 }
 
                                 // Only for me
@@ -326,10 +346,29 @@ internal class RealmCryptoStore @Inject constructor(
                                     if (existingUSK != null && existingUSK.publicKeyBase64 == userSigningKey.unpaddedBase64PublicKey) {
                                         crossSigningKeysMapper.update(existingUSK, userSigningKey)
                                     } else {
+                                        Timber.d("## CrossSigning  USK change for $userId")
                                         val keyEntity = crossSigningKeysMapper.map(userSigningKey)
                                         signingInfo.setUserSignedKey(keyEntity)
+                                        if (userId == credentials.userId) {
+                                            shouldResetMyDevicesLocalTrust = true
+                                            // my usk has changed! clear my private key
+                                            realm.where<CryptoMetadataEntity>().findFirst()?.apply {
+                                                xSignUserPrivateKey = null
+                                            }
+                                        }
                                     }
                                 }
+
+                                // When my cross signing keys are reset, we consider clearing all existing device trust
+                                if (shouldResetMyDevicesLocalTrust) {
+                                    realm.where<UserEntity>()
+                                            .equalTo(UserEntityFields.USER_ID, credentials.userId)
+                                            .findFirst()
+                                            ?.devices?.forEach {
+                                                it?.trustLevelEntity?.crossSignedVerified = false
+                                                it?.trustLevelEntity?.locallyVerified = it.deviceId == credentials.deviceId
+                                            }
+                                }
                                 userEntity.crossSigningInfoEntity = signingInfo
                             }
                         }
@@ -1197,7 +1236,7 @@ internal class RealmCryptoStore @Inject constructor(
                     .findAll()
                     .mapNotNull { entity ->
                         when (entity.type) {
-                            GossipRequestType.KEY -> {
+                            GossipRequestType.KEY    -> {
                                 IncomingRoomKeyRequest(
                                         userId = entity.otherUserId,
                                         deviceId = entity.otherDeviceId,
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 829ab1624b..32a4af1b1b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -138,6 +138,7 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable, UnknownDeviceDet
                 is HomeActivityViewEvents.AskPasswordToInitCrossSigning -> handleAskPasswordToInitCrossSigning(it)
                 is HomeActivityViewEvents.OnNewSession                  -> handleOnNewSession(it)
                 HomeActivityViewEvents.PromptToEnableSessionPush        -> handlePromptToEnablePush()
+                is HomeActivityViewEvents.OnCrossSignedInvalidated      -> handleCrossSigningInvalidated(it)
             }.exhaustive
         }
         homeActivityViewModel.subscribe(this) { renderState(it) }
@@ -182,6 +183,17 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable, UnknownDeviceDet
         }
     }
 
+    private fun handleCrossSigningInvalidated(event: HomeActivityViewEvents.OnCrossSignedInvalidated) {
+        // We need to ask
+        promptSecurityEvent(
+                event.userItem,
+                R.string.crosssigning_verify_this_session,
+                R.string.confirm_your_identity
+        ) {
+            it.navigator.waitSessionVerification(it)
+        }
+    }
+
     private fun handleOnNewSession(event: HomeActivityViewEvents.OnNewSession) {
         // We need to ask
         promptSecurityEvent(
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
index be62997e0c..2a29e13572 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewEvents.kt
@@ -22,5 +22,6 @@ import org.matrix.android.sdk.api.util.MatrixItem
 sealed class HomeActivityViewEvents : VectorViewEvents {
     data class AskPasswordToInitCrossSigning(val userItem: MatrixItem.UserItem?) : HomeActivityViewEvents()
     data class OnNewSession(val userItem: MatrixItem.UserItem?, val waitForIncomingRequest: Boolean = true) : HomeActivityViewEvents()
+    data class OnCrossSignedInvalidated(val userItem: MatrixItem.UserItem?) : HomeActivityViewEvents()
     object PromptToEnableSessionPush : HomeActivityViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index 46ae65ec02..48a71db35c 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -27,6 +27,9 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.login.ReAuthHelper
 import im.vector.app.features.settings.VectorPreferences
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.pushrules.RuleIds
@@ -38,9 +41,7 @@ import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.rest.UserPasswordAuth
 import org.matrix.android.sdk.rx.asObservable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 
 class HomeActivityViewModel @AssistedInject constructor(
@@ -67,11 +68,39 @@ class HomeActivityViewModel @AssistedInject constructor(
     }
 
     private var checkBootstrap = false
+    private var onceTrusted = false
 
     init {
         observeInitialSync()
         mayBeInitializeCrossSigning()
         checkSessionPushIsOn()
+        observeCrossSigningReset()
+    }
+
+    private fun observeCrossSigningReset() {
+        val safeActiveSession = activeSessionHolder.getSafeActiveSession()
+        val crossSigningService = safeActiveSession
+                ?.cryptoService()
+                ?.crossSigningService()
+        onceTrusted = crossSigningService
+                ?.allPrivateKeysKnown() ?: false
+
+        safeActiveSession
+                ?.rx()
+                ?.liveCrossSigningInfo(safeActiveSession.myUserId)
+                ?.subscribe {
+                    val isVerified = it.getOrNull()?.isTrusted() ?: false
+                    if (!isVerified && onceTrusted) {
+                        // cross signing keys have been reset
+                        // Tigger a popup to re-verify
+                        _viewEvents.post(
+                                HomeActivityViewEvents.OnCrossSignedInvalidated(
+                                        safeActiveSession.getUser(safeActiveSession.myUserId)?.toMatrixItem()
+                                )
+                        )
+                    }
+                    onceTrusted = isVerified
+                }?.disposeOnClear()
     }
 
     private fun observeInitialSync() {
diff --git a/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
index eeb1639045..3bdcfc4018 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnknownDeviceDetectorSharedViewModel.kt
@@ -30,6 +30,8 @@ import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
 import im.vector.app.features.settings.VectorPreferences
+import io.reactivex.Observable
+import io.reactivex.functions.Function3
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
@@ -39,8 +41,6 @@ import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
-import io.reactivex.Observable
-import io.reactivex.functions.Function3
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.util.concurrent.TimeUnit

From d8e9d363fa72733c833afac8b1fb365a411e9366 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Mon, 12 Oct 2020 17:15:38 +0200
Subject: [PATCH 202/278] Cross signing: update CHANGES and clean

---
 CHANGES.md                                                       | 1 +
 .../crypto/verification/request/VerificationRequestController.kt | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 74aaa8cee3..3bda0d9084 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Improvements 🙌:
  - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
  - Add Sygnal API implementation to test is Push are correctly received
  - Add PushGateway API implementation to test if Push are correctly received
+ - Cross signing: shouldn't offer to verify with other session when there is not.
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index 1b2c32a7e4..6e98d924e7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -53,7 +53,6 @@ class VerificationRequestController @Inject constructor(
 
         if (state.selfVerificationMode) {
             if (state.hasAnyOtherSession) {
-
                 bottomSheetVerificationNoticeItem {
                     id("notice")
                     notice(stringProvider.getString(R.string.verification_open_other_to_verify))

From d6b94802d8578fb7796f6969818a684262489f68 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 12 Oct 2020 18:32:31 +0300
Subject: [PATCH 203/278] Benoit code review fixes.

---
 .../members/RoomMemberListFragment.kt         | 20 +++++++++----------
 .../res/layout/fragment_room_member_list.xml  | 11 ++++------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index f38877ca6b..77337d7208 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -58,6 +58,15 @@ class RoomMemberListFragment @Inject constructor(
         setupSearchView()
         setupInviteUsersButton()
         recyclerView.configureWith(roomMemberListController, hasFixedSize = true)
+        viewModel.selectSubscribe(this, RoomMemberListViewState::actionsPermissions) {
+            invalidateOptionsMenu()
+        }
+    }
+
+    private fun setupInviteUsersButton() {
+        inviteUsersButton.debouncedClicks {
+            navigator.openInviteUsersToRoom(requireContext(), roomProfileArgs.roomId)
+        }
         // Hide FAB when list is scrolling
         recyclerView.addOnScrollListener(
                 object : RecyclerView.OnScrollListener() {
@@ -76,15 +85,6 @@ class RoomMemberListFragment @Inject constructor(
                     }
                 }
         )
-        viewModel.selectSubscribe(this, RoomMemberListViewState::actionsPermissions) {
-            invalidateOptionsMenu()
-        }
-    }
-
-    private fun setupInviteUsersButton() {
-        inviteUsersButton.debouncedClicks {
-            navigator.openInviteUsersToRoom(requireContext(), roomProfileArgs.roomId)
-        }
     }
 
     private fun setupSearchView() {
@@ -110,6 +110,7 @@ class RoomMemberListFragment @Inject constructor(
     override fun invalidate() = withState(viewModel) { viewState ->
         roomMemberListController.setData(viewState)
         renderRoomSummary(viewState)
+        inviteUsersButton.isVisible = viewState.actionsPermissions.canInvite
     }
 
     override fun onRoomMemberClicked(roomMember: RoomMemberSummary) {
@@ -137,6 +138,5 @@ class RoomMemberListFragment @Inject constructor(
             roomSettingsToolbarTitleView.text = it.displayName
             avatarRenderer.render(it.toMatrixItem(), roomSettingsToolbarAvatarImageView)
         }
-        inviteUsersButton.isVisible = state.actionsPermissions.canInvite
     }
 }
diff --git a/vector/src/main/res/layout/fragment_room_member_list.xml b/vector/src/main/res/layout/fragment_room_member_list.xml
index cfc7e2a891..e144ddb6e3 100644
--- a/vector/src/main/res/layout/fragment_room_member_list.xml
+++ b/vector/src/main/res/layout/fragment_room_member_list.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,14 +10,12 @@
         android:id="@+id/inviteUsersButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:contentDescription="@string/add_members_to_room"
         android:scaleType="center"
         android:src="@drawable/ic_fab_add_members"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:maxImageSize="36dp"
-        tools:visibility="visible" />
+        app:maxImageSize="36dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file

From c0a540268465bc1e318977baea81b80b613369b0 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Mon, 12 Oct 2020 17:54:02 +0200
Subject: [PATCH 204/278] Removed version check

---
 .../java/im/vector/app/features/share/IncomingShareFragment.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index c9a8ec51c2..92e383f8d1 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.share
 import android.app.Activity
 import android.content.ClipDescription
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -89,7 +88,7 @@ class IncomingShareFragment @Inject constructor(
                 }
 
                 // Direct share
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && intent.hasExtra(Intent.EXTRA_SHORTCUT_ID)) {
+                if (intent.hasExtra(Intent.EXTRA_SHORTCUT_ID)) {
                     val roomId = intent.getStringExtra(Intent.EXTRA_SHORTCUT_ID)!!
                     sessionHolder.getSafeActiveSession()?.getRoomSummary(roomId)?.let { viewModel.handle(IncomingShareAction.ShareToRoom(it)) }
                 }

From 5ad46d251daa6b0c8e68802921866295c75a951b Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Mon, 12 Oct 2020 17:57:09 +0200
Subject: [PATCH 205/278] Update CHANGES.md

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3bda0d9084..257837dc6a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,7 +19,7 @@ Improvements 🙌:
  - Implement "Jump to read receipt" and "Mention" actions on the room member profile screen
  - Add Sygnal API implementation to test is Push are correctly received
  - Add PushGateway API implementation to test if Push are correctly received
- - Cross signing: shouldn't offer to verify with other session when there is not.
+ - Cross signing: shouldn't offer to verify with other session when there is not. (#2227)
 
 Bugfix 🐛:
  - Improve support for image/audio/video/file selection with intent changes (#1376)

From 1b0049aaf705acb7bf8059900b5ee51627fe9a1b Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 9 Oct 2020 09:31:53 +0000
Subject: [PATCH 206/278] Translated using Weblate (Albanian)

Currently translated at 99.5% (1864 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sq/
---
 vector/src/main/res/values-sq/strings.xml | 269 +++++++++++++++++++++-
 1 file changed, 264 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 43506d8798..af5708143f 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -566,7 +566,7 @@
     <string name="encryption_information_sender_device_information">Të dhëna sesioni dërguesi</string>
     <string name="encryption_information_device_name">Emër publik</string>
     <string name="encryption_information_name">Emër publik</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="encryption_information_device_id">ID Sesioni</string>
     <string name="encryption_information_device_key">Kyç sesioni</string>
     <string name="encryption_information_verification">Verifikim</string>
     <string name="encryption_information_ed25519_fingerprint">Shenja gishtash Ed25519</string>
@@ -1536,7 +1536,7 @@
     <string name="login_error_homeserver_not_found">S’kapet dot shërbyes Home te kjo URL, ju lutemi, kontrollojeni</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Do të përdoret %s si ndihmë kur shërbyesi juaj Home nuk ofron të tillë (gjatë thirrjes, adresa juaj IP do të ndahet me të tjerë)</string>
     <string name="invite_no_identity_server_error">Që të kryhet ky veprim, shtoni një shërbyes identitetesh, që nga rregullimet tuaja.</string>
-    <string name="settings_background_fdroid_sync_mode">Mënyrë Njëkohësimi Në Prapaskenë (Eksperimentale)</string>
+    <string name="settings_background_fdroid_sync_mode">Mënyrë Njëkohësimi Në Prapaskenë</string>
     <string name="settings_background_fdroid_sync_mode_battery">E optimizuar për baterinë</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element-i do të bëjë njëkohësim në prapaskenë, në një mënyrë që kursen burimet e kufizuara të pajisjes (baterinë).
 \nNë varësi të gjendjes së burimeve tuaja, njëkohësimi mund të shtyhet për më vonë nga sistemi operativ.</string>
@@ -1629,7 +1629,7 @@
     <string name="report_content_custom_title">Raportojeni këtë lëndë</string>
     <string name="report_content_custom_hint">Arsye për raportimin e kësaj lënde</string>
     <string name="report_content_custom_submit">RAPORTOJENI</string>
-    <string name="block_user">BLLOKOJENI PËRDORUESIN</string>
+    <string name="block_user">SHPËRFILLE PËRDORUESIN</string>
 
     <string name="content_reported_title">Lënda u raportua</string>
     <string name="content_reported_content">Kjo lëndë është raportuar.
@@ -1690,7 +1690,7 @@
     <string name="sas_error_m_mismatched_commitment">Hashi i lëndës s’u përputh me atë që pritej</string>
     <string name="error_handling_incoming_share">S’trajtoi dot të dhëna ndarjeje</string>
 
-    <string name="message_ignore_user">Bllokoje përdoruesin</string>
+    <string name="message_ignore_user">Shpërfille përdoruesin</string>
 
     <string name="room_list_quick_actions_notifications_all_noisy">Krejt mesazhet (e zhurmshme)</string>
     <string name="room_list_quick_actions_notifications_all">Krejt mesazhet</string>
@@ -2207,7 +2207,7 @@
 
     <string name="auth_invalid_login_param_space_in_password">Emër përdoruesi dhe/ose fjalëkalim i pasaktë. Fjalëkalimi i dhënë fillon ose mbaron me hapësirë, ju lutemi, kontrollojeni.</string>
 
-    <string name="settings_rageshake" />
+    <string name="settings_rageshake"/>
     <string name="bootstrap_crosssigning_progress_initializing">Po publikohen kyçe të krijuar identiteti</string>
     <string name="room_message_placeholder">Mesazh…</string>
 
@@ -2333,4 +2333,263 @@
     <string name="identity_server_set_alternative_submit">Parashtroje</string>
 
     <string name="open_terms_of">Hap termat e %s</string>
+<string name="play_video">Luaje</string>
+    <string name="pause_video">Pauzë</string>
+    <string name="dismiss">Hidhe poshtë</string>
+
+
+    <string name="no_permissions_to_start_conf_call">S’keni leje të nisni një thirrje konferencë në këtë dhomë</string>
+    <string name="no_permissions_to_start_webrtc_call">S’keni leje të nisni thirrje në këtë dhomë</string>
+    <string name="conference_call_in_progress">Ka tashmë një konferencë në ecuri e sipër!</string>
+    <string name="video_meeting">Nis mbledhje video</string>
+    <string name="audio_meeting">Nis mbledhje audio</string>
+    <string name="audio_video_meeting_description">Mbledhjet përdorin siguri dhe rregulla lejesh Jitsi. Krejt personat aktualisht në dhomë do të shohin një ftesë për të marrë pjesë, teksa mbahet mbledhja juaj.</string>
+    <string name="cannot_call_yourself">S’mund të bëni thirrje me vetveten</string>
+    <string name="cannot_call_yourself_with_invite">S’mund të bëni thirrje me vetveten, prisni për pjesëmarrësit të pranojnë ftesën</string>
+    <string name="failed_to_add_widget">S’u arrit të shtohej widget</string>
+    <string name="failed_to_remove_widget">S’u arrit të hiqej widget</string>
+    <string name="call_notification_answer">Pranoje</string>
+    <string name="call_notification_reject">Hidhe poshtë</string>
+    <string name="call_notification_hangup">Mbylle</string>
+
+    <string name="action_copy">Kopjoje</string>
+    <string name="dialog_title_success">Sukses</string>
+
+    <string name="bottom_action_notification">Njoftime</string>
+    <string name="call_failed_no_connection">Thirrja Element Dështoi</string>
+    <string name="call_failed_no_connection_description">S’u arrit të vendosej lidhje e atypëratyshme.
+\nQë thirrjet të punojnë mirë, ju lutemi, kërkojini përgjegjësit të shërbyesit tuaj Home të formësojë një shërbyes TURN.</string>
+
+    <string name="call_select_sound_device">Përzgjidhni Pajisje Zëri</string>
+    <string name="sound_device_phone">Telefon</string>
+    <string name="sound_device_speaker">Altoparlant</string>
+    <string name="call_switch_camera">Ndërroni Kamera</string>
+    <string name="call_camera_front">Ballore</string>
+    <string name="call_camera_back">E pasme</string>
+    <string name="call_format_turn_hd_off">Mbyllni HD-në</string>
+    <string name="call_format_turn_hd_on">Hapni HD-në</string>
+
+    <string name="auth_msisdn_already_defined">Ky numër telefoni është i përcaktuar tashmë.</string>
+    <string name="login_error_ssl_peer_unverified">Gabim SSL: identiteti i ortakut s’është verifikuar.</string>
+    <string name="login_error_ssl_other">Gabim SSL.</string>
+    <string name="settings_call_show_confirmation_dialog_title">Parandalo thirrje aksidentale</string>
+    <string name="settings_call_show_confirmation_dialog_summary">Kërko për ripohim, para se të fillohet një thirrje</string>
+    <string name="active_call_with_duration">Thirrje Aktive (%s)</string>
+    <string name="return_to_call">Kthehu te thirrje</string>
+
+    <string name="room_participants_action_cancel_invite">Anuloje ftesën</string>
+    <string name="room_participants_power_level_demote_warning_title">Të zhgradohet vetja\?</string>
+    <string name="room_participants_power_level_demote_warning_prompt">S’do të jeni në gjendje ta zhbëni këtë ndryshim, teksa zhgradoni veten, nëse jeni përdoruesi i fundit i privilegjuar, s’do të jetë e mundur të rifitoni privilegjet.</string>
+    <string name="room_participants_power_level_demote">Zhgradoje</string>
+
+
+    <string name="room_participants_action_ignore_title">Shpërfille përdoruesin</string>
+    <string name="room_participants_action_ignore_prompt_msg">Shpërfillja e këtij përdoruesi do të heqë mesazhet e tij prej dhomave që ndani me të.
+\n
+\nKëtë veprim mund ta zhbëni në çfarëdo kohe, te rregullimet e përgjithshme.</string>
+    <string name="room_participants_action_unignore_title">Hiqe shpërfilljen e përdoruesit</string>
+    <string name="room_participants_action_unignore_prompt_msg">Heqja e shpërfilljes së këtij përdoruesi do të shfaqë sërish krejt mesazhet prej tij.</string>
+    <string name="room_participants_action_cancel_invite_title">Anuloje ftesën</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Jeni i sigurt se doni të anulohet ftesa për këtë përdorues\?</string>
+    <string name="room_participants_kick_title">Përzëre përdoruesin</string>
+    <string name="room_participants_kick_reason">Arsye për përzënie</string>
+    <string name="room_participants_kick_prompt_msg">Përzënia e përdoruesit do ta heqë prej kësaj dhome.
+\n
+\nQë të pengohet pjesëmarrja sërish e tij, duhet ta dëboni.</string>
+    <string name="room_participants_ban_title">Dëboje përdoruesin</string>
+    <string name="room_participants_ban_reason">Arsye për dëbim</string>
+    <string name="room_participants_unban_title">Hiqja dëbimin përdoruesit</string>
+    <string name="room_participants_unban_prompt_msg">Heqja e dëbimit përdoruesit do t’i lejojë të marrë pjesë sërish në dhomë.</string>
+
+    <string name="settings_phone_number_empty">Te llogaria juaj s’është shtuar ndonjë numër telefoni</string>
+    <string name="settings_emails">Adresa email</string>
+    <string name="settings_emails_empty">Te llogaria juaj s’është shtuar ndonjë email</string>
+    <string name="settings_phone_numbers">Numra telefoni</string>
+    <string name="settings_remove_three_pid_confirmation_content">Të hiqet %s\?</string>
+    <string name="error_threepid_auth_failed">Sigurohuni që keni klikuar te lidhja në email-in që ju kemi dërguar.</string>
+
+    <plurals name="seconds">
+	<item quantity="one">%d sekondë</item>
+	<item quantity="other">%d sekonda</item>
+</plurals>
+
+    <string name="settings_show_room_member_state_events">Shfaq akte gjendjeje përdoruesish të dhomës</string>
+    <string name="settings_show_room_member_state_events_summary">Përfshin akte ftimi/pjesëmarrjeje/ikjeje/përzënieje/dëbimi dhe ndryshime emri avatari/shfaqjeje.</string>
+    <string name="settings_secure_backup_section_title">Kopjeruajtje e Sigurt</string>
+    <string name="settings_secure_backup_manage">Administroni</string>
+    <string name="settings_secure_backup_setup">Ujdisni Kopjeruajtje të Sigurt</string>
+    <string name="settings_secure_backup_reset">Riktheje Kopjeruajtjen e Sigurt te Parazgjedhjet</string>
+    <string name="settings_secure_backup_enter_to_setup">Ujdise në këtë pajisje</string>
+    <string name="settings_secure_backup_section_info">Ruhuni nga humbja e hyrjes te mesazhe &amp; të dhëna të fshehtëzuara, duke kopjeruajtur kyçe fshehtëzimi në shërbyesin tuaj.</string>
+    <string name="reset_secure_backup_title">Prodhoni një Kyç të ri Sigurie ose caktoni një Frazë të re Sigurie për kopjeruajtjen tuaj ekzistuese.</string>
+    <string name="reset_secure_backup_warning">Kjo do të zëvendësojë Kyçin ose Frazën tuaj aktuale.</string>
+
+    <string name="disabled_integration_dialog_title">Integrimet janë të çaktivizuara</string>
+    <string name="disabled_integration_dialog_content">Që të bëhet kjo, aktivizoni “Lejo integrime”, te Rregullimet.</string>
+
+    <string name="settings_emails_and_phone_numbers_title">Email-e dhe numra telefonash</string>
+    <string name="settings_emails_and_phone_numbers_summary">Administroni email-e dhe numra telefonash të lidhur me llogarinë tuaj Matrix</string>
+
+    <plurals name="room_settings_banned_users_count">
+	<item quantity="one">%d përdorues i dëbuar</item>
+	<item quantity="other">%d përdorues të dëbuar</item>
+</plurals>
+
+    <string name="encryption_exported_successfully">Kyçet u eksportuan me sukses</string>
+
+    <plurals name="encryption_import_room_keys_success">
+	<item quantity="one">%1$d/%2$d kyç i importuar me sukses.</item>
+	<item quantity="other">%1$d/%2$d kyçe të importuar me sukses.</item>
+</plurals>
+
+    <string name="active_widget_view_action">SHIHENI</string>
+    <string name="active_widgets_title">Widget-e aktivë</string>
+
+
+    <string name="room_manage_integrations">Administroni Integrime</string>
+    <string name="room_no_active_widgets">S’ka widget-e aktivë</string>
+    <string name="recovery_key_export_saved">Kyçi i rikthimeve u ruajt.</string>
+
+    <string name="secure_backup_banner_setup_line1">Kopjeruajtje e Sigur</string>
+    <string name="secure_backup_banner_setup_line2">Ruhuni nga humbja e hyrjes në mesazhe &amp; të dhëna të fshehtëzuara</string>
+
+    <string name="secure_backup_setup">Ujdisni Kopjeruajtje të Sigurt</string>
+
+    <string name="create_room_federation_error">Dhoma është krijuar, por disa ftesa s’janë dërguar, për arsyen vijuese:
+\n
+\n%s</string>
+
+    <string name="labs_show_unread_notifications_as_tab">Shtoni një skedë enkas për njoftime të palexuar në skenën kryesore.</string>
+
+    <string name="settings_text_message_sent_hint">Kod</string>
+    <plurals name="two_and_some_others_read">
+	<item quantity="one">%1$s, %2$s dhe %3$d tjetër i lexuar</item>
+	<item quantity="other">%1$s, %2$s dhe %3$d të tjerë të lexuar</item>
+</plurals>
+    <string name="room_list_quick_actions_favorite_add">Shtoje te të parapëlqyerit</string>
+    <string name="room_list_quick_actions_favorite_remove">Hiqe prej të parapëlqyerve</string>
+    <string name="notice_member_no_changes_by_you">S’bëtë ndryshime</string>
+    <string name="room_join_rules_public_by_you">E bëtë dhomën publike për këdo që di lidhjen.</string>
+    <string name="room_join_rules_invite_by_you">E bëtë dhomën vetëm me ftesa.</string>
+    <string name="login_server_url_form_common_notice">Jepni adresën e shërbyesit që doni të përdoret</string>
+
+    <string name="login_msisdn_notice">Ju lutemi, përdorni formatin ndërkombëtar (numrat e telefonave duhet të fillojnë me \'+\')</string>
+    <string name="login_signin_matrix_id_password_notice">Nëse s’e dini fjalëkalimin, kthehuni mbrapsht që ta ricaktoni.</string>
+    <string name="send_a_sticker">Ngjitës</string>
+    <string name="sent_a_poll">Pyetësor</string>
+    <string name="sent_a_bot_buttons">Butona Roboti</string>
+    <string name="sent_a_reaction">Reagoi me: %s</string>
+    <string name="sent_verification_conclusion">Përfundim Verifikimi</string>
+
+    <string name="room_profile_section_admin">Veprime Përgjegjësi</string>
+    <string name="room_member_power_level_default_in">%1$s, si parazgjedhje</string>
+    <string name="settings_hs_admin_e2e_disabled">Përgjegjësi i shërbyesit tuaj ka çaktivizuar, si parazgjedhje, fshehtëzim skaj-më-skaj në dhoma private &amp; Mesazhe të Drejtpërdrejtë.</string>
+    <string name="delete_account_data_warning">Të fshihen të dhënat e llogarisë të llojit %1$s\?
+\n
+\nPërdoreni me kujdes, mund të shpjerë në sjellje të papritura.</string>
+
+    <string name="bootstrap_info_text_2">Jepni një frazë sigurie që e dini vetëm ju, e përdorur për të siguruar të fshehta në shërbyesin tuaj.</string>
+
+    <string name="bootstrap_cancel_text">Nëse e anuloni tani, mund të humbni mesazhe &amp; të dhëna të fshehtëzuara, nëse humbni hyrje te kredencialet tuaja.
+\n
+\nMundeni edhe të ujdisni Kopjeruajtje të Sigurt &amp; të administroni kyçet tuaj, te Rregullimet.</string>
+
+    <string name="room_created_summary_item_by_you">Krijuat dhe formësuat dhomën.</string>
+
+    <string name="auth_invalid_login_deactivated_account">Kjo llogari është çaktivizuar.</string>
+
+    <string name="error_saving_media_file">S’u ruajt dot kartelë media</string>
+    <string name="confirm_your_identity_quad_s">Ripohoni identitetin tuaj duke verifikuar këto kredenciale hyrjeje, duke i akorduar hyrje te mesazhe të fshehtëzuar.</string>
+    <string name="error_sso_flow_not_supported_yet">Na ndjeni, ky veprim s’është ende i mundshëm për llogari të lidhura duke përdorur Hyrje Njëshe.</string>
+
+    <string name="identity_server_error_bulk_sha256_not_supported">Për privatësinë tuaj, Element-i mbulon vetëm dërgim email-esh dhe numrash telefoni përdoruesi të koduar.</string>
+    <string name="power_level_edit_title">Caktoni rol</string>
+    <string name="power_level_title">Rol</string>
+    <string name="a11y_open_chat">Hapni fjalosje</string>
+    <string name="a11y_mute_microphone">Mbylle mikrofonin</string>
+    <string name="a11y_unmute_microphone">Hape mikrofonin</string>
+    <string name="a11y_stop_camera">Ndale kamerën</string>
+    <string name="a11y_start_camera">Nise kamerën</string>
+
+    <string name="settings_setup_secure_backup">Ujdisni Kopjeruajtje të Sigurt</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">Kopjeruajtje e sigurt</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Ruhuni nga humbja e hyrjes te mesazhe &amp; të dhëna të fshehtëzuara, duke kopjeruajtur në shërbyesin tuaj kyçet e fshehtëzimit.</string>
+    <string name="bottom_sheet_setup_secure_backup_submit">Ujdiseni</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_title">Përdor një Kyç Sigurie</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Prodhoni një kyç sigurie që të depozitohet diku në një vend të parrezik, bie fjala, në një përgjegjës fjalëkalimesh ose kasafortë.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Përdor një Frazë Sigurie</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Jepni një frazë të fshehtë që e dini vetëm ju, dhe prodhoni një kyç për kopjeruajtjen.</string>
+
+    <string name="bottom_sheet_save_your_recovery_key_title">Ruani Kyçin tuaj të Sigurisë</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Depozitojeni Kyçin tuaj të Sigurisë në një vend të parrezik, bie fjala, një përgjegjës fjalëkalimesh ose një kasafortë.</string>
+
+    <string name="set_a_security_phrase_title">Caktoni një Frazë Sigurie</string>
+    <string name="set_a_security_phrase_notice">Jepni një frazë sigurie që e dini vetëm ju, e përdorur për të siguruar të fshehta në shërbyesin tuaj.</string>
+    <string name="set_a_security_phrase_hint">Frazë Sigurie</string>
+    <string name="set_a_security_phrase_again_notice">Rijepni Frazën tuaj të Sigurisë, për ta ripohuar.</string>
+
+    <string name="save_your_security_key_title">Ruani Kyçin tuaj të Sigurisë</string>
+    <string name="save_your_security_key_notice">Depozitojeni Kyçin tuaj të Sigurisë në një vend të parrezik, bie fjala, një përgjegjës fjalëkalimesh ose një kasafortë.</string>
+
+    <string name="room_settings_name_hint">Emër Dhome</string>
+    <string name="room_settings_topic_hint">Temë</string>
+    <string name="room_settings_save_success">Ndryshuat me sukses rregullimet për dhomën</string>
+
+    <string name="notice_crypto_unable_to_decrypt_final">S’mund të hapni këtë mesazh</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly">Po pritet për këtë mesazh, kjo mund të zgjasë ca</string>
+    <string name="crypto_utd">Nuk Shfshehtëzohet Dot</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Për shkak të fshehtëzimit skaj-më-skaj, mund t’ju duhet të prisni që të mbërrijë mesazhi i dikujt, ngaqë kyçet e fshehtëzimit s’qenë ujdisur si duhet për ju.</string>
+    <string name="crypto_error_withheld_blacklisted">S’mund ta hapni këtë mesazh, ngaqë jeni bllokuar nga dërguesi</string>
+    <string name="crypto_error_withheld_unverified">S’mund të hapni këtë mesazh, ngaqë sesionit tuaj nuk i zihet besë nga dërguesi</string>
+    <string name="crypto_error_withheld_generic">S’mund ta hapni këtë mesazh, ngaqë dërguesi qëllimisht nuk ju dërgoi kyçet</string>
+    <string name="notice_crypto_unable_to_decrypt_merged">Po pritet për historik fshehtëzimesh</string>
+
+    <string name="element_disclaimer_title">Riot-i tanimë quhet Element!</string>
+    <string name="element_disclaimer_content">Jemi të ngazëllyer t’ju njoftojmë se kemi ndërruar emër! Aplikacioni juaj është i përditësuar dhe jeni i futur në llogarinë tuaj.</string>
+    <string name="element_disclaimer_negative_button">E MORA VESH</string>
+    <string name="element_disclaimer_positive_button">MËSONI MË TEPËR</string>
+
+    <string name="element_login_splash_brand">element</string>
+
+
+    <string name="save_recovery_key_chooser_hint">Ruaje kyçin e rimarrjeve te</string>
+
+    <string name="add_from_phone_book">Shto prej numëratorit tim telefonik</string>
+    <string name="empty_phone_book">Numëratori juaj telefonik është i zbrazët</string>
+    <string name="phone_book_title">Numërator telefonik</string>
+    <string name="search_in_my_contacts">Kërko te kontaktet e mia</string>
+    <string name="loading_contact_book">Po merren kontaktet tuaja…</string>
+    <string name="empty_contact_book">Numëratori juaj telefonik është i zbrazët</string>
+    <string name="contacts_book_title">Libër adresash</string>
+
+    <string name="three_pid_revoke_invite_dialog_title">Shfuqizo ftesën</string>
+    <string name="three_pid_revoke_invite_dialog_content">Të shfuqizohet ftesa për %1$s\?</string>
+
+    <string name="member_banned_by">Dëbuar nga %1$s</string>
+    <string name="failed_to_unban">S’u arrit të Hiqej Dëbimi i përdoruesit</string>
+
+    <string name="alert_push_are_disabled_title">Njoftimet push janë të çaktivizuar</string>
+    <string name="alert_push_are_disabled_description">Që të aktivizoni njoftimet push, shihni te rregullimet tuaja</string>
+    <plurals name="wrong_pin_message_remaining_attempts">
+	<item quantity="one">Kod i gabuar, edhe %d provë</item>
+	<item quantity="other">Kod i gabuar, edhe %d prova</item>
+</plurals>
+    <string name="wrong_pin_message_last_remaining_attempt">Kujdes! Prova e fundit e mbetur, përpara daljes!</string>
+    <string name="too_many_pin_failures">Shumë gabime, u nxorët nga llogaria</string>
+    <string name="create_pin_title">Zgjidhni një PIN për siguri</string>
+    <string name="create_pin_confirm_title">Ripohoni PIN-in</string>
+    <string name="create_pin_confirm_failure">S’u arrit të vlerësohet pin-i, ju lutemi, jepni një të ri.</string>
+    <string name="auth_pin_title">Jepni PIN-in tuaj</string>
+    <string name="auth_pin_forgot">Harruat PIN-in\?</string>
+    <string name="auth_pin_reset_title">Ricaktoni pin-in</string>
+    <string name="auth_pin_new_pin_action">Pin i ri</string>
+    <string name="auth_pin_reset_content">Që të ricaktoni PIN-in tuaj, do t’ju duhet të ribëni hyrjen dhe të krijoni një të ri.</string>
+    <string name="settings_security_pin_code_title">Aktivizo PIN-in</string>
+    <string name="settings_security_pin_code_summary">Nëse doni të ricaktoni PIN-in tuaj, prekni “Harrova PIN-in”, që të bëhet dalja nga llogaria dhe ricaktimi.</string>
+    <string name="auth_pin_confirm_to_disable_title">Që të çaktivizohet PIN-i, ripohoni PIN-in</string>
+    <string name="error_opening_banned_room">S’mund të hapet një dhomë prej të cilës jeni dëbuar.</string>
+    <string name="room_error_not_found">S’gjendet dot kjo dhomë. Sigurohuni që ekziston.</string>
+
+    <string name="universal_link_malformed">Lidhja qe e keqformësuar</string>
 </resources>

From 087711f1f7906ccbe1e9fbb3ad2b163584cb8979 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Mon, 12 Oct 2020 11:35:25 +0000
Subject: [PATCH 207/278] Translated using Weblate (Albanian)

Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/sq/
---
 .../src/main/res/values-sq/strings.xml        | 94 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
index 14a7c61bbc..4dc7f910d8 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -138,4 +138,96 @@
     <string name="key_verification_request_fallback_message">%s po kërkon të verifikojë kyçin tuaj, por klienti juaj nuk mbulon verifikim kyçesh brenda fjalosjeje. Që të verifikoni kyça, do t’ju duhet të përdorni verifikim të dikurshëm kyçesh.</string>
 
     <string name="notice_room_created">%1$s krijo dhomën</string>
-</resources>
+<string name="summary_you_sent_image">Dërguat një figurë.</string>
+    <string name="summary_you_sent_sticker">Dërguat një ngjitës.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">Ftesa juaj</string>
+    <string name="notice_room_created_by_you">Krijuat dhomën</string>
+    <string name="notice_room_invite_by_you">Ftuat %1$s</string>
+    <string name="notice_room_join_by_you">Hytë në dhomë</string>
+    <string name="notice_room_leave_by_you">Dolët nga dhoma</string>
+    <string name="notice_room_reject_by_you">Hodhët poshtë ftesën</string>
+    <string name="notice_room_kick_by_you">Përzutë %1$s</string>
+    <string name="notice_room_unban_by_you">Hoqët dëbimin për %1$s</string>
+    <string name="notice_room_ban_by_you">Dëbuat %1$s</string>
+    <string name="notice_room_withdraw_by_you">Tërhoqët mbrapsht ftesën për %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Ndryshuat avatarin tuaj</string>
+    <string name="notice_display_name_set_by_you">Caktuat si emrin tuaj në ekran %1$s</string>
+    <string name="notice_display_name_changed_from_by_you">E ndryshuat emrin tuaj në ekran nga %1$s në %2$s</string>
+    <string name="notice_display_name_removed_by_you">Hoqët emrin tuaj në ekran (qe %1$s)</string>
+    <string name="notice_room_topic_changed_by_you">E ndryshuat temën në: %1$s</string>
+    <string name="notice_room_avatar_changed">%1$s ndryshoi avatarin e dhomës</string>
+    <string name="notice_room_avatar_changed_by_you">Ndryshuat avatarin e dhomës</string>
+    <string name="notice_room_name_changed_by_you">Ndryshuat emrin e dhomës në: %1$s</string>
+    <string name="notice_placed_video_call_by_you">Filluat një thirrje video.</string>
+    <string name="notice_placed_voice_call_by_you">Filluat një thirrje zanore.</string>
+    <string name="notice_call_candidates">%s dërgoi të dhëna për ujdisjen e thirrjes.</string>
+    <string name="notice_call_candidates_by_you">Dërguat të dhëna për ujdisjen e thirrjes.</string>
+    <string name="notice_answered_call_by_you">Iu përgjigjët thirrjes.</string>
+    <string name="notice_ended_call_by_you">E përfunduat thirrjen.</string>
+    <string name="notice_made_future_room_visibility_by_you">E bëtë historikun e ardhshëm të dhomë të dukshëm për %1$s</string>
+    <string name="notice_end_to_end_by_you">Aktivizuat fshehtëzim skaj-më-skaj (%1$s)</string>
+    <string name="notice_room_update_by_you">Përmirësuat këtë dhomë.</string>
+
+    <string name="notice_requested_voip_conference_by_you">Kërkuat një konferencë VoIP</string>
+    <string name="notice_room_name_removed_by_you">Hoqët emrin e dhomës</string>
+    <string name="notice_room_topic_removed_by_you">Hoqët temën e dhomës</string>
+    <string name="notice_room_avatar_removed">%1$s hoqi avatarin e dhomës</string>
+    <string name="notice_room_avatar_removed_by_you">Hoqët avatarin e dhomës</string>
+    <string name="notice_profile_change_redacted_by_you">Përditësuat profilin tuaj %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">Dërguat një ftesë te %1$s për të ardhur te dhoma</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Shfuqizuat ftesën për ardhjen në dhomë të %1$s</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Pranuat ftesën për %1$s</string>
+
+    <string name="notice_widget_added">%1$s shtoi widget-in %2$s</string>
+    <string name="notice_widget_added_by_you">Shtuat widget-in %1$s</string>
+    <string name="notice_widget_removed">%1$s hoqi widget-in %2$s</string>
+    <string name="notice_widget_removed_by_you">Hoqët widget-in %1$s</string>
+    <string name="notice_widget_modified">%1$s ndryshoi widget-in %2$s</string>
+    <string name="notice_widget_modified_by_you">Ndryshuat widget-in %1$s</string>
+
+    <string name="power_level_admin">Përgjegjës</string>
+    <string name="power_level_moderator">Moderator</string>
+    <string name="power_level_default">Parazgjedhje</string>
+    <string name="power_level_custom">Vetjake (%1$d)</string>
+    <string name="power_level_custom_no_value">Vetjake</string>
+
+    <string name="notice_power_level_changed_by_you">Ndryshuat shkallën e pushtetit për %1$s.</string>
+    <string name="notice_power_level_changed">%1$s ndryshoi shkallën e pushtetit për %2$s.</string>
+    <string name="notice_power_level_diff">%1$s nga %2$s në %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">Ftesa juaj. Arsye: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Ftuat %1$s. Arsye: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">Erdhët në dhomë, Arsye: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Ikët nga dhoma. Arsye: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Hodhët poshtë ftesën. Arsye: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">Përzutë %1$s. Arsye: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Hoqët dëbimin për %1$s. Arsye: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">Dëbuat %1$s. Arsye: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">Dërguat një ftesë për %1$s të vijë në dhomë. Arsye: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Shfuqizuat ftesën për ardhjen në dhomë të %1$s. Arsye: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Pranuat ftesën për %1$s. Arsye: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Tërhoqët mbrapsht ftesën për %1$s. Arsye: %2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+	<item quantity="one">Shtuat %1$s si një adresë për këtë dhomë.</item>
+	<item quantity="other">Shtuat %1$s si adresa për këtë dhomë.</item>
+</plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+	<item quantity="one">Hoqët %1$s si një adresë për këtë dhomë.</item>
+	<item quantity="other">Hoqët %1$s si adresa për këtë dhomë.</item>
+</plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">Shtuat %1$s dhe hoqët %2$s si adresa për këtë dhomë.</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">Caktuat si adresë kryesore për këtë dhomë %1$s.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Hoqët adresën kryesore për këtë dhomë.</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">Keni lejuar të vijnë mysafirë në dhomë.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">U keni penguar mysafirëve të vijnë në dhomë.</string>
+
+    <string name="notice_end_to_end_ok_by_you">Aktivizuat fshehtëzimin skaj-më-skaj.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Aktivizuat fshehtëzimin skaj-më-skaj (algoritëm %1$s i panjohur).</string>
+
+    </resources>

From 2b2a263ba69906d0c8863f21ec644c103ced9cf9 Mon Sep 17 00:00:00 2001
From: Kahina Messaoudi <kahinamessaoudi03@gmail.com>
Date: Thu, 8 Oct 2020 21:40:05 +0000
Subject: [PATCH 208/278] Translated using Weblate (Kabyle)

Currently translated at 99.8% (1870 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
---
 vector/src/main/res/values-kab/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 9dabcdd77a..9b4f2a512e 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2549,4 +2549,6 @@
     <string name="sent_verification_conclusion">Taggrayt n usenqed</string>
 
     <string name="universal_link_malformed">Aseɣwen ur yemsil ara akken iwata</string>
-</resources>
+<string name="no_permissions_to_start_webrtc_call">Ur tesɛiḍ ara tasiregt ad tebduḍ asiwel deg texxamt-a</string>
+    <string name="sent_a_reaction">Issedmer s: %s</string>
+    </resources>

From 8d4912126630cde1d9118df7eb363f6c146d5f8f Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Sat, 10 Oct 2020 14:17:08 +0000
Subject: [PATCH 209/278] Translated using Weblate (Persian)

Currently translated at 64.9% (1216 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/fa/
---
 vector/src/main/res/values-fa/strings.xml | 911 +++++++++++++++++++++-
 1 file changed, 874 insertions(+), 37 deletions(-)

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 34aaeb3599..a08650c539 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -20,9 +20,9 @@
     <string name="save">ذخیره</string>
     <string name="leave">ترک کردن</string>
     <string name="send">ارسال</string>
-    <string name="resend">ارسال مجدد</string>
+    <string name="resend">ارسال دوباره</string>
     <string name="quote">نقل قول</string>
-    <string name="share">اشتراک گذاری</string>
+    <string name="share">هم‌رسانی</string>
     <string name="later">بعداً</string>
     <string name="view_source">مشاهده منبع</string>
     <string name="delete">حذف</string>
@@ -74,7 +74,7 @@
     <string name="create_account">ساخت حساب</string>
     <string name="login">ورود</string>
     <string name="logout">خروج از حساب</string>
-    <string name="search">جستجو</string>
+    <string name="search">جست‌وجو</string>
 
     <string name="start_new_chat">آغاز گپ جدید</string>
     <string name="start_voice_call">آغاز تماس صوتی</string>
@@ -152,7 +152,7 @@
 
     <string name="local_address_book_header">مخاطبین من</string>
     <string name="user_directory_header">فهرست کاربران</string>
-    <string name="matrix_only_filter">فقط مخاطبین ماتریس</string>
+    <string name="matrix_only_filter">فقط مخاطبین ماتریکس</string>
     <string name="no_contact_access_placeholder">شما اجازه‌ی دسترسی به مخاطبین را به برنامه نداده‌اید</string>
     <string name="no_result_placeholder">نتیجه‌ای نیست</string>
 
@@ -202,7 +202,7 @@
     <string name="auth_home_server">سرور خانه:</string>
     <string name="auth_identity_server">سرور هویتی:</string>
     <string name="login_error_unable_login">امکان ورود وجود ندارد</string>
-    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
+    <string name="attachment_remaining_time_minutes">%1$dد %2$dث</string>
 
     <string name="room_info_room_topic">موضوع اتاق</string>
 
@@ -289,7 +289,7 @@
     <string name="skip">رد شدن</string>
     <string name="done">انجام شد</string>
     <string name="abort">انصراف</string>
-    <string name="ignore">نادیده‌گیری</string>
+    <string name="ignore">چشم‌پوشی</string>
 
     <string name="action_sign_out_confirmation_simple">آیا می‌خواهید از حساب کاربری خود خارج شوید؟</string>
     <string name="action_mark_room_read">علامت‌گذاری به عنوان خوانده شده</string>
@@ -304,7 +304,7 @@
     <string name="title_activity_group_details">جزییات انجمن</string>
     <string name="title_activity_choose_sticker">ارسال برچسب</string>
     <string name="title_activity_keys_backup_setup">پشتیبان‌گیری کلید</string>
-    <string name="title_activity_keys_backup_restore">بازیابی پشتیبان کلید</string>
+    <string name="title_activity_keys_backup_restore">استفاده از پشتیبان کلید</string>
     <string name="keys_backup_is_not_finished_please_wait">پشتیبان‌گیری از کلید هنوز به پایان نرسیده است، لطفاً شکیبا باشید…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">در صورتی که اکنون از حساب خود خارج شوید، پیام‌های رمزنگاری شده خود را از دست خواهید داد</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">پشتیبان‌گیری کلید در جریان است. در صورتی که اکنون از حساب خود خارج شوید، پیام‌های رمزنگاری شده خود را از دست خواهید داد.</string>
@@ -335,7 +335,7 @@
     <string name="e2e_re_request_encryption_key_sent">درخواست کلید ارسال شد.</string>
 
     <string name="e2e_re_request_encryption_key_dialog_title">درخواست ارسال شد</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">لطفاً ریوت را روی دستگاه دیگر که می‌تواند پیام را رمزگشایی کند، اجرا کنید تا بتواند کلیدها را به این نشست بفرستد.</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">لطفاً المنت را روی افزاره‌ای دیگر که می‌تواند پیام را رمزگشایی کند، اجرا کنید تا بتواند کلیدها را به این نشست بفرستد.</string>
 
     <string name="read_receipts_list">فهرست رسیدهای خواندن</string>
 
@@ -346,7 +346,7 @@
 
     <string name="call_failed_dont_ask_again">دوباره از من نپرس</string>
 
-    <string name="auth_add_email_message_2">برای بازیابی یک ایمیل وارد کنید، و بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید.</string>
+    <string name="auth_add_email_message_2">رایانامه‌ای برای بازیابی تنظیم کرده تا بتوانید در صورت نیاز، از طریقش به دست افرادی که می‌شناسید، قابل کشف باشید.</string>
     <string name="auth_add_phone_message_2">ثبت شماره تلفن (بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید).</string>
     <string name="auth_reset_password_message">نشانی رایانامهٔ پیوسته به حسابتان را برای بازنشانی گذواژه‌تان وارد کنید:</string>
     <string name="resources_script">Latn</string>
@@ -370,7 +370,7 @@
     <string name="room_sliding_menu_version_x">نگارش %s</string>
     <string name="room_sliding_menu_term_and_conditions">شرایط و ضوابط</string>
     <string name="room_sliding_menu_third_party_notices">تذکّرهای سوم‌شخص</string>
-    <string name="room_sliding_menu_copyright">حق نشر</string>
+    <string name="room_sliding_menu_copyright">حق رونوشت</string>
     <string name="room_sliding_menu_privacy_policy">سیاست محرمانگی</string>
 
     <string name="settings_profile_picture">عکس نمایه</string>
@@ -382,7 +382,7 @@
     <string name="settings_app_info_link_title">اطّلاعات برنامه</string>
     <string name="settings_app_info_link_summary">نمایش اطّلاعات برنامه در تنظیمات سامانه.</string>
     <string name="settings_add_3pid_confirm_password_title">تأیید گذرواژه‌تان</string>
-    <string name="settings_add_3pid_flow_not_supported">نمی‌توانید این کار را از ریوت همراه انجام دهید</string>
+    <string name="settings_add_3pid_flow_not_supported">نمی‌توانید با المنت همراه، این کار را بکنید</string>
     <string name="settings_add_3pid_authentication_needed">نیاز به تأیید هویت است</string>
 
 
@@ -395,8 +395,8 @@
     <string name="settings_troubleshoot_test_account_settings_failed">آگاهی‌ها برای حسابتان از کار افتاده‌اند.
 \nلطفاً تتظیمات حساب را بررسی کنید.</string>
     <string name="settings_troubleshoot_test_device_settings_success">آگاهی‌ها برای این نشست به کار افتاده‌اند.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">آگاهی‌ها برای این نشست از کار افتاده‌اند.
-\nلطفاً تنظینات ریوت را بررسی کنید.</string>
+    <string name="settings_troubleshoot_test_device_settings_failed">آگاهی‌ها برای این نشست به کار نیفتاده‌اند. 
+\nلطفاً تنظیمات المنت را بررسی کنید.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">برخی آگاهی‌ها در تنظیمات سفارشیتان از کار افتاده‌اند.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_title">خدمت آگاهی</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">خدمت آگاهی در حال اجراست.</string>
@@ -414,7 +414,7 @@
     <string name="settings_olm_version">نگارش olm</string>
     <string name="settings_app_term_conditions">شرایط و ضوابط</string>
     <string name="settings_third_party_notices">تذکّرهای سوم‌شخص</string>
-    <string name="settings_copyright">حق نشر</string>
+    <string name="settings_copyright">حق رونوشت</string>
     <string name="settings_privacy_policy">سیاست محرمانگی</string>
     <string name="settings_keep_media">نگه‌داری رسانه</string>
     <string name="settings_clear_cache">پاک‌سازی انباره</string>
@@ -476,7 +476,7 @@
     <string name="settings_theme">زمینه</string>
 
     <string name="encryption_never_send_to_unverified_devices_title">رمزنگاری فقط به نشست‌های تأیید شده</string>
-    <string name="unknown_devices_alert_title">اتاق شامل نشست‌های ناشناخته</string>
+    <string name="unknown_devices_alert_title">اتاق شامل نشست‌های ناشناخته است</string>
     <string name="directory_server_type_homeserver">برای فهرست شدن اتاق‌های عمومی از یک کاساز، نامش را بنویسید</string>
     <string name="directory_server_all_rooms_on_server">تمامی اتاق‌های روی کارساز %s</string>
     <string name="directory_server_native_rooms">تمامی اتاق‌های بومی %s</string>
@@ -492,7 +492,7 @@
     </plurals>
 
     <string name="room_widget_permission_theme">زمینه‌تان</string>
-    <string name="room_add_matrix_apps">افزودن کاره‌های ماتریس</string>
+    <string name="room_add_matrix_apps">افزودن کاره‌های ماتریکس</string>
     <string name="encrypted_message">پیام رمزنگاری شده</string>
 
     <string name="create_community">ایجاد اجتماع</string>
@@ -566,7 +566,7 @@
     <string name="create_room_directory_title">نمایهٔ اتاق‌ها</string>
     <string name="create_room_directory_description">انتشار این اتاق در نمایهٔ اتاق‌ها</string>
 
-    <string name="settings_sdk_version">نگارش SDK ماتریس</string>
+    <string name="settings_sdk_version">نگارش SDK ماتریکس</string>
     <string name="settings_general_title">عمومی</string>
     <string name="settings_preferences">ترجیحات</string>
     <string name="settings_security_and_privacy">امنیت و محرمانگی</string>
@@ -602,8 +602,8 @@
 
     <string name="labs_swipe_to_reply_in_timeline">به کار انداختن کشیدن برای پاسخ در خط زمانی</string>
 
-    <string name="add_by_matrix_id">افزودن با شناسهٔ ماتریس</string>
-    <string name="direct_room_no_known_users">نتیجه‌ای پیدا نشد. برای جست‌وجو روی کارساز، از افزون با شناسهٔ ماتریس استفاده کنید.</string>
+    <string name="add_by_matrix_id">افزودن با شناسهٔ ماتریکس</string>
+    <string name="direct_room_no_known_users">نتیجه‌ای پیدا نشد. برای جست‌وجو روی کارساز، از افزون با شناسهٔ ماتریکس استفاده کنید.</string>
     <string name="direct_room_filter_hint">پالایش با نام کاربری یا شناسه…</string>
 
     <string name="a11y_create_direct_message">ایجاد یک گفت‌وگوی مستقیم جدید</string>
@@ -614,12 +614,12 @@
     <string name="report_content_custom_title">گزارش این محتوا</string>
     <string name="report_content_custom_hint">دلیل گزارش این محتوا</string>
     <string name="report_content_custom_submit">گزارش</string>
-    <string name="block_user">انسداد کاربر</string>
+    <string name="block_user">چشم‌پوشی از کاربر</string>
 
     <string name="content_reported_title">محتوا گزارش شد</string>
     <string name="content_reported_as_spam_title">به عنوان هرزنامه گزارش شد</string>
     <string name="content_reported_as_inappropriate_title">به عنوان نامناسب گزارش شد</string>
-    <string name="message_ignore_user">انسداد کاربر</string>
+    <string name="message_ignore_user">چشم‌پوشی از کاربر</string>
 
     <string name="login_server_other_text">تنظیمات پیش‌رفته و سفارشی</string>
 
@@ -649,7 +649,7 @@
     <string name="room_member_profile_failed_to_get_devices">شکست در گرفتن نشست‌ها</string>
     <string name="room_member_profile_sessions_section_title">نشست‌ها</string>
     <string name="settings_dev_tools">ابزارهای توسعه</string>
-    <string name="title_activity_verify_device">نشست را تایید کن</string>
+    <string name="title_activity_verify_device">تأیید نشست</string>
 
     <string name="none">هیچ</string>
     <string name="revoke">ابطال</string>
@@ -657,8 +657,8 @@
 
     <string name="call_failed_no_ice_title">تماس بدلیل سرور بد پیکربندی شده شکست خورد</string>
     <string name="call_failed_no_ice_use_alt">از %s استفاده کنید</string>
-    <string name="auth_add_email_phone_message_2">یک ایمیل برای بازیابی ثبت کنید. بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید.</string>
-    <string name="auth_add_email_and_phone_message_2">یک ایمیل برای بازیابی ثبت کنید. بعدا در صورت دلخواه می توانید از آن برای شناسایی دوستان خود استفاده کنید.</string>
+    <string name="auth_add_email_phone_message_2">رایانامه‌ای برای بازیابی تنظیم کنید. برای کشف شدن به دست افرادی که می‌شناسید، از رایانامه یا تلفن بعدی استفاده کنید.</string>
+    <string name="auth_add_email_and_phone_message_2">رایانامه‌ای برای بازیابی تنظیم کنید. برای کشف شدن به دست افرادی که می‌شناسید، از رایانامه یا تلفن بعدی استفاده کنید.</string>
     <string name="auth_reset_password_missing_email">نشانی ایمیل پیوست شده به حساب شما باید وارد شده باشد.</string>
     <string name="auth_reset_password_missing_password">گذرواژه جدیدی باید وارد شود.</string>
     <string name="auth_reset_password_email_validation_message">یک ایمیل به %s فرستاده شد. هنگامی که پیوند همراه را دنبال کردید، در زیر کلیک کنید.</string>
@@ -674,24 +674,24 @@
     <string name="login_error_unable_register_mail_ownership">نمی‌توان ثبت‌نام کرد : مالکیت ایمیل تایید نشد</string>
     <string name="login_error_invalid_home_server">لطفا یک نشانی معتبر وارد کنید</string>
     <string name="login_error_unknown_host">نشانی قابل دسترس نیست، لطفا آن را بررسی کنید</string>
-    <string name="login_error_no_homeserver_found">این یک نشانی سرور ماتریس معتبر نیست</string>
+    <string name="login_error_no_homeserver_found">این یک نشانی کارساز ماتریکس معتبر نیست</string>
     <string name="login_error_homeserver_not_found">نمی‌توان به این نشانی سرور خانه دست یافت، لطفا آن را بررسی کنید</string>
-    <string name="login_error_ssl_handshake">دستگاه شما یک پروتوکل امنیتی TLS خارج از رده را استفاده می‌کند، به حمله آسیپ پذیر بوده، برای امنیت شما شما نمی‌توانید متصل شوید</string>
+    <string name="login_error_ssl_handshake">افزاره‌تان از یک قرارداد امنیتی TLS تاریخ‌گذشته که به حمله آسیپ‌پذیر است استفاده می‌کند. برای امنیتتان، نخواهید توانست وصل شوید</string>
     <string name="login_error_unknown_token">توکن دسترسی مشخص شده، شناخته نشد</string>
     <string name="login_error_bad_json">JSON ناهنجار</string>
     <string name="login_error_not_json">شامل یک JSON معتبر نبود</string>
     <string name="login_error_limit_exceeded">درخواست‌های بیش از حد ارسال شده</string>
     <string name="login_error_login_email_not_yet">هنوز روی پیوند ایمیل کلیک نشده</string>
 
-    <string name="settings_call_ringtone_use_app_ringtone">برای تماس‌های ورودی از آهنگ زنگ پیش‌فرض ریوت استفاده کن</string>
-    <string name="settings_call_ringtone_title">آهنگ زنگ تماس ورودی</string>
-    <string name="settings_call_ringtone_dialog_title">انتخاب آهنگ زنگ برای تماس‌ها:</string>
+    <string name="settings_call_ringtone_use_app_ringtone">استفاده از صدای زنگ پیش‌گزیدهٔ المنت برای تماس‌های ورودی</string>
+    <string name="settings_call_ringtone_title">صدای زنگ تماس ورودی</string>
+    <string name="settings_call_ringtone_dialog_title">گزینش صدای زنگ برای تماس‌ها:</string>
 
     <string name="media_picker_both_capture_title">یک عکس یا ویدیو بگیر</string>
     <string name="media_picker_cannot_record_video">نمی‌توان ویدیو ظبط کرد</string>
 
     <string name="permissions_rationale_popup_title">اطلاعات</string>
-    <string name="permissions_rationale_msg_camera">ریوت برای گرفتن عکس و برای تماس‌های ویدیویی باید به دوربین شما به دسترسی یابد.</string>
+    <string name="permissions_rationale_msg_camera">المنت برای گرفتن عکس و تماس‌های ویدیویی نیاز به اجازه دارد.</string>
     <string name="open_chat_header">بازکردن سرتیتر</string>
     <string name="room_sync_in_progress">در حال هم‌گام‌سازی…</string>
     <string name="room_jump_to_first_unread">پریدن به نخستین پیام خوانده نشده.</string>
@@ -704,22 +704,22 @@
         <item quantity="one">۱ عضو فعال</item>
         <item quantity="other">%d عضو فعال</item>
     </plurals>
-    <string name="room_participants_action_ban">انسداد</string>
+    <string name="room_participants_action_ban">تحریم</string>
     <string name="room_participants_action_unban">رفع انسداد</string>
     <string name="room_participants_action_kick">اخراج</string>
     <string name="room_participants_action_set_default_power_level">بازنشانی به کاربر عادی</string>
     <string name="room_participants_action_set_moderator">ناظر کردن</string>
     <string name="room_participants_action_set_admin">مدیر کردن</string>
-    <string name="room_participants_action_ignore">پنهان کردن همه پیام‌ها از این کاربر</string>
+    <string name="room_participants_action_ignore">چشم‌پوشی</string>
     <string name="room_participants_action_unignore">نمایش همه پیام‌ها از این کاربر</string>
     <string name="room_participants_action_mention">اشاره</string>
     <string name="room_participants_action_devices_list">نمایش فهرست نشست</string>
-    <string name="room_participants_ban_prompt_msg">آیا مطئنید می‌خواهید این کاربر را از این گفتگو مسدود کنید؟</string>
+    <string name="room_participants_ban_prompt_msg">انسداد کاربر، او را از این اتاق اخراج کرده و از پیوستن دوباره‌اش جلوگیری می‌کند.</string>
     <string name="reason_hint">دلیل</string>
 
     <string name="room_details_settings">تنظیمات</string>
     <string name="tab_title_search_messages">پیام‌ها</string>
-    <string name="room_settings_all_messages">همه پیام‌ها</string>
+    <string name="room_settings_all_messages">تمام پیام‌ها</string>
     <string name="room_sliding_menu_messages">پیام‌ها</string>
     <string name="room_sliding_menu_settings">تنظیمات</string>
     <string name="settings_password">گذرواژه</string>
@@ -738,11 +738,11 @@
     <string name="room_list_quick_actions_settings">تنظیمات</string>
     <string name="login_reset_password_password_hint">گذرواژه جدید</string>
 
-    <string name="login_reset_password_success_notice">گذرواژه شما بازنشانی شد.</string>
+    <string name="login_reset_password_success_notice">گذرواژه‌تان بازنشانی شد.</string>
     <string name="login_signup_password_hint">گذرواژه</string>
     <string name="soft_logout_signin_password_hint">گذرواژه</string>
     <string name="settings">تنظیمات</string>
-    <string name="account_password">گذرواژه حساب</string>
+    <string name="account_password">گذرواژهٔ حساب</string>
 
     <string name="play_video">پخش</string>
     <string name="pause_video">توقف</string>
@@ -750,4 +750,841 @@
     <string name="dialog_title_success">موفقیت</string>
 
     <string name="bottom_action_notification">اعلان‌ها</string>
-</resources>
+<string name="dismiss">خاتمه</string>
+
+
+    <string name="no_permissions_to_start_conf_call">اجازهٔ شروع تماس کنفرانسی در این اتاق را ندارید</string>
+    <string name="no_permissions_to_start_webrtc_call">اجازهٔ شروع تماس در این اتاق را ندارید</string>
+    <string name="conference_call_in_progress">کنفرانسی در حال اجراست!</string>
+    <string name="video_meeting">شروع جلسهٔ ویدیویی</string>
+    <string name="audio_meeting">شروع جلسهٔ صوتی</string>
+    <string name="cannot_call_yourself">نمی‌توانید با خودتان تماس بگیرید</string>
+    <string name="cannot_call_yourself_with_invite">نمی‌توانید با خودتان تماس بگیرید. منتظر پذیرش دعوت شرکت‌کنندگان شوید</string>
+    <string name="failed_to_add_widget">شکست در افزودن ابزارک</string>
+    <string name="failed_to_remove_widget">شکست در برداشتن ابزارک</string>
+    <string name="call_notification_answer">پذیرش</string>
+    <string name="call_notification_reject">رد</string>
+    <string name="call_notification_hangup">قطع</string>
+
+    <string name="call_failed_no_connection">تماس المنت شکست خورد</string>
+    <string name="call_select_sound_device">گزینش افزارهٔ صوتی</string>
+    <string name="sound_device_phone">تلفن</string>
+    <string name="sound_device_speaker">بلندگو</string>
+    <string name="sound_device_headset">هدست</string>
+    <string name="sound_device_wireless_headset">هدست بی‌سیم</string>
+    <string name="call_switch_camera">تعویض دوربین</string>
+    <string name="call_camera_front">جلو</string>
+    <string name="call_camera_back">پشت</string>
+    <string name="call_format_turn_hd_off">خاموش کردن HD</string>
+    <string name="call_format_turn_hd_on">روشن کردن HD</string>
+
+    <string name="auth_msisdn_already_defined">این شماره تلفن از پیش تعریف شده.</string>
+    <string name="login_error_ssl_other">خطای SSL.</string>
+    <plurals name="membership_changes">
+	<item quantity="one">۱ عضویت تغییر کرد</item>
+	<item quantity="other">%d عضویت تغییر کردند</item>
+</plurals>
+
+    <string name="settings_call_show_confirmation_dialog_title">پیش‌گیری از تماس تصادفی</string>
+    <string name="settings_call_show_confirmation_dialog_summary">خواستن تأیید پیش از شروع تماس</string>
+    <string name="active_call_with_duration">تماس فعّال (%s)</string>
+    <string name="return_to_call">بازگشت به تماس</string>
+
+    <string name="room_preview_room_interactions_disabled">این پیش‌نمایی از اتاق است. برهم‌کنش‌های اتاق از کار افتاده‌اند.</string>
+    <string name="invite_no_identity_server_error">برای انجام این عمل، کارساز هویتی را به تنظیماتتان بیفزایید.</string>
+    <string name="room_participants_action_cancel_invite">لغو دعوت</string>
+    <string name="room_participants_action_ignore_title">چشم‌پوشی از کاربر</string>
+    <string name="room_participants_action_unignore_title">نادیده نگرفتن کاربر</string>
+    <string name="room_participants_action_cancel_invite_title">لغو دعوت</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">مطمئنید که می‌خواهید دعوت این کاربر را لغو کنید؟</string>
+    <string name="room_participants_kick_title">اخراج کاربر</string>
+    <string name="room_participants_kick_reason">دلیل اخراج</string>
+    <string name="room_participants_kick_prompt_msg">اخراج کاربر، از این اتاق برش می‌دارد.
+\n
+\nبرای پیش‌گیری از پیوستن دوباره، باید تحریمش کنید.</string>
+    <string name="room_participants_ban_title">تحریم کاربر</string>
+    <string name="room_participants_ban_reason">دلیل تحریم</string>
+    <string name="room_participants_unban_title">تحریم نکردن کاربر</string>
+    <string name="room_participants_invite_prompt_msg">مطمئنید که می‌خواهید %s را به این گپ دعوت کنید؟</string>
+    <string name="room_participants_invite_join_names">"%1$s، "</string>
+    <string name="room_participants_invite_join_names_and">%1$s و %2$s</string>
+    <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
+
+    <string name="people_search_invite_by_id"><u>با شناسه دعوت شده</u></string>
+    <string name="people_search_local_contacts">مخاطبان محلّی (%d)</string>
+    <string name="people_search_user_directory">شاخهٔ کاربر (%s)</string>
+    <string name="people_search_filter_text">فقط کاربران ماتریکس</string>
+
+    <string name="people_search_invite_by_id_dialog_title">دعوت کاربر با شناسه</string>
+    <string name="people_search_invite_by_id_dialog_description">لطفاً یک یا چند نشانی رایانامه یا شناسهٔ ماتریکس را وارد کنید</string>
+    <string name="people_search_invite_by_id_dialog_hint">رایانامه یا شناسهٔ ماتریکس</string>
+
+    <string name="room_menu_search">جست‌وجو</string>
+    <string name="room_one_user_is_typing">%s دارد می‌نویسد…</string>
+    <string name="room_two_users_are_typing">%1$s و %2$s دارند می‌نویسند…</string>
+    <string name="room_many_users_are_typing">%1$s و %2$s و دیگران دارند می‌نویسند…</string>
+    <string name="room_message_placeholder_encrypted">فرستادن پیام رمزشده…</string>
+    <string name="room_message_placeholder_not_encrypted">فرستادن پیام (رمز نشده)…</string>
+    <string name="room_offline_notification">اتّصال به کارساز از دست رفت.</string>
+    <string name="room_prompt_resend">بازفرستادن همه</string>
+    <string name="room_prompt_cancel">لغو همه</string>
+    <string name="room_resend_unsent_messages">بازفرستادن پیام‌های فرستاده‌نشده</string>
+    <string name="room_delete_unsent_messages">حذف پیام‌های فرستاده‌نشده</string>
+    <string name="room_message_file_not_found">پرونده پیدا نشد</string>
+    <string name="room_do_not_have_permission_to_post">اجازهٔ فرستادن در این اتاق را ندارید</string>
+    <plurals name="room_new_messages_notification">
+	<item quantity="one">۱ پیام جدید</item>
+	<item quantity="other">%d پیام جدید</item>
+</plurals>
+
+    <string name="ssl_trust">اعتماد کردن</string>
+    <string name="ssl_do_not_trust">اعتماد نکردن</string>
+    <string name="ssl_logout_account">خروج</string>
+    <string name="ssl_remain_offline">چشم‌پوشی</string>
+    <string name="ssl_fingerprint_hash">اثرانگشت (%s):</string>
+    <string name="ssl_could_not_verify">نمی‌توان هویت کارساز دوردست را تأیید کرد.</string>
+    <string name="search_hint">جست‌وجو</string>
+    <string name="tab_title_search_people">افراد</string>
+    <string name="tab_title_search_files">پرونده‌ها</string>
+
+    <string name="room_recents_join">پیوستن</string>
+    <string name="room_recents_directory">شاخه</string>
+    <string name="room_recents_favourites">محبوب‌ها</string>
+    <string name="room_recents_low_priority">کم‌اهمیت</string>
+    <string name="room_recents_invites">دعوت‌ها</string>
+    <string name="room_recents_start_chat">شروع گپ</string>
+    <string name="room_recents_create_room">ایجاد اتاق</string>
+    <string name="room_recents_join_room">پیوستن به اتاق</string>
+    <string name="room_recents_join_room_title">پیوستن به یک اتاق</string>
+    <string name="room_recents_join_room_prompt">شناسهٔ اتاق یا نام مستعارش را بنویسید</string>
+
+    <string name="directory_search_results_title">مرور شاخه</string>
+    <string name="directory_searching_title">جست‌وجو کردن شاخه…</string>
+
+    <string name="room_settings_all_messages_noisy">تمام پیام‌ها (پرصدا)</string>
+    <string name="room_settings_mention_only">فقط اشاره‌ها</string>
+    <string name="room_settings_mute">خموش</string>
+    <string name="room_settings_favourite">محبوب</string>
+    <string name="room_settings_de_prioritize">بی‌اولویت</string>
+    <string name="room_settings_leave_conversation">ترک گفت‌وگو</string>
+    <string name="room_settings_forget">فراموشی</string>
+    <string name="room_settings_add_homescreen_shortcut">افزودن میان‌بر صفحهٔ خانگی</string>
+
+    <string name="settings_notification_by_event">اهمّیت آگاهی بر حسب رویداد</string>
+
+    <string name="settings_notification_privacy">محرمانگی آگاهی</string>
+    <string name="settings_troubleshoot_test_system_settings_title">تنظیمات سامانه.</string>
+    <string name="open_settings">گشودن تنظیمات</string>
+
+    <string name="settings_troubleshoot_test_account_settings_title">تنظیمات حساب.</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">به کار انداختن</string>
+
+    <string name="settings_troubleshoot_test_device_settings_title">تنظیمات نشست.</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">به کار انداختن</string>
+
+    <string name="settings_troubleshoot_test_bing_settings_title">تنظیمات سفارشی.</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">به یاد داشته باشید که برخی گونه‌های پیام‌ها روی صامت بودن تنظیم شده‌اند (آگاهی‌ای بدون هیچ صدایی تولید خواهند کرد).</string>
+    <string name="settings_troubleshoot_test_bing_settings_quickfix">بررسی تنظیمات</string>
+
+    <string name="settings_troubleshoot_test_play_services_title">بررسی خدمات پلی</string>
+    <string name="settings_troubleshoot_test_foreground_service_started_quickfix">شروع خدمت</string>
+
+    <string name="settings_troubleshoot_test_service_restart_success">خدمت کشته و به صورت خودکار دوباره شروع شد.</string>
+    <string name="settings_troubleshoot_test_service_restart_failed">شروع دوبارهٔ خدمت شکست خورد</string>
+
+    <string name="settings_troubleshoot_test_service_boot_title">شروع هنگام راه‌اندازی</string>
+    <string name="settings_troubleshoot_test_service_boot_success">خدمت هنگام شروع دوبارهٔ افزاره، شروع خواهد شد.</string>
+    <string name="settings_troubleshoot_test_service_boot_quickfix">به کار اندازی شروع هنگام راه‌اندازی</string>
+
+    <string name="settings_troubleshoot_test_bg_restricted_title">بررسی محدودیت‌های پس‌زمینه</string>
+    <string name="settings_troubleshoot_test_bg_restricted_success">محدودیت‌های پس‌زمینه برای المنت از کار افتاده‌اند. این آزمون باید با استفاده از دادهٔ همراه (بدون وای‌فای) اجرا شود.
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_failed">محدودیت‌های پس‌زمینه برای النت به کار افتاده‌اند.
+\nکارهایی که کاره می‌خواهد انجام دهد، هنگامی که در پس‌زمینه است به صورت تهاجمی محدود می‌شوند که می‌تواند روی آگاهی‌ها تأثیر بگذارد.
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_bg_restricted_quickfix">از کار انداختن محدودیت‌ها</string>
+
+    <string name="settings_troubleshoot_test_battery_title">بهینه‌سازی باتری</string>
+    <string name="settings_troubleshoot_test_battery_success">المنت تحت تأثیر بهینه‌سازی باتری نیست.</string>
+    <string name="settings_troubleshoot_test_battery_quickfix">چشم‌پوشی از بهینه‌سازی</string>
+
+    <string name="settings_notification_privacy_normal">عادی</string>
+    <string name="settings_notification_privacy_reduced">محرمانگی کاهش‌یافته</string>
+    <string name="settings_notification_privacy_need_permission">کاره برای اجرا در پس‌زمینه نیاز به اجازه دارد</string>
+    <string name="settings_notification_privacy_no_background_sync">کاره در پس‌زمینه، به وصل شدن به کارساز خانگی نیاز <b>ندارد</b>. این کار نصرف باتری را کاهش می‌دهد</string>
+    <string name="settings_notification_ringtone">صدای آگاهی</string>
+    <string name="settings_system_preferences_summary">گزینش رنگ چراغ، لرزش، صدا و…</string>
+
+
+    <string name="settings_containing_my_display_name">پیام‌های شامل نام نمایشی</string>
+    <string name="settings_containing_my_user_name">پیام‌های شامل نام کاربری</string>
+    <string name="settings_messages_in_one_to_one">پیام‌ها در گپ‌های یک‌به‌یک</string>
+    <string name="settings_messages_in_group_chat">پیام‌ها در گپ‌های گروهی</string>
+    <string name="settings_invited_to_room">هنگام دعوت شدن به یک اتاق</string>
+    <string name="settings_call_invitations">دعوت‌های تماس</string>
+    <string name="settings_messages_sent_by_bot">پیام‌های ارسالی از بات‌ها</string>
+
+    <string name="settings_background_sync">همگام‌سازی پس‌زمینه</string>
+    <string name="settings_background_fdroid_sync_mode">حالت همگام‌سازی پس‌زمینه</string>
+    <string name="settings_background_fdroid_sync_mode_battery">بهینه برای باتری</string>
+    <string name="settings_background_fdroid_sync_mode_real_time">بهینه برای بلادرنگ</string>
+    <string name="settings_background_fdroid_sync_mode_disabled">بدون همگام‌سازی پس‌زمینه</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">هنگامی که کاره در پس‌زمینه‌است، از پیام‌های ورودی آگاه نخواهید شد.</string>
+    <string name="settings_background_sync_update_error">شکست در به‌روز رسانی تنظیمات.</string>
+
+
+    <string name="settings_start_on_boot">شروع هنگام راه‌اندازی</string>
+    <string name="settings_enable_background_sync">به کار انداختن همگام‌سازی پس‌زمینه</string>
+    <string name="settings_set_sync_timeout">پایان زمان درخواست همگام‌سازی</string>
+    <string name="settings_set_workmanager_delay">دورهٔ همگام‌سازی ترجیحی</string>
+    <plurals name="seconds">
+	<item quantity="one">%d ثانیه</item>
+	<item quantity="other">%d ثانیه</item>
+</plurals>
+
+    <string name="settings_integrations_summary">برای مدیریت بات‌ها، پل‌ها، ابزارک‌ها و بسته‌های برچسب از یک مدیر یکپارچگی استفاده کنید.
+\nمدیرهای یکپارچگی، داده‌های پیکربندی را دریافت کرده و می‌توانند از طرف شما ابزارک‌ها را تغییر داده، دعوت‌های اتاق فرستاده و سطوح قدرت را تنظیم کنند.</string>
+    <string name="settings_always_show_timestamps">نمایش برچسب زمانی برای تمامی پیام‌ها</string>
+    <string name="settings_12_24_timestamps">نمایش برچسب‌های زمانی در قالب ۱۲ساعته</string>
+    <string name="settings_show_room_member_state_events_summary">شامل رویدادهای دعوت/پیوستن/خروج/اخراج/تحریم و تغییرهای آواتار/نام نمایشی.</string>
+    <string name="settings_secure_backup_section_title">پشتیبان امن</string>
+    <string name="settings_secure_backup_manage">مدیریت</string>
+    <string name="settings_secure_backup_setup">برپایی پشتیبان امن</string>
+    <string name="settings_secure_backup_reset">بازنشانی پشتیبان امن</string>
+    <string name="settings_secure_backup_enter_to_setup">برپایی روی این افزاره</string>
+    <string name="settings_secure_backup_section_info">سپرامنیتی در برابر از دست دادن دسترسی به داده‌ها و پیام‌های رمزشده با پشتیبان گیری از کلیدها روی کارسازتان.</string>
+    <string name="settings_deactivate_account_section">غیرفعّال‌سازی حساب</string>
+    <string name="settings_deactivate_my_account">غیرفعّال‌سازی حسابم</string>
+    <string name="settings_discovery_category">کشف</string>
+    <string name="settings_discovery_manage">مدیریت تنظیمات کشفتان.</string>
+    <string name="startup_notification_privacy_title">محرمانگی آگاهی</string>
+    <string name="startup_notification_fdroid_battery_optim_title">اتّصال پس‌زمینه</string>
+    <string name="settings_unignore_user">نمایش همهٔ پیام‌ها از %s؟
+\n
+\nبه خاطر داشته باشید این عمل، کاره را دوباره شروع خواهد کرد و ممکن است کمی زمان ببرد.</string>
+    <string name="passwords_do_not_match">گذرواژه‌ها مطابق نیستند</string>
+
+    <string name="settings_emails_and_phone_numbers_title">رایانامه‌ها و شماره تلفن‌ها</string>
+    <string name="settings_emails_and_phone_numbers_summary">مدیریت رایانامه‌ها و شماره تلفن‌های پیوسته به حساب ماتریکستان</string>
+
+    <string name="settings_delete_notification_targets_confirmation">مطمئنید که می‌خواهید این هدف آگاهی را بردارید؟</string>
+
+    <string name="media_saving_period_3_days">۳ روز</string>
+    <string name="media_saving_period_1_week">۱ هفته</string>
+    <string name="media_saving_period_1_month">۱ ماه</string>
+    <string name="media_saving_period_forever">برای همیشه</string>
+
+    <string name="room_settings_room_photo">عکس اتاق</string>
+    <string name="room_settings_room_name">نام اتاق</string>
+    <string name="room_settings_topic">موضوع</string>
+    <string name="room_settings_room_tag">برچسب اتاق</string>
+    <string name="room_settings_tag_pref_dialog_title">برچسب خورده به عنوان:</string>
+
+    <string name="room_settings_tag_pref_entry_favourite">محبوب</string>
+    <string name="room_settings_tag_pref_entry_low_priority">اولویت پایین</string>
+    <string name="room_settings_tag_pref_entry_none">هیچ</string>
+
+    <string name="room_settings_category_access_visibility_title">دسترسی و مشاهده‌پذیری</string>
+    <string name="room_settings_directory_visibility">فهرست کردن این اتاق در شاخهٔ اتاق‌ها</string>
+    <string name="room_settings_room_access_rules_pref_title">دسترسی اتاق</string>
+    <string name="room_settings_room_read_history_rules_pref_title">خوانش تاریخچهٔ اتاق</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">چه‌کسی می‌تواند تاریخچه را بخواند؟</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">چه‌کسی می‌تواندبه این اتاق دسترسی داشته باشد؟</string>
+
+    <string name="room_settings_read_history_entry_anyone">هرکسی</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">فقط اعضا (از زمان گزینش این گزینه)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">فقط اعضا (از زمان دعوتشان)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">فقط اعضا (از زمان پیوستنشان)</string>
+
+    <plurals name="room_settings_banned_users_count">
+	<item quantity="one">%d کاربر مسدود</item>
+	<item quantity="other">%d کاربر مسدود</item>
+</plurals>
+
+    <string name="room_settings_labs_warning_message">این‌ها ویژگی‌های آزمایشی‌ای هستند که ممکن است به روش‌های نامنتظره‌ای حراب شوندا. با احتیاط استفاده کنید.</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">هرگز پیام‌های رمزشده از این نشست به نشست‌های تأییدنشده در این اتاق فرستاده نشود.</string>
+
+    <string name="room_settings_addresses_no_local_addresses">این اتاق هیچ نشانی محلّی‌ای ندارد</string>
+    <string name="room_settings_addresses_add_new_address">نشانی جدید (مثلاً ‪#foo:matrix.org‬)</string>
+
+    <string name="room_settings_addresses_invalid_format_dialog_title">قالب نام مستعار نامعتبر</string>
+    <string name="room_settings_set_main_address">تظنیم به عنوان نشانی اصلی</string>
+    <string name="encryption_information_session_id">شناسهٔ نشست</string>
+    <string name="encryption_information_device_name">نام عمومی</string>
+    <string name="encryption_information_name">نام عمومی</string>
+    <string name="encryption_information_device_id">شناسهٔ نشست</string>
+    <string name="encryption_information_device_key">کلید نشست</string>
+    <string name="encryption_information_verification">تأییدیه</string>
+    <string name="encryption_information_ed25519_fingerprint">اثرانگشت Ed25519</string>
+
+    <string name="encryption_export_e2e_room_keys">برون‌ریزی کلید‌های اتاق‌های سرتاسری</string>
+    <string name="encryption_export_room_keys">برون‌ریزی کلید‌های اتاق‌ها</string>
+    <string name="encryption_export_room_keys_summary">برون‌ریزی کلیدها به یک پروندهٔ محلّی</string>
+    <string name="encryption_export_export">برون‌ریزی</string>
+    <string name="encryption_message_recovery">بازیابی پیام‌های رمزشده</string>
+    <string name="encryption_settings_manage_message_recovery_summary">مدیریت پشتیبان کلید</string>
+
+    <string name="encryption_import_e2e_room_keys">درون‌ریزی کلید‌های اتاق‌های سرتاسری</string>
+    <string name="encryption_import_room_keys">درون‌ریزی کلیدهای اتاق‌ها</string>
+    <string name="encryption_import_room_keys_summary">درون‌ریزی کلیدها از یک پروندهٔ محلّی</string>
+    <string name="encryption_import_import">درون‌ریزی</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">هرگز پیام‌های رمزشده از این نشست به نشست‌های تأییدنشده فرستاده نشود.</string>
+    <string name="encryption_information_not_verified">تأیید نشده</string>
+    <string name="encryption_information_verified">تأیید‌شده</string>
+    <string name="encryption_information_blocked">در فهرست سیاه</string>
+
+    <string name="encryption_information_unknown_device">نشست ناشناخته</string>
+    <string name="encryption_information_unknown_ip">آی‌پی ناشناخته</string>
+    <string name="encryption_information_none">هیچ‌کدام</string>
+
+    <string name="encryption_information_verify">تأیید</string>
+    <string name="encryption_information_unverify">عدم تأیید</string>
+    <string name="encryption_information_block">بردن در فهرست سیاه</string>
+    <string name="encryption_information_unblock">بیرون آوردن از فهرست سیاه</string>
+
+    <string name="encryption_information_verify_device">تأیید نشست</string>
+    <string name="encryption_information_verify_device_warning">با مقایسهٔ موارد زیر با تنظیمات کاربر در دیگر نشستتان، تأیید کنید:</string>
+    <string name="encryption_information_verify_device_warning2">اگر مطابق نبودند، ممکن است امنیت ارتباطاتتان در معرض خطر باشد.</string>
+    <string name="encryption_information_verify_key_match">تأیید می‌کنم که کلیدها مطابقند</string>
+
+    <string name="select_room_directory">گزینش یک شاخهٔ اتاق</string>
+    <string name="directory_server_fail_to_retrieve_server">ممکن است کارساز در دسترس نبوده یا شلوغ باشد</string>
+    <string name="lock_screen_hint">این‌جا بنویسید…</string>
+
+    <plurals name="notification_unread_notified_messages">
+	<item quantity="one">۱ پیام آگاهی نخوانده</item>
+	<item quantity="other">%d پیام آگاهی نخوانده</item>
+</plurals>
+    <plurals name="notification_unread_notified_messages_in_room_msgs">
+	<item quantity="one">۱ پیام آگاهی نخوانده</item>
+	<item quantity="other">%d پیام آگاهی نخوانده</item>
+</plurals>
+    <plurals name="notification_compat_summary_line_for_room">
+	<item quantity="one">%1$s: ۱ پیام</item>
+	<item quantity="other">%1$s: %2$d پیام</item>
+</plurals>
+    <string name="notification_unread_notified_messages_in_room">%1$s در %2$s</string>
+    <string name="notification_unknown_new_event">رویداد جدید</string>
+    <string name="notification_unknown_room_name">اتاق</string>
+    <string name="notification_new_messages">پیام‌های جدید</string>
+    <string name="notification_new_invitation">دعوت جدید</string>
+    <string name="notification_sender_me">من</string>
+    <string name="notification_inline_reply_failed">**‌شکست در فرستادن - لطفاً اتاق را بگشایید</string>
+    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
+    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+
+    <string name="font_size">اندازهٔ قلم</string>
+    <string name="tiny">ریز</string>
+    <string name="small">کوچک</string>
+    <string name="normal">عادی</string>
+    <string name="large">بزرگ</string>
+    <string name="larger">بزرگ‌تر</string>
+    <string name="largest">بزرگ‌ترین</string>
+    <string name="huge">سترگ</string>
+
+    <string name="widget_no_power_to_manage">برای مدیریت ابزارک‌های این اتاق، نیاز به اجازه دارید</string>
+    <string name="widget_creation_failure">ایجاد ابزارک شکست خورد</string>
+    <string name="settings_labs_create_conference_with_jitsi">ایجاد تماس کنفرانسی با جیتسی</string>
+    <string name="widget_delete_message_confirmation">مطمئنید که می‌خواهید ابزارک را از این اتاق حذف کنید؟</string>
+    <plurals name="active_widgets">
+	<item quantity="one">۱ ابزارک فعّال</item>
+	<item quantity="other">%d ابزارک فعّال</item>
+</plurals>
+    <string name="active_widget_view_action">نما</string>
+    <string name="active_widgets_title">ابزارک‌های فعّال</string>
+
+
+    <string name="room_widget_activity_title">ابزارک</string>
+    <string name="room_widget_permission_title">بار کردن ابزارک</string>
+    <string name="room_widget_permission_added_by">ابزارک افزوده شده به دست:</string>
+    <string name="room_widget_permission_webview_shared_info_title">استفاده از آن ممکن است کوکی تنظیم کرده و داده‌ها را با %s هم‌رسانی کند:</string>
+    <string name="room_widget_permission_shared_info_title">استفاده از آن ممکن است داده‌ها را با %s هم‌رسانی کند:</string>
+    <string name="room_widget_failed_to_load">شکست در بار کردن ابزارک.
+\n%s</string>
+    <string name="room_widget_reload">بار کردن دوبارهٔ ابزارک</string>
+    <string name="room_widget_open_in_browser">گشودن در مرورگر</string>
+    <string name="room_widget_revoke_access">ابطال دسترسی من</string>
+
+    <string name="room_widget_permission_display_name">نام نمایشیتان</string>
+    <string name="room_widget_permission_avatar_url">نشانی اینترنتی آواتارتان</string>
+    <string name="room_widget_permission_user_id">شناسهٔ کاربریتان</string>
+    <string name="room_widget_permission_widget_id">شناسهٔ ابزارک</string>
+    <string name="room_widget_permission_room_id">شناسهٔ اتاق</string>
+
+
+    <string name="error_jitsi_not_supported_on_old_device">متأسّفانه تماس‌های کنفرانسی با جیتسی روی افزاره‌های قدیمی (افزاره‌هایی با سیستم‌عامل اندروید زیر ۵) پشتیبانی نمی‌شود</string>
+    <string name="room_widget_resource_permission_title">این ابزارک می‌خواهد از منابع زیر استفاده کند:</string>
+    <string name="room_widget_resource_grant_permission">اجازه</string>
+    <string name="room_widget_resource_decline_permission">انسداد همه</string>
+    <string name="room_widget_webview_access_camera">استفاده از دوربین</string>
+    <string name="room_widget_webview_access_microphone">استفاده از میکروفون</string>
+    <string name="room_widget_webview_read_protected_media">خواندن رسانهٔ محافظت‌شده با DRM</string>
+
+    <string name="widget_integration_unable_to_create">ناتوان در ایجاد ابزارک.</string>
+    <string name="widget_integration_failed_to_send_request">شکست در فرستادن درخواست.</string>
+    <string name="widget_integration_positive_power_level">سطح قدرت باید عدد صحیح مثبت باشد.</string>
+    <string name="widget_integration_must_be_in_room">در این اتاق نیستید.</string>
+    <string name="widget_integration_no_permission_in_room">اجازهٔ انجامش را در این اتاق ندارید.</string>
+    <string name="widget_integration_missing_room_id">بدون room_id در درخواست.</string>
+    <string name="widget_integration_missing_user_id">بدون user_id در درخواست.</string>
+    <string name="widget_integration_room_not_visible">اتاق %s قابل مشاهده نیست.</string>
+    <string name="integration_manager_not_configured">هیچ مدیر یکپارچگی‌ای پیکربندی نشده.</string>
+    <string name="room_manage_integrations">مدیریت یکپارچگی‌ها</string>
+    <string name="room_no_active_widgets">بدون ابزارک فعّال</string>
+    <string name="settings_labs_native_camera">استفاده از دوربین بومی</string>
+    <string name="settings_labs_native_camera_summary">استفاده از دوربین سامانه به جای صفحهٔ دوربین سفارشی.</string>
+    <string name="settings_labs_keyboard_options_to_send_message">استفاده از کلید ورود صفحه‌کلید برای فرستادن پیام</string>
+    <string name="settings_labs_enable_send_voice">فرستادن پیام‌های صوتی</string>
+    <string name="settings_labs_enable_send_voice_summary">این انتخاب برای ضبط پیام نیاز به یک برنامهٔ سوم‌شخص دارد.</string>
+    <string name="widget_integration_review_terms">برای ادامه لازم است شرایط خدمت را بپذیرید.</string>
+
+    <string name="start_verification">آغاز تأیید</string>
+    <string name="start_verification_short_label">تأیید</string>
+    <string name="share_without_verifying">هم‌رسانی بدون تأیید</string>
+    <string name="share_without_verifying_short_label">هم‌رسانی</string>
+    <string name="key_share_request">درخواست هم‌رسانی کلید</string>
+    <string name="ignore_request">چشم‌پوشی از درخواست</string>
+    <string name="ignore_request_short_label">چشم‌پوشی</string>
+
+    <string name="conference_call_warning_title">هشدار!</string>
+    <string name="notification_off">خاموش</string>
+    <string name="notification_silent">خموش</string>
+    <string name="notification_noisy">پرصدا</string>
+
+    <string name="create">ایجاد</string>
+    <string name="community_name_hint">مثال</string>
+    <string name="community_id_hint">مثال</string>
+
+    <string name="group_details_home">خانه</string>
+    <string name="group_details_people">مردم</string>
+    <string name="no_users_placeholder">بدون کاربر</string>
+
+    <string name="joined">پیوست</string>
+    <string name="invited">دعوت شد</string>
+    <plurals name="group_members">
+	<item quantity="one">۱ عضو</item>
+	<item quantity="other">%d عضو</item>
+</plurals>
+
+    <string name="deactivate_account_title">غیرفعّال‌سازی حساب</string>
+    <string name="deactivate_account_submit">غیرفعّال‌سازی حساب</string>
+
+    <string name="settings_lazy_loading_description">افزایش کارایی با فقط بار کردن اعضای اتاق در نمای نخست.</string>
+    <string name="error_lazy_loading_not_supported_by_home_server">کارساز خانگیتان هنوز از بار کردن تنبلانهٔ اعضای اتاق پشتیبانی نمی‌کند. بعداً تلاش کنید.</string>
+
+    <string name="keys_backup_setup_step1_title">هرگز پیام‌های رمزشده را از دست ندهید</string>
+    <string name="keys_backup_setup">شروع با استفاده از پشتیبان کلید</string>
+    <string name="keys_backup_setup_step1_manual_export">برون‌ریزی دستی کلیدها</string>
+
+    <string name="keys_backup_setup_step2_text_title">امن کردن پشتیبانتان با یک عبارت عبور.</string>
+    <string name="keys_backup_setup_step2_button_title">تنظیم عبارت عبور</string>
+    <string name="keys_backup_setup_creating_backup">ایجاد کردن پشتیبان</string>
+    <string name="keys_backup_setup_step3_success_title">موفّق!</string>
+    <string name="keys_backup_setup_step3_button_title">انجام شد</string>
+    <string name="keys_backup_setup_step3_button_title_no_passphrase">رونوشت گرفتم</string>
+    <string name="keys_backup_setup_step3_copy_button_title">ذخیرهٔ کلید بازیابی</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">هم‌رسانی</string>
+    <string name="keys_backup_setup_step3_save_button_title">ذخیره به شکل پرونده</string>
+    <string name="keys_backup_setup_override_replace">جایگزینی</string>
+    <string name="keys_backup_setup_override_stop">توقّف</string>
+
+    <string name="keys_backup_setup_step3_please_make_copy">لطفاً رونوشتی بردارید</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">هم‌رسانی کلید بازیابی با…</string>
+    <string name="recovery_key">کلید بازیابی</string>
+    <string name="unexpected_error">خطای نامنتظره</string>
+    <string name="keys_backup_setup_backup_started_title">پشتیبان‌گیری آغاز شد</string>
+    <string name="keys_backup_restore_use_recovery_key">استفاده از کلید بازیابیتان</string>
+    <string name="keys_backup_restore_key_enter_hint">ورود کلید بازیابی</string>
+
+    <string name="keys_backup_restore_setup_recovery_key">بازیابی پیام</string>
+
+    <string name="keys_backup_restoring_computing_key_waiting_message">محاسبهٔ کلید بازیابی…</string>
+    <string name="keys_backup_recovery_code_empty_error_message">لطفاً‌یک کلید بازیابی وارد کنید</string>
+    <string name="new_recovery_method_popup_was_me">من بودم</string>
+
+    <string name="keys_backup_banner_setup_line1">هرگز پیام‌های رمزشده را از دست ندهید</string>
+    <string name="keys_backup_banner_setup_line2">شروع با استفاده از پشتیبان کلید</string>
+
+    <string name="secure_backup_banner_setup_line1">پشتیبان امن</string>
+    <string name="secure_backup_banner_setup_line2">سپرامنیتی در برابر از دست دادن دسترسی به داده‌ها و پیام‌های رمزشده</string>
+
+    <string name="keys_backup_banner_recover_line1">هرگز پیام‌های رمزشده را از دست ندهید</string>
+    <string name="keys_backup_banner_recover_line2">استفاده از پشتیبان کلید</string>
+
+    <string name="secure_backup_setup">برپایی پشتیبان امن</string>
+
+    <string name="autodiscover_invalid_response">پاسخ کشف کارساز خانگی نامعتبر</string>
+    <string name="settings_show_redacted">نمایش پیام‌های برداشته</string>
+    <string name="settings_show_redacted_summary">نمایش یک جانگه‌دار برای پیام‌های برداشته‌شده</string>
+    <string name="message_edits">ویرایش‌های پیام‌ها</string>
+    <string name="no_message_edits_found">هیچ ویرایشی پیدا نشد</string>
+
+    <string name="room_filtering_footer_title">نمی‌توانید کسی که به دنبالش هستید را بیابید؟</string>
+    <string name="room_filtering_footer_open_room_directory">مشاهدهٔ شاخهٔ اتاق</string>
+
+    <string name="labs_merge_e2e_in_timeline">ادغام پیام‌های شکست‌خورده در رمزگشایی در خط زمانی</string>
+    <string name="labs_show_unread_notifications_as_tab">افزودن زبانه‌ای اختصاصی روی صفحهٔ اصلی برای آگاهی‌های خوانده‌نشده.</string>
+
+    <string name="link_copied_to_clipboard">پیوند در تخته‌گیره رونشت شد</string>
+
+    <string name="creating_direct_room">ایجاد کردن اتاق…</string>
+    <string name="direct_room_start_search">برغای گرفتن نتایج، شروع به نوشتن کنید</string>
+    <string name="joining_room">پیوستن به اتاق…</string>
+
+    <string name="message_view_edit_history">مشاهدهٔ تاریخچهٔ ویرایش</string>
+
+    <string name="terms_of_service">شرایط خدمت</string>
+    <string name="review_terms">بازبینی شرایط</string>
+    <string name="terms_description_for_identity_server">قابل‌مشاهده بودن برای دیگران</string>
+    <string name="terms_description_for_integration_manager">استفاده از بات‌ها،پل‌ها، ابزارک‌ها و بسته‌های برچسب</string>
+
+    <string name="identity_server">کارساز هویت</string>
+    <string name="disconnect_identity_server">قطع از کارساز هویت</string>
+    <string name="add_identity_server">پیکربندی کارساز هویت</string>
+    <string name="change_identity_server">تغییر کارساز هویت</string>
+    <string name="settings_discovery_emails_title">نشانی‌های رایانامهٔ قابل‌کشف</string>
+    <string name="settings_discovery_no_mails">گزینه‌های کشف به محض افزودن یک رایانامه، ظاهر خواهند شد.</string>
+    <string name="settings_discovery_no_msisdn">گزینه‌های کشف به محض افزودن یک شماره تلفن، ظاهر خواهند شد.</string>
+    <string name="settings_discovery_msisdn_title">شماره تلفن‌های قابل‌کشف</string>
+    <string name="settings_discovery_mail_pending">منتظر</string>
+
+    <string name="labs_allow_extended_logging">به کار انداختن گزارش‌های پرگو.</string>
+    <string name="labs_allow_extended_logging_summary">گزارش‌های پرگو با فراهم کردن گزارش‌های بیش‌تر هنگام تکان دادن محکم گوشی، به توسعه‌دهندگان کمک می‌کند. حتا هنگام به کار افتاده بودن هم برنامه، محتوای پیام یا هیچ دادهٔ خصوصی دیگری را گزارش نمی‌کند.</string>
+
+
+    <string name="attachment_type_file">پرونده</string>
+    <string name="attachment_type_contact">مخاطب</string>
+    <string name="attachment_type_camera">دوربین</string>
+    <string name="attachment_type_audio">صدا</string>
+    <string name="attachment_type_gallery">جُنگ</string>
+    <string name="attachment_type_sticker">برچسب</string>
+    <string name="uploads_media_title">رسانه</string>
+    <string name="uploads_media_no_result">هیچ رسانه‌ای در این اتاق نیست</string>
+    <string name="uploads_files_title">پرونده‌ها</string>
+    <string name="uploads_files_subtitle">%1$s در %2$s</string>
+    <string name="uploads_files_no_result">هیچ پرونده‌ای در این اتاق نیست</string>
+
+    <string name="room_list_quick_actions_notifications_all_noisy">تمام پیام‌ها (پرصدا)</string>
+    <string name="room_list_quick_actions_notifications_all">تمام پیام‌ها</string>
+    <string name="room_list_quick_actions_notifications_mentions">فقط اشاره‌ها</string>
+    <string name="room_list_quick_actions_notifications_mute">خموش</string>
+    <string name="room_list_quick_actions_favorite_add">افزودن به محبوب‌ها</string>
+    <string name="room_list_quick_actions_favorite_remove">برداشتن از محبوب‌ها</string>
+    <string name="room_list_quick_actions_leave">ترک اتاق</string>
+    <string name="notice_member_no_changes">%1$s تغییری ایجاد نکرد</string>
+    <string name="notice_member_no_changes_by_you">تغییری ایجاد نکردید</string>
+    <string name="reaction_search_type_hint">برای یافتن واکنش، کلیدواژگان را بنویسید.</string>
+
+    <string name="no_ignored_users">از هیچ کاربری چشم نمی‌پوشید</string>
+
+    <string name="login_server_modular_text">میزبانی حرفه‌ای برای سازمان‌ها</string>
+    <string name="login_server_modular_learn_more">بیش‌تر بدانید</string>
+    <string name="login_server_other_title">دیگر</string>
+    <string name="login_continue">ادامه</string>
+    <string name="login_connect_to">وصل شدن به %1$s</string>
+    <string name="login_connect_to_modular">وصل شدن به حدمات ماتریکس المنت</string>
+    <string name="login_connect_to_a_custom_server">وصل شدن به یک کارساز سفارشی</string>
+    <string name="login_signin_to">ورود به %1$s</string>
+    <string name="login_signup">نام‌نویسی</string>
+    <string name="login_signin">ورود</string>
+    <string name="login_signin_sso">ادامه با ورود یکپارچه</string>
+
+    <string name="login_server_url_form_modular_hint">نشانی خدمات ماتریکس المنت</string>
+    <string name="login_server_url_form_other_hint">نشانی</string>
+    <string name="login_server_url_form_modular_text">میزبانی حرفه‌ای برای سازمان‌ها</string>
+    <string name="login_reset_password_email_hint">رایانامه</string>
+    <string name="login_reset_password_warning_title">هشدار!</string>
+    <string name="login_reset_password_warning_submit">ادامه</string>
+
+    <string name="login_reset_password_success_title">موفق!</string>
+    <string name="login_reset_password_success_submit">بازگشت به ورود</string>
+
+    <string name="login_reset_password_cancel_confirmation_title">هشدار</string>
+    <string name="login_set_email_title">تنظیم نشانی رایانامه</string>
+    <string name="login_set_email_mandatory_hint">رایانامه</string>
+    <string name="login_set_email_optional_hint">رایانامه (اختیاری)</string>
+    <string name="login_set_email_submit">بعدی</string>
+
+    <string name="login_set_msisdn_title">تنظیم شماره تلفن</string>
+    <string name="login_set_msisdn_notice2">لطفاً از قالب بین‌المللی استفاده کنید.</string>
+    <string name="login_set_msisdn_mandatory_hint">شماره تلفن</string>
+    <string name="login_set_msisdn_optional_hint">شماره تلفن (اختیاری)</string>
+    <string name="login_set_msisdn_submit">بعدی</string>
+
+    <string name="login_msisdn_confirm_title">تأیید شماره تلفن</string>
+    <string name="login_msisdn_confirm_hint">ورود رمز</string>
+    <string name="login_msisdn_confirm_send_again">فرستادن دوباره</string>
+    <string name="login_msisdn_confirm_submit">بعدی</string>
+
+    <string name="login_msisdn_notice">لطفاً از قالب بین‌المللی استفاده کنید (شماره تلفن باید با + شروع شود)</string>
+    <string name="login_msisdn_error_not_international">شماره تلفن‌های بین‌المللی باید با + شروع شوند</string>
+    <string name="login_signup_username_hint">نام کاربری</string>
+    <string name="login_signup_submit">بعدی</string>
+    <string name="login_signup_error_user_in_use">نام کاربری گرفته شده</string>
+    <string name="login_signup_cancel_confirmation_title">هشدار</string>
+    <string name="login_connect_using_matrix_id_submit">ورود با شناسهٔ ماتریکس</string>
+    <string name="login_signin_matrix_id_title">ورود با شناسهٔ ماتریکس</string>
+    <string name="login_signin_matrix_id_hint">شناسهٔ ماتریکس</string>
+    <string name="seen_by">دیده شده به دست</string>
+
+    <string name="signed_out_title">خارج شده‌اید</string>
+    <string name="signed_out_submit">ورود دوباره</string>
+
+    <string name="soft_logout_title">خارج شده‌اید</string>
+    <string name="soft_logout_signin_title">ورود</string>
+    <string name="soft_logout_signin_submit">ورود</string>
+    <string name="soft_logout_clear_data_title">پاک‌سازی داده‌های شخصی</string>
+    <string name="soft_logout_clear_data_submit">پاک‌سازی تمامی داده‌ها</string>
+
+    <string name="soft_logout_clear_data_dialog_title">پاک‌سازی داده</string>
+    <string name="soft_logout_clear_data_dialog_submit">پاک‌سازی داده</string>
+    <string name="bug_report_error_too_short">شرح بیش از حد کوتاه است</string>
+
+    <string name="notification_initial_sync">همگام‌سازی نخستین…</string>
+
+    <string name="settings_developer_mode_summary">حالت توسعه‌دهنده ویژگی‌های پنهان را فعّال کرده و همچنین ممکن است پایداری برنامه را کاهش دهد. فقط برای توسعه‌دهنگان!</string>
+    <string name="settings_rageshake_detection_threshold">آستانهٔ تشخیص</string>
+    <string name="settings_rageshake_detection_threshold_summary">برای آزمودن آستانهٔ تشخیص، تلفنتان را تکان دهید</string>
+    <string name="devices_current_device">نشست جاری</string>
+    <string name="autocomplete_limited_results">فقط نمایش نخستین نتایج. حرف‌های بیش‌تری بنویسید…</string>
+
+    <string name="settings_developer_mode_fail_fast_title">شکست سریع</string>
+    <string name="settings_developer_mode_fail_fast_summary">المنت ممکن است هنگام رخ دادن خطای نامنتظره،‌بیش‌تر فروبپاشد</string>
+
+    <string name="create_room_encryption_title">به کار انداختن رمزنگاری</string>
+    <string name="create_room_encryption_description">پس از به کار افتادن، رمزنگاری قابل از کار انداختن نیست.</string>
+
+    <string name="verification_conclusion_warning">ورود نامطمئن</string>
+    <string name="verification_sas_match">مطابقند</string>
+    <string name="verification_sas_do_not_match">مطابق نیستند</string>
+    <string name="verification_conclusion_not_secure">ناامن</string>
+    <string name="sent_a_video">ویدیو.</string>
+    <string name="sent_an_image">تصویر.</string>
+    <string name="sent_an_audio_file">صدا</string>
+    <string name="sent_a_file">پرونده</string>
+    <string name="send_a_sticker">برچسب</string>
+    <string name="sent_a_poll">نظرسنجی</string>
+    <string name="sent_a_bot_buttons">دکمه‌های بات</string>
+    <string name="sent_a_reaction">واکنش داده با: %s</string>
+    <string name="sent_verification_conclusion">نتیجه‌گیری تأیید</string>
+
+    <string name="verification_request_waiting">در حال انتظار…</string>
+    <string name="verification_request_other_cancelled">%s لغو شد</string>
+    <string name="verification_request_you_cancelled">لغو کردید</string>
+    <string name="verification_request_other_accepted">%s پذیرفت</string>
+    <string name="verification_request_you_accepted">پذیرفتید</string>
+    <string name="verification_sent">تأییدیه فرستاده شد</string>
+    <string name="verification_request">درخواست تأییدیه</string>
+    <string name="verification_verify_device">تأیید این نشست</string>
+    <string name="verification_verify_device_manually">تأیید دستی</string>
+
+    <string name="you">شما</string>
+
+    <string name="verification_scan_notice">برای تأیید امن یکدیگر* رمز را با افزارهٔ کاربر دیگر بپویید</string>
+    <string name="verification_scan_their_code">رمزش را بپویید</string>
+    <string name="verification_scan_emoji_title">ناتوانی در پویش</string>
+    <string name="verification_scan_emoji_subtitle">اگر کنار هم نیستید، به‌جایش اموجی‌ها را مقایسه کنید</string>
+
+    <string name="verification_no_scan_emoji_title">تأیید با مقایسهٔ اموجی‌ها</string>
+
+    <string name="verify_by_emoji_title">تأیید با اموجی</string>
+    <string name="verify_by_emoji_description">اگر نمی‌توانید رمز بالا را بپویید، با مقایسهٔ گزیده‌ای خاص و کوتاه از اموجی‌ها، تأیید کنید.</string>
+
+    <string name="a13n_qr_code_description">تصویر رمز QR</string>
+
+    <string name="verification_verify_user">تأیید %s</string>
+    <string name="verification_verified_user">%s تأیید شد</string>
+    <string name="verification_request_waiting_for">منتظر %s…</string>
+    <string name="room_profile_not_encrypted_subtitle">پیام‌های این اتاق، رمزنگاری سرتاسری نشده‌اند.</string>
+    <string name="room_profile_encrypted_subtitle">پیام‌های این اتاق، رمزنگاری سرتاسری شده‌اند.
+\n
+\nپیام‌هایتان با قفل‌هایی امن شده‌اند و فقط شما و گیرندگان دیگر، کلیدهای یکتا را برای قفل‌گشاییشان دارید.</string>
+    <string name="room_profile_section_security">امنیت</string>
+    <string name="room_profile_section_security_learn_more">بثیش‌تر بدانید</string>
+    <string name="room_profile_section_more">بیش‌تر</string>
+    <string name="room_profile_section_admin">کنش‌های مدیر</string>
+    <string name="room_profile_section_more_settings">تنظمیات اتاق</string>
+    <plurals name="room_profile_section_more_member_list">
+	<item quantity="one">۱ نفر</item>
+	<item quantity="other">%1$d نفر</item>
+</plurals>
+    <string name="room_profile_section_more_uploads">بارگذاری‌ها</string>
+    <string name="room_profile_section_more_leave">ترک اتاق</string>
+    <string name="room_profile_leaving_room">ترک کردن اتاق…</string>
+
+    <string name="room_member_power_level_admins">مدیران</string>
+    <string name="room_member_power_level_moderators">ناظم‌ها</string>
+    <string name="room_member_power_level_custom">سفارشی</string>
+    <string name="room_member_power_level_invites">دعوت‌ها</string>
+    <string name="room_member_power_level_users">کاربران</string>
+
+    <string name="room_member_power_level_admin_in">مدیر در %1$s</string>
+    <string name="room_member_power_level_moderator_in">ناظم در %1$s</string>
+    <string name="room_member_power_level_default_in">پیش گزیده در %1$s</string>
+    <string name="room_member_power_level_custom_in">سفارشی (%1$d) در %2$s</string>
+
+    <string name="room_member_jump_to_read_receipt">پرش به رسیدِ خواندن</string>
+
+    <string name="unignore">چشم‌ناپوشی</string>
+
+    <string name="room_settings_enable_encryption_warning">پس از به کار افتادن، رمزنگاری قابل از کار انداختن نیست.</string>
+
+    <string name="room_settings_enable_encryption_dialog_submit">به کار انداختن رمزنگاری</string>
+
+    <string name="encryption_information_cross_signing_state">ورود چندگانه</string>
+    <string name="encryption_information_dg_xsigning_complete">ورود چندگانه به کار افتاده
+\nکلیدهای خصوصی روی دستگاه.</string>
+    <string name="encryption_information_dg_xsigning_trusted">ورود چندگانه به کار افتاده
+\nکلیدها مورد اعتمادند.
+\nکلیدهای خصوصی ناشناخته</string>
+    <string name="encryption_information_dg_xsigning_not_trusted">ورود چندگانه به کار افتاده.
+\nکلیدها مورد اعتماد نیستند</string>
+    <string name="encryption_information_dg_xsigning_disabled">ورود چندگانه به کار نیفتاده</string>
+
+    <string name="settings_hs_admin_e2e_disabled">مدیر کارسازتان رمزنگاری سرتاسری پیش‌گزیده را در اتاق‌های خصوصی و پیام‌های مستقیم از کار انداخته است.</string>
+    <string name="settings_active_sessions_signout_device">خروج از این نشست</string>
+
+    <string name="crosssigning_verify_this_session">تأیید این ورود</string>
+    <string name="crosssigning_other_user_not_trust">ممکن است دیگر کاربران، به آن اعتماد نکنند</string>
+    <string name="complete_security">تکمیل امنیت</string>
+
+    <string name="verification_open_other_to_verify">استفاده از نشستی موجود برای تأییدش که به پیام‌های رمزشده دسترسی می‌دهد.</string>
+
+
+    <string name="verification_profile_verify">تأیید</string>
+    <string name="verification_profile_verified">تأیید‌شده</string>
+    <string name="verification_profile_warning">هشدار</string>
+
+    <string name="trusted">مورد اعتماد</string>
+    <string name="not_trusted">بدون اعتماد</string>
+
+    <string name="reset_cross_signing">بازنشانی کلیدها</string>
+
+    <string name="a11y_qr_code_for_verification">رمز QR</string>
+
+    <string name="qr_code_scanned_by_other_notice">تقریباً تمام شد! آیا %s همین سپر را نشان می‌دهد؟</string>
+    <string name="qr_code_scanned_by_other_yes">بله</string>
+    <string name="qr_code_scanned_by_other_no">خیر</string>
+
+    <string name="no_connectivity_to_the_server_indicator">اتّصال به کارساز از دست رفت</string>
+    <string name="no_connectivity_to_the_server_indicator_airplane">حالت هواپیما روشن است</string>
+
+    <string name="settings_account_data">داده‌های حساب</string>
+    <plurals name="poll_info">
+	<item quantity="one">%d رأی</item>
+	<item quantity="other">%d رأی</item>
+</plurals>
+    <plurals name="poll_info_final">
+	<item quantity="one">%d رأی - نتایج نهایی</item>
+	<item quantity="other">%d رأی - نتایج نهایی</item>
+</plurals>
+    <string name="poll_item_selected_aria">انتخاب گزیده</string>
+    <string name="command_description_poll">ایجاد نظرسنجی‌ای ساده</string>
+    <string name="verification_cannot_access_other_session">استفاده از یک کلید یا عبارت بازیابی</string>
+    <string name="verification_use_passphrase">اگر به نشست‌های موجود دسترسی ندارید</string>
+
+    <string name="new_signin">ورود جدید</string>
+
+    <string name="enter_secret_storage_passphrase_warning">هشدار:</string>
+    <string name="message_action_item_redact">برداشتن…</string>
+    <string name="share_confirm_room">می‌خواهید این پیوست را به %1$s بفرستید؟</string>
+    <plurals name="send_images_with_original_size">
+	<item quantity="one">فرستادن تصویر با اندازهٔ اصلی</item>
+	<item quantity="other">فرستادن تصویرها با اندازهٔ اصلی</item>
+</plurals>
+
+    <string name="delete_event_dialog_title">تأیید برداشت</string>
+    <string name="delete_event_dialog_reason_checkbox">آوردن دلیل</string>
+    <string name="login_default_session_public_name">المنت اندروید</string>
+
+    <string name="settings_key_requests">درخواست‌های کلید</string>
+
+    <string name="e2e_use_keybackup">قفل‌گشایی از تاریخچهٔ پیام‌های رمزشده</string>
+
+    <string name="refresh">نوسازی</string>
+
+    <string name="new_session">ورود جدید. خودتان بودید؟</string>
+    <string name="new_session_review">برای بازبینی و تأیید بزنید</string>
+    <string name="verify_new_session_was_not_me">من نبودم</string>
+    <string name="verify_cancelled_notice">تأیید افزاره‌هایتان از تنظیمات.</string>
+    <string name="verification_cancelled">تأیید لغو شد</string>
+
+    <string name="recovery_passphrase">عبارت عبور بازیابی</string>
+    <string name="message_key">کلید پیام</string>
+    <string name="set_recovery_passphrase">تنظیم یک %s</string>
+    <string name="generate_message_key">تولید یک کلید پیام</string>
+
+    <string name="confirm_recovery_passphrase">تأیید %s</string>
+
+    <string name="enter_account_password">برای ادامه %s تان را وارد کنید.</string>
+
+    <string name="bootstrap_loading_title">برپایی بازیابی.</string>
+    <string name="your_recovery_key">کلید بازیابیتان</string>
+    <string name="settings_troubleshoot_title">رفع‌اشکال</string>
+    <string name="settings_notification_advanced_summary">تنظیم اهمّیت آگاهی بر حسب رویداد</string>
+
+    <string name="room_message_placeholder">پیام…</string>
+
+    <string name="upgrade_security">ارتقای رمزنگاری موجود است</string>
+    <string name="use_file">استفاده از پرونده</string>
+
+    <string name="backup_recovery_passphrase">عبارت عبور بازیابی</string>
+    <string name="bootstrap_invalid_recovery_key">این یک کلید بازیابی معتبر نیست</string>
+    <string name="recovery_key_empty_error_message">لطفاً‌یک کلید بازیابی وارد کنید</string>
+
+    <string name="bootstrap_progress_checking_backup">بررسی کردن کلید پشتیبان</string>
+    <string name="bootstrap_progress_checking_backup_with_info">بررسی کردن کلید پشتیبان (%s)</string>
+    <string name="new_session_review_with_info">%1$s (%2$s)</string>
+
+    <string name="bootstrap_migration_enter_backup_password">برای ادامه،‌عبارت عبور پشتیبان کلیدتان را وارد کنید.</string>
+    <string name="bootstrap_migration_use_recovery_key">استفاده از کلید بازیابی پشتیبان کلیدتان</string>
+    <string name="bootstrap_migration_backup_recovery_key">کلید بازیابی پشتیبان کلید</string>
+
+    <string name="settings_security_prevent_screenshots_title">جلوگیری از نماگرفت کاره</string>
+    <string name="settings_security_prevent_screenshots_summary">به کار انداختن این انتخاب، FLAG_SECURE را به تمامی فعّالیت‌ها می‌افزاید. برای اثرگذاری تغییر، برنامه را دوباره شروع کنید.</string>
+
+    <string name="media_file_added_to_gallery">پروندهٔ رسانه‌ای به جُنگ افزوده شد</string>
+    <string name="app_desktop_web">المنت وب
+\nالمنت میزکار</string>
+    <string name="app_ios_android">المنت آی‌اواس
+\nالمنت اندروید</string>
+    <string name="use_recovery_key">استفاده از کلید بازیابی</string>
+    <string name="encrypted_unverified">رمزشده به دست افزاره‌ای تأییدنشده</string>
+    <string name="error_empty_field_choose_user_name">لطفاً نام کاربری‌ای برگزینید.</string>
+    <string name="error_empty_field_choose_password">لطفاً گذرواژه‌ای برگزینید.</string>
+    <string name="external_link_confirmation_title">این پیوند را دوباره بررسی کنید</string>
+    <string name="external_link_confirmation_message">پیوند %1$s به پایگاه دیگری می‌بردتان: %2$s.
+\n
+\nمطمئنید که می‌خواهید ادامه دهید؟</string>
+
+    <string name="add_members_to_room">افزودن اعضا</string>
+    <string name="invite_users_to_room_action_invite">دعوت</string>
+    <string name="inviting_users_to_room">دعوت کردن کاربران…</string>
+    <string name="invite_users_to_room_title">دعوت کاربران</string>
+    <string name="invitation_sent_to_one_user">دعوت برای %1$s فرستاده شد</string>
+    <string name="invitations_sent_to_two_users">دعوت برای %1$s و %2$s فرستاده شد</string>
+    <plurals name="invitations_sent_to_one_and_more_users">
+	<item quantity="one">دعوت برای %1$s و یک نفر دیگر فرستاده شد</item>
+	<item quantity="other">دعوت برای %1$s و %2$d نفر دیگر فرستاده شد</item>
+</plurals>
+    <string name="choose_locale_current_locale_title">زبان جاری</string>
+    <string name="choose_locale_other_locales_title">دیگر زبان‌های موجود</string>
+    <string name="choose_locale_loading_locales">بار کردن زبان‌های موچود…</string>
+
+    <string name="open_terms_of">گشودن شرایط %s</string>
+    <string name="a11y_stop_camera">توقّف دوربین</string>
+    <string name="a11y_start_camera">شروع دوربین</string>
+
+    <string name="settings_setup_secure_backup">برپایی پشتیبان امن</string>
+
+    <string name="bottom_sheet_setup_secure_backup_title">پشتیبان امن</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">سپرامنیتی در برابر از دست دادن دسترسی به داده‌ها و پیام‌های رمزشده با پشتیبان گیری از کلیدها روی کارسازتان.</string>
+    <string name="room_settings_name_hint">نام اتاق</string>
+    <string name="room_settings_topic_hint">موضوع</string>
+    <string name="element_disclaimer_negative_button">گرفتم</string>
+    <string name="element_disclaimer_positive_button">اطّلاعات بیش‌تر</string>
+
+    <string name="element_login_splash_brand">المنت</string>
+
+
+    </resources>

From ecdec83c37b94a1e83cfb0db50aee8cecce53fc4 Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Sun, 11 Oct 2020 15:38:41 +0000
Subject: [PATCH 210/278] Translated using Weblate (Persian)

Currently translated at 100.0% (168 of 168 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.riot.im/projects/element-android/element-sdk/fa/
---
 .../src/main/res/values-fa/strings.xml        | 106 ++++++++++++++++--
 1 file changed, 99 insertions(+), 7 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-fa/strings.xml b/matrix-sdk-android/src/main/res/values-fa/strings.xml
index b88a98459d..72610aa31c 100644
--- a/matrix-sdk-android/src/main/res/values-fa/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fa/strings.xml
@@ -40,10 +40,10 @@
     <string name="notice_avatar_changed_too">(تصویر هم عوض شد)</string>
     <string name="notice_room_name_removed">%1$s نام اتاق را پاک کرد</string>
     <string name="notice_room_topic_removed">%1$s موضوع اتاق را پاک کرد</string>
-    <string name="notice_event_redacted">پیام پاک شد</string>
-    <string name="notice_event_redacted_by">پیام به دست %1$s پاک شد</string>
-    <string name="notice_event_redacted_with_reason">پیام پاک شد [دلیل: %1$s]</string>
-    <string name="notice_event_redacted_by_with_reason">پیام به دست %1$s پاک شد [دلیل: %2$s]</string>
+    <string name="notice_event_redacted">پیام برداشته شد</string>
+    <string name="notice_event_redacted_by">پیام به دست %1$s برداشته شد</string>
+    <string name="notice_event_redacted_with_reason">پیام برداشته شد [دلیل: %1$s]</string>
+    <string name="notice_event_redacted_by_with_reason">پیام به دست %1$s برداشته شد [دلیل: %2$s]</string>
     <string name="notice_room_third_party_invite">%1$s دعوتی برای پیوستن %2$s به اتاق فرستاد</string>
     <string name="notice_room_third_party_revoked_invite">%1$s دعوت پیوستن به اتاق %2$s را باطل کرد</string>
     <string name="notice_room_third_party_registered_invite">%1$s دعوت برای %2$s را پذیرفت</string>
@@ -56,7 +56,7 @@
     <string name="message_failed_to_upload">شکست در بارگذاری تصویر</string>
 
     <string name="network_error">خطای شبکه</string>
-    <string name="matrix_error">خطای ماتریس</string>
+    <string name="matrix_error">خطای ماتریکس</string>
 
     <string name="room_error_join_failed_empty_room">در حال حاضر امکان بازپیوست به اتاقی خالی وجود ندارد‌‌.</string>
 
@@ -135,6 +135,98 @@
     <string name="key_verification_request_fallback_message">%s درخواست تأیید کلیدتان را دارد، ولی کارخواهتان تأیید کلید درون گپ را پشتیبانی نمی‌کند. برای تأیید کلیدها لازم است از تأییدیهٔ کلید قدیمی استفاده کنید.</string>
 
     <string name="notice_room_created">%1$s اتاق را ایجاد کرد</string>
-    <string name="notice_profile_change_redacted">%1$s نمایه خود را به‌روز کرد %2$s</string>
+    <string name="notice_profile_change_redacted">%1$s نمایه‌اش را به‌روز کرد %2$s</string>
     <string name="could_not_redact">نمی‌توان ویرایش کرد</string>
-</resources>
+<string name="summary_you_sent_image">تصویری فرستادید.</string>
+    <string name="summary_you_sent_sticker">برچسبی فرستادید.</string>
+
+    <string name="notice_room_invite_no_invitee_by_you">دعوتتان</string>
+    <string name="notice_room_created_by_you">اتاق را ایجاد کردید</string>
+    <string name="notice_room_invite_by_you">از %1$s دعوت کردید</string>
+    <string name="notice_room_join_by_you">به اتاق پیوستید</string>
+    <string name="notice_room_leave_by_you">اتاق را ترک کردید</string>
+    <string name="notice_room_reject_by_you">دعوت را رد کردید</string>
+    <string name="notice_room_kick_by_you">%1$s را اخراج کردید</string>
+    <string name="notice_room_unban_by_you">تحریم %1$s را برداشتید</string>
+    <string name="notice_room_ban_by_you">%1$s را تحریم کردید</string>
+    <string name="notice_room_withdraw_by_you">دعوت %1$s را پس‌گرفتید</string>
+    <string name="notice_avatar_url_changed_by_you">آواتارتان را عوض کردید</string>
+    <string name="notice_display_name_set_by_you">نام نمایشیتان را به %1$s تغییر دادید</string>
+    <string name="notice_display_name_changed_from_by_you">نام نمایشیتان را از %1$s به %2$s تغییر دادید</string>
+    <string name="notice_display_name_removed_by_you">نام نمایشیتان را برداشتید (%1$s بود)</string>
+    <string name="notice_room_topic_changed_by_you">موضوع را به %1$s تغییر دادید</string>
+    <string name="notice_room_avatar_changed">%1$s آواتار اتاق را تغییر داد</string>
+    <string name="notice_room_avatar_changed_by_you">آواتار اتاق را تغییر دادید</string>
+    <string name="notice_room_name_changed_by_you">نام اتاق را به %1$s تغییر دادید</string>
+    <string name="notice_placed_video_call_by_you">تماس تصویری گرفتید.</string>
+    <string name="notice_placed_voice_call_by_you">تماس صوتی گرفتید.</string>
+    <string name="notice_call_candidates">%s برای برپایی تماس، داده فرستاد.</string>
+    <string name="notice_call_candidates_by_you">برای برپایی تماس، داده فرستادید.</string>
+    <string name="notice_answered_call_by_you">تماس را پاسخ دادید.</string>
+    <string name="notice_ended_call_by_you">به تماس پایان دادید.</string>
+    <string name="notice_made_future_room_visibility_by_you">تاریخچهٔ آتی اتاق را برای %1$s نمایان کردید</string>
+    <string name="notice_end_to_end_by_you">رمزنگاری سرتاسری را روشن کردید (%1$s)</string>
+    <string name="notice_room_update_by_you">این اتاق را ارتقا دادید.</string>
+
+    <string name="notice_requested_voip_conference_by_you">دارخواست کنفرانس ویپ دادید</string>
+    <string name="notice_room_name_removed_by_you">نام اتاق را برداشتید</string>
+    <string name="notice_room_topic_removed_by_you">موضوع اتاق را برداشتید</string>
+    <string name="notice_room_avatar_removed">%1$s آواتار اتاق را برداشت</string>
+    <string name="notice_room_avatar_removed_by_you">آواتار اتاق را برداشتید</string>
+    <string name="notice_profile_change_redacted_by_you">نمایه‌تان را به‌روز کردید %1$s</string>
+    <string name="notice_room_third_party_invite_by_you">برای %1$s دعوت پیوستن به اتاق فرستادید</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">دعوت پیوستن %1$s به اتاق را پس گرفتید</string>
+    <string name="notice_room_third_party_registered_invite_by_you">دعوت برای %1$s را پذیرفتید</string>
+
+    <string name="notice_widget_added">%1$s ابزارک %2$s را افزود</string>
+    <string name="notice_widget_added_by_you">ابزارک %1$s را افزودید</string>
+    <string name="notice_widget_removed">%1$s ابزارک %2$s را برداشت</string>
+    <string name="notice_widget_removed_by_you">ابزارک %1$s را برداشتید</string>
+    <string name="notice_widget_modified">%1$s ابزارک %2$s را دستکاری کرد</string>
+    <string name="notice_widget_modified_by_you">ابزارک %1$s را دستکاری کردید</string>
+
+    <string name="power_level_admin">مدیر</string>
+    <string name="power_level_moderator">ناظم</string>
+    <string name="power_level_default">پیش‌گزیده</string>
+    <string name="power_level_custom">سفارشی (%1$d)</string>
+    <string name="power_level_custom_no_value">سفارشی</string>
+
+    <string name="notice_power_level_changed_by_you">سطح قدرت %1$s را تغییر دادید.</string>
+    <string name="notice_power_level_changed">%1$s سطح قدرت %2$s را تغییر داد.</string>
+    <string name="notice_power_level_diff">%1$s از %2$s به %3$s</string>
+
+    <string name="notice_room_invite_no_invitee_with_reason_by_you">دعوتتان. دلیل: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">%1$s را دعوت کردید. دلیل: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">به اتاق پیوستید. دلیل: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">اتاق را ترک کردید. دلیل: %1$s</string>
+    <string name="notice_room_reject_with_reason_by_you">دعوت را رد کردید. دلیل: %1$s</string>
+    <string name="notice_room_kick_with_reason_by_you">%1$s را اخراج کردید. دلیل: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">تحریم %1$s را برداشتید. دلیل: %2$s</string>
+    <string name="notice_room_ban_with_reason_by_you">%1$s را تحریم کردید. دلیل: %2$s</string>
+    <string name="notice_room_third_party_invite_with_reason_by_you">دعوتی به %1$s برای پیوستن به اتاق فرستادید. دلیل: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason_by_you">دعوت %1$s برای پیوستن به اتاق را پس گرفتید. دلیل: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">دعوت برای %1$s را پذیرفتید. دلیل: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">دعوت %1$s را رد کردید. دلیل: %2$s</string>
+
+    <plurals name="notice_room_aliases_added_by_you">
+	<item quantity="one">نشانی %1$s را به این اتاق افزودید.</item>
+	<item quantity="other">نشانی‌های %1$s را به این اتاق افزودید.</item>
+</plurals>
+
+    <plurals name="notice_room_aliases_removed_by_you">
+	<item quantity="one">نشانی %1$s ار از این اتاق برداشتید.</item>
+	<item quantity="other">نشانی‌های %1$s ار از این اتاق برداشتید.</item>
+</plurals>
+
+    <string name="notice_room_aliases_added_and_removed_by_you">نشانی %1$s ار افزوده و %2$s را از این اتاق برداشتید.</string>
+
+    <string name="notice_room_canonical_alias_set_by_you">نشانی اصلی این اتاق را به %1$s تنظیم کردید.</string>
+    <string name="notice_room_canonical_alias_unset_by_you">نشانی اصلی این اتاق را برداشتید.</string>
+
+    <string name="notice_room_guest_access_can_join_by_you">به میهمانان اجازهٔ پیوستن به گروه دادید.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">میمهانان را از پیوستن به گروه بازداشتید.</string>
+
+    <string name="notice_end_to_end_ok_by_you">رمزنگاری سرتاسری را روشن کردید.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم ناشناخته %1$s).</string>
+
+    </resources>

From 9c6ea95df89e0e6513a0be5823cedc75f3ebc115 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Fri, 9 Oct 2020 18:11:35 +0000
Subject: [PATCH 211/278] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1874 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/pt_BR/
---
 vector/src/main/res/values-pt-rBR/strings.xml | 149 ++++++++++--------
 1 file changed, 81 insertions(+), 68 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index fbf710feaf..5e66462496 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -543,7 +543,7 @@
 
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acesso e visibilidade</string>
-    <string name="room_settings_directory_visibility">Exibir esta sala no diretório público de salas</string>
+    <string name="room_settings_directory_visibility">Exibir esta sala na lista pública de salas</string>
     <string name="room_settings_room_access_rules_pref_title">Acesso à sala</string>
     <string name="room_settings_room_read_history_rules_pref_title">Legibilidade do histórico da sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Quem pode ler o histórico de mensagens?</string>
@@ -1180,7 +1180,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_is_not_finished_please_wait">Backup de chaves não está concluído. Por favor, aguarde…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Você perderá suas mensagens criptografadas se sair agora</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Backup de chave em andamento. Se você sair agora, perderá o acesso às suas mensagens criptografadas.</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">O backup de chave segura deve estar ativado em todas as suas sessões, para evitar perder o acesso às suas mensagens criptografadas.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">O backup de chave deve estar ativado em todas as suas sessões, para evitar perder o acesso às suas mensagens criptografadas.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Não quero minhas mensagens criptografadas</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Fazendo backup das chaves…</string>
     <string name="keys_backup_activate">Use o backup de chave</string>
@@ -1331,14 +1331,14 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_set_workmanager_delay_summary">%s
 \nA sincronização pode ser adiada dependendo dos recursos (bateria) ou do estado do aparelho (modo de suspensão).</string>
     <string name="settings_integrations">Integrações</string>
-    <string name="settings_integrations_summary">Use o Gerenciador de Integrações para gerenciar bots, pontes, widgets e pacotes de figurinhas.
+    <string name="settings_integrations_summary">Use o Gerenciador de Integrações para gerenciar bots, integrações, widgets e pacotes de figurinhas. 
 \nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.</string>
     <string name="settings_send_message_with_enter_summary">Botão enter do teclado enviará a mensagem em vez de adicionar uma quebra de linha</string>
 
-    <string name="settings_secure_backup_section_title">Backup Seguro</string>
+    <string name="settings_secure_backup_section_title">Backup online</string>
     <string name="settings_secure_backup_manage">Gerenciar</string>
-    <string name="settings_secure_backup_setup">Configurar Backup Seguro</string>
-    <string name="settings_secure_backup_reset">Restaurar Backup Seguro</string>
+    <string name="settings_secure_backup_setup">Configurar backup online</string>
+    <string name="settings_secure_backup_reset">Restaurar backup online</string>
     <string name="settings_secure_backup_enter_to_setup">Configurar neste aparelho</string>
     <string name="settings_secure_backup_section_info">Prevenir contra a perda de acesso a mensagens e dados encriptados, guardando as chaves de encriptação no seu servidor.</string>
     <string name="reset_secure_backup_title">Gerar uma nova Chave de Segurança ou definir uma nova Frase de Segurança para o seu backup existente.</string>
@@ -1375,7 +1375,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="encryption_exported_successfully">Chaves exportadas com sucesso</string>
 
     <string name="encryption_message_recovery">Recuperação de mensagens criptografadas</string>
-    <string name="encryption_settings_manage_message_recovery_summary">Gerenciar Backup das Chaves</string>
+    <string name="encryption_settings_manage_message_recovery_summary">Configurar backup das chaves</string>
 
     <string name="encryption_information_unknown_ip">IP desconhecido</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -1452,23 +1452,23 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_no_session_error">Nenhuma sessão Matrix disponível</string>
 
     <string name="keys_backup_setup_step1_title">Nunca perca mensagens criptografadas</string>
-    <string name="keys_backup_setup_step1_description">As mensagens em salas criptografadas são protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens.
-\n
-\nFaça backup de suas chaves de segurança para evitar perdê-las.</string>
-    <string name="keys_backup_setup">Comece a usar o Backup de Chave</string>
+    <string name="keys_backup_setup_step1_description">As mensagens em salas criptografadas são protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens. 
+\n 
+\nFaça backup de suas chaves para evitar perdê-las.</string>
+    <string name="keys_backup_setup">Comece a fazer o backup de chave</string>
     <string name="keys_backup_setup_step1_advanced">(Avançado)</string>
     <string name="keys_backup_setup_step1_manual_export">Exportar as chaves manualmente</string>
 
     <string name="keys_backup_setup_step2_text_title">Proteja seu backup com uma frase secreta.</string>
     <string name="keys_backup_setup_step2_text_description">Armazenaremos uma cópia criptografada de suas chaves em nosso servidor. Proteja seu backup com uma frase secreta para mantê-lo seguro. 
-\n
-\nPara segurança máxima, isso deve ser diferente da senha da sua conta.</string>
+\n 
+\nPara segurança máxima, a frase secreta deve ser diferente da senha da sua conta.</string>
     <string name="keys_backup_setup_step2_button_title">Criar frase secreta</string>
-    <string name="keys_backup_setup_creating_backup">Criar Backup</string>
+    <string name="keys_backup_setup_creating_backup">Criando backup</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">Ou proteja seu backup com uma chave de recuperação, salvando-a em algum lugar seguro.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Avançado) Configurar a chave de recuperação</string>
     <string name="keys_backup_setup_step3_success_title">Parabéns !</string>
-    <string name="keys_backup_setup_step3_text_line1">Está sendo feito backup das suas chaves.</string>
+    <string name="keys_backup_setup_step3_text_line1">O backup das suas chaves está sendo feito.</string>
     <string name="keys_backup_setup_step3_text_line2">Sua chave de recuperação é uma rede de proteção - você pode usá-la para restaurar o acesso às suas mensagens criptografadas se você esquecer sua frase de recuperação.
 \nMantenha a sua chave de recuperação em algum lugar muito seguro, como um gerenciador de senhas (ou um cofre)</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Mantenha sua chave de recuperação em algum lugar muito seguro, como um gerenciador de senhas (ou um cofre)</string>
@@ -1482,8 +1482,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \nAtenção: este arquivo pode ser removido se o aplicativo for desinstalado.</string>
     <string name="recovery_key_export_saved">A chave de recuperação foi guardada.</string>
 
-    <string name="keys_backup_setup_override_backup_prompt_tile">Já existe uma cópia de segurança no servidor</string>
-    <string name="keys_backup_setup_override_backup_prompt_description">Parece que você já tem configuração backup da chave de outra sessão. Queres substituí-lo pela nova que estás criando \?</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Já existe um backup no seu servidor</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Parece que você já configurou um backup de chaves em outra sessão. Deseja substituí-lo por um novo backup\?</string>
     <string name="keys_backup_setup_override_replace">Substituir</string>
     <string name="keys_backup_setup_override_stop">Parar</string>
 
@@ -1492,14 +1492,14 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_setup_step3_generating_key_status">Gerando Chave de Recuperação usando a frase secreta, este processo pode levar alguns segundos.</string>
     <string name="recovery_key">Chave de recuperação</string>
     <string name="unexpected_error">Erro inesperado</string>
-    <string name="keys_backup_setup_backup_started_title">A Cópia de Segurança foi iniciada</string>
-    <string name="keys_backup_setup_backup_started_message">As suas chaves de encriptação estão sendo copiadas em segundo plano para o seu servidor. O backup inicial pode demorar vários minutos.</string>
+    <string name="keys_backup_setup_backup_started_title">Começando o backup</string>
+    <string name="keys_backup_setup_backup_started_message">O backup de suas chaves está sendo feito. O primeiro backup pode demorar vários minutos.</string>
 
 
     <string name="keys_backup_setup_skip_title">Você tem certeza\?</string>
     <string name="keys_backup_setup_skip_msg">Você pode perder o acesso às suas mensagens se você sair do Element ou perder este aparelho.</string>
 
-    <string name="keys_backup_restore_is_getting_backup_version">Obtendo versão do backup…</string>
+    <string name="keys_backup_restore_is_getting_backup_version">Obtendo a versão do backup…</string>
     <string name="keys_backup_restore_with_passphrase">Use sua frase secreta de recuperação para desbloquear seu histórico de mensagens seguras</string>
     <string name="keys_backup_restore_use_recovery_key">use sua chave de recuperação</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Não sabe sua frase secreta de recuperação, você pode %s.</string>
@@ -1510,7 +1510,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_restore_setup_recovery_key">Recuperação de Mensagem</string>
 
     <string name="keys_backup_restore_with_key_helper">Perdeu sua chave de recuperação\? Você pode configurar uma nova nas configurações.</string>
-    <string name="keys_backup_passphrase_error_decrypt">O backup não pôde ser descriptografado com essa frase secreta: verifique se você digitou a frase secreta de recuperação correta.</string>
+    <string name="keys_backup_passphrase_error_decrypt">O backup não pôde ser descriptografado com essa frase secreta: verifique se você digitou corretamente a frase secreta de recuperação.</string>
     <string name="network_error_please_check_and_retry">Erro de rede: verifique a sua conexão e tente de novo, por favor.</string>
 
     <string name="keys_backup_restoring_waiting_message">Restaurando o backup:</string>
@@ -1523,9 +1523,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="keys_backup_restore_success_title">Backup restaurado %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
-        <item quantity="one">Restaurou um backup com chave %d.</item>
-        <item quantity="other">Restaurou um backup com chaves %d.</item>
-    </plurals>
+	<item quantity="one">O backup restaurou %d chave.</item>
+	<item quantity="other">O backup restaurou %d chaves.</item>
+</plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d nova chave foi adicionada a esta sessão.</item>
         <item quantity="other">%d novas chaves foram adicionadas a esta sessão.</item>
@@ -1536,56 +1536,56 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
 
     <string name="keys_backup_settings_restore_backup_button">Restaurar do backup</string>
-    <string name="keys_backup_settings_delete_backup_button">Excluir Backup</string>
+    <string name="keys_backup_settings_delete_backup_button">Remover backup</string>
 
-    <string name="keys_backup_settings_status_ok">A chave do backup foi configurada correctamente para esta sessão.</string>
-    <string name="keys_backup_settings_status_ko">A chave do backup não está activa nesta sessão.</string>
-    <string name="keys_backup_settings_status_not_setup">Não está sendo feito backup das suas chaves nesta sessão.</string>
+    <string name="keys_backup_settings_status_ok">O backup da chave foi configurado corretamente para esta sessão.</string>
+    <string name="keys_backup_settings_status_ko">O backup da chave não está configurado nesta sessão.</string>
+    <string name="keys_backup_settings_status_not_setup">O backup das suas chaves não está sendo feito nesta sessão.</string>
 
-    <string name="keys_backup_settings_signature_from_unknown_device">O backup tem uma assinatura da sessão desconhecida com o ID %s.</string>
+    <string name="keys_backup_settings_signature_from_unknown_device">O backup tem uma assinatura de uma sessão desconhecida com ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">O backup tem uma assinatura válida desta sessão.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">O backup tem uma assinatura válida da sessão confirmada %s.</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">O backup tem uma assinatura válida da sessão não confirmada %s</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">O backup tem uma assinatura inválida da sessão confirmada %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">O backup tem uma assinatura inválida da sessão não confirmada %s</string>
-    <string name="keys_backup_get_trust_error">Não foi possível obter a informação de confiança para o backup (%s).</string>
+    <string name="keys_backup_get_trust_error">Não foi possível saber se o backup é confiável (%s).</string>
 
     <string name="keys_backup_settings_untrusted_backup">Para usar o Backup de Chaves nesta sessão, restaure com a sua frase secreta ou chave de recuperação agora.</string>
-    <string name="keys_backup_settings_deleting_backup">Excluindo o backup…</string>
-    <string name="keys_backup_settings_delete_backup_error">Não foi possível excluir o backup (%s)</string>
+    <string name="keys_backup_settings_deleting_backup">Removendo o backup…</string>
+    <string name="keys_backup_settings_delete_backup_error">Não foi possível remover o backup (%s)</string>
 
     <string name="keys_backup_settings_checking_backup_state">Verificando a situação do backup</string>
-    <string name="keys_backup_settings_delete_confirm_title">Excluir Backup</string>
+    <string name="keys_backup_settings_delete_confirm_title">Remover backup</string>
     <string name="keys_backup_settings_delete_confirm_message">Excluir as chaves de criptografia do servidor\? Você não será mais capaz de usar a sua chave de recuperação para ler o histórico de mensagens criptografadas.</string>
 
-    <string name="new_recovery_method_popup_title">Novo Backup da Chave</string>
-    <string name="new_recovery_method_popup_description">Foi detectado um novo backup da chave de mensagem.
-\n
+    <string name="new_recovery_method_popup_title">Novo backup de chave</string>
+    <string name="new_recovery_method_popup_description">Foi detectado um novo backup de chave. 
+\n 
 \nSe você não definiu o novo método de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina um novo método de recuperação imediatamente nas Configurações.</string>
     <string name="new_recovery_method_popup_was_me">Foi eu</string>
 
     <string name="keys_backup_banner_setup_line1">Nunca perca mensagens criptografadas</string>
-    <string name="keys_backup_banner_setup_line2">Comece a usar o Backup da Chave</string>
+    <string name="keys_backup_banner_setup_line2">Comece a fazer o backup da chave</string>
 
-    <string name="secure_backup_banner_setup_line1">Backup Seguro</string>
+    <string name="secure_backup_banner_setup_line1">Backup online</string>
     <string name="secure_backup_banner_setup_line2">Proteja-se contra a perda de acesso a mensagens e dados criptografados</string>
 
     <string name="keys_backup_banner_recover_line1">Nunca perca mensagens criptografadas</string>
-    <string name="keys_backup_banner_recover_line2">Use o backup da chave</string>
+    <string name="keys_backup_banner_recover_line2">Fazer o backup da chave</string>
 
     <string name="keys_backup_banner_update_line1">Novas chaves de mensagens seguras</string>
-    <string name="keys_backup_banner_update_line2">Gerenciar Backup das Chaves</string>
+    <string name="keys_backup_banner_update_line2">Configurar o backup das chaves</string>
 
-    <string name="keys_backup_banner_in_progress">Fazendo backup das chaves. Isto pode demorar vários minutos.…</string>
+    <string name="keys_backup_banner_in_progress">Fazendo backup das chaves. Isso pode demorar vários minutos…</string>
 
 
-    <string name="secure_backup_setup">Configurar Backup Seguro</string>
+    <string name="secure_backup_setup">Configurar o backup online</string>
 
     <string name="keys_backup_info_keys_all_backup_up">O backup de todas as chaves foi concluído</string>
     <plurals name="keys_backup_info_keys_backing_up">
-        <item quantity="one">Fazendo o backup da chave %d …</item>
-        <item quantity="other">Fazendo o backup das chaves %d …</item>
-    </plurals>
+	<item quantity="one">Fazendo o backup de %d chave…</item>
+	<item quantity="other">Fazendo o backup de %d chaves…</item>
+</plurals>
 
     <string name="keys_backup_info_title_version">Versão</string>
     <string name="keys_backup_info_title_algorithm">Algoritmo</string>
@@ -1655,10 +1655,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="send_you_invite">Enviou um convite</string>
     <string name="invited_by">Convidado por %s</string>
 
-    <string name="room_list_catchup_empty_title">Vocês estão todos tão envolvidos em tudo aquilo!</string>
+    <string name="room_list_catchup_empty_title">Tudo em dia!</string>
     <string name="room_list_catchup_empty_body">Você não tem mais mensagens não lidas</string>
-    <string name="room_list_catchup_welcome_title">Bem-vindo a casa!</string>
-    <string name="room_list_catchup_welcome_body">Encarregar-se de mensagens não lidas</string>
+    <string name="room_list_catchup_welcome_title">Boas-vindas!</string>
+    <string name="room_list_catchup_welcome_body">Leia mensagens não lidas aqui</string>
     <string name="room_list_people_empty_title">Conversas</string>
     <string name="room_list_people_empty_body">Suas conversas serão exibidas aqui</string>
     <string name="room_list_rooms_empty_title">Salas</string>
@@ -1784,7 +1784,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="terms_of_service">Termos de serviço</string>
     <string name="review_terms">Revisar termos</string>
     <string name="terms_description_for_identity_server">Seja descoberto por outros</string>
-    <string name="terms_description_for_integration_manager">Use bots, pontes, widgets e pacotes de figurinhas</string>
+    <string name="terms_description_for_integration_manager">Use bots, integrações, widgets e pacotes de figurinhas</string>
 
     <string name="read_at">Leia em</string>
 
@@ -1962,7 +1962,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_reset_password_password_hint">Nova senha</string>
 
     <string name="login_reset_password_warning_title">Atenção!</string>
-    <string name="login_reset_password_warning_content">Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça uma cópia (backup) das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.</string>
+    <string name="login_reset_password_warning_content">Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça um backup das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.</string>
     <string name="login_reset_password_warning_submit">Continuar</string>
 
     <string name="login_reset_password_error_not_found">Este e-mail não está associado a nenhuma conta</string>
@@ -2098,7 +2098,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_developer_mode_fail_fast_title">Relatar imediatamente as falhas</string>
     <string name="settings_developer_mode_fail_fast_summary">Element poderá quebrar com mais frequência quando ocorrer um erro inesperado</string>
 
-    <string name="command_description_shrug">Adicionar ¯\\_(ツ)_/¯ para uma mensagem de texto simples</string>
+    <string name="command_description_shrug">Adiciona ¯\\_(ツ)_/¯ a uma mensagem de texto</string>
 
     <string name="create_room_encryption_title">Ativar criptografia</string>
     <string name="create_room_encryption_description">Uma vez ativada, a criptografia não poderá ser desativada.</string>
@@ -2210,7 +2210,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_settings_enable_encryption_warning">Uma vez ativada, a criptografia não poderá ser desativada.</string>
 
     <string name="room_settings_enable_encryption_dialog_title">Ativar criptografia\?</string>
-    <string name="room_settings_enable_encryption_dialog_content">Uma vez ativada, a criptografia de uma sala não pode ser desativada. As mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes desta sala. A ativação da criptografia pode impedir que muitos bots e pontes funcionem corretamente.</string>
+    <string name="room_settings_enable_encryption_dialog_content">Uma vez ativada, a criptografia de uma sala não pode ser desativada. As mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes desta sala. A ativação da criptografia pode impedir que muitos bots e integrações funcionem corretamente.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Ativar criptografia</string>
 
     <string name="verification_request_notice">Para ficar seguro, confirme %s comparando um código único.</string>
@@ -2381,7 +2381,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_crosssigning_progress_save_msk">Sincronização da chave Geral</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Sincronização da chave do Usuário</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Sincronizando a chave de Auto-Assinatura</string>
-    <string name="bootstrap_crosssigning_progress_key_backup">Criando o Backup da Chave</string>
+    <string name="bootstrap_crosssigning_progress_key_backup">Criando o backup da chave</string>
 
 
     <string name="bootstrap_cross_signing_success">Suas %2$s &amp; %1$s estão agora definidas.
@@ -2389,7 +2389,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \nSalva arquivos em local seguro! Você precisará deles para desbloquear mensagens criptografadas e proteger informações se perder todas as suas sessões ativas.</string>
 
     <string name="bootstrap_crosssigning_print_it">Imprime e armazena em local seguro</string>
-    <string name="bootstrap_crosssigning_save_usb">Salva em uma chave USB ou HDD de backup</string>
+    <string name="bootstrap_crosssigning_save_usb">Salve isto em uma chave USB ou unidade de backup</string>
     <string name="bootstrap_crosssigning_save_cloud">Copia para sua nuvem pessoal</string>
 
     <string name="auth_flow_not_supported">Você não pode fazer isso por celular</string>
@@ -2406,14 +2406,14 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="enter_backup_passphrase">Digite %s</string>
     <string name="backup_recovery_passphrase">Frase Secreta de Recuperação</string>
-    <string name="bootstrap_progress_checking_backup">Verificando a chave de backup</string>
+    <string name="bootstrap_progress_checking_backup">Verificando o backup de chave</string>
     <string name="bootstrap_skip_text">Criando uma Frase Secreta de Recuperação permite proteger e desbloquear mensagens criptografadas e estabelecer confiança.
 \n
 \nSe você não quiser definir uma Senha de Mensagem, crie antes uma Chave de Mensagem.</string>
     <string name="bootstrap_skip_text_no_gen_key">Criar uma Frase Secreta de Recuperação permite proteger e desbloquear mensagens criptografadas e estabelecer confiança.</string>
-    <string name="bootstrap_cancel_text">Se você cancelar agora, poderá perder mensagens e dados criptografados para sempre se esquecer seus credenciais.
-\n
-\nTambém pode configurar o Backup Seguro e gerenciar suas chaves em Configurações.</string>
+    <string name="bootstrap_cancel_text">Se você cancelar agora, poderá perder mensagens e dados criptografados para sempre se esquecer suas credenciais. 
+\n 
+\nVocê também pode configurar o Backup online e gerenciar suas chaves em Configurações.</string>
 
     <string name="encryption_enabled_tile_description">As mensagens nesta sala estão criptografadas de ponta a ponta. Confirme os usuários em seus perfis.</string>
     <string name="encryption_unknown_algorithm_tile_description">A criptografia usada por esta sala não é suportada</string>
@@ -2444,18 +2444,18 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_invalid_recovery_key">Não é uma chave de recuperação válida</string>
     <string name="recovery_key_empty_error_message">Digite uma chave de recuperação</string>
 
-    <string name="bootstrap_progress_checking_backup_with_info">Verificando a chave de backup (%s)</string>
+    <string name="bootstrap_progress_checking_backup_with_info">Verificando o backup da chave (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Obtendo a chave da curva</string>
     <string name="bootstrap_progress_generating_ssss">Gerando a chave SSSS a partir de uma frase secreta</string>
     <string name="bootstrap_progress_generating_ssss_with_info">Gerando a chave SSSS a partir de uma frase secreta (%s)</string>
     <string name="bootstrap_progress_generating_ssss_recovery">Gerando a chave SSSS a partir da chave de recuperação</string>
-    <string name="bootstrap_progress_storing_in_sss">Armazenando secreto de chave do backup em SSSS</string>
+    <string name="bootstrap_progress_storing_in_sss">Armazenando backup secreto de chave em SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
 
     <string name="bootstrap_migration_enter_backup_password">Digite sua Frase Secreta de Chave do Backup para continuar.</string>
-    <string name="bootstrap_migration_use_recovery_key">use sua chave de recuperação de Chave do Backup</string>
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">Não conheça sua Frase Secreta de Chave do Backup, você pode %s.</string>
-    <string name="bootstrap_migration_backup_recovery_key">Chave de recuperação de Chave do Backup</string>
+    <string name="bootstrap_migration_use_recovery_key">use sua chave de recuperação da Chave do Backup</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Se não se lembrar de sua Frase Secreta do backup de chave, você pode %s.</string>
+    <string name="bootstrap_migration_backup_recovery_key">Chave de recuperação do backup de chave</string>
 
     <string name="settings_security_prevent_screenshots_title">Impedir a captura de tela do aplicativo</string>
     <string name="settings_security_prevent_screenshots_summary">Ativando esta opção acrescenta FLAG_SECURE a todas as atividades. Reinicie o aplicativo para que a alteração tenha efeito.</string>
@@ -2477,7 +2477,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="enter_secret_storage_passphrase_or_key">Use seu %1$s ou %2$s para continuar.</string>
     <string name="use_recovery_key">Usar a chave de recuperação</string>
     <string name="enter_secret_storage_input_key">Selecione sua Chave de Recuperação, ou insira manualmente digitando-a ou colando-a da sua área de transferência</string>
-    <string name="keys_backup_recovery_key_error_decrypt">O backup não pôde ser descriptografado com essa Chave de Recuperação: verifique se você digitou a Chave de Recuperação correta.</string>
+    <string name="keys_backup_recovery_key_error_decrypt">O backup não pôde ser descriptografado com essa Chave de Recuperação: verifique se você digitou corretamente a Chave de Recuperação.</string>
     <string name="failed_to_access_secure_storage">Falha ao acessar o armazenamento seguro</string>
 
     <string name="unencrypted">Não criptografado</string>
@@ -2540,10 +2540,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="a11y_stop_camera">Desligue a câmera</string>
     <string name="a11y_start_camera">Ativar a câmera</string>
 
-    <string name="settings_setup_secure_backup">Configure um Backup Seguro</string>
+    <string name="settings_setup_secure_backup">Configure o backup online</string>
 
-    <string name="bottom_sheet_setup_secure_backup_title">Backup Seguro</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Previna-se contra perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de encriptação no seu servidor.</string>
+    <string name="bottom_sheet_setup_secure_backup_title">Backup online</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Previna-se contra perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de criptografia no seu servidor.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Configure</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Use uma Chave de Segurança</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Gere uma chave de segurança para armazenar num local seguro, como um gerenciador de senhas ou um cofre.</string>
@@ -2667,4 +2667,17 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_error_not_found">Não foi possível encontrar esta sala. Certifique-se de que ela existe.</string>
 
     <string name="universal_link_malformed">O link não está correto</string>
-</resources>
+<string name="auth_msisdn_already_defined">Este número de telefone já foi adicionado.</string>
+    <string name="settings_show_room_member_state_events">Mostrar eventos de status dos integrantes da sala</string>
+    <string name="sent_a_poll">Votação</string>
+    <string name="sent_a_bot_buttons">Botões do bot</string>
+    <string name="sent_a_reaction">Reagiu com: %s</string>
+    <string name="sent_verification_conclusion">Confirmação concluída</string>
+
+    <string name="delete_account_data_warning">Remover os dados de %1$s desta conta\?
+\n
+\nProssiga com cuidado, pois não há como reverter esta escolha.</string>
+
+    <string name="error_sso_flow_not_supported_yet">Desculpe, esta funcionalidade ainda não está disponível para contas conectadas via acesso único.</string>
+
+    </resources>

From 19b6898568e8eba19be5ea53ebe56b86a76d6fa2 Mon Sep 17 00:00:00 2001
From: Rob Johnson <rvjt8725@outlook.com>
Date: Thu, 8 Oct 2020 18:22:57 +0000
Subject: [PATCH 212/278] Translated using Weblate (Spanish)

Currently translated at 99.4% (1863 of 1874 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/es/
---
 vector/src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 4687fffa77..4f80aaf32c 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1811,7 +1811,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="login_splash_submit">Empieza</string>
 
     <string name="login_server_title">Selecciona un servidor</string>
-    <string name="login_server_text">Como el correo electrónico, las cuantas tienen un hogar, aunque se puede hablar con cualquiera</string>
+    <string name="login_server_text">Como el correo electrónico, las cuentas tienen un hogar, aunque se puede hablar con cualquiera</string>
     <string name="login_server_modular_text">Alojamiento de pago para organizaciones</string>
     <string name="login_server_modular_learn_more">Saber más</string>
     <string name="login_server_other_title">Otro</string>

From cb40485aad6fae818e4d7e570994138cc72dcea5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 18:53:07 +0200
Subject: [PATCH 213/278] Format strings

---
 .../src/main/res/values-cs/strings.xml        | 34 +++----
 .../src/main/res/values-fa/strings.xml        | 16 ++--
 .../src/main/res/values-sq/strings.xml        | 16 ++--
 vector/src/main/res/values-cs/strings.xml     |  4 +-
 vector/src/main/res/values-de/strings.xml     | 10 +--
 vector/src/main/res/values-el/strings.xml     |  4 +-
 vector/src/main/res/values-et/strings.xml     |  4 +-
 vector/src/main/res/values-fa/strings.xml     | 88 +++++++++----------
 vector/src/main/res/values-fr/strings.xml     |  4 +-
 vector/src/main/res/values-it/strings.xml     |  8 +-
 vector/src/main/res/values-ja/strings.xml     |  4 +-
 vector/src/main/res/values-kab/strings.xml    |  4 +-
 vector/src/main/res/values-pt-rBR/strings.xml | 24 ++---
 vector/src/main/res/values-ru/strings.xml     | 36 ++++----
 vector/src/main/res/values-sq/strings.xml     | 34 +++----
 vector/src/main/res/values-sv/strings.xml     |  4 +-
 vector/src/main/res/values-uk/strings.xml     | 38 ++++----
 vector/src/main/res/values-zh-rCN/strings.xml |  6 +-
 vector/src/main/res/values-zh-rTW/strings.xml |  4 +-
 19 files changed, 171 insertions(+), 171 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-cs/strings.xml b/matrix-sdk-android/src/main/res/values-cs/strings.xml
index 57828ac182..2ea2112b45 100644
--- a/matrix-sdk-android/src/main/res/values-cs/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-cs/strings.xml
@@ -105,7 +105,7 @@
     <string name="notice_room_leave_with_reason">%1$s opustil místnost. Důvod: %2$s</string>
     <string name="notice_event_redacted">Zpráva odstraněna</string>
     <string name="notice_event_redacted_by">Zprávu odstranil/a %1$s</string>
-<string name="summary_you_sent_image">Poslali jste obrázek.</string>
+    <string name="summary_you_sent_image">Poslali jste obrázek.</string>
     <string name="summary_you_sent_sticker">Poslali jste nálepku.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">Vaše pozvání</string>
@@ -188,28 +188,28 @@
     <string name="notice_room_withdraw_with_reason_by_you">Zrušili jste pozvání od %1$s. Důvod: %2$s</string>
 
     <plurals name="notice_room_aliases_added">
-	<item quantity="one">%1$s přidali %2$s jako adresu pro tuto místnost.</item>
-	<item quantity="few">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
-	<item quantity="other">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
-</plurals>
+        <item quantity="one">%1$s přidali %2$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
+        <item quantity="other">%1$s přidali %2$s jako adresy pro tuto místnost.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">Přidali jste %1$s jako adresu pro tuto místnost.</item>
-	<item quantity="few">Přidali jste %1$s jako adresy pro tuto místnost.</item>
-	<item quantity="other">Přidali jste %1$s jako adresy pro tuto místnost.</item>
-</plurals>
+        <item quantity="one">Přidali jste %1$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">Přidali jste %1$s jako adresy pro tuto místnost.</item>
+        <item quantity="other">Přidali jste %1$s jako adresy pro tuto místnost.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed">
-	<item quantity="one">%1$s odstranili %2$s jako adresu pro tuto místnost.</item>
-	<item quantity="few">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
-	<item quantity="other">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
-</plurals>
+        <item quantity="one">%1$s odstranili %2$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
+        <item quantity="other">%1$s odstranili %2$s jako adresy pro tuto místnost.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">Odstranili jste %2$s jako adresu pro tuto místnost.</item>
-	<item quantity="few">Odstranili jste %2$s jako adresuy pro tuto místnost.</item>
-	<item quantity="other">Odstranili jste %2$s jako adresy pro tuto místnost.</item>
-</plurals>
+        <item quantity="one">Odstranili jste %2$s jako adresu pro tuto místnost.</item>
+        <item quantity="few">Odstranili jste %2$s jako adresuy pro tuto místnost.</item>
+        <item quantity="other">Odstranili jste %2$s jako adresy pro tuto místnost.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed">%1$s přidali %2$ a odstranili %3$s jako adresy pro tuto místnost.</string>
     <string name="notice_room_aliases_added_and_removed_by_you">Přidali jste %1$s a odstranili %2$s jako adresy pro tuto místnost.</string>
diff --git a/matrix-sdk-android/src/main/res/values-fa/strings.xml b/matrix-sdk-android/src/main/res/values-fa/strings.xml
index 72610aa31c..25d92b4abe 100644
--- a/matrix-sdk-android/src/main/res/values-fa/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-fa/strings.xml
@@ -137,7 +137,7 @@
     <string name="notice_room_created">%1$s اتاق را ایجاد کرد</string>
     <string name="notice_profile_change_redacted">%1$s نمایه‌اش را به‌روز کرد %2$s</string>
     <string name="could_not_redact">نمی‌توان ویرایش کرد</string>
-<string name="summary_you_sent_image">تصویری فرستادید.</string>
+    <string name="summary_you_sent_image">تصویری فرستادید.</string>
     <string name="summary_you_sent_sticker">برچسبی فرستادید.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">دعوتتان</string>
@@ -209,14 +209,14 @@
     <string name="notice_room_withdraw_with_reason_by_you">دعوت %1$s را رد کردید. دلیل: %2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">نشانی %1$s را به این اتاق افزودید.</item>
-	<item quantity="other">نشانی‌های %1$s را به این اتاق افزودید.</item>
-</plurals>
+        <item quantity="one">نشانی %1$s را به این اتاق افزودید.</item>
+        <item quantity="other">نشانی‌های %1$s را به این اتاق افزودید.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">نشانی %1$s ار از این اتاق برداشتید.</item>
-	<item quantity="other">نشانی‌های %1$s ار از این اتاق برداشتید.</item>
-</plurals>
+        <item quantity="one">نشانی %1$s ار از این اتاق برداشتید.</item>
+        <item quantity="other">نشانی‌های %1$s ار از این اتاق برداشتید.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">نشانی %1$s ار افزوده و %2$s را از این اتاق برداشتید.</string>
 
@@ -229,4 +229,4 @@
     <string name="notice_end_to_end_ok_by_you">رمزنگاری سرتاسری را روشن کردید.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">رمزنگاری سرتاسری را روشن کردید (الگوریتم ناشناخته %1$s).</string>
 
-    </resources>
+</resources>
diff --git a/matrix-sdk-android/src/main/res/values-sq/strings.xml b/matrix-sdk-android/src/main/res/values-sq/strings.xml
index 4dc7f910d8..9756a11762 100644
--- a/matrix-sdk-android/src/main/res/values-sq/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sq/strings.xml
@@ -138,7 +138,7 @@
     <string name="key_verification_request_fallback_message">%s po kërkon të verifikojë kyçin tuaj, por klienti juaj nuk mbulon verifikim kyçesh brenda fjalosjeje. Që të verifikoni kyça, do t’ju duhet të përdorni verifikim të dikurshëm kyçesh.</string>
 
     <string name="notice_room_created">%1$s krijo dhomën</string>
-<string name="summary_you_sent_image">Dërguat një figurë.</string>
+    <string name="summary_you_sent_image">Dërguat një figurë.</string>
     <string name="summary_you_sent_sticker">Dërguat një ngjitës.</string>
 
     <string name="notice_room_invite_no_invitee_by_you">Ftesa juaj</string>
@@ -210,14 +210,14 @@
     <string name="notice_room_withdraw_with_reason_by_you">Tërhoqët mbrapsht ftesën për %1$s. Arsye: %2$s</string>
 
     <plurals name="notice_room_aliases_added_by_you">
-	<item quantity="one">Shtuat %1$s si një adresë për këtë dhomë.</item>
-	<item quantity="other">Shtuat %1$s si adresa për këtë dhomë.</item>
-</plurals>
+        <item quantity="one">Shtuat %1$s si një adresë për këtë dhomë.</item>
+        <item quantity="other">Shtuat %1$s si adresa për këtë dhomë.</item>
+    </plurals>
 
     <plurals name="notice_room_aliases_removed_by_you">
-	<item quantity="one">Hoqët %1$s si një adresë për këtë dhomë.</item>
-	<item quantity="other">Hoqët %1$s si adresa për këtë dhomë.</item>
-</plurals>
+        <item quantity="one">Hoqët %1$s si një adresë për këtë dhomë.</item>
+        <item quantity="other">Hoqët %1$s si adresa për këtë dhomë.</item>
+    </plurals>
 
     <string name="notice_room_aliases_added_and_removed_by_you">Shtuat %1$s dhe hoqët %2$s si adresa për këtë dhomë.</string>
 
@@ -230,4 +230,4 @@
     <string name="notice_end_to_end_ok_by_you">Aktivizuat fshehtëzimin skaj-më-skaj.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Aktivizuat fshehtëzimin skaj-më-skaj (algoritëm %1$s i panjohur).</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 919acc53b7..e330295004 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2623,9 +2623,9 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="sent_verification_conclusion">Výsledek ověření</string>
 
     <string name="universal_link_malformed">Odkaz byl chybně zformován</string>
-<string name="no_permissions_to_start_webrtc_call">K zahájení hovoru v této místnosti nemáte oprávnění</string>
+    <string name="no_permissions_to_start_webrtc_call">K zahájení hovoru v této místnosti nemáte oprávnění</string>
     <string name="delete_account_data_warning">Smazat údaje účtu typu %1$s\?
 \n
 \nOpatrně, může vést k neočekávanému chování.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 1b653375cc..fcbe068476 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -96,9 +96,9 @@
     <string name="no_room_placeholder">Keine Räume</string>
     <string name="no_public_room_placeholder">Keine öffentl. Räume verfügbar</string>
     <plurals name="public_room_nb_users">
-	<item quantity="one">1 Benutzer</item>
-	<item quantity="other">%d Benutzer/in</item>
-</plurals>
+        <item quantity="one">1 Benutzer</item>
+        <item quantity="other">%d Benutzer/in</item>
+    </plurals>
 
     <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
@@ -2683,11 +2683,11 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="sent_a_bot_buttons">Bot-Schaltflächen</string>
     <string name="sent_a_reaction">Reagierte mit: %s</string>
     <string name="universal_link_malformed">Der Link war fehlerhaft</string>
-<string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
+    <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
     <string name="sent_verification_conclusion">Ergebnis der Überprüfung</string>
 
     <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
 \n
 \nVorsicht! Es kann zu unerwartetem Verhalten führen.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml
index 14580a49f8..87d1089b7a 100644
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@@ -338,7 +338,7 @@
     <string name="bottom_action_people">Άτομα</string>
     <string name="home_filter_placeholder_people">Αναζήτηση ατόμων</string>
     <string name="tab_title_search_people">ΑΤΟΜΑ</string>
-<string name="resources_script">Λτνκ</string>
+    <string name="resources_script">Λτνκ</string>
 
     <string name="notification_sync_init">Αρχικοποίηση υπηρεσίας</string>
     <string name="notification_listening_for_events">Αναμονή για συμβάντα</string>
@@ -363,4 +363,4 @@
     <string name="disconnect">Αποσύνδεση</string>
     <string name="pause_video">Παύση</string>
     <string name="room_participants_header_direct_chats">Прямі повідомлення</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 5a35f77cdf..1e6a5edf23 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2557,9 +2557,9 @@
     <string name="sent_verification_conclusion">Verifitseerimise tulemus</string>
 
     <string name="universal_link_malformed">Link oli vigane</string>
-<string name="no_permissions_to_start_webrtc_call">Sul ei ole õigusi siin jututoas helistamiseks</string>
+    <string name="no_permissions_to_start_webrtc_call">Sul ei ole õigusi siin jututoas helistamiseks</string>
     <string name="delete_account_data_warning">Kas kustutame %1$s tüüpi kasutajakonto andmed\?
 \n
 \nKuna nii mõndagi ootamatut võib juhtuda, siis kasuta seda võimalust mõningase ettevaatusega.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index a08650c539..e290c78e6a 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -750,7 +750,7 @@
     <string name="dialog_title_success">موفقیت</string>
 
     <string name="bottom_action_notification">اعلان‌ها</string>
-<string name="dismiss">خاتمه</string>
+    <string name="dismiss">خاتمه</string>
 
 
     <string name="no_permissions_to_start_conf_call">اجازهٔ شروع تماس کنفرانسی در این اتاق را ندارید</string>
@@ -781,9 +781,9 @@
     <string name="auth_msisdn_already_defined">این شماره تلفن از پیش تعریف شده.</string>
     <string name="login_error_ssl_other">خطای SSL.</string>
     <plurals name="membership_changes">
-	<item quantity="one">۱ عضویت تغییر کرد</item>
-	<item quantity="other">%d عضویت تغییر کردند</item>
-</plurals>
+        <item quantity="one">۱ عضویت تغییر کرد</item>
+        <item quantity="other">%d عضویت تغییر کردند</item>
+    </plurals>
 
     <string name="settings_call_show_confirmation_dialog_title">پیش‌گیری از تماس تصادفی</string>
     <string name="settings_call_show_confirmation_dialog_summary">خواستن تأیید پیش از شروع تماس</string>
@@ -833,9 +833,9 @@
     <string name="room_message_file_not_found">پرونده پیدا نشد</string>
     <string name="room_do_not_have_permission_to_post">اجازهٔ فرستادن در این اتاق را ندارید</string>
     <plurals name="room_new_messages_notification">
-	<item quantity="one">۱ پیام جدید</item>
-	<item quantity="other">%d پیام جدید</item>
-</plurals>
+        <item quantity="one">۱ پیام جدید</item>
+        <item quantity="other">%d پیام جدید</item>
+    </plurals>
 
     <string name="ssl_trust">اعتماد کردن</string>
     <string name="ssl_do_not_trust">اعتماد نکردن</string>
@@ -938,9 +938,9 @@
     <string name="settings_set_sync_timeout">پایان زمان درخواست همگام‌سازی</string>
     <string name="settings_set_workmanager_delay">دورهٔ همگام‌سازی ترجیحی</string>
     <plurals name="seconds">
-	<item quantity="one">%d ثانیه</item>
-	<item quantity="other">%d ثانیه</item>
-</plurals>
+        <item quantity="one">%d ثانیه</item>
+        <item quantity="other">%d ثانیه</item>
+    </plurals>
 
     <string name="settings_integrations_summary">برای مدیریت بات‌ها، پل‌ها، ابزارک‌ها و بسته‌های برچسب از یک مدیر یکپارچگی استفاده کنید.
 \nمدیرهای یکپارچگی، داده‌های پیکربندی را دریافت کرده و می‌توانند از طرف شما ابزارک‌ها را تغییر داده، دعوت‌های اتاق فرستاده و سطوح قدرت را تنظیم کنند.</string>
@@ -997,9 +997,9 @@
     <string name="room_settings_read_history_entry_members_only_joined">فقط اعضا (از زمان پیوستنشان)</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d کاربر مسدود</item>
-	<item quantity="other">%d کاربر مسدود</item>
-</plurals>
+        <item quantity="one">%d کاربر مسدود</item>
+        <item quantity="other">%d کاربر مسدود</item>
+    </plurals>
 
     <string name="room_settings_labs_warning_message">این‌ها ویژگی‌های آزمایشی‌ای هستند که ممکن است به روش‌های نامنتظره‌ای حراب شوندا. با احتیاط استفاده کنید.</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">هرگز پیام‌های رمزشده از این نشست به نشست‌های تأییدنشده در این اتاق فرستاده نشود.</string>
@@ -1052,17 +1052,17 @@
     <string name="lock_screen_hint">این‌جا بنویسید…</string>
 
     <plurals name="notification_unread_notified_messages">
-	<item quantity="one">۱ پیام آگاهی نخوانده</item>
-	<item quantity="other">%d پیام آگاهی نخوانده</item>
-</plurals>
+        <item quantity="one">۱ پیام آگاهی نخوانده</item>
+        <item quantity="other">%d پیام آگاهی نخوانده</item>
+    </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-	<item quantity="one">۱ پیام آگاهی نخوانده</item>
-	<item quantity="other">%d پیام آگاهی نخوانده</item>
-</plurals>
+        <item quantity="one">۱ پیام آگاهی نخوانده</item>
+        <item quantity="other">%d پیام آگاهی نخوانده</item>
+    </plurals>
     <plurals name="notification_compat_summary_line_for_room">
-	<item quantity="one">%1$s: ۱ پیام</item>
-	<item quantity="other">%1$s: %2$d پیام</item>
-</plurals>
+        <item quantity="one">%1$s: ۱ پیام</item>
+        <item quantity="other">%1$s: %2$d پیام</item>
+    </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s در %2$s</string>
     <string name="notification_unknown_new_event">رویداد جدید</string>
     <string name="notification_unknown_room_name">اتاق</string>
@@ -1087,9 +1087,9 @@
     <string name="settings_labs_create_conference_with_jitsi">ایجاد تماس کنفرانسی با جیتسی</string>
     <string name="widget_delete_message_confirmation">مطمئنید که می‌خواهید ابزارک را از این اتاق حذف کنید؟</string>
     <plurals name="active_widgets">
-	<item quantity="one">۱ ابزارک فعّال</item>
-	<item quantity="other">%d ابزارک فعّال</item>
-</plurals>
+        <item quantity="one">۱ ابزارک فعّال</item>
+        <item quantity="other">%d ابزارک فعّال</item>
+    </plurals>
     <string name="active_widget_view_action">نما</string>
     <string name="active_widgets_title">ابزارک‌های فعّال</string>
 
@@ -1162,9 +1162,9 @@
     <string name="joined">پیوست</string>
     <string name="invited">دعوت شد</string>
     <plurals name="group_members">
-	<item quantity="one">۱ عضو</item>
-	<item quantity="other">%d عضو</item>
-</plurals>
+        <item quantity="one">۱ عضو</item>
+        <item quantity="other">%d عضو</item>
+    </plurals>
 
     <string name="deactivate_account_title">غیرفعّال‌سازی حساب</string>
     <string name="deactivate_account_submit">غیرفعّال‌سازی حساب</string>
@@ -1405,9 +1405,9 @@
     <string name="room_profile_section_admin">کنش‌های مدیر</string>
     <string name="room_profile_section_more_settings">تنظمیات اتاق</string>
     <plurals name="room_profile_section_more_member_list">
-	<item quantity="one">۱ نفر</item>
-	<item quantity="other">%1$d نفر</item>
-</plurals>
+        <item quantity="one">۱ نفر</item>
+        <item quantity="other">%1$d نفر</item>
+    </plurals>
     <string name="room_profile_section_more_uploads">بارگذاری‌ها</string>
     <string name="room_profile_section_more_leave">ترک اتاق</string>
     <string name="room_profile_leaving_room">ترک کردن اتاق…</string>
@@ -1471,13 +1471,13 @@
 
     <string name="settings_account_data">داده‌های حساب</string>
     <plurals name="poll_info">
-	<item quantity="one">%d رأی</item>
-	<item quantity="other">%d رأی</item>
-</plurals>
+        <item quantity="one">%d رأی</item>
+        <item quantity="other">%d رأی</item>
+    </plurals>
     <plurals name="poll_info_final">
-	<item quantity="one">%d رأی - نتایج نهایی</item>
-	<item quantity="other">%d رأی - نتایج نهایی</item>
-</plurals>
+        <item quantity="one">%d رأی - نتایج نهایی</item>
+        <item quantity="other">%d رأی - نتایج نهایی</item>
+    </plurals>
     <string name="poll_item_selected_aria">انتخاب گزیده</string>
     <string name="command_description_poll">ایجاد نظرسنجی‌ای ساده</string>
     <string name="verification_cannot_access_other_session">استفاده از یک کلید یا عبارت بازیابی</string>
@@ -1489,9 +1489,9 @@
     <string name="message_action_item_redact">برداشتن…</string>
     <string name="share_confirm_room">می‌خواهید این پیوست را به %1$s بفرستید؟</string>
     <plurals name="send_images_with_original_size">
-	<item quantity="one">فرستادن تصویر با اندازهٔ اصلی</item>
-	<item quantity="other">فرستادن تصویرها با اندازهٔ اصلی</item>
-</plurals>
+        <item quantity="one">فرستادن تصویر با اندازهٔ اصلی</item>
+        <item quantity="other">فرستادن تصویرها با اندازهٔ اصلی</item>
+    </plurals>
 
     <string name="delete_event_dialog_title">تأیید برداشت</string>
     <string name="delete_event_dialog_reason_checkbox">آوردن دلیل</string>
@@ -1564,9 +1564,9 @@
     <string name="invitation_sent_to_one_user">دعوت برای %1$s فرستاده شد</string>
     <string name="invitations_sent_to_two_users">دعوت برای %1$s و %2$s فرستاده شد</string>
     <plurals name="invitations_sent_to_one_and_more_users">
-	<item quantity="one">دعوت برای %1$s و یک نفر دیگر فرستاده شد</item>
-	<item quantity="other">دعوت برای %1$s و %2$d نفر دیگر فرستاده شد</item>
-</plurals>
+        <item quantity="one">دعوت برای %1$s و یک نفر دیگر فرستاده شد</item>
+        <item quantity="other">دعوت برای %1$s و %2$d نفر دیگر فرستاده شد</item>
+    </plurals>
     <string name="choose_locale_current_locale_title">زبان جاری</string>
     <string name="choose_locale_other_locales_title">دیگر زبان‌های موجود</string>
     <string name="choose_locale_loading_locales">بار کردن زبان‌های موچود…</string>
@@ -1587,4 +1587,4 @@
     <string name="element_login_splash_brand">المنت</string>
 
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 48df26c6d8..70b1772fd3 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2377,7 +2377,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="identity_server_set_alternative_notice_no_default">Renseignez l’URL d’un serveur d’identité</string>
     <string name="identity_server_set_alternative_submit">Valider</string>
 
-<string name="play_video">Lancer</string>
+    <string name="play_video">Lancer</string>
     <string name="pause_video">Pause</string>
     <string name="dismiss">Ignorer</string>
 
@@ -2427,4 +2427,4 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="room_participants_ban_title">Bloquer l\'utilisateur</string>
     <string name="room_participants_ban_reason">Motif du blocage</string>
     <string name="room_participants_unban_title">Débloquer l\'utilisateur</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 3ea31027a4..f91a328fbd 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2669,11 +2669,11 @@
 
     <string name="error_opening_banned_room">Impossibile aprire una stanza dove sei stato bandito.</string>
     <string name="room_error_not_found">Impossibile trovare questa stanza. Assicurati che esista.</string>
-<string name="no_permissions_to_start_webrtc_call">Non hai il permesso di avviare una chiamata in questa stanza</string>
+    <string name="no_permissions_to_start_webrtc_call">Non hai il permesso di avviare una chiamata in questa stanza</string>
     <plurals name="seconds">
-	<item quantity="one">%d secondo</item>
-	<item quantity="other">%d secondi</item>
-</plurals>
+        <item quantity="one">%d secondo</item>
+        <item quantity="other">%d secondi</item>
+    </plurals>
 
     <string name="settings_show_room_member_state_events">Mostra eventi di stato dei membri della stanza</string>
     <string name="settings_show_room_member_state_events_summary">Includi eventi di invito/entrata/uscita/kick/ban e modifiche di avatar/nome.</string>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 9f98d6f7e3..165ff49f7a 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -1227,7 +1227,7 @@ Matrixでのメッセージの可視性は電子メールと同様です。メ
     </plurals>
 
     <string name="cannot_call_yourself">自分自身には通話できません</string>
-<string name="settings_send_markdown">マークダウン書式</string>
+    <string name="settings_send_markdown">マークダウン書式</string>
     <string name="settings_send_markdown_summary">メッセージ送信前にマークダウン書式を適用します。これにより、アスタリスクを使用して斜体のテキストを表示するなどの高度な書式設定が利用できます。</string>
     <string name="preference_voice_and_video">音声とビデオ</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index 9b4f2a512e..efe5ea787f 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2549,6 +2549,6 @@
     <string name="sent_verification_conclusion">Taggrayt n usenqed</string>
 
     <string name="universal_link_malformed">Aseɣwen ur yemsil ara akken iwata</string>
-<string name="no_permissions_to_start_webrtc_call">Ur tesɛiḍ ara tasiregt ad tebduḍ asiwel deg texxamt-a</string>
+    <string name="no_permissions_to_start_webrtc_call">Ur tesɛiḍ ara tasiregt ad tebduḍ asiwel deg texxamt-a</string>
     <string name="sent_a_reaction">Issedmer s: %s</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 5e66462496..74a92178ac 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1523,9 +1523,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="keys_backup_restore_success_title">Backup restaurado %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
-	<item quantity="one">O backup restaurou %d chave.</item>
-	<item quantity="other">O backup restaurou %d chaves.</item>
-</plurals>
+        <item quantity="one">O backup restaurou %d chave.</item>
+        <item quantity="other">O backup restaurou %d chaves.</item>
+    </plurals>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d nova chave foi adicionada a esta sessão.</item>
         <item quantity="other">%d novas chaves foram adicionadas a esta sessão.</item>
@@ -1583,9 +1583,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="keys_backup_info_keys_all_backup_up">O backup de todas as chaves foi concluído</string>
     <plurals name="keys_backup_info_keys_backing_up">
-	<item quantity="one">Fazendo o backup de %d chave…</item>
-	<item quantity="other">Fazendo o backup de %d chaves…</item>
-</plurals>
+        <item quantity="one">Fazendo o backup de %d chave…</item>
+        <item quantity="other">Fazendo o backup de %d chaves…</item>
+    </plurals>
 
     <string name="keys_backup_info_title_version">Versão</string>
     <string name="keys_backup_info_title_algorithm">Algoritmo</string>
@@ -2643,7 +2643,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Atenção! Última tentativa restante antes de você ser desconectada/o!</string>
     <string name="too_many_pin_failures">Muitos erros, você foi desconectada/o</string>
-<string name="no_permissions_to_start_webrtc_call">Você não tem permissão para iniciar uma chamada nesta sala</string>
+    <string name="no_permissions_to_start_webrtc_call">Você não tem permissão para iniciar uma chamada nesta sala</string>
     <string name="settings_phone_number_empty">Nenhum número de telefone foi adicionado à sua conta</string>
     <string name="settings_emails">Endereços de e-mail</string>
     <string name="settings_emails_empty">Nenhum e-mail foi adicionado à sua conta</string>
@@ -2652,9 +2652,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="error_threepid_auth_failed">Certifique-se de ter clicado no link do e-mail que enviamos para você.</string>
 
     <plurals name="seconds">
-	<item quantity="one">%d segundo</item>
-	<item quantity="other">%d segundos</item>
-</plurals>
+        <item quantity="one">%d segundo</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
 
     <string name="settings_show_room_member_state_events_summary">Mostrar quando alguém for convidado/entrar/sair/banido e mostrar alterações de foto de perfil e de nome e sobrenome.</string>
     <string name="settings_emails_and_phone_numbers_title">E-mails e números de telefone</string>
@@ -2667,7 +2667,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_error_not_found">Não foi possível encontrar esta sala. Certifique-se de que ela existe.</string>
 
     <string name="universal_link_malformed">O link não está correto</string>
-<string name="auth_msisdn_already_defined">Este número de telefone já foi adicionado.</string>
+    <string name="auth_msisdn_already_defined">Este número de telefone já foi adicionado.</string>
     <string name="settings_show_room_member_state_events">Mostrar eventos de status dos integrantes da sala</string>
     <string name="sent_a_poll">Votação</string>
     <string name="sent_a_bot_buttons">Botões do bot</string>
@@ -2680,4 +2680,4 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 
     <string name="error_sso_flow_not_supported_yet">Desculpe, esta funcionalidade ainda não está disponível para contas conectadas via acesso único.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index f3665caded..feb85b3c59 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -99,7 +99,7 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="send_bug_report_include_logs">Отправить логи</string>
@@ -833,13 +833,13 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
 
@@ -847,7 +847,7 @@
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <!-- Widget Integration Manager -->
@@ -857,45 +857,45 @@
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
@@ -1030,20 +1030,20 @@
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
 
@@ -1304,7 +1304,7 @@
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="keys_backup_restore_success_description_part1">
@@ -1355,7 +1355,7 @@
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
@@ -2730,9 +2730,9 @@
     <string name="sent_verification_conclusion">Результат проверки</string>
 
     <string name="universal_link_malformed">Ссылка была искажена</string>
-<string name="no_permissions_to_start_webrtc_call">У вас нет разрешения на запуск звонка в этой комнате</string>
+    <string name="no_permissions_to_start_webrtc_call">У вас нет разрешения на запуск звонка в этой комнате</string>
     <string name="delete_account_data_warning">Удалить данные учетной записи типа %1$s\?
 \n
 \nИспользуйте с осторожностью, это может привести к неожиданному поведению.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index af5708143f..aa677f0b41 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2207,7 +2207,7 @@
 
     <string name="auth_invalid_login_param_space_in_password">Emër përdoruesi dhe/ose fjalëkalim i pasaktë. Fjalëkalimi i dhënë fillon ose mbaron me hapësirë, ju lutemi, kontrollojeni.</string>
 
-    <string name="settings_rageshake"/>
+    <string name="settings_rageshake" />
     <string name="bootstrap_crosssigning_progress_initializing">Po publikohen kyçe të krijuar identiteti</string>
     <string name="room_message_placeholder">Mesazh…</string>
 
@@ -2333,7 +2333,7 @@
     <string name="identity_server_set_alternative_submit">Parashtroje</string>
 
     <string name="open_terms_of">Hap termat e %s</string>
-<string name="play_video">Luaje</string>
+    <string name="play_video">Luaje</string>
     <string name="pause_video">Pauzë</string>
     <string name="dismiss">Hidhe poshtë</string>
 
@@ -2409,9 +2409,9 @@
     <string name="error_threepid_auth_failed">Sigurohuni që keni klikuar te lidhja në email-in që ju kemi dërguar.</string>
 
     <plurals name="seconds">
-	<item quantity="one">%d sekondë</item>
-	<item quantity="other">%d sekonda</item>
-</plurals>
+        <item quantity="one">%d sekondë</item>
+        <item quantity="other">%d sekonda</item>
+    </plurals>
 
     <string name="settings_show_room_member_state_events">Shfaq akte gjendjeje përdoruesish të dhomës</string>
     <string name="settings_show_room_member_state_events_summary">Përfshin akte ftimi/pjesëmarrjeje/ikjeje/përzënieje/dëbimi dhe ndryshime emri avatari/shfaqjeje.</string>
@@ -2431,16 +2431,16 @@
     <string name="settings_emails_and_phone_numbers_summary">Administroni email-e dhe numra telefonash të lidhur me llogarinë tuaj Matrix</string>
 
     <plurals name="room_settings_banned_users_count">
-	<item quantity="one">%d përdorues i dëbuar</item>
-	<item quantity="other">%d përdorues të dëbuar</item>
-</plurals>
+        <item quantity="one">%d përdorues i dëbuar</item>
+        <item quantity="other">%d përdorues të dëbuar</item>
+    </plurals>
 
     <string name="encryption_exported_successfully">Kyçet u eksportuan me sukses</string>
 
     <plurals name="encryption_import_room_keys_success">
-	<item quantity="one">%1$d/%2$d kyç i importuar me sukses.</item>
-	<item quantity="other">%1$d/%2$d kyçe të importuar me sukses.</item>
-</plurals>
+        <item quantity="one">%1$d/%2$d kyç i importuar me sukses.</item>
+        <item quantity="other">%1$d/%2$d kyçe të importuar me sukses.</item>
+    </plurals>
 
     <string name="active_widget_view_action">SHIHENI</string>
     <string name="active_widgets_title">Widget-e aktivë</string>
@@ -2463,9 +2463,9 @@
 
     <string name="settings_text_message_sent_hint">Kod</string>
     <plurals name="two_and_some_others_read">
-	<item quantity="one">%1$s, %2$s dhe %3$d tjetër i lexuar</item>
-	<item quantity="other">%1$s, %2$s dhe %3$d të tjerë të lexuar</item>
-</plurals>
+        <item quantity="one">%1$s, %2$s dhe %3$d tjetër i lexuar</item>
+        <item quantity="other">%1$s, %2$s dhe %3$d të tjerë të lexuar</item>
+    </plurals>
     <string name="room_list_quick_actions_favorite_add">Shtoje te të parapëlqyerit</string>
     <string name="room_list_quick_actions_favorite_remove">Hiqe prej të parapëlqyerve</string>
     <string name="notice_member_no_changes_by_you">S’bëtë ndryshime</string>
@@ -2572,9 +2572,9 @@
     <string name="alert_push_are_disabled_title">Njoftimet push janë të çaktivizuar</string>
     <string name="alert_push_are_disabled_description">Që të aktivizoni njoftimet push, shihni te rregullimet tuaja</string>
     <plurals name="wrong_pin_message_remaining_attempts">
-	<item quantity="one">Kod i gabuar, edhe %d provë</item>
-	<item quantity="other">Kod i gabuar, edhe %d prova</item>
-</plurals>
+        <item quantity="one">Kod i gabuar, edhe %d provë</item>
+        <item quantity="other">Kod i gabuar, edhe %d prova</item>
+    </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Kujdes! Prova e fundit e mbetur, përpara daljes!</string>
     <string name="too_many_pin_failures">Shumë gabime, u nxorët nga llogaria</string>
     <string name="create_pin_title">Zgjidhni një PIN për siguri</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 96385b4cc3..a359eb58cf 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2560,9 +2560,9 @@
     <string name="sent_verification_conclusion">Verifieringsavslutning</string>
 
     <string name="universal_link_malformed">Länken var felformaterad</string>
-<string name="no_permissions_to_start_webrtc_call">Du har inte behörighet att starta ett samtal i det här rummet</string>
+    <string name="no_permissions_to_start_webrtc_call">Du har inte behörighet att starta ett samtal i det här rummet</string>
     <string name="delete_account_data_warning">Radera kontodata av typen %1$s\?
 \n
 \nAnvänd varsamt, det kan leda till oväntat beteende.</string>
 
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index ce34bf8ddb..f2434c6af3 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -772,7 +772,7 @@
         <item quantity="one">%d зміна  членства</item>
         <item quantity="few">%d зміни членства</item>
         <item quantity="many">%d змін членства</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="list_members">Список учасників</string>
@@ -797,13 +797,13 @@
         <item quantity="one">%d активний участник</item>
         <item quantity="few">%d активних участника</item>
         <item quantity="many">%d активних участників</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участників</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="room_participants_ban_prompt_msg">Ви впевнені, що хочете забанити цього користувача в цьому чаті?</string>
 
@@ -811,7 +811,7 @@
         <item quantity="one">%d нове повідомлення</item>
         <item quantity="few">%d нових повідомленя</item>
         <item quantity="many">%d нових повідомлень</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="settings_notification_privacy_reduced">Обмежена конфіденційність</string>
@@ -863,25 +863,25 @@
         <item quantity="one">%d сек.</item>
         <item quantity="few">%d сек.</item>
         <item quantity="many">%d сек.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_m">
         <item quantity="one">%d хв.</item>
         <item quantity="few">%d хв.</item>
         <item quantity="many">%d хв.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%d год.</item>
         <item quantity="few">%d год.</item>
         <item quantity="many">%d год.</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d день</item>
         <item quantity="few">%d днів</item>
         <item quantity="many">%d дні</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="room_participants_now">Зараз %1$s</string>
@@ -897,19 +897,19 @@
         <item quantity="one">%d обрано</item>
         <item quantity="few">"%d  обрано"</item>
         <item quantity="many">"%d  обрано"</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="directory_search_rooms">
         <item quantity="one">%d кімната</item>
         <item quantity="few">%d кімнати</item>
         <item quantity="many">%d кімнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s кімнату знайдено для %2$s</item>
         <item quantity="few">%1$s кімнати знайдено для %2$s</item>
         <item quantity="many">%1$s кімнат знайдено для %2$s</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="room_sliding_menu_version_x">Версія %s</string>
     <string name="settings_notification_privacy_nosecure_message_content">• Сповіщення містять <b>метадані та дані повідомлення</b></string>
@@ -938,19 +938,19 @@
         <item quantity="one">%d непрочитане сповіщення</item>
         <item quantity="few">%d непрочитані сповіщення</item>
         <item quantity="many">%d непрочитаних сповіщень</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитане сповіщення</item>
         <item quantity="few">%d непрочитані сповіщення</item>
         <item quantity="many">%d непрочитаних сповіщень</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d кімната</item>
         <item quantity="few">%d кімнати</item>
         <item quantity="many">%d кімнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s у %2$s</string>
 
@@ -958,7 +958,7 @@
         <item quantity="one">%d активний віджет</item>
         <item quantity="few">%d активні віджети</item>
         <item quantity="many">%d активних віджетів</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <string name="widget_integration_missing_parameter">Пропущено обов’язковий параметр.</string>
@@ -1004,14 +1004,14 @@
         <item quantity="one">%d учасник</item>
         <item quantity="few">%d учасника</item>
         <item quantity="many">%d учасників</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
 
     <plurals name="group_rooms">
         <item quantity="one">%d кімната</item>
         <item quantity="few">%d кімнати</item>
         <item quantity="many">%d кімнат</item>
-        <item quantity="other"/>
+        <item quantity="other" />
     </plurals>
     <string name="group_no_long_description">Адміністратор спільноти не вказав для неї детальної інформації.</string>
 
@@ -1110,7 +1110,7 @@
     <string name="auth_accept_policies">Будь ласка, ознайомтесь та прийміть правила цього серверу:</string>
 
     <string name="action_mark_room_read">Позначити як прочитане</string>
-<string name="resources_script">Cyrl</string>
+    <string name="resources_script">Cyrl</string>
 
     <string name="notification_sync_init">Запуск сервісу</string>
     <string name="title_activity_keys_backup_setup">Резервна копія ключа</string>
@@ -1134,4 +1134,4 @@
 
     <string name="notice_crypto_unable_to_decrypt_final">Ви не маєте доступу до цього повідомлення</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Очікуємо повідомлення, це може тривати певний час</string>
-    </resources>
+</resources>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 5a9e3a9066..c5668da75a 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2578,10 +2578,10 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 
     <string name="error_opening_banned_room">无法打开您被封禁的聊天室。</string>
     <string name="room_error_not_found">无法找到此聊天室。请确认它存在。</string>
-<string name="no_permissions_to_start_webrtc_call">您没有权限在此聊天室发起通话</string>
+    <string name="no_permissions_to_start_webrtc_call">您没有权限在此聊天室发起通话</string>
     <plurals name="seconds">
-	<item quantity="other">%d 秒</item>
-</plurals>
+        <item quantity="other">%d 秒</item>
+    </plurals>
 
     <string name="settings_show_room_member_state_events">显示聊天室成员状态事件</string>
     <string name="settings_show_room_member_state_events_summary">包括邀请/加入/离开/踢掉/封禁事件和头像/昵称变更。</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index dac6b366ce..1d415b8878 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2574,9 +2574,9 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="sent_verification_conclusion">驗證結論</string>
 
     <string name="universal_link_malformed">連結格式錯誤</string>
-<string name="no_permissions_to_start_webrtc_call">您沒有在此聊天室開始通話的權限</string>
+    <string name="no_permissions_to_start_webrtc_call">您沒有在此聊天室開始通話的權限</string>
     <string name="delete_account_data_warning">刪除類型為 %1$s 的帳號資料？
 \n
 \n小心使用，它可能會導致意料之外的行為。</string>
 
-    </resources>
+</resources>

From 648462f7f4dc97c16d4b33a2e20471fe27bb33e1 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 19:02:54 +0200
Subject: [PATCH 214/278] Remove unused string `labs_merge_e2e_in_timeline`

---
 vector/src/main/res/values-cs/strings.xml     | 1 -
 vector/src/main/res/values-de/strings.xml     | 1 -
 vector/src/main/res/values-es/strings.xml     | 1 -
 vector/src/main/res/values-et/strings.xml     | 1 -
 vector/src/main/res/values-fa/strings.xml     | 1 -
 vector/src/main/res/values-hu/strings.xml     | 1 -
 vector/src/main/res/values-it/strings.xml     | 1 -
 vector/src/main/res/values-kab/strings.xml    | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml | 1 -
 vector/src/main/res/values-ru/strings.xml     | 1 -
 vector/src/main/res/values-sk/strings.xml     | 1 -
 vector/src/main/res/values-sv/strings.xml     | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml | 1 -
 vector/src/main/res/values/strings.xml        | 1 -
 15 files changed, 15 deletions(-)

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index e330295004..d64bb4d16e 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2483,7 +2483,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 \n
 \n%s</string>
 
-    <string name="labs_merge_e2e_in_timeline">Sloučení nemohlo dešifrovat zprávy v časové ose</string>
     <string name="labs_show_unread_notifications_as_tab">Přidat panel věnovaný nepřečteným oznámením na hlavní obrazovku.</string>
 
     <string name="settings_text_message_sent_hint">Kód</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index fcbe068476..358609bc2e 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2620,7 +2620,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_security_pin_code_title">Aktiviere PIN</string>
     <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe \"PIN vergessen\" um dich abzumelden und sie anschließend zurückzusetzen.</string>
     <string name="auth_pin_confirm_to_disable_title">Bestätige PIN um die PIN zu deaktivieren</string>
-    <string name="labs_merge_e2e_in_timeline">\"Nicht entschlüsselbar\"-Fehler im Chatverlauf zusammenfassen</string>
     <string name="settings_call_show_confirmation_dialog_title">Verhindere versehentliche Anrufe</string>
     <string name="settings_call_show_confirmation_dialog_summary">Bitte um Bestätigung, bevor du einen Anruf tätigst</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Konfiguration</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 4f80aaf32c..c5ca0d5f1a 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1930,7 +1930,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="room_participants_unban_prompt_msg">Desbanear usuario y permitir entrar a la sala nuevamente.</string>
 
     <string name="push_gateway_item_device_name">nombre_session:</string>
-    <string name="labs_merge_e2e_in_timeline">Error al descifrar el mensaje en la línea de tiempo</string>
     <string name="labs_show_unread_notifications_as_tab">Adicionar pestaña dedicada para notificaciones no leidas en la pantalla principal.</string>
 
     <string name="bug_report_error_too_short">Descripcion muy corta</string>
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 1e6a5edf23..4a7f5ddbed 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2217,7 +2217,6 @@
 \n
 \n%s</string>
 
-    <string name="labs_merge_e2e_in_timeline">Ei õnnestunud dekrüptida ajajoonel leiduvat sõnumit</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Sa parasjagu jagad oma e-posti aadressi ja telefoninumbrit isikutuvastusserveriga %1$s. Selleks, et lõpetada see jagamine, pead uuesti looma ühenduse isikutuvastusserveriga %2$s.</string>
     <string name="labs_allow_extended_logging_summary">Detailne logimine võimaldab arendajatel saada rohkem teadet kui sa peale nutiseadme tõsist raputamist saadad veateate. Kui ka detailne logimine on kasutusel, siis rakendus ei logi sõnumite sisu ega isiklikke andmeid.</string>
 
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index e290c78e6a..9dec816e0c 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1222,7 +1222,6 @@
     <string name="room_filtering_footer_title">نمی‌توانید کسی که به دنبالش هستید را بیابید؟</string>
     <string name="room_filtering_footer_open_room_directory">مشاهدهٔ شاخهٔ اتاق</string>
 
-    <string name="labs_merge_e2e_in_timeline">ادغام پیام‌های شکست‌خورده در رمزگشایی در خط زمانی</string>
     <string name="labs_show_unread_notifications_as_tab">افزودن زبانه‌ای اختصاصی روی صفحهٔ اصلی برای آگاهی‌های خوانده‌نشده.</string>
 
     <string name="link_copied_to_clipboard">پیوند در تخته‌گیره رونشت شد</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 2516d203e0..657f661264 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2481,7 +2481,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \n
 \n%s</string>
 
-    <string name="labs_merge_e2e_in_timeline">Az egyesítésnek nem sikerült visszafejtenie egy üzenetet az idővonalon</string>
     <string name="labs_show_unread_notifications_as_tab">Külön lap hozzáadása az olvasatlan értesítések számára a főképernyőn.</string>
 
     <plurals name="two_and_some_others_read">
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index f91a328fbd..9852e714a1 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2512,7 +2512,6 @@
 
     <string name="secure_backup_setup">Imposta il Backup Sicuro</string>
 
-    <string name="labs_merge_e2e_in_timeline">Decifrazione del messaggio nella timeline fallita</string>
     <string name="labs_show_unread_notifications_as_tab">Aggiungi una scheda dedicata per le notifiche non lette nella schermata principale.</string>
 
     <string name="room_list_quick_actions_favorite_add">Aggiungi ai preferiti</string>
diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index efe5ea787f..e213ae3f03 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -2527,7 +2527,6 @@
 
     <string name="send_file_step_sending_thumbnail">Tuzna n tenfult (%1$s / %2$s)</string>
     <string name="labs_swipe_to_reply_in_timeline">Rmed afraḍ i tririt deg tesnakudt</string>
-    <string name="labs_merge_e2e_in_timeline">Asdukkel ur yeddi ara i tukksa n uwgelhen n yiznan deg tesnakudt</string>
     <string name="settings_discovery_no_terms">Aqeddac n timagit i tferneḍ ulac ɣer-s akk tiwtilin n yimeẓla. Ur ttkemmil ara ala ma yella tettekleḍ ɣef umeẓlu</string>
     <string name="labs_allow_extended_logging_summary">Iɣmisen ɣezzifen ad ɛawnen ineflayen s umuddu n wugar n yiɣemisen mi ara tazneḍ aneqqis RageShake, ula ma yili yermed asnas ur yettazen ara agbur n yiznan neɣ isefka-nniḍen usligen.</string>
 
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 74a92178ac..97da7a8a82 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1766,7 +1766,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_directory_search_hint">Nome ou ID (#example:matrix.org)</string>
 
     <string name="labs_swipe_to_reply_in_timeline">Ativar o recurso de deslizar para responder nas conversas</string>
-    <string name="labs_merge_e2e_in_timeline">Alertar apenas uma vez em uma conversa de que não é possível descriptografar as mensagens, em vez de alertar para cada mensagem</string>
     <string name="labs_show_unread_notifications_as_tab">Adicione uma aba dedicada para notificações não lidas na tela principal.</string>
 
     <string name="link_copied_to_clipboard">Link copiado para a memória</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index feb85b3c59..c88a1162fa 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2163,7 +2163,6 @@
 
     <string name="secure_backup_setup">Настроить безопасное резервное копирование</string>
 
-    <string name="labs_merge_e2e_in_timeline">Слиянию не удаётся расшифровать сообщение на временной шкале</string>
     <string name="labs_show_unread_notifications_as_tab">Добавьте специальную вкладку для непрочитанных уведомлений на главном экране.</string>
 
     <plurals name="fallback_users_read">
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index 66ba1f354d..13c8612e23 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -1757,7 +1757,6 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí
     <string name="room_directory_search_hint">Názov alebo ID (#priklad:matrix.org)</string>
 
     <string name="labs_swipe_to_reply_in_timeline">Povoliť odpovedať švihnutím na časovej osy</string>
-    <string name="labs_merge_e2e_in_timeline">Zlúčiť správy nepodarilo sa dešifrovať na časovej osy</string>
     <string name="labs_show_unread_notifications_as_tab">Zobrazovať záložku oznámenia na hlavnej obrazovke.</string>
 
     <string name="link_copied_to_clipboard">Odkaz skopírovaný do schránky</string>
diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index a359eb58cf..fe80632d99 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -1046,7 +1046,6 @@
     <string name="downloaded_file">Filen %1$s har laddats ner!</string>
 
     <string name="message_edits">Meddelanderedigeringar</string>
-    <string name="labs_merge_e2e_in_timeline">Sammanfogaren misslyckades med att avkryptera ett meddelande i tidslinjen</string>
     <string name="add_by_matrix_id">Lägg till med Matrix-ID</string>
     <string name="direct_room_no_known_users">Inga resultat hittade, använd \"Lägg till med Matrix-ID\" för att söka på servern.</string>
     <string name="terms_description_for_integration_manager">Använd bottar, bryggor, widgets och dekalpaket</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index c5668da75a..5504dbc81f 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1696,7 +1696,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="room_directory_search_hint">名称或 ID (#example:matrix.org)</string>
 
     <string name="labs_swipe_to_reply_in_timeline">在时间线中启用滑动回复</string>
-    <string name="labs_merge_e2e_in_timeline">在时间线中合并解密失败消息</string>
     <string name="labs_show_unread_notifications_as_tab">在主屏幕上添加未读通知选项卡。</string>
 
     <string name="link_copied_to_clipboard">链接已复制到剪贴板</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 1d415b8878..07f1303554 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2408,7 +2408,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="secure_backup_setup">設定安全備份</string>
 
-    <string name="labs_merge_e2e_in_timeline">合併未能在時間軸中解密訊息</string>
     <string name="labs_show_unread_notifications_as_tab">在主畫面上新增專用的未讀通知分頁。</string>
 
     <string name="room_list_quick_actions_favorite_add">新增到最愛</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e400f7fe64..ec916d1daf 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1750,7 +1750,6 @@
     <string name="room_directory_search_hint">Name or ID (#example:matrix.org)</string>
 
     <string name="labs_swipe_to_reply_in_timeline">Enable swipe to reply in timeline</string>
-    <string name="labs_merge_e2e_in_timeline">Merge failed to decrypt message in timeline</string>
     <string name="labs_show_unread_notifications_as_tab">Add a dedicated tab for unread notifications on main screen.</string>
 
     <string name="link_copied_to_clipboard">Link copied to clipboard</string>

From 17e7aedcbaee47a21547d57000620ca21da9a9c6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 19:09:04 +0200
Subject: [PATCH 215/278] Move store data to `/fastlane/metadata/android`
 (#812)

---
 CHANGES.md                                                      | 2 +-
 .../metadata/android}/de/full_description.txt                   | 0
 .../metadata/android}/de/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/de/title.txt    | 0
 .../metadata/android}/en-US/full_description.txt                | 0
 .../metadata/android}/en-US/short_description.txt               | 0
 .../play/listings => fastlane/metadata/android}/en-US/title.txt | 0
 .../metadata/android}/es/full_description.txt                   | 0
 .../metadata/android}/es/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/es/title.txt    | 0
 .../metadata/android}/fi/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/fi/title.txt    | 0
 .../play/listings => fastlane/metadata/android}/fr/title.txt    | 0
 .../metadata/android}/hu/full_description.txt                   | 0
 .../metadata/android}/hu/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/hu/title.txt    | 0
 .../metadata/android}/kab/full_description.txt                  | 0
 .../metadata/android}/kab/short_description.txt                 | 0
 .../play/listings => fastlane/metadata/android}/kab/title.txt   | 0
 .../metadata/android}/pt_BR/full_description.txt                | 0
 .../metadata/android}/pt_BR/short_description.txt               | 0
 .../play/listings => fastlane/metadata/android}/pt_BR/title.txt | 0
 .../metadata/android}/ru/full_description.txt                   | 0
 .../metadata/android}/ru/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/ru/title.txt    | 0
 .../metadata/android}/sk/full_description.txt                   | 0
 .../metadata/android}/sk/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/sk/title.txt    | 0
 .../metadata/android}/sv/full_description.txt                   | 0
 .../metadata/android}/sv/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/sv/title.txt    | 0
 .../metadata/android}/th/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/th/title.txt    | 0
 .../metadata/android}/tr/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/tr/title.txt    | 0
 .../metadata/android}/uk/full_description.txt                   | 0
 .../metadata/android}/uk/short_description.txt                  | 0
 .../play/listings => fastlane/metadata/android}/uk/title.txt    | 0
 .../metadata/android}/zh_Hans/full_description.txt              | 0
 .../metadata/android}/zh_Hans/short_description.txt             | 0
 .../listings => fastlane/metadata/android}/zh_Hans/title.txt    | 0
 41 files changed, 1 insertion(+), 1 deletion(-)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/de/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/de/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/de/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/en-US/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/en-US/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/en-US/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/es/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/es/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/es/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/fi/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/fi/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/fr/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/hu/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/hu/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/hu/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/kab/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/kab/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/kab/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/pt_BR/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/pt_BR/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/pt_BR/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/ru/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/ru/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/ru/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/sk/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/sk/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/sk/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/sv/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/sv/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/sv/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/th/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/th/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/tr/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/tr/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/uk/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/uk/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/uk/title.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/zh_Hans/full_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/zh_Hans/short_description.txt (100%)
 rename {vector/src/main/play/listings => fastlane/metadata/android}/zh_Hans/title.txt (100%)

diff --git a/CHANGES.md b/CHANGES.md
index 534194c2a9..a3e2500635 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,7 +30,7 @@ Bugfix 🐛:
  - Very long topic cannot be fully visible (#1957)
 
 Translations 🗣:
- -
+ - Move store data to `/fastlane/metadata/android` (#812)
 
 SDK API changes ⚠️:
  - Search messages in a room by using Session.searchService() or Room.search()
diff --git a/vector/src/main/play/listings/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/de/full_description.txt
rename to fastlane/metadata/android/de/full_description.txt
diff --git a/vector/src/main/play/listings/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/de/short_description.txt
rename to fastlane/metadata/android/de/short_description.txt
diff --git a/vector/src/main/play/listings/de/title.txt b/fastlane/metadata/android/de/title.txt
similarity index 100%
rename from vector/src/main/play/listings/de/title.txt
rename to fastlane/metadata/android/de/title.txt
diff --git a/vector/src/main/play/listings/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/en-US/full_description.txt
rename to fastlane/metadata/android/en-US/full_description.txt
diff --git a/vector/src/main/play/listings/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/en-US/short_description.txt
rename to fastlane/metadata/android/en-US/short_description.txt
diff --git a/vector/src/main/play/listings/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
similarity index 100%
rename from vector/src/main/play/listings/en-US/title.txt
rename to fastlane/metadata/android/en-US/title.txt
diff --git a/vector/src/main/play/listings/es/full_description.txt b/fastlane/metadata/android/es/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/es/full_description.txt
rename to fastlane/metadata/android/es/full_description.txt
diff --git a/vector/src/main/play/listings/es/short_description.txt b/fastlane/metadata/android/es/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/es/short_description.txt
rename to fastlane/metadata/android/es/short_description.txt
diff --git a/vector/src/main/play/listings/es/title.txt b/fastlane/metadata/android/es/title.txt
similarity index 100%
rename from vector/src/main/play/listings/es/title.txt
rename to fastlane/metadata/android/es/title.txt
diff --git a/vector/src/main/play/listings/fi/short_description.txt b/fastlane/metadata/android/fi/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/fi/short_description.txt
rename to fastlane/metadata/android/fi/short_description.txt
diff --git a/vector/src/main/play/listings/fi/title.txt b/fastlane/metadata/android/fi/title.txt
similarity index 100%
rename from vector/src/main/play/listings/fi/title.txt
rename to fastlane/metadata/android/fi/title.txt
diff --git a/vector/src/main/play/listings/fr/title.txt b/fastlane/metadata/android/fr/title.txt
similarity index 100%
rename from vector/src/main/play/listings/fr/title.txt
rename to fastlane/metadata/android/fr/title.txt
diff --git a/vector/src/main/play/listings/hu/full_description.txt b/fastlane/metadata/android/hu/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/hu/full_description.txt
rename to fastlane/metadata/android/hu/full_description.txt
diff --git a/vector/src/main/play/listings/hu/short_description.txt b/fastlane/metadata/android/hu/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/hu/short_description.txt
rename to fastlane/metadata/android/hu/short_description.txt
diff --git a/vector/src/main/play/listings/hu/title.txt b/fastlane/metadata/android/hu/title.txt
similarity index 100%
rename from vector/src/main/play/listings/hu/title.txt
rename to fastlane/metadata/android/hu/title.txt
diff --git a/vector/src/main/play/listings/kab/full_description.txt b/fastlane/metadata/android/kab/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/kab/full_description.txt
rename to fastlane/metadata/android/kab/full_description.txt
diff --git a/vector/src/main/play/listings/kab/short_description.txt b/fastlane/metadata/android/kab/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/kab/short_description.txt
rename to fastlane/metadata/android/kab/short_description.txt
diff --git a/vector/src/main/play/listings/kab/title.txt b/fastlane/metadata/android/kab/title.txt
similarity index 100%
rename from vector/src/main/play/listings/kab/title.txt
rename to fastlane/metadata/android/kab/title.txt
diff --git a/vector/src/main/play/listings/pt_BR/full_description.txt b/fastlane/metadata/android/pt_BR/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/pt_BR/full_description.txt
rename to fastlane/metadata/android/pt_BR/full_description.txt
diff --git a/vector/src/main/play/listings/pt_BR/short_description.txt b/fastlane/metadata/android/pt_BR/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/pt_BR/short_description.txt
rename to fastlane/metadata/android/pt_BR/short_description.txt
diff --git a/vector/src/main/play/listings/pt_BR/title.txt b/fastlane/metadata/android/pt_BR/title.txt
similarity index 100%
rename from vector/src/main/play/listings/pt_BR/title.txt
rename to fastlane/metadata/android/pt_BR/title.txt
diff --git a/vector/src/main/play/listings/ru/full_description.txt b/fastlane/metadata/android/ru/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/ru/full_description.txt
rename to fastlane/metadata/android/ru/full_description.txt
diff --git a/vector/src/main/play/listings/ru/short_description.txt b/fastlane/metadata/android/ru/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/ru/short_description.txt
rename to fastlane/metadata/android/ru/short_description.txt
diff --git a/vector/src/main/play/listings/ru/title.txt b/fastlane/metadata/android/ru/title.txt
similarity index 100%
rename from vector/src/main/play/listings/ru/title.txt
rename to fastlane/metadata/android/ru/title.txt
diff --git a/vector/src/main/play/listings/sk/full_description.txt b/fastlane/metadata/android/sk/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/sk/full_description.txt
rename to fastlane/metadata/android/sk/full_description.txt
diff --git a/vector/src/main/play/listings/sk/short_description.txt b/fastlane/metadata/android/sk/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/sk/short_description.txt
rename to fastlane/metadata/android/sk/short_description.txt
diff --git a/vector/src/main/play/listings/sk/title.txt b/fastlane/metadata/android/sk/title.txt
similarity index 100%
rename from vector/src/main/play/listings/sk/title.txt
rename to fastlane/metadata/android/sk/title.txt
diff --git a/vector/src/main/play/listings/sv/full_description.txt b/fastlane/metadata/android/sv/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/sv/full_description.txt
rename to fastlane/metadata/android/sv/full_description.txt
diff --git a/vector/src/main/play/listings/sv/short_description.txt b/fastlane/metadata/android/sv/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/sv/short_description.txt
rename to fastlane/metadata/android/sv/short_description.txt
diff --git a/vector/src/main/play/listings/sv/title.txt b/fastlane/metadata/android/sv/title.txt
similarity index 100%
rename from vector/src/main/play/listings/sv/title.txt
rename to fastlane/metadata/android/sv/title.txt
diff --git a/vector/src/main/play/listings/th/short_description.txt b/fastlane/metadata/android/th/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/th/short_description.txt
rename to fastlane/metadata/android/th/short_description.txt
diff --git a/vector/src/main/play/listings/th/title.txt b/fastlane/metadata/android/th/title.txt
similarity index 100%
rename from vector/src/main/play/listings/th/title.txt
rename to fastlane/metadata/android/th/title.txt
diff --git a/vector/src/main/play/listings/tr/short_description.txt b/fastlane/metadata/android/tr/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/tr/short_description.txt
rename to fastlane/metadata/android/tr/short_description.txt
diff --git a/vector/src/main/play/listings/tr/title.txt b/fastlane/metadata/android/tr/title.txt
similarity index 100%
rename from vector/src/main/play/listings/tr/title.txt
rename to fastlane/metadata/android/tr/title.txt
diff --git a/vector/src/main/play/listings/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/uk/full_description.txt
rename to fastlane/metadata/android/uk/full_description.txt
diff --git a/vector/src/main/play/listings/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/uk/short_description.txt
rename to fastlane/metadata/android/uk/short_description.txt
diff --git a/vector/src/main/play/listings/uk/title.txt b/fastlane/metadata/android/uk/title.txt
similarity index 100%
rename from vector/src/main/play/listings/uk/title.txt
rename to fastlane/metadata/android/uk/title.txt
diff --git a/vector/src/main/play/listings/zh_Hans/full_description.txt b/fastlane/metadata/android/zh_Hans/full_description.txt
similarity index 100%
rename from vector/src/main/play/listings/zh_Hans/full_description.txt
rename to fastlane/metadata/android/zh_Hans/full_description.txt
diff --git a/vector/src/main/play/listings/zh_Hans/short_description.txt b/fastlane/metadata/android/zh_Hans/short_description.txt
similarity index 100%
rename from vector/src/main/play/listings/zh_Hans/short_description.txt
rename to fastlane/metadata/android/zh_Hans/short_description.txt
diff --git a/vector/src/main/play/listings/zh_Hans/title.txt b/fastlane/metadata/android/zh_Hans/title.txt
similarity index 100%
rename from vector/src/main/play/listings/zh_Hans/title.txt
rename to fastlane/metadata/android/zh_Hans/title.txt

From 5ef97362cb041b68ef60c9a0f46c23da94df232d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 14:59:34 +0200
Subject: [PATCH 216/278] Fix gravity on topic

---
 vector/src/main/res/layout/item_expandable_textview.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index b0c232d77e..8fd04a5bb8 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -25,7 +25,6 @@
         android:layout_marginTop="4dp"
         android:autoLink="web"
         android:fontFamily="sans-serif"
-        android:gravity="center"
         android:src="@drawable/ic_expand_more"
         android:textSize="14sp"
         android:textStyle="normal"

From 4ac62bcf51d1569cf0679d2f340bf642d17704d0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 15:54:58 +0200
Subject: [PATCH 217/278] Display filter only if there are more than 2 members
 in this room

---
 .../app/features/roomprofile/members/RoomMemberListFragment.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 77337d7208..a00bcf02fc 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -88,7 +88,6 @@ class RoomMemberListFragment @Inject constructor(
     }
 
     private fun setupSearchView() {
-        searchViewAppBarLayout.isVisible = true
         searchView.queryHint = getString(R.string.search_members_hint)
         searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
@@ -111,6 +110,8 @@ class RoomMemberListFragment @Inject constructor(
         roomMemberListController.setData(viewState)
         renderRoomSummary(viewState)
         inviteUsersButton.isVisible = viewState.actionsPermissions.canInvite
+        // Display filter only if there are more than 2 members in this room
+        searchViewAppBarLayout.isVisible = viewState.roomSummary()?.otherMemberIds.orEmpty().size > 1
     }
 
     override fun onRoomMemberClicked(roomMember: RoomMemberSummary) {

From b1625838edf22f07a27349cd6fa2fa69fcb960da Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 16:00:25 +0200
Subject: [PATCH 218/278] Move the attibute to the correct View

---
 vector/src/main/res/layout/item_expandable_textview.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml
index 8fd04a5bb8..9f61a3c4d4 100644
--- a/vector/src/main/res/layout/item_expandable_textview.xml
+++ b/vector/src/main/res/layout/item_expandable_textview.xml
@@ -10,7 +10,11 @@
         android:id="@+id/expandableContent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:autoLink="web"
         android:ellipsize="end"
+        android:fontFamily="sans-serif"
+        android:textSize="14sp"
+        android:textStyle="normal"
         app:layout_constraintBottom_toTopOf="@+id/expandableArrow"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,11 +27,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
-        android:autoLink="web"
-        android:fontFamily="sans-serif"
         android:src="@drawable/ic_expand_more"
-        android:textSize="14sp"
-        android:textStyle="normal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/expandableContent"

From 67f1fe69faeb7e6fde49760660be44d11cb87b6d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 16:05:16 +0200
Subject: [PATCH 219/278] We are now API 21+

---
 tools/check/forbidden_strings_in_resources.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tools/check/forbidden_strings_in_resources.txt b/tools/check/forbidden_strings_in_resources.txt
index 0bbe90b31f..6fb6b184ba 100644
--- a/tools/check/forbidden_strings_in_resources.txt
+++ b/tools/check/forbidden_strings_in_resources.txt
@@ -79,9 +79,5 @@ layout_constraintLeft_
 ### Use im.vector.app.core.preference.VectorPreference to support multiline of the title
 <Preference\n
 
-### Will crash on API < 21. Use ?colorAccent instead
-\?android:colorAccent
-\?android:attr/colorAccent
-
 ### Use androidx.recyclerview.widget.RecyclerView because EpoxyRecyclerViews add behavior we do not want to
 <com\.airbnb\.epoxy\.EpoxyRecyclerView

From e6d5d0f9c684ea7d24d366a5126e2050a08feb4f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 18:18:50 +0200
Subject: [PATCH 220/278] There is no more menu in this Fragment

---
 .../app/features/roomprofile/members/RoomMemberListFragment.kt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index a00bcf02fc..66745fef25 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -58,9 +58,6 @@ class RoomMemberListFragment @Inject constructor(
         setupSearchView()
         setupInviteUsersButton()
         recyclerView.configureWith(roomMemberListController, hasFixedSize = true)
-        viewModel.selectSubscribe(this, RoomMemberListViewState::actionsPermissions) {
-            invalidateOptionsMenu()
-        }
     }
 
     private fun setupInviteUsersButton() {

From 63eb119df6441a42a76999664f292cdf957b4504 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 21:12:48 +0200
Subject: [PATCH 221/278] Inject userId and deviceId instead of sessionParam

---
 .../crypto/store/db/RealmCryptoStore.kt       | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 9065da47b9..b25349cba9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -23,7 +23,6 @@ import io.realm.Realm
 import io.realm.RealmConfiguration
 import io.realm.Sort
 import io.realm.kotlin.where
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MXCrossSigningInfo
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.LocalEcho
@@ -86,7 +85,9 @@ import org.matrix.android.sdk.internal.crypto.store.db.query.getById
 import org.matrix.android.sdk.internal.crypto.store.db.query.getOrCreate
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
 import org.matrix.android.sdk.internal.di.CryptoDatabase
+import org.matrix.android.sdk.internal.di.DeviceId
 import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.SessionScope
 import org.matrix.olm.OlmAccount
 import org.matrix.olm.OlmException
@@ -98,7 +99,9 @@ import kotlin.collections.set
 internal class RealmCryptoStore @Inject constructor(
         @CryptoDatabase private val realmConfiguration: RealmConfiguration,
         private val crossSigningKeysMapper: CrossSigningKeysMapper,
-        private val credentials: Credentials) : IMXCryptoStore {
+        @UserId private val userId: String,
+        @DeviceId private val deviceId: String?
+) : IMXCryptoStore {
 
     /* ==========================================================================================
      * Memory cache, to correctly release JNI objects
@@ -141,8 +144,8 @@ internal class RealmCryptoStore @Inject constructor(
                 // Check credentials
                 // The device id may not have been provided in credentials.
                 // Check it only if provided, else trust the stored one.
-                if (currentMetadata.userId != credentials.userId
-                        || (credentials.deviceId != null && credentials.deviceId != currentMetadata.deviceId)) {
+                if (currentMetadata.userId != userId
+                        || (deviceId != null && deviceId != currentMetadata.deviceId)) {
                     Timber.w("## open() : Credentials do not match, close this store and delete data")
                     deleteAll = true
                     currentMetadata = null
@@ -155,8 +158,8 @@ internal class RealmCryptoStore @Inject constructor(
                 }
 
                 // Metadata not found, or database cleaned, create it
-                realm.createObject(CryptoMetadataEntity::class.java, credentials.userId).apply {
-                    deviceId = credentials.deviceId
+                realm.createObject(CryptoMetadataEntity::class.java, userId).apply {
+                    deviceId = this@RealmCryptoStore.deviceId
                 }
             }
         }
@@ -312,7 +315,7 @@ internal class RealmCryptoStore @Inject constructor(
                                     Timber.d("## CrossSigning  MSK change for $userId")
                                     val keyEntity = crossSigningKeysMapper.map(masterKey)
                                     signingInfo.setMasterKey(keyEntity)
-                                    if (userId == credentials.userId) {
+                                    if (userId == this.userId) {
                                         shouldResetMyDevicesLocalTrust = true
                                         // my msk has changed! clear my private key
                                         // Could we have some race here? e.g I am the one that did change the keys
@@ -331,7 +334,7 @@ internal class RealmCryptoStore @Inject constructor(
                                     Timber.d("## CrossSigning  SSK change for $userId")
                                     val keyEntity = crossSigningKeysMapper.map(selfSigningKey)
                                     signingInfo.setSelfSignedKey(keyEntity)
-                                    if (userId == credentials.userId) {
+                                    if (userId == this.userId) {
                                         shouldResetMyDevicesLocalTrust = true
                                         // my ssk has changed! clear my private key
                                         realm.where<CryptoMetadataEntity>().findFirst()?.apply {
@@ -349,7 +352,7 @@ internal class RealmCryptoStore @Inject constructor(
                                         Timber.d("## CrossSigning  USK change for $userId")
                                         val keyEntity = crossSigningKeysMapper.map(userSigningKey)
                                         signingInfo.setUserSignedKey(keyEntity)
-                                        if (userId == credentials.userId) {
+                                        if (userId == this.userId) {
                                             shouldResetMyDevicesLocalTrust = true
                                             // my usk has changed! clear my private key
                                             realm.where<CryptoMetadataEntity>().findFirst()?.apply {
@@ -362,11 +365,11 @@ internal class RealmCryptoStore @Inject constructor(
                                 // When my cross signing keys are reset, we consider clearing all existing device trust
                                 if (shouldResetMyDevicesLocalTrust) {
                                     realm.where<UserEntity>()
-                                            .equalTo(UserEntityFields.USER_ID, credentials.userId)
+                                            .equalTo(UserEntityFields.USER_ID, this.userId)
                                             .findFirst()
                                             ?.devices?.forEach {
                                                 it?.trustLevelEntity?.crossSignedVerified = false
-                                                it?.trustLevelEntity?.locallyVerified = it.deviceId == credentials.deviceId
+                                                it?.trustLevelEntity?.locallyVerified = it.deviceId == deviceId
                                             }
                                 }
                                 userEntity.crossSigningInfoEntity = signingInfo
@@ -1355,7 +1358,7 @@ internal class RealmCryptoStore @Inject constructor(
                     .findAll()
             xInfoEntities?.forEach { info ->
                 // Need to ignore mine
-                if (info.userId != credentials.userId) {
+                if (info.userId != userId) {
                     info.crossSigningKeys.forEach {
                         it.trustLevelEntity = null
                     }
@@ -1370,7 +1373,7 @@ internal class RealmCryptoStore @Inject constructor(
                     .findAll()
             xInfoEntities?.forEach { xInfoEntity ->
                 // Need to ignore mine
-                if (xInfoEntity.userId == credentials.userId) return@forEach
+                if (xInfoEntity.userId == userId) return@forEach
                 val mapped = mapCrossSigningInfoEntity(xInfoEntity)
                 val currentTrust = mapped.isTrusted()
                 val newTrust = check(mapped.userId)

From 778c5aee32ec971f9cb76f12cc4fbd2ef7aefa33 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 12 Oct 2020 18:45:19 +0200
Subject: [PATCH 222/278] Add param to `when`

---
 .../sdk/internal/crypto/DefaultCryptoService.kt  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index c77ac70124..21aafda9ef 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -194,18 +194,18 @@ internal class DefaultCryptoService @Inject constructor(
     private val lastNewSessionForcedDates = MXUsersDevicesMap<Long>()
 
     fun onStateEvent(roomId: String, event: Event) {
-        when {
-            event.getClearType() == EventType.STATE_ROOM_ENCRYPTION         -> onRoomEncryptionEvent(roomId, event)
-            event.getClearType() == EventType.STATE_ROOM_MEMBER             -> onRoomMembershipEvent(roomId, event)
-            event.getClearType() == EventType.STATE_ROOM_HISTORY_VISIBILITY -> onRoomHistoryVisibilityEvent(roomId, event)
+        when (event.getClearType()) {
+            EventType.STATE_ROOM_ENCRYPTION         -> onRoomEncryptionEvent(roomId, event)
+            EventType.STATE_ROOM_MEMBER             -> onRoomMembershipEvent(roomId, event)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> onRoomHistoryVisibilityEvent(roomId, event)
         }
     }
 
     fun onLiveEvent(roomId: String, event: Event) {
-        when {
-            event.getClearType() == EventType.STATE_ROOM_ENCRYPTION         -> onRoomEncryptionEvent(roomId, event)
-            event.getClearType() == EventType.STATE_ROOM_MEMBER             -> onRoomMembershipEvent(roomId, event)
-            event.getClearType() == EventType.STATE_ROOM_HISTORY_VISIBILITY -> onRoomHistoryVisibilityEvent(roomId, event)
+        when (event.getClearType()) {
+            EventType.STATE_ROOM_ENCRYPTION         -> onRoomEncryptionEvent(roomId, event)
+            EventType.STATE_ROOM_MEMBER             -> onRoomMembershipEvent(roomId, event)
+            EventType.STATE_ROOM_HISTORY_VISIBILITY -> onRoomHistoryVisibilityEvent(roomId, event)
         }
     }
 

From 0fc92889c14b823f951ce725b49da9fa861d9032 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 12 Oct 2020 22:14:46 +0200
Subject: [PATCH 223/278] Fix test compilation issue

---
 .../sdk/internal/crypto/CryptoStoreHelper.kt        | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
index 6e6a11d568..75ccce0db9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreHelper.kt
@@ -16,7 +16,6 @@
 
 package org.matrix.android.sdk.internal.crypto
 
-import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStore
 import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule
@@ -34,14 +33,8 @@ internal class CryptoStoreHelper {
                         .modules(RealmCryptoStoreModule())
                         .build(),
                 crossSigningKeysMapper = CrossSigningKeysMapper(MoshiProvider.providesMoshi()),
-                credentials = createCredential())
+                userId = "userId_" + Random.nextInt(),
+                deviceId = "deviceId_sample"
+        )
     }
-
-    fun createCredential() = Credentials(
-            userId = "userId_" + Random.nextInt(),
-            homeServer = "http://matrix.org",
-            accessToken = "access_token",
-            refreshToken = null,
-            deviceId = "deviceId_sample"
-    )
 }

From 68947588d7af6c188683f4b8bfccc1f3c225be3d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Oct 2020 22:30:18 +0200
Subject: [PATCH 224/278] Replace deprecated shouldEqual and shouldEqualTo by
 shouldBeEqualTo

---
 .../crypto/verification/qrcode/QrCodeTest.kt  | 53 +++++++++----------
 .../session/room/timeline/ChunkEntityTest.kt  | 28 +++++-----
 .../sdk/session/room/timeline/TimelineTest.kt |  2 +-
 .../verification/qrcode/BinaryStringTest.kt   | 12 ++---
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
index 92afd3ee47..ee604fc9ab 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/QrCodeTest.kt
@@ -17,15 +17,14 @@
 package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.matrix.android.sdk.InstrumentedTest
+import org.amshove.kluent.shouldBeEqualTo
 import org.amshove.kluent.shouldBeNull
-import org.amshove.kluent.shouldEqual
-import org.amshove.kluent.shouldEqualTo
 import org.amshove.kluent.shouldNotBeNull
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
 
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
@@ -66,32 +65,32 @@ class QrCodeTest : InstrumentedTest {
 
     @Test
     fun testEncoding1() {
-        qrCode1.toEncodedString() shouldEqual value1
+        qrCode1.toEncodedString() shouldBeEqualTo value1
     }
 
     @Test
     fun testEncoding2() {
-        qrCode2.toEncodedString() shouldEqual value2
+        qrCode2.toEncodedString() shouldBeEqualTo value2
     }
 
     @Test
     fun testEncoding3() {
-        qrCode3.toEncodedString() shouldEqual value3
+        qrCode3.toEncodedString() shouldBeEqualTo value3
     }
 
     @Test
     fun testSymmetry1() {
-        qrCode1.toEncodedString().toQrCodeData() shouldEqual qrCode1
+        qrCode1.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode1
     }
 
     @Test
     fun testSymmetry2() {
-        qrCode2.toEncodedString().toQrCodeData() shouldEqual qrCode2
+        qrCode2.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode2
     }
 
     @Test
     fun testSymmetry3() {
-        qrCode3.toEncodedString().toQrCodeData() shouldEqual qrCode3
+        qrCode3.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode3
     }
 
     @Test
@@ -102,7 +101,7 @@ class QrCodeTest : InstrumentedTest {
         checkHeader(byteArray)
 
         // Mode
-        byteArray[7] shouldEqualTo 0
+        byteArray[7] shouldBeEqualTo 0
 
         checkSizeAndTransaction(byteArray)
 
@@ -120,7 +119,7 @@ class QrCodeTest : InstrumentedTest {
         checkHeader(byteArray)
 
         // Mode
-        byteArray[7] shouldEqualTo 1
+        byteArray[7] shouldBeEqualTo 1
 
         checkSizeAndTransaction(byteArray)
         compareArray(byteArray.copyOfRange(23, 23 + 32), kte_byteArray)
@@ -137,7 +136,7 @@ class QrCodeTest : InstrumentedTest {
         checkHeader(byteArray)
 
         // Mode
-        byteArray[7] shouldEqualTo 2
+        byteArray[7] shouldBeEqualTo 2
 
         checkSizeAndTransaction(byteArray)
         compareArray(byteArray.copyOfRange(23, 23 + 32), tlx_byteArray)
@@ -156,10 +155,10 @@ class QrCodeTest : InstrumentedTest {
         val result = qrCode.toEncodedString()
         val expected = value1.replace("\u0000\u000DMaTransaction", "\u0007\u00D0$longTransactionId")
 
-        result shouldEqual expected
+        result shouldBeEqualTo expected
 
         // Reverse operation
-        expected.toQrCodeData() shouldEqual qrCode
+        expected.toQrCodeData() shouldBeEqualTo qrCode
     }
 
     @Test
@@ -170,7 +169,7 @@ class QrCodeTest : InstrumentedTest {
             val qrCode = qrCode1.copy(transactionId = longTransactionId)
 
             // Symmetric operation
-            qrCode.toEncodedString().toQrCodeData() shouldEqual qrCode
+            qrCode.toEncodedString().toQrCodeData() shouldBeEqualTo qrCode
         }
     }
 
@@ -218,32 +217,32 @@ class QrCodeTest : InstrumentedTest {
     }
 
     private fun compareArray(actual: ByteArray, expected: ByteArray) {
-        actual.size shouldEqual expected.size
+        actual.size shouldBeEqualTo expected.size
 
         for (i in actual.indices) {
-            actual[i] shouldEqualTo expected[i]
+            actual[i] shouldBeEqualTo expected[i]
         }
     }
 
     private fun checkHeader(byteArray: ByteArray) {
         // MATRIX
-        byteArray[0] shouldEqualTo 'M'.toByte()
-        byteArray[1] shouldEqualTo 'A'.toByte()
-        byteArray[2] shouldEqualTo 'T'.toByte()
-        byteArray[3] shouldEqualTo 'R'.toByte()
-        byteArray[4] shouldEqualTo 'I'.toByte()
-        byteArray[5] shouldEqualTo 'X'.toByte()
+        byteArray[0] shouldBeEqualTo 'M'.toByte()
+        byteArray[1] shouldBeEqualTo 'A'.toByte()
+        byteArray[2] shouldBeEqualTo 'T'.toByte()
+        byteArray[3] shouldBeEqualTo 'R'.toByte()
+        byteArray[4] shouldBeEqualTo 'I'.toByte()
+        byteArray[5] shouldBeEqualTo 'X'.toByte()
 
         // Version
-        byteArray[6] shouldEqualTo 2
+        byteArray[6] shouldBeEqualTo 2
     }
 
     private fun checkSizeAndTransaction(byteArray: ByteArray) {
         // Size
-        byteArray[8] shouldEqualTo 0
-        byteArray[9] shouldEqualTo 13
+        byteArray[8] shouldBeEqualTo 0
+        byteArray[9] shouldBeEqualTo 13
 
         // Transaction
-        byteArray.copyOfRange(10, 10 + "MaTransaction".length).toString(Charsets.ISO_8859_1) shouldEqual "MaTransaction"
+        byteArray.copyOfRange(10, 10 + "MaTransaction".length).toString(Charsets.ISO_8859_1) shouldBeEqualTo "MaTransaction"
     }
 }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index 237386832c..7c55143096 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -18,6 +18,14 @@ package org.matrix.android.sdk.session.room.timeline
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.zhuinden.monarchy.Monarchy
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import io.realm.kotlin.createObject
+import org.amshove.kluent.shouldBeEqualTo
+import org.amshove.kluent.shouldBeTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.matrix.android.sdk.InstrumentedTest
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.send.SendState
@@ -29,14 +37,6 @@ import org.matrix.android.sdk.internal.database.model.SessionRealmModule
 import org.matrix.android.sdk.internal.session.room.timeline.PaginationDirection
 import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeListOfEvents
 import org.matrix.android.sdk.session.room.timeline.RoomDataHelper.createFakeMessageEvent
-import io.realm.Realm
-import io.realm.RealmConfiguration
-import io.realm.kotlin.createObject
-import org.amshove.kluent.shouldBeTrue
-import org.amshove.kluent.shouldEqual
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 internal class ChunkEntityTest : InstrumentedTest {
@@ -63,7 +63,7 @@ internal class ChunkEntityTest : InstrumentedTest {
                 realm.copyToRealmOrUpdate(it)
             }
             chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
-            chunk.timelineEvents.size shouldEqual 1
+            chunk.timelineEvents.size shouldBeEqualTo 1
         }
     }
 
@@ -76,7 +76,7 @@ internal class ChunkEntityTest : InstrumentedTest {
             }
             chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
             chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
-            chunk.timelineEvents.size shouldEqual 1
+            chunk.timelineEvents.size shouldBeEqualTo 1
         }
     }
 
@@ -88,7 +88,7 @@ internal class ChunkEntityTest : InstrumentedTest {
             chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
             chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
             chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS)
-            chunk1.timelineEvents.size shouldEqual 60
+            chunk1.timelineEvents.size shouldBeEqualTo 60
         }
     }
 
@@ -104,7 +104,7 @@ internal class ChunkEntityTest : InstrumentedTest {
             chunk1.addAll(ROOM_ID, eventsForChunk1, PaginationDirection.FORWARDS)
             chunk2.addAll(ROOM_ID, eventsForChunk2, PaginationDirection.BACKWARDS)
             chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS)
-            chunk1.timelineEvents.size shouldEqual 40
+            chunk1.timelineEvents.size shouldBeEqualTo 40
             chunk1.isLastForward.shouldBeTrue()
         }
     }
@@ -119,7 +119,7 @@ internal class ChunkEntityTest : InstrumentedTest {
             chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
             chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
             chunk1.merge(ROOM_ID, chunk2, PaginationDirection.FORWARDS)
-            chunk1.prevToken shouldEqual prevToken
+            chunk1.prevToken shouldBeEqualTo prevToken
         }
     }
 
@@ -133,7 +133,7 @@ internal class ChunkEntityTest : InstrumentedTest {
             chunk1.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
             chunk2.addAll(ROOM_ID, createFakeListOfEvents(30), PaginationDirection.BACKWARDS)
             chunk1.merge(ROOM_ID, chunk2, PaginationDirection.BACKWARDS)
-            chunk1.nextToken shouldEqual nextToken
+            chunk1.nextToken shouldBeEqualTo nextToken
         }
     }
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
index 91016f7d01..9be0a5d5af 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/TimelineTest.kt
@@ -78,7 +78,7 @@ internal class TimelineTest : InstrumentedTest {
 //            }
 //        }
 //        latch.await()
-//        timelineEvents.size shouldEqual initialLoad + paginationCount
+//        timelineEvents.size shouldBeEqualTo initialLoad + paginationCount
 //        timeline.dispose()
 //    }
 }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
index a56426688d..b04834f9f4 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/BinaryStringTest.kt
@@ -17,13 +17,13 @@
 package org.matrix.android.sdk.internal.crypto.verification.qrcode
 
 import org.matrix.android.sdk.MatrixTest
-import org.amshove.kluent.shouldEqualTo
+import org.amshove.kluent.shouldBeEqualTo
 import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runners.MethodSorters
 
 @FixMethodOrder(MethodSorters.JVM)
-class BinaryStringTest: MatrixTest {
+class BinaryStringTest : MatrixTest {
 
     /**
      * I want to put bytes to a String, and vice versa
@@ -37,17 +37,17 @@ class BinaryStringTest: MatrixTest {
 
         val str = byteArray.toString(Charsets.ISO_8859_1)
 
-        str.length shouldEqualTo 256
+        str.length shouldBeEqualTo 256
 
         // Ok convert back to bytearray
 
         val result = str.toByteArray(Charsets.ISO_8859_1)
 
-        result.size shouldEqualTo 256
+        result.size shouldBeEqualTo 256
 
         for (i in 0..255) {
-            result[i] shouldEqualTo i.toByte()
-            result[i] shouldEqualTo byteArray[i]
+            result[i] shouldBeEqualTo i.toByte()
+            result[i] shouldBeEqualTo byteArray[i]
         }
     }
 }

From 9dc103489185c46c2c6fa422278dde59e54ae97e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 09:47:34 +0200
Subject: [PATCH 225/278] Fix some of the non-passing tests

---
 .../java/org/matrix/android/sdk/api/Matrix.kt    |  8 +++++++-
 .../sdk/session/room/timeline/ChunkEntityTest.kt |  6 +++---
 .../sdk/session/room/timeline/RoomDataHelper.kt  | 16 ++++++++--------
 matrix-sdk-android/src/main/AndroidManifest.xml  |  2 ++
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
index 053b4e19bd..0d71af864b 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/api/Matrix.kt
@@ -17,6 +17,8 @@
 package org.matrix.android.sdk.api
 
 import android.content.Context
+import android.os.Handler
+import android.os.Looper
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import androidx.work.WorkManager
@@ -48,13 +50,17 @@ class Matrix private constructor(context: Context, matrixConfiguration: MatrixCo
     @Inject internal lateinit var olmManager: OlmManager
     @Inject internal lateinit var sessionManager: SessionManager
 
+    private val uiHandler = Handler(Looper.getMainLooper())
+
     init {
         Monarchy.init(context)
         DaggerTestMatrixComponent.factory().create(context, matrixConfiguration).inject(this)
         if (context.applicationContext !is Configuration.Provider) {
             WorkManager.initialize(context, Configuration.Builder().setExecutor(Executors.newCachedThreadPool()).build())
         }
-        ProcessLifecycleOwner.get().lifecycle.addObserver(backgroundDetectionObserver)
+        uiHandler.post {
+            ProcessLifecycleOwner.get().lifecycle.addObserver(backgroundDetectionObserver)
+        }
     }
 
     fun getUserAgent() = userAgentHolder.userAgent
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
index 7c55143096..69ae57e644 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/ChunkEntityTest.kt
@@ -60,7 +60,7 @@ internal class ChunkEntityTest : InstrumentedTest {
             val chunk: ChunkEntity = realm.createObject()
 
             val fakeEvent = createFakeMessageEvent().toEntity(ROOM_ID, SendState.SYNCED, System.currentTimeMillis()).let {
-                realm.copyToRealmOrUpdate(it)
+                realm.copyToRealm(it)
             }
             chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
             chunk.timelineEvents.size shouldBeEqualTo 1
@@ -72,7 +72,7 @@ internal class ChunkEntityTest : InstrumentedTest {
         monarchy.runTransactionSync { realm ->
             val chunk: ChunkEntity = realm.createObject()
             val fakeEvent = createFakeMessageEvent().toEntity(ROOM_ID, SendState.SYNCED, System.currentTimeMillis()).let {
-                realm.copyToRealmOrUpdate(it)
+                realm.copyToRealm(it)
             }
             chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
             chunk.addTimelineEvent(ROOM_ID, fakeEvent, PaginationDirection.FORWARDS, emptyMap())
@@ -142,7 +142,7 @@ internal class ChunkEntityTest : InstrumentedTest {
                                    direction: PaginationDirection) {
         events.forEach { event ->
             val fakeEvent = event.toEntity(roomId, SendState.SYNCED, System.currentTimeMillis()).let {
-                realm.copyToRealmOrUpdate(it)
+                realm.copyToRealm(it)
             }
             addTimelineEvent(roomId, fakeEvent, direction, emptyMap())
         }
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
index 0dace9bd4c..1adf31be5f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/RoomDataHelper.kt
@@ -21,7 +21,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent
 import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomMemberContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
 import kotlin.random.Random
@@ -41,11 +41,11 @@ object RoomDataHelper {
         }
     }
 
-    fun createFakeEvent(type: String,
-                        content: Content? = null,
-                        prevContent: Content? = null,
-                        sender: String = FAKE_TEST_SENDER,
-                        stateKey: String = FAKE_TEST_SENDER
+    private fun createFakeEvent(type: String,
+                                content: Content? = null,
+                                prevContent: Content? = null,
+                                sender: String = FAKE_TEST_SENDER,
+                                stateKey: String = FAKE_TEST_SENDER
     ): Event {
         return Event(
                 type = type,
@@ -62,8 +62,8 @@ object RoomDataHelper {
         return createFakeEvent(EventType.MESSAGE, message)
     }
 
-    fun createFakeRoomMemberEvent(): Event {
-        val roomMember = RoomMemberSummary(Membership.JOIN, "Fake name #${Random.nextLong()}").toContent()
+    private fun createFakeRoomMemberEvent(): Event {
+        val roomMember = RoomMemberContent(Membership.JOIN, "Fake name #${Random.nextLong()}").toContent()
         return createFakeEvent(EventType.STATE_ROOM_MEMBER, roomMember)
     }
 }
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index eeb944d955..220a168f60 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -2,8 +2,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.matrix.android.sdk">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <!-- TODO Is WRITE_EXTERNAL_STORAGE necessary? -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:networkSecurityConfig="@xml/network_security_config">

From db1f129034eb1192e5c012e55af067c2dd73a3dc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 13 Oct 2020 11:27:30 +0200
Subject: [PATCH 226/278] Improve detection of encrypted rooms

---
 .../crypto/encryption/EncryptionTest.kt       | 111 ++++++++++++++++++
 .../internal/crypto/DefaultCryptoService.kt   |   6 +
 .../room/summary/RoomSummaryUpdater.kt        |   1 +
 .../timeline/factory/EncryptionItemFactory.kt |   3 +
 .../factory/MergedHeaderItemFactory.kt        |   2 +-
 .../timeline/format/NoticeEventFormatter.kt   |   3 +
 .../helper/TimelineDisplayableEvents.kt       |   2 +-
 7 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
new file mode 100644
index 0000000000..e42059c639
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.crypto.encryption
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.amshove.kluent.shouldBe
+import org.junit.FixMethodOrder
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.MethodSorters
+import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.api.NoOpMatrixCallback
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toContent
+import org.matrix.android.sdk.api.session.room.Room
+import org.matrix.android.sdk.api.session.room.send.SendState
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.common.CommonTestHelper
+import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.internal.crypto.MXCRYPTO_ALGORITHM_MEGOLM
+import org.matrix.android.sdk.internal.crypto.model.event.EncryptionEventContent
+import java.util.concurrent.CountDownLatch
+
+@RunWith(AndroidJUnit4::class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+class EncryptionTest : InstrumentedTest {
+    private val mTestHelper = CommonTestHelper(context())
+    private val mCryptoTestHelper = CryptoTestHelper(mTestHelper)
+
+    @Test
+    fun test_EncryptionEvent() {
+        performTest(roomShouldBeEncrypted = false) { room ->
+            // Send an encryption Event as an Event (and not as a state event)
+            room.sendEvent(
+                    eventType = EventType.STATE_ROOM_ENCRYPTION,
+                    content = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent()
+            )
+        }
+    }
+
+    @Test
+    fun test_EncryptionStateEvent() {
+        performTest(roomShouldBeEncrypted = true) { room ->
+            // Send an encryption Event as a State Event
+            room.sendStateEvent(
+                    eventType = EventType.STATE_ROOM_ENCRYPTION,
+                    stateKey = null,
+                    body = EncryptionEventContent(algorithm = MXCRYPTO_ALGORITHM_MEGOLM).toContent(),
+                    callback = NoOpMatrixCallback()
+            )
+        }
+    }
+
+    private fun performTest(roomShouldBeEncrypted: Boolean, action: (Room) -> Unit) {
+        val cryptoTestData = mCryptoTestHelper.doE2ETestWithAliceInARoom(encryptedRoom = false)
+
+        val aliceSession = cryptoTestData.firstSession
+        val room = aliceSession.getRoom(cryptoTestData.roomId)!!
+
+        room.isEncrypted() shouldBe false
+
+        val timeline = room.createTimeline(null, TimelineSettings(10))
+        val latch = CountDownLatch(1)
+        val timelineListener = object : Timeline.Listener {
+            override fun onTimelineFailure(throwable: Throwable) {
+            }
+
+            override fun onNewTimelineEvents(eventIds: List<String>) {
+                // noop
+            }
+
+            override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
+                val newMessages = snapshot
+                        .filter { it.root.sendState == SendState.SYNCED }
+                        .filter { it.root.getClearType() == EventType.STATE_ROOM_ENCRYPTION }
+
+                if (newMessages.isNotEmpty()) {
+                    timeline.removeListener(this)
+                    latch.countDown()
+                }
+            }
+        }
+        timeline.start()
+        timeline.addListener(timelineListener)
+
+        action.invoke(room)
+
+        mTestHelper.await(latch)
+        timeline.dispose()
+
+        room.isEncrypted() shouldBe roomShouldBeEncrypted
+
+        cryptoTestData.cleanUp(mTestHelper)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
index 21aafda9ef..b78afe6d41 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
@@ -615,6 +615,7 @@ internal class DefaultCryptoService @Inject constructor(
         val encryptionEvent = monarchy.fetchCopied { realm ->
             EventEntity.whereType(realm, roomId = roomId, type = EventType.STATE_ROOM_ENCRYPTION)
                     .contains(EventEntityFields.CONTENT, "\"algorithm\":\"$MXCRYPTO_ALGORITHM_MEGOLM\"")
+                    .isNotNull(EventEntityFields.STATE_KEY)
                     .findFirst()
         }
         return encryptionEvent != null
@@ -915,6 +916,11 @@ internal class DefaultCryptoService @Inject constructor(
      * @param event the encryption event.
      */
     private fun onRoomEncryptionEvent(roomId: String, event: Event) {
+        if (!event.isStateEvent()) {
+            // Ignore
+            Timber.w("Invalid encryption event")
+            return
+        }
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
             val params = LoadRoomMembersTask.Params(roomId)
             try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index f58059d6f2..f9a27c367c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -94,6 +94,7 @@ internal class RoomSummaryUpdater @Inject constructor(
         // Don't use current state for this one as we are only interested in having MXCRYPTO_ALGORITHM_MEGOLM event in the room
         val encryptionEvent = EventEntity.whereType(realm, roomId = roomId, type = EventType.STATE_ROOM_ENCRYPTION)
                 .contains(EventEntityFields.CONTENT, "\"algorithm\":\"$MXCRYPTO_ALGORITHM_MEGOLM\"")
+                .isNotNull(EventEntityFields.STATE_KEY)
                 .findFirst()
 
         val latestPreviewableEvent = RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 4f2c8ea63a..1eb09f2e7a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -44,6 +44,9 @@ class EncryptionItemFactory @Inject constructor(
     fun create(event: TimelineEvent,
                highlight: Boolean,
                callback: TimelineEventController.Callback?): StatusTileTimelineItem? {
+        if (!event.root.isStateEvent()) {
+            return null
+        }
         val algorithm = event.root.getClearContent().toModel<EncryptionEventContent>()?.algorithm
         val informationData = informationDataFactory.create(event, null)
         val attributes = messageItemAttributesFactory.create(null, informationData, callback)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
index 35db7fe469..e7a911ceb1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt
@@ -148,7 +148,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde
         var hasEncryption = false
         var encryptionAlgorithm: String? = null
         while (prevEvent != null && prevEvent.isRoomConfiguration(null)) {
-            if (prevEvent.root.getClearType() == EventType.STATE_ROOM_ENCRYPTION) {
+            if (prevEvent.root.isStateEvent() && prevEvent.root.getClearType() == EventType.STATE_ROOM_ENCRYPTION) {
                 hasEncryption = true
                 encryptionAlgorithm = prevEvent.root.getClearContent()?.toModel<EncryptionEventContent>()?.algorithm
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index e26472feb0..1a5f820831 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -428,6 +428,9 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
     }
 
     private fun formatRoomEncryptionEvent(event: Event, senderName: String?): CharSequence? {
+        if (!event.isStateEvent()) {
+            return null
+        }
         val content = event.content.toModel<EncryptionEventContent>() ?: return null
         return when (content.algorithm) {
             MXCRYPTO_ALGORITHM_MEGOLM ->
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
index b1b1109580..14b8c12fee 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineDisplayableEvents.kt
@@ -55,7 +55,7 @@ fun TimelineEvent.canBeMerged(): Boolean {
 }
 
 fun TimelineEvent.isRoomConfiguration(roomCreatorUserId: String?): Boolean {
-    return when (root.getClearType()) {
+    return root.isStateEvent() && when (root.getClearType()) {
         EventType.STATE_ROOM_GUEST_ACCESS,
         EventType.STATE_ROOM_HISTORY_VISIBILITY,
         EventType.STATE_ROOM_JOIN_RULES,

From 0345ca47dddd778c4975b8defeee00c175cdaad7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 14:35:33 +0200
Subject: [PATCH 227/278] protected

---
 .../main/java/im/vector/app/core/platform/VectorBaseFragment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index 4ce4d210b0..f221c29215 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -58,7 +58,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     // Butterknife unbinder
     private var mUnBinder: Unbinder? = null
 
-    val vectorBaseActivity: VectorBaseActivity by lazy {
+    protected val vectorBaseActivity: VectorBaseActivity by lazy {
         activity as VectorBaseActivity
     }
 

From ca99a52545c565b37a610498ccd9df7df9d1b94d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 14:40:23 +0200
Subject: [PATCH 228/278] Remove dead code

---
 vector/src/main/AndroidManifest.xml           |   2 -
 .../im/vector/app/core/di/ScreenComponent.kt  |   4 -
 .../media/ImageMediaViewerActivity.kt         | 256 ------------------
 .../media/VideoMediaViewerActivity.kt         | 115 --------
 .../layout/activity_image_media_viewer.xml    |  62 -----
 .../layout/activity_video_media_viewer.xml    |  71 -----
 6 files changed, 510 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt
 delete mode 100644 vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt
 delete mode 100644 vector/src/main/res/layout/activity_image_media_viewer.xml
 delete mode 100644 vector/src/main/res/layout/activity_video_media_viewer.xml

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 23e483f50b..c905f83113 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -92,7 +92,6 @@
                 <data android:host="element" />
             </intent-filter>
         </activity>
-        <activity android:name=".features.media.ImageMediaViewerActivity" />
 
         <!-- Add tools:ignore="Instantiatable" for the error reported only by Buildkite :/ -->
         <activity
@@ -108,7 +107,6 @@
             android:name=".features.settings.VectorSettingsActivity"
             android:label="@string/title_activity_settings"
             android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".features.media.VideoMediaViewerActivity" />
         <activity
             android:name=".features.crypto.keysbackup.restore.KeysBackupRestoreActivity"
             android:label="@string/title_activity_keys_backup_setup" />
diff --git a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
index 17ec00952b..fde40f9195 100644
--- a/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ScreenComponent.kt
@@ -51,9 +51,7 @@ import im.vector.app.features.invite.VectorInviteView
 import im.vector.app.features.link.LinkHandlerActivity
 import im.vector.app.features.login.LoginActivity
 import im.vector.app.features.media.BigImageViewerActivity
-import im.vector.app.features.media.ImageMediaViewerActivity
 import im.vector.app.features.media.VectorAttachmentViewerActivity
-import im.vector.app.features.media.VideoMediaViewerActivity
 import im.vector.app.features.navigation.Navigator
 import im.vector.app.features.permalink.PermalinkHandlerActivity
 import im.vector.app.features.pin.PinLocker
@@ -125,10 +123,8 @@ interface ScreenComponent {
     fun inject(activity: MainActivity)
     fun inject(activity: RoomDirectoryActivity)
     fun inject(activity: BugReportActivity)
-    fun inject(activity: ImageMediaViewerActivity)
     fun inject(activity: FilteredRoomsActivity)
     fun inject(activity: CreateRoomActivity)
-    fun inject(activity: VideoMediaViewerActivity)
     fun inject(activity: CreateDirectRoomActivity)
     fun inject(activity: IncomingShareActivity)
     fun inject(activity: SoftLogoutActivity)
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt
deleted file mode 100644
index fa7f397b8f..0000000000
--- a/vector/src/main/java/im/vector/app/features/media/ImageMediaViewerActivity.kt
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.media
-
-import android.content.Context
-import android.content.Intent
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewTreeObserver
-import androidx.appcompat.widget.Toolbar
-import androidx.core.net.toUri
-import androidx.core.transition.addListener
-import androidx.core.view.ViewCompat
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.transition.Transition
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
-import com.github.piasy.biv.indicator.progresspie.ProgressPieIndicator
-import com.github.piasy.biv.view.GlideImageViewFactory
-import im.vector.app.R
-import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.glide.GlideApp
-import im.vector.app.core.intent.getMimeTypeFromUri
-import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.core.utils.shareMedia
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.file.FileService
-import kotlinx.android.synthetic.main.activity_image_media_viewer.*
-import timber.log.Timber
-import java.io.File
-import javax.inject.Inject
-
-class ImageMediaViewerActivity : VectorBaseActivity() {
-
-    @Inject lateinit var session: Session
-    @Inject lateinit var imageContentRenderer: ImageContentRenderer
-
-    private lateinit var mediaData: ImageContentRenderer.Data
-
-    override fun injectWith(injector: ScreenComponent) {
-        injector.inject(this)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(im.vector.app.R.layout.activity_image_media_viewer)
-
-        if (intent.hasExtra(EXTRA_MEDIA_DATA)) {
-            mediaData = intent.getParcelableExtra(EXTRA_MEDIA_DATA)!!
-        } else {
-            finish()
-        }
-
-        intent.extras?.getString(EXTRA_SHARED_TRANSITION_NAME)?.let {
-            ViewCompat.setTransitionName(imageTransitionView, it)
-        }
-
-        if (mediaData.url.isNullOrEmpty()) {
-            supportFinishAfterTransition()
-            return
-        }
-
-        configureToolbar(imageMediaViewerToolbar, mediaData)
-
-        if (isFirstCreation() && addTransitionListener()) {
-            // Encrypted image
-            imageTransitionView.isVisible = true
-            imageMediaViewerImageView.isVisible = false
-            encryptedImageView.isVisible = false
-            // Postpone transaction a bit until thumbnail is loaded
-            supportPostponeEnterTransition()
-
-            // We are not passing the exact same image that in the
-            imageContentRenderer.renderFitTarget(mediaData, ImageContentRenderer.Mode.THUMBNAIL, imageTransitionView) {
-                // Proceed with transaction
-                scheduleStartPostponedTransition(imageTransitionView)
-            }
-        } else {
-            imageTransitionView.isVisible = false
-
-            if (mediaData.elementToDecrypt != null) {
-                // Encrypted image
-                imageMediaViewerImageView.isVisible = false
-                encryptedImageView.isVisible = true
-
-                GlideApp
-                        .with(this)
-                        .load(mediaData)
-                        .dontAnimate()
-                        .into(encryptedImageView)
-            } else {
-                // Clear image
-                imageMediaViewerImageView.isVisible = true
-                encryptedImageView.isVisible = false
-
-                imageMediaViewerImageView.setImageViewFactory(GlideImageViewFactory())
-                imageMediaViewerImageView.setProgressIndicator(ProgressPieIndicator())
-                imageContentRenderer.render(mediaData, imageMediaViewerImageView)
-            }
-        }
-    }
-
-    override fun getMenuRes() = R.menu.vector_media_viewer
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.mediaViewerShareAction -> {
-                onShareActionClicked()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun onShareActionClicked() {
-        session.fileService().downloadFile(
-                downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE,
-                id = mediaData.eventId,
-                fileName = mediaData.filename,
-                mimeType = mediaData.mimeType,
-                url = mediaData.url,
-                elementToDecrypt = mediaData.elementToDecrypt,
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        shareMedia(this@ImageMediaViewerActivity, data, getMimeTypeFromUri(this@ImageMediaViewerActivity, data.toUri()))
-                    }
-                }
-        )
-    }
-
-    private fun configureToolbar(toolbar: Toolbar, mediaData: ImageContentRenderer.Data) {
-        setSupportActionBar(toolbar)
-        supportActionBar?.apply {
-            title = mediaData.filename
-            setHomeButtonEnabled(true)
-            setDisplayHomeAsUpEnabled(true)
-        }
-    }
-
-    override fun onBackPressed() {
-        // show again for exit animation
-        imageTransitionView.isVisible = true
-        super.onBackPressed()
-    }
-
-    private fun scheduleStartPostponedTransition(sharedElement: View) {
-        sharedElement.viewTreeObserver.addOnPreDrawListener(
-                object : ViewTreeObserver.OnPreDrawListener {
-                    override fun onPreDraw(): Boolean {
-                        sharedElement.viewTreeObserver.removeOnPreDrawListener(this)
-                        supportStartPostponedEnterTransition()
-                        return true
-                    }
-                })
-    }
-
-    /**
-     * Try and add a [Transition.TransitionListener] to the entering shared element
-     * [Transition]. We do this so that we can load the full-size image after the transition
-     * has completed.
-     *
-     * @return true if we were successful in adding a listener to the enter transition
-     */
-    private fun addTransitionListener(): Boolean {
-        val transition = window.sharedElementEnterTransition
-
-        if (transition != null) {
-            // There is an entering shared element transition so add a listener to it
-            transition.addListener(
-                    onEnd = {
-                        if (mediaData.elementToDecrypt != null) {
-                            // Encrypted image
-                            GlideApp
-                                    .with(this)
-                                    .load(mediaData)
-                                    .dontAnimate()
-                                    .listener(object : RequestListener<Drawable> {
-                                        override fun onLoadFailed(e: GlideException?,
-                                                                  model: Any?,
-                                                                  target: Target<Drawable>?,
-                                                                  isFirstResource: Boolean): Boolean {
-                                            // TODO ?
-                                            Timber.e("TRANSITION onLoadFailed")
-                                            imageMediaViewerImageView.isVisible = false
-                                            encryptedImageView.isVisible = true
-                                            return false
-                                        }
-
-                                        override fun onResourceReady(resource: Drawable?,
-                                                                     model: Any?,
-                                                                     target: Target<Drawable>?,
-                                                                     dataSource: DataSource?,
-                                                                     isFirstResource: Boolean): Boolean {
-                                            Timber.e("TRANSITION onResourceReady")
-                                            imageTransitionView.isInvisible = true
-                                            imageMediaViewerImageView.isVisible = false
-                                            encryptedImageView.isVisible = true
-                                            return false
-                                        }
-                                    })
-                                    .into(encryptedImageView)
-                        } else {
-                            imageTransitionView.isInvisible = true
-                            // Clear image
-                            imageMediaViewerImageView.isVisible = true
-                            encryptedImageView.isVisible = false
-
-                            imageMediaViewerImageView.setImageViewFactory(GlideImageViewFactory())
-                            imageMediaViewerImageView.setProgressIndicator(ProgressPieIndicator())
-                            imageContentRenderer.render(mediaData, imageMediaViewerImageView)
-                        }
-                    },
-                    onCancel = {
-                        // Something to do?
-                    }
-            )
-            return true
-        }
-
-        // If we reach here then we have not added a listener
-        return false
-    }
-
-    companion object {
-
-        private const val EXTRA_MEDIA_DATA = "EXTRA_MEDIA_DATA"
-        private const val EXTRA_SHARED_TRANSITION_NAME = "EXTRA_SHARED_TRANSITION_NAME"
-
-        fun newIntent(context: Context, mediaData: ImageContentRenderer.Data, shareTransitionName: String?): Intent {
-            return Intent(context, ImageMediaViewerActivity::class.java).apply {
-                putExtra(EXTRA_MEDIA_DATA, mediaData)
-                putExtra(EXTRA_SHARED_TRANSITION_NAME, shareTransitionName)
-            }
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt
deleted file mode 100644
index 5bdda9b0be..0000000000
--- a/vector/src/main/java/im/vector/app/features/media/VideoMediaViewerActivity.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2019 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.media
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.appcompat.widget.Toolbar
-import androidx.core.net.toUri
-import im.vector.app.R
-import im.vector.app.core.di.ScreenComponent
-import im.vector.app.core.intent.getMimeTypeFromUri
-import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.core.utils.shareMedia
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.file.FileService
-import kotlinx.android.synthetic.main.activity_video_media_viewer.*
-import java.io.File
-import javax.inject.Inject
-
-class VideoMediaViewerActivity : VectorBaseActivity() {
-
-    @Inject lateinit var session: Session
-    @Inject lateinit var imageContentRenderer: ImageContentRenderer
-    @Inject lateinit var videoContentRenderer: VideoContentRenderer
-
-    private lateinit var mediaData: VideoContentRenderer.Data
-
-    override fun injectWith(injector: ScreenComponent) {
-        injector.inject(this)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(im.vector.app.R.layout.activity_video_media_viewer)
-
-        if (intent.hasExtra(EXTRA_MEDIA_DATA)) {
-            mediaData = intent.getParcelableExtra<VideoContentRenderer.Data>(EXTRA_MEDIA_DATA)!!
-
-            configureToolbar(videoMediaViewerToolbar, mediaData)
-            imageContentRenderer.render(mediaData.thumbnailMediaData, ImageContentRenderer.Mode.FULL_SIZE, videoMediaViewerThumbnailView)
-            videoContentRenderer.render(mediaData,
-                    videoMediaViewerThumbnailView,
-                    videoMediaViewerLoading,
-                    videoMediaViewerVideoView,
-                    videoMediaViewerErrorView)
-        } else {
-            finish()
-        }
-    }
-
-    override fun getMenuRes() = R.menu.vector_media_viewer
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.mediaViewerShareAction -> {
-                onShareActionClicked()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun onShareActionClicked() {
-        session.fileService().downloadFile(
-                downloadMode = FileService.DownloadMode.FOR_EXTERNAL_SHARE,
-                id = mediaData.eventId,
-                fileName = mediaData.filename,
-                mimeType = mediaData.mimeType,
-                url = mediaData.url,
-                elementToDecrypt = mediaData.elementToDecrypt,
-                callback = object : MatrixCallback<File> {
-                    override fun onSuccess(data: File) {
-                        shareMedia(this@VideoMediaViewerActivity, data, getMimeTypeFromUri(this@VideoMediaViewerActivity, data.toUri()))
-                    }
-                }
-        )
-    }
-
-    private fun configureToolbar(toolbar: Toolbar, mediaData: VideoContentRenderer.Data) {
-        setSupportActionBar(toolbar)
-        supportActionBar?.apply {
-            title = mediaData.filename
-            setHomeButtonEnabled(true)
-            setDisplayHomeAsUpEnabled(true)
-        }
-    }
-
-    companion object {
-
-        private const val EXTRA_MEDIA_DATA = "EXTRA_MEDIA_DATA"
-
-        fun newIntent(context: Context, mediaData: VideoContentRenderer.Data): Intent {
-            return Intent(context, VideoMediaViewerActivity::class.java).apply {
-                putExtra(EXTRA_MEDIA_DATA, mediaData)
-            }
-        }
-    }
-}
diff --git a/vector/src/main/res/layout/activity_image_media_viewer.xml b/vector/src/main/res/layout/activity_image_media_viewer.xml
deleted file mode 100644
index cfcfa6702b..0000000000
--- a/vector/src/main/res/layout/activity_image_media_viewer.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/imageMediaViewerToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp"
-        android:transitionName="toolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/imageMediaViewerToolbar">
-
-        <ImageView
-            android:id="@+id/imageTransitionView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="fitCenter"
-            android:transitionName="imagePreview"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <com.github.piasy.biv.view.BigImageView
-            android:id="@+id/imageMediaViewerImageView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:failureImageInitScaleType="center"
-            app:optimizeDisplay="true" />
-
-        <ImageView
-            android:id="@+id/encryptedImageView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/fakeContainerForTransition"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:transitionName="composer"
-        android:background="?riotx_background"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_video_media_viewer.xml b/vector/src/main/res/layout/activity_video_media_viewer.xml
deleted file mode 100644
index c68577bcd5..0000000000
--- a/vector/src/main/res/layout/activity_video_media_viewer.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/videoMediaViewerToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:elevation="4dp" />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:id="@+id/videoMediaViewerThumbnailView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:scaleType="centerInside"
-            tools:visibility="visible" />
-
-        <ProgressBar
-            android:id="@+id/videoMediaViewerLoading"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <VideoView
-            android:id="@+id/videoMediaViewerVideoView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/videoMediaViewerErrorView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="16dp"
-            android:textColor="@color/riotx_notice"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:text="Error"
-            tools:visibility="visible" />
-
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file

From ff56414695f9a4c4988b32eddd12d58fc2f28c28 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 14:44:04 +0200
Subject: [PATCH 229/278] Cleanup and log onResume and onPause for
 VectorAttachmentViewerActivity

---
 .../vector/app/core/platform/VectorBaseActivity.kt   |  8 ++++----
 .../platform/VectorBaseBottomSheetDialogFragment.kt  |  2 +-
 .../vector/app/core/platform/VectorBaseFragment.kt   |  6 +++---
 .../features/media/VectorAttachmentViewerActivity.kt | 12 +++++++++++-
 .../features/settings/VectorSettingsBaseFragment.kt  |  2 +-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index cdba5b2ef2..79021902c4 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -177,7 +177,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        Timber.i("onCreate Activity ${this.javaClass.simpleName}")
+        Timber.i("onCreate Activity ${javaClass.simpleName}")
         val vectorComponent = getVectorComponent()
         screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this)
         val timeForInjection = measureTimeMillis {
@@ -305,7 +305,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onDestroy() {
         super.onDestroy()
-        Timber.i("onDestroy Activity ${this.javaClass.simpleName}")
+        Timber.i("onDestroy Activity ${javaClass.simpleName}")
         unBinder?.unbind()
         unBinder = null
 
@@ -333,7 +333,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume Activity ${this.javaClass.simpleName}")
+        Timber.i("onResume Activity ${javaClass.simpleName}")
 
         configurationViewModel.onActivityResumed()
 
@@ -373,7 +373,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onPause() {
         super.onPause()
-        Timber.i("onPause Activity ${this.javaClass.simpleName}")
+        Timber.i("onPause Activity ${javaClass.simpleName}")
 
         rageShake.stop()
 
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 9f4924ebb2..4a251de1a3 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -141,7 +141,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
 
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume BottomSheet ${this.javaClass.simpleName}")
+        Timber.i("onResume BottomSheet ${javaClass.simpleName}")
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
index f221c29215..179e21a6d8 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseFragment.kt
@@ -112,7 +112,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     }
 
     final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        Timber.i("onCreateView Fragment ${this.javaClass.simpleName}")
+        Timber.i("onCreateView Fragment ${javaClass.simpleName}")
         return inflater.inflate(getLayoutResId(), container, false)
     }
 
@@ -122,7 +122,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     @CallSuper
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume Fragment ${this.javaClass.simpleName}")
+        Timber.i("onResume Fragment ${javaClass.simpleName}")
     }
 
     @CallSuper
@@ -142,7 +142,7 @@ abstract class VectorBaseFragment : BaseMvRxFragment(), HasScreenInjector {
     @CallSuper
     override fun onDestroyView() {
         super.onDestroyView()
-        Timber.i("onDestroyView Fragment ${this.javaClass.simpleName}")
+        Timber.i("onDestroyView Fragment ${javaClass.simpleName}")
         mUnBinder?.unbind()
         mUnBinder = null
         uiDisposables.clear()
diff --git a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
index 74f4c7148f..9302be502d 100644
--- a/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VectorAttachmentViewerActivity.kt
@@ -74,7 +74,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Timber.i("onCreate Activity ${this.javaClass.simpleName}")
+        Timber.i("onCreate Activity ${javaClass.simpleName}")
         val vectorComponent = getVectorComponent()
         screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this)
         val timeForInjection = measureTimeMillis {
@@ -154,6 +154,16 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen
         window.navigationBarColor = ContextCompat.getColor(this, R.color.black_alpha)
     }
 
+    override fun onResume() {
+        super.onResume()
+        Timber.i("onResume Activity ${javaClass.simpleName}")
+    }
+
+    override fun onPause() {
+        super.onPause()
+        Timber.i("onPause Activity ${javaClass.simpleName}")
+    }
+
     private fun getOtherThemes() = ActivityOtherThemes.VectorAttachmentsPreview
 
     override fun shouldAnimateDismiss(): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
index 512545afe2..add6fba38c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
@@ -70,7 +70,7 @@ abstract class VectorSettingsBaseFragment : PreferenceFragmentCompat(), HasScree
 
     override fun onResume() {
         super.onResume()
-        Timber.i("onResume Fragment ${this.javaClass.simpleName}")
+        Timber.i("onResume Fragment ${javaClass.simpleName}")
         vectorActivity.supportActionBar?.setTitle(titleRes)
         // find the view from parent activity
         mLoadingView = vectorActivity.findViewById(R.id.vector_settings_spinner_views)

From ede5bb0e90b4fad3fd6b72eb0baa5f610a639f3d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 14:57:45 +0200
Subject: [PATCH 230/278] Format files, in particular align `->`

---
 .idea/codeStyles/Project.xml                  | 11 +--
 .../matrix/android/sdk/api/MatrixCallback.kt  |  2 +-
 .../android/sdk/api/failure/MatrixError.kt    | 36 +++++++
 .../android/sdk/api/pushrules/Action.kt       | 14 +--
 .../android/sdk/api/raw/RawCacheStrategy.kt   |  6 +-
 .../api/session/call/CallSignalingService.kt  |  2 +-
 .../android/sdk/api/session/call/MxCall.kt    |  1 +
 .../sdk/api/session/crypto/CryptoService.kt   |  8 +-
 .../crypto/keysbackup/KeysBackupService.kt    |  2 +-
 .../crypto/keysbackup/KeysBackupState.kt      |  8 ++
 .../keyshare/GossipingRequestListener.kt      |  2 +-
 .../crypto/verification/VerificationMethod.kt |  2 +
 .../sdk/api/session/events/model/Event.kt     |  1 +
 .../api/session/events/model/RelationType.kt  |  3 +
 .../events/model/UnsignedRelationInfo.kt      |  2 +-
 .../IntegrationManagerConfig.kt               |  2 +
 .../room/members/ChangeMembershipState.kt     |  2 +-
 .../session/room/model/PollSummaryContent.kt  |  2 +-
 .../room/model/RoomGuestAccessContent.kt      |  1 +
 .../room/model/RoomHistoryVisibility.kt       |  3 +
 .../room/model/message/MessageAudioContent.kt |  4 +-
 .../room/model/message/MessageImageContent.kt |  4 +-
 .../model/message/MessageStickerContent.kt    |  4 +-
 .../session/room/model/message/MessageType.kt |  1 +
 .../room/model/message/MessageVideoContent.kt |  4 +-
 .../sdk/api/session/room/send/SendState.kt    |  7 ++
 .../sdk/api/session/room/timeline/Timeline.kt |  1 +
 .../session/room/timeline/TimelineService.kt  |  2 +-
 .../sdk/api/session/sync/FilterService.kt     |  1 +
 .../matrix/android/sdk/api/util/Optional.kt   |  2 +-
 .../sdk/internal/crypto/CryptoConstants.kt    |  1 +
 .../internal/crypto/GossipingRequestState.kt  |  3 +-
 .../crypto/MXMegolmExportEncryption.kt        |  1 +
 .../crypto/OutgoingGossipingRequestManager.kt |  4 +-
 .../crypto/algorithms/IMXDecrypting.kt        |  2 +-
 .../algorithms/megolm/MXMegolmDecryption.kt   |  2 +-
 .../crypto/crosssigning/ShieldTrustUpdater.kt |  2 +-
 .../model/OlmInboundGroupSessionWrapper2.kt   |  1 +
 .../model/event/RoomKeyWithHeldContent.kt     |  4 +
 .../crypto/store/SavedKeyBackupKeyInfo.kt     |  2 +-
 .../crypto/store/db/model/OlmSessionEntity.kt |  8 +-
 ...tgoingSASDefaultVerificationTransaction.kt |  6 +-
 .../DefaultVerificationTransaction.kt         |  2 +-
 .../SASDefaultVerificationTransaction.kt      |  4 +
 .../VerificationTransportRoomMessage.kt       |  4 +-
 .../sdk/internal/database/RealmKeysUtils.kt   |  2 +-
 .../sdk/internal/database/RealmQueryLatch.kt  |  4 +-
 .../internal/database/model/ChunkEntity.kt    |  4 +-
 .../sdk/internal/database/model/SyncEntity.kt |  2 +-
 .../EventAnnotationsSummaryEntityQuery.kt     |  1 +
 .../riot/HomeServerConnectionConfig.java      |  2 +-
 .../legacy/riot/WellKnownManagerConfig.kt     |  2 +-
 .../internal/network/UnitConverterFactory.kt  | 18 ++--
 .../sdk/internal/raw/DefaultGetUrlTask.kt     |  4 +-
 .../session/content/ImageCompressor.kt        | 12 +--
 .../session/content/UploadContentWorker.kt    |  2 +-
 .../session/profile/AddThreePidTask.kt        |  2 +-
 .../membership/RoomDisplayNameResolver.kt     |  6 +-
 .../session/room/send/DefaultSendService.kt   |  2 +-
 .../room/send/LocalEchoEventFactory.kt        |  2 +-
 .../session/room/send/MarkdownParser.kt       |  6 +-
 .../session/room/timeline/DefaultTimeline.kt  |  8 +-
 .../room/timeline/TimelineEventDecryptor.kt   |  1 +
 .../room/typing/DefaultTypingService.kt       |  1 +
 .../session/sync/ReadReceiptHandler.kt        |  6 +-
 .../internal/session/sync/RoomTagHandler.kt   |  2 +-
 .../widgets/DefaultWidgetPostAPIMediator.kt   |  1 +
 .../im/vector/app/EmojiCompatFontProvider.kt  |  2 +-
 .../java/im/vector/app/EmojiCompatWrapper.kt  |  2 +-
 .../dialogs/UnrecognizedCertificateDialog.kt  | 12 +--
 .../app/core/epoxy/VectorEpoxyHolder.kt       |  2 +-
 .../bottomsheet/BottomSheetActionItem.kt      |  7 ++
 .../BottomSheetMessagePreviewItem.kt          |  5 +
 .../BottomSheetQuickReactionsItem.kt          |  3 +
 .../bottomsheet/BottomSheetSendStateItem.kt   |  2 +
 .../epoxy/profiles/BaseProfileMatrixItem.kt   |  1 +
 .../core/epoxy/profiles/ProfileActionItem.kt  |  1 +
 .../core/epoxy/profiles/ProfileSectionItem.kt |  2 +-
 .../vector/app/core/error/ErrorFormatter.kt   | 24 ++---
 .../im/vector/app/core/files/FileSaver.kt     | 18 ++--
 .../app/core/glide/VectorGlideModelLoader.kt  |  2 +-
 .../app/core/intent/ExternalIntentAnalyser.kt |  2 +-
 .../vector/app/core/linkify/VectorLinkify.kt  |  2 +-
 .../app/core/platform/CheckableFrameLayout.kt |  6 +-
 .../VectorBaseBottomSheetDialogFragment.kt    |  2 +-
 .../app/core/resources/DrawableProvider.kt    |  1 +
 .../app/core/ui/views/PasswordStrengthBar.kt  |  4 +
 .../preview/AttachmentPreviewItems.kt         |  2 +
 .../preview/AttachmentsPreviewAction.kt       |  4 +-
 .../preview/AttachmentsPreviewFragment.kt     |  2 +-
 .../autocomplete/RecyclerViewPresenter.kt     |  1 +
 .../command/AutocompleteCommandItem.kt        |  3 +
 .../command/CommandAutocompletePolicy.kt      |  2 +-
 .../app/features/call/SdpObserverAdapter.kt   |  2 +-
 .../call/WebRtcPeerConnectionManager.kt       |  2 +-
 .../app/features/command/ParsedCommand.kt     |  2 +-
 .../contactsbook/ContactsBookViewModel.kt     |  2 +-
 .../createdirect/CreateDirectRoomActivity.kt  |  4 +-
 .../createdirect/CreateDirectRoomViewModel.kt |  2 +-
 .../createdirect/CreateDirectRoomViewState.kt |  2 +-
 .../KeysBackupRestoreSuccessFragment.kt       |  1 +
 .../recover/BootstrapSharedViewModel.kt       |  4 +-
 .../crypto/recover/BootstrapViewEvents.kt     |  4 +-
 .../VerificationConclusionController.kt       |  4 +-
 .../BottomSheetVerificationActionItem.kt      |  4 +
 .../request/VerificationRequestController.kt  |  4 +-
 .../app/features/home/LoadingFragment.kt      |  2 +-
 .../app/features/home/RoomListDisplayMode.kt  | 10 +-
 .../home/room/detail/RoomDetailAction.kt      |  8 +-
 .../home/room/detail/RoomDetailFragment.kt    |  4 +-
 .../home/room/detail/RoomDetailViewEvents.kt  | 15 +--
 .../home/room/detail/RoomDetailViewModel.kt   | 98 +++++++++----------
 .../home/room/detail/RoomDetailViewState.kt   |  1 +
 .../room/detail/composer/TextComposerView.kt  |  7 ++
 .../home/room/detail/search/SearchFragment.kt |  2 +-
 .../room/detail/search/SearchViewModel.kt     |  4 +-
 .../action/MessageSharedActionViewModel.kt    |  2 +-
 .../timeline/factory/TimelineItemFactory.kt   | 16 +--
 .../format/DisplayableEventFormatter.kt       | 10 +-
 .../timeline/format/NoticeEventFormatter.kt   |  2 +-
 .../timeline/item/AbsBaseMessageItem.kt       |  2 +
 .../detail/timeline/item/BaseEventItem.kt     |  1 +
 .../timeline/item/MessageBlockCodeItem.kt     |  1 +
 .../timeline/item/MessageImageVideoItem.kt    |  5 +
 .../timeline/item/MessageInformationData.kt   |  4 +-
 .../detail/timeline/item/MessageTextItem.kt   |  3 +
 .../reactions/ReactionInfoSimpleItem.kt       |  3 +
 .../home/room/detail/widget/RoomWidgetItem.kt |  1 +
 .../room/list/RoomListDisplayModeFilter.kt    |  4 +-
 .../home/room/list/RoomListFragment.kt        | 18 ++--
 .../home/room/list/RoomListViewModel.kt       |  8 +-
 .../home/room/list/RoomListViewState.kt       |  4 +-
 .../home/room/list/RoomSummaryItem.kt         |  2 +
 .../invite/InviteUsersToRoomActivity.kt       |  2 +-
 .../invite/InviteUsersToRoomViewEvents.kt     |  2 +-
 .../vector/app/features/login/LoginAction.kt  |  1 +
 .../im/vector/app/features/login/SignMode.kt  |  3 +
 .../features/media/ImageContentRenderer.kt    |  5 +-
 .../features/notifications/NotifiableEvent.kt |  3 +
 .../NotificationDrawerManager.kt              |  4 +-
 .../notifications/RoomEventGroupInfo.kt       |  1 +
 .../app/features/roomdirectory/JoinState.kt   |  1 +
 .../features/roomprofile/RoomProfileAction.kt |  4 +-
 .../roomprofile/RoomProfileViewModel.kt       |  8 +-
 .../banned/RoomBannedMemberListFragment.kt    |  2 +-
 .../settings/RoomSettingsViewModel.kt         |  4 +-
 .../uploads/RoomUploadsFragment.kt            |  4 +-
 .../uploads/media/UploadsVideoItem.kt         |  6 +-
 .../settings/VectorSettingsActivity.kt        |  4 +-
 ...ttingsNotificationsTroubleshootFragment.kt | 14 +--
 .../VectorSettingsSecurityPrivacyFragment.kt  |  2 +-
 .../threepids/ThreePidsSettingsController.kt  |  4 +-
 .../threepids/ThreePidsSettingsFragment.kt    |  2 +-
 .../threepids/ThreePidsSettingsViewModel.kt   | 12 +--
 ...ficationTroubleshootRecyclerViewAdapter.kt | 12 ++-
 .../troubleshoot/TestAccountSettings.kt       | 16 +--
 .../features/share/IncomingShareFragment.kt   |  4 +-
 .../vector/app/features/share/SharedData.kt   |  6 +-
 .../app/features/widgets/WidgetViewEvents.kt  |  2 +-
 .../RoomWidgetPermissionActions.kt            |  6 +-
 .../SignOutBottomSheetDialogFragment.kt       |  4 +-
 161 files changed, 477 insertions(+), 325 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 89a7c466fd..b3719669fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,16 +4,7 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
index 5dede5abdd..166ba8eab9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixCallback.kt
@@ -42,4 +42,4 @@ interface MatrixCallback<in T> {
 /**
  * Basic no op implementation
  */
-class NoOpMatrixCallback<T>: MatrixCallback<T>
+class NoOpMatrixCallback<T> : MatrixCallback<T>
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
index c6ef33327a..895be0031a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/MatrixError.kt
@@ -48,18 +48,25 @@ data class MatrixError(
     companion object {
         /** Forbidden access, e.g. joining a room without permission, failed login. */
         const val M_FORBIDDEN = "M_FORBIDDEN"
+
         /** An unknown error has occurred. */
         const val M_UNKNOWN = "M_UNKNOWN"
+
         /** The access token specified was not recognised. */
         const val M_UNKNOWN_TOKEN = "M_UNKNOWN_TOKEN"
+
         /** No access token was specified for the request. */
         const val M_MISSING_TOKEN = "M_MISSING_TOKEN"
+
         /** Request contained valid JSON, but it was malformed in some way, e.g. missing required keys, invalid values for keys. */
         const val M_BAD_JSON = "M_BAD_JSON"
+
         /** Request did not contain valid JSON. */
         const val M_NOT_JSON = "M_NOT_JSON"
+
         /** No resource was found for this request. */
         const val M_NOT_FOUND = "M_NOT_FOUND"
+
         /** Too many requests have been sent in a short period of time. Wait a while then try again. */
         const val M_LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED"
 
@@ -69,68 +76,97 @@ data class MatrixError(
 
         /** Encountered when trying to register a user ID which has been taken. */
         const val M_USER_IN_USE = "M_USER_IN_USE"
+
         /** Sent when the room alias given to the createRoom API is already in use. */
         const val M_ROOM_IN_USE = "M_ROOM_IN_USE"
+
         /** (Not documented yet) */
         const val M_BAD_PAGINATION = "M_BAD_PAGINATION"
+
         /** The request was not correctly authorized. Usually due to login failures. */
         const val M_UNAUTHORIZED = "M_UNAUTHORIZED"
+
         /** (Not documented yet) */
         const val M_OLD_VERSION = "M_OLD_VERSION"
+
         /** The server did not understand the request. */
         const val M_UNRECOGNIZED = "M_UNRECOGNIZED"
+
         /** (Not documented yet) */
         const val M_LOGIN_EMAIL_URL_NOT_YET = "M_LOGIN_EMAIL_URL_NOT_YET"
+
         /** Authentication could not be performed on the third party identifier. */
         const val M_THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
+
         /** Sent when a threepid given to an API cannot be used because no record matching the threepid was found. */
         const val M_THREEPID_NOT_FOUND = "M_THREEPID_NOT_FOUND"
+
         /** Sent when a threepid given to an API cannot be used because the same threepid is already in use. */
         const val M_THREEPID_IN_USE = "M_THREEPID_IN_USE"
+
         /** The client's request used a third party server, eg. identity server, that this server does not trust. */
         const val M_SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED"
+
         /** The request or entity was too large. */
         const val M_TOO_LARGE = "M_TOO_LARGE"
+
         /** (Not documented yet) */
         const val M_CONSENT_NOT_GIVEN = "M_CONSENT_NOT_GIVEN"
+
         /** The request cannot be completed because the homeserver has reached a resource limit imposed on it. For example,
          *  a homeserver held in a shared hosting environment may reach a resource limit if it starts using too much memory
          *  or disk space. The error MUST have an admin_contact field to provide the user receiving the error a place to reach
          *  out to. Typically, this error will appear on routes which attempt to modify state (eg: sending messages, account
          *  data, etc) and not routes which only read state (eg: /sync, get account data, etc). */
         const val M_RESOURCE_LIMIT_EXCEEDED = "M_RESOURCE_LIMIT_EXCEEDED"
+
         /** The user ID associated with the request has been deactivated. Typically for endpoints that prove authentication, such as /login. */
         const val M_USER_DEACTIVATED = "M_USER_DEACTIVATED"
+
         /** Encountered when trying to register a user ID which is not valid. */
         const val M_INVALID_USERNAME = "M_INVALID_USERNAME"
+
         /** Sent when the initial state given to the createRoom API is invalid. */
         const val M_INVALID_ROOM_STATE = "M_INVALID_ROOM_STATE"
+
         /** The server does not permit this third party identifier. This may happen if the server only permits,
          *  for example, email addresses from a particular domain. */
         const val M_THREEPID_DENIED = "M_THREEPID_DENIED"
+
         /** The client's request to create a room used a room version that the server does not support. */
         const val M_UNSUPPORTED_ROOM_VERSION = "M_UNSUPPORTED_ROOM_VERSION"
+
         /** The client attempted to join a room that has a version the server does not support.
          *  Inspect the room_version property of the error response for the room's version. */
         const val M_INCOMPATIBLE_ROOM_VERSION = "M_INCOMPATIBLE_ROOM_VERSION"
+
         /** The state change requested cannot be performed, such as attempting to unban a user who is not banned. */
         const val M_BAD_STATE = "M_BAD_STATE"
+
         /** The room or resource does not permit guests to access it. */
         const val M_GUEST_ACCESS_FORBIDDEN = "M_GUEST_ACCESS_FORBIDDEN"
+
         /** A Captcha is required to complete the request. */
         const val M_CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED"
+
         /** The Captcha provided did not match what was expected. */
         const val M_CAPTCHA_INVALID = "M_CAPTCHA_INVALID"
+
         /** A required parameter was missing from the request. */
         const val M_MISSING_PARAM = "M_MISSING_PARAM"
+
         /** A parameter that was specified has the wrong value. For example, the server expected an integer and instead received a string. */
         const val M_INVALID_PARAM = "M_INVALID_PARAM"
+
         /** The resource being requested is reserved by an application service, or the application service making the request has not created the resource. */
         const val M_EXCLUSIVE = "M_EXCLUSIVE"
+
         /** The user is unable to reject an invite to join the server notices room. See the Server Notices module for more information. */
         const val M_CANNOT_LEAVE_SERVER_NOTICE_ROOM = "M_CANNOT_LEAVE_SERVER_NOTICE_ROOM"
+
         /** (Not documented yet) */
         const val M_WRONG_ROOM_KEYS_VERSION = "M_WRONG_ROOM_KEYS_VERSION"
+
         /** (Not documented yet) */
         const val M_WEAK_PASSWORD = "M_WEAK_PASSWORD"
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
index 34cdab58af..30289531e7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/Action.kt
@@ -71,15 +71,15 @@ sealed class Action {
 fun List<Action>.toJson(): List<Any> {
     return map { action ->
         when (action) {
-            is Action.Notify -> Action.ACTION_NOTIFY
+            is Action.Notify      -> Action.ACTION_NOTIFY
             is Action.DoNotNotify -> Action.ACTION_DONT_NOTIFY
-            is Action.Sound -> {
+            is Action.Sound       -> {
                 mapOf(
                         Action.ACTION_OBJECT_SET_TWEAK_KEY to Action.ACTION_OBJECT_SET_TWEAK_VALUE_SOUND,
                         Action.ACTION_OBJECT_VALUE_KEY to action.sound
                 )
             }
-            is Action.Highlight -> {
+            is Action.Highlight   -> {
                 mapOf(
                         Action.ACTION_OBJECT_SET_TWEAK_KEY to Action.ACTION_OBJECT_SET_TWEAK_VALUE_HIGHLIGHT,
                         Action.ACTION_OBJECT_VALUE_KEY to action.highlight
@@ -94,9 +94,9 @@ fun PushRule.getActions(): List<Action> {
 
     actions.forEach { actionStrOrObj ->
         when (actionStrOrObj) {
-            Action.ACTION_NOTIFY -> Action.Notify
+            Action.ACTION_NOTIFY      -> Action.Notify
             Action.ACTION_DONT_NOTIFY -> Action.DoNotNotify
-            is Map<*, *> -> {
+            is Map<*, *>              -> {
                 when (actionStrOrObj[Action.ACTION_OBJECT_SET_TWEAK_KEY]) {
                     Action.ACTION_OBJECT_SET_TWEAK_VALUE_SOUND     -> {
                         (actionStrOrObj[Action.ACTION_OBJECT_VALUE_KEY] as? String)?.let { stringValue ->
@@ -112,13 +112,13 @@ fun PushRule.getActions(): List<Action> {
                         // When the value is not there, default is true, says the spec
                                 ?: Action.Highlight(true)
                     }
-                    else                                    -> {
+                    else                                           -> {
                         Timber.w("Unsupported set_tweak value ${actionStrOrObj[Action.ACTION_OBJECT_SET_TWEAK_KEY]}")
                         null
                     }
                 }
             }
-            else               -> {
+            else                      -> {
                 Timber.w("Unsupported action type $actionStrOrObj")
                 null
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt
index 944f458b6f..f4eada559e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/raw/RawCacheStrategy.kt
@@ -18,12 +18,12 @@ package org.matrix.android.sdk.api.raw
 
 sealed class RawCacheStrategy {
     // Data is always fetched from the server
-    object NoCache: RawCacheStrategy()
+    object NoCache : RawCacheStrategy()
 
     // Once data is retrieved, it is stored for the provided amount of time.
     // In case of error, and if strict is set to false, the cache can be returned if available
-    data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean): RawCacheStrategy()
+    data class TtlCache(val validityDurationInMillis: Long, val strict: Boolean) : RawCacheStrategy()
 
     // Once retrieved, the data is stored in cache and will be always get from the cache
-    object InfiniteCache: RawCacheStrategy()
+    object InfiniteCache : RawCacheStrategy()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
index 494c1afd1a..e28c1fa595 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/CallSignalingService.kt
@@ -32,7 +32,7 @@ interface CallSignalingService {
 
     fun removeCallListener(listener: CallsListener)
 
-    fun getCallWithId(callId: String) : MxCall?
+    fun getCallWithId(callId: String): MxCall?
 
     fun isThereAnyActiveCall(): Boolean
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
index 2c115a63f2..a1ab687894 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/call/MxCall.kt
@@ -33,6 +33,7 @@ interface MxCallDetail {
 interface MxCall : MxCallDetail {
 
     var state: CallState
+
     /**
      * Pick Up the incoming call
      * It has no effect on outgoing call
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
index c6e5056198..121d9fb401 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/CryptoService.kt
@@ -101,9 +101,9 @@ interface CryptoService {
 
     fun fetchDevicesList(callback: MatrixCallback<DevicesListResponse>)
 
-    fun getMyDevicesInfo() : List<DeviceInfo>
+    fun getMyDevicesInfo(): List<DeviceInfo>
 
-    fun getLiveMyDevicesInfo() : LiveData<List<DeviceInfo>>
+    fun getLiveMyDevicesInfo(): LiveData<List<DeviceInfo>>
 
     fun getDeviceInfo(deviceId: String, callback: MatrixCallback<DeviceInfo>)
 
@@ -148,6 +148,6 @@ interface CryptoService {
     fun getGossipingEventsTrail(): List<Event>
 
     // For testing shared session
-    fun getSharedWithInfo(roomId: String?, sessionId: String) : MXUsersDevicesMap<Int>
-    fun getWithHeldMegolmSession(roomId: String, sessionId: String) : RoomKeyWithHeldContent?
+    fun getSharedWithInfo(roomId: String?, sessionId: String): MXUsersDevicesMap<Int>
+    fun getWithHeldMegolmSession(roomId: String, sessionId: String): RoomKeyWithHeldContent?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
index fb6bb74454..465d00168f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupService.kt
@@ -216,7 +216,7 @@ interface KeysBackupService {
 
     // For gossiping
     fun saveBackupRecoveryKey(recoveryKey: String?, version: String?)
-    fun getKeyBackupRecoveryKeyInfo() : SavedKeyBackupKeyInfo?
+    fun getKeyBackupRecoveryKeyInfo(): SavedKeyBackupKeyInfo?
 
     fun isValidRecoveryKeyForCurrentVersion(recoveryKey: String, callback: MatrixCallback<Boolean>)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
index 1dc75ce687..7d0f04ebcf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keysbackup/KeysBackupState.kt
@@ -53,23 +53,31 @@ package org.matrix.android.sdk.api.session.crypto.keysbackup
 enum class KeysBackupState {
     // Need to check the current backup version on the homeserver
     Unknown,
+
     // Checking if backup is enabled on home server
     CheckingBackUpOnHomeserver,
+
     // Backup has been stopped because a new backup version has been detected on the homeserver
     WrongBackUpVersion,
+
     // Backup from this device is not enabled
     Disabled,
+
     // There is a backup available on the homeserver but it is not trusted.
     // It is not trusted because the signature is invalid or the device that created it is not verified
     // Use [KeysBackup.getKeysBackupTrust()] to get trust details.
     // Consequently, the backup from this device is not enabled.
     NotTrusted,
+
     // Backup is being enabled: the backup version is being created on the homeserver
     Enabling,
+
     // Backup is enabled and ready to send backup to the homeserver
     ReadyToBackUp,
+
     // e2e keys are going to be sent to the homeserver
     WillBackUp,
+
     // e2e keys are being sent to the homeserver
     BackingUp
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
index 491d42cd05..810d28dd83 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/keyshare/GossipingRequestListener.kt
@@ -35,7 +35,7 @@ interface GossipingRequestListener {
      * Returns the secret value to be shared
      * @return true if is handled
      */
-    fun onSecretShareRequest(request: IncomingSecretShareRequest) : Boolean
+    fun onSecretShareRequest(request: IncomingSecretShareRequest): Boolean
 
     /**
      * A room key request cancellation has been received.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
index c4432f3a8a..4efec93a34 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationMethod.kt
@@ -22,8 +22,10 @@ package org.matrix.android.sdk.api.session.crypto.verification
 enum class VerificationMethod {
     // Use it when your application supports the SAS verification method
     SAS,
+
     // Use it if your application is able to display QR codes
     QR_CODE_SHOW,
+
     // Use it if your application is able to scan QR codes
     QR_CODE_SCAN
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 6a119319e9..8f9f409b74 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -253,6 +253,7 @@ fun Event.isFileMessage(): Boolean {
         else                     -> false
     }
 }
+
 fun Event.isAttachmentMessage(): Boolean {
     return getClearType() == EventType.MESSAGE
             && when (getClearContent()?.toModel<MessageContent>()?.msgType) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
index 83f3931b1f..7d827f871b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/RelationType.kt
@@ -21,10 +21,13 @@ package org.matrix.android.sdk.api.session.events.model
 object RelationType {
     /** Lets you define an event which annotates an existing event.*/
     const val ANNOTATION = "m.annotation"
+
     /** Lets you define an event which replaces an existing event.*/
     const val REPLACE = "m.replace"
+
     /** Lets you define an event which references an existing event.*/
     const val REFERENCE = "m.reference"
+
     /** Lets you define an event which adds a response to an existing event.*/
     const val RESPONSE = "org.matrix.response"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
index 0eba953c8e..f09041ee90 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/UnsignedRelationInfo.kt
@@ -16,6 +16,6 @@
 package org.matrix.android.sdk.api.session.events.model
 
 interface UnsignedRelationInfo {
-    val limited : Boolean?
+    val limited: Boolean?
     val count: Int?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
index 171d7d6b16..069ed7427c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerConfig.kt
@@ -33,10 +33,12 @@ data class IntegrationManagerConfig(
          * Defined in UserAccountData
          */
         ACCOUNT,
+
         /**
          * Defined in Wellknown
          */
         HOMESERVER,
+
         /**
          * Fallback value, hardcoded by the SDK
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
index 2f366d0a9e..9cd754a0fb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/members/ChangeMembershipState.kt
@@ -16,7 +16,7 @@
 
 package org.matrix.android.sdk.api.session.room.members
 
-sealed class ChangeMembershipState() {
+sealed class ChangeMembershipState {
     object Unknown : ChangeMembershipState()
     object Joining : ChangeMembershipState()
     data class FailedJoining(val throwable: Throwable) : ChangeMembershipState()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
index 3ae8783edd..844ef6c1c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/PollSummaryContent.kt
@@ -35,7 +35,7 @@ data class PollSummaryContent(
         return votes?.size ?: 0
     }
 
-    fun voteCountForOption(optionIndex: Int) : Int {
+    fun voteCountForOption(optionIndex: Int): Int {
         return votes?.filter { it.optionIndex == optionIndex }?.count() ?: 0
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index beae8834de..99b035d30e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -33,6 +33,7 @@ data class RoomGuestAccessContent(
 enum class GuestAccess(val value: String) {
     @Json(name = "can_join")
     CanJoin("can_join"),
+
     @Json(name = "forbidden")
     Forbidden("forbidden")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
index 0b628649f5..06069f2646 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomHistoryVisibility.kt
@@ -29,16 +29,19 @@ enum class RoomHistoryVisibility {
      * participating homeserver with anyone, regardless of whether they have ever joined the room.
      */
     @Json(name = "world_readable") WORLD_READABLE,
+
     /**
      * Previous events are always accessible to newly joined members. All events in the
      * room are accessible, even those sent when the member was not a part of the room.
      */
     @Json(name = "shared") SHARED,
+
     /**
      * Events are accessible to newly joined members from the point they were invited onwards.
      * Events stop being accessible when the member's state changes to something other than invite or join.
      */
     @Json(name = "invited") INVITED,
+
     /**
      * Events are accessible to newly joined members from the point they joined the room onwards.
      * Events stop being accessible when the member's state changes to something other than join.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
index 952d65eb15..fcf3d73cbe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageAudioContent.kt
@@ -53,6 +53,6 @@ data class MessageAudioContent(
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageWithAttachmentContent {
 
-        override val mimeType: String?
-                get() =  encryptedFileInfo?.mimetype ?: audioInfo?.mimeType
+    override val mimeType: String?
+        get() = encryptedFileInfo?.mimetype ?: audioInfo?.mimeType
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
index 8255934546..859f7fd104 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageImageContent.kt
@@ -53,6 +53,6 @@ data class MessageImageContent(
          */
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageImageInfoContent {
-        override val mimeType: String?
-                get() = encryptedFileInfo?.mimetype ?: info?.mimeType ?: "image/*"
+    override val mimeType: String?
+        get() = encryptedFileInfo?.mimetype ?: info?.mimeType ?: "image/*"
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
index 92d9220893..00fa68c0ac 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageStickerContent.kt
@@ -53,6 +53,6 @@ data class MessageStickerContent(
          */
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageImageInfoContent {
-        override val mimeType: String?
-                get() = encryptedFileInfo?.mimetype ?: info?.mimeType
+    override val mimeType: String?
+        get() = encryptedFileInfo?.mimetype ?: info?.mimeType
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
index fa889a3e17..0f133323b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageType.kt
@@ -29,6 +29,7 @@ object MessageType {
     const val MSGTYPE_RESPONSE = "org.matrix.response"
     const val MSGTYPE_POLL_CLOSED = "org.matrix.poll_closed"
     const val MSGTYPE_VERIFICATION_REQUEST = "m.key.verification.request"
+
     // Add, in local, a fake message type in order to StickerMessage can inherit Message class
     // Because sticker isn't a message type but a event type without msgtype field
     const val MSGTYPE_STICKER_LOCAL = "org.matrix.android.sdk.sticker"
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
index 127ca7f82c..b7581c9fbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageVideoContent.kt
@@ -52,6 +52,6 @@ data class MessageVideoContent(
          */
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageWithAttachmentContent {
-        override val mimeType: String?
-                get() = encryptedFileInfo?.mimetype ?: videoInfo?.mimeType
+    override val mimeType: String?
+        get() = encryptedFileInfo?.mimetype ?: videoInfo?.mimeType
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
index 2555fd4e5a..7c806bf35b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/send/SendState.kt
@@ -18,18 +18,25 @@ package org.matrix.android.sdk.api.session.room.send
 
 enum class SendState {
     UNKNOWN,
+
     // the event has not been sent
     UNSENT,
+
     // the event is encrypting
     ENCRYPTING,
+
     // the event is currently sending
     SENDING,
+
     // the event has been sent
     SENT,
+
     // the event has been received from server
     SYNCED,
+
     // The event failed to be sent
     UNDELIVERED,
+
     // the event failed to be sent because some unknown devices have been found while encrypting it
     FAILED_UNKNOWN_DEVICES;
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
index 18c795bc87..8932d0734e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
@@ -128,6 +128,7 @@ interface Timeline {
          * It represents future events.
          */
         FORWARDS,
+
         /**
          * It represents past events.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
index 07a2a9742e..2876ec69e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineService.kt
@@ -40,5 +40,5 @@ interface TimelineService {
 
     fun getTimeLineEventLive(eventId: String): LiveData<Optional<TimelineEvent>>
 
-    fun getAttachmentMessages() : List<TimelineEvent>
+    fun getAttachmentMessages(): List<TimelineEvent>
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
index 68cc1143dc..70de026857 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
@@ -20,6 +20,7 @@ interface FilterService {
 
     enum class FilterPreset {
         NoFilter,
+
         /**
          * Filter for Riot, will include only known event type
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
index 02d2cbd682..42724746c0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/Optional.kt
@@ -46,7 +46,7 @@ data class Optional<T : Any> constructor(private val value: T?) {
             return Optional(value)
         }
 
-        fun <T: Any> empty(): Optional<T> {
+        fun <T : Any> empty(): Optional<T> {
             return Optional(null)
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
index a7a3734855..96635b33d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CryptoConstants.kt
@@ -35,6 +35,7 @@ const val MXCRYPTO_ALGORITHM_MEGOLM_BACKUP = "m.megolm_backup.v1.curve25519-aes-
  * Secured Shared Storage algorithm constant
  */
 const val SSSS_ALGORITHM_CURVE25519_AES_SHA2 = "m.secret_storage.v1.curve25519-aes-sha2"
+
 /* Secrets are encrypted using AES-CTR-256 and MACed using HMAC-SHA-256. **/
 const val SSSS_ALGORITHM_AES_HMAC_SHA2 = "m.secret_storage.v1.aes-hmac-sha2"
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
index 56fabbbcf0..e398cbfcaf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/GossipingRequestState.kt
@@ -28,7 +28,8 @@ enum class GossipingRequestState {
     ACCEPTING,
     ACCEPTED,
     FAILED_TO_ACCEPTED,
-   // USER_REJECTED,
+
+    // USER_REJECTED,
     UNABLE_TO_PROCESS,
     CANCELLED_BY_REQUESTER,
     RE_REQUESTED
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
index 5409202b9e..e5ffa0ed7d 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
@@ -36,6 +36,7 @@ import kotlin.math.min
 object MXMegolmExportEncryption {
     private const val HEADER_LINE = "-----BEGIN MEGOLM SESSION DATA-----"
     private const val TRAILER_LINE = "-----END MEGOLM SESSION DATA-----"
+
     // we split into lines before base64ing, because encodeBase64 doesn't deal
     // terribly well with large arrays.
     private const val LINE_LENGTH = 72 * 4 / 3
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
index 69f5838315..efda663230 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OutgoingGossipingRequestManager.kt
@@ -70,7 +70,9 @@ internal class OutgoingGossipingRequestManager @Inject constructor(
             delay(1500)
             cryptoStore.getOrAddOutgoingSecretShareRequest(secretName, recipients)?.let {
                 // TODO check if there is already one that is being sent?
-                if (it.state == OutgoingGossipingRequestState.SENDING /**|| it.state == OutgoingGossipingRequestState.SENT*/) {
+                if (it.state == OutgoingGossipingRequestState.SENDING
+                /**|| it.state == OutgoingGossipingRequestState.SENT*/
+                ) {
                     Timber.v("## CRYPTO - GOSSIP sendSecretShareRequest() : we are already sending for that session: $it")
                     return@launch
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
index 680ac7fbb5..79c7608cbf 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/IMXDecrypting.kt
@@ -68,7 +68,7 @@ internal interface IMXDecrypting {
      */
     fun shareKeysWithDevice(request: IncomingRoomKeyRequest) {}
 
-    fun shareSecretWithDevice(request: IncomingSecretShareRequest, secretValue : String) {}
+    fun shareSecretWithDevice(request: IncomingSecretShareRequest, secretValue: String) {}
 
     fun requestKeysForEvent(event: Event, withHeld: Boolean)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
index ad0def541f..e0116fae1c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt
@@ -104,7 +104,7 @@ internal class MXMegolmDecryption(private val userId: String,
                                         senderCurve25519Key = olmDecryptionResult.senderKey,
                                         claimedEd25519Key = olmDecryptionResult.keysClaimed?.get("ed25519"),
                                         forwardingCurve25519KeyChain = olmDecryptionResult.forwardingCurve25519KeyChain
-                                               .orEmpty()
+                                                .orEmpty()
                                 )
                             } else {
                                 throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
index 2ac5a25c14..05ceba5965 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/crosssigning/ShieldTrustUpdater.kt
@@ -43,7 +43,7 @@ internal class ShieldTrustUpdater @Inject constructor(
         private val taskExecutor: TaskExecutor,
         @SessionDatabase private val sessionRealmConfiguration: RealmConfiguration,
         private val roomSummaryUpdater: RoomSummaryUpdater
-): SessionLifecycleObserver {
+) : SessionLifecycleObserver {
 
     companion object {
         private val BACKGROUND_HANDLER = createBackgroundHandler("SHIELD_CRYPTO_DB_THREAD")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
index 803f82a5b5..478d55d077 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/OlmInboundGroupSessionWrapper2.kt
@@ -80,6 +80,7 @@ class OlmInboundGroupSessionWrapper2 : Serializable {
     constructor() {
         // empty
     }
+
     /**
      * Create a new instance from the provided keys map.
      *
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
index 077a53136c..4c462357db 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/model/event/RoomKeyWithHeldContent.kt
@@ -66,19 +66,23 @@ enum class WithHeldCode(val value: String) {
      * the user/device was blacklisted
      */
     BLACKLISTED("m.blacklisted"),
+
     /**
      * the user/devices is unverified
      */
     UNVERIFIED("m.unverified"),
+
     /**
      * the user/device is not allowed have the key. For example, this would usually be sent in response
      * to a key request if the user was not in the room when the message was sent
      */
     UNAUTHORISED("m.unauthorised"),
+
     /**
      * Sent in reply to a key request if the device that the key is requested from does not have the requested key
      */
     UNAVAILABLE("m.unavailable"),
+
     /**
      * An olm session could not be established.
      * This may happen, for example, if the sender was unable to obtain a one-time key from the recipient.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
index 689f9c911d..a48f4ecef5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/SavedKeyBackupKeyInfo.kt
@@ -17,6 +17,6 @@
 package org.matrix.android.sdk.internal.crypto.store
 
 data class SavedKeyBackupKeyInfo(
-        val recoveryKey : String,
+        val recoveryKey: String,
         val version: String
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
index 44e70f7ff8..8f41057807 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/model/OlmSessionEntity.kt
@@ -26,10 +26,10 @@ internal fun OlmSessionEntity.Companion.createPrimaryKey(sessionId: String, devi
 
 // olmSessionData is a serialized OlmSession
 internal open class OlmSessionEntity(@PrimaryKey var primaryKey: String = "",
-                            var sessionId: String? = null,
-                            var deviceKey: String? = null,
-                            var olmSessionData: String? = null,
-                            var lastReceivedMessageTs: Long = 0)
+                                     var sessionId: String? = null,
+                                     var deviceKey: String? = null,
+                                     var olmSessionData: String? = null,
+                                     var lastReceivedMessageTs: Long = 0)
     : RealmObject() {
 
     fun getOlmSession(): OlmSession? {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
index b7f4d5ad2f..1a41f89006 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
@@ -138,7 +138,7 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
 
     override fun onVerificationAccept(accept: ValidVerificationInfoAccept) {
         Timber.v("## SAS O: onVerificationAccept id:$transactionId")
-        if (state != VerificationTxState.Started && state !=  VerificationTxState.SendingStart) {
+        if (state != VerificationTxState.Started && state != VerificationTxState.SendingStart) {
             Timber.e("## SAS O: received accept request from invalid state $state")
             cancel(CancelCode.UnexpectedMessage)
             return
@@ -212,7 +212,7 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
                 // - the Matrix ID of the user who sent the m.key.verification.accept message,
                 // - he device ID of the device that sent the m.key.verification.accept message
                 // - the transaction ID.
-                val sasInfo =  "MATRIX_KEY_VERIFICATION_SAS$userId$deviceId$otherUserId$otherDeviceId$transactionId"
+                val sasInfo = "MATRIX_KEY_VERIFICATION_SAS$userId$deviceId$otherUserId$otherDeviceId$transactionId"
 
                 // decimal: generate five bytes by using HKDF.
                 // emoji: generate six bytes by using HKDF.
@@ -220,7 +220,7 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
             }
             KEY_AGREEMENT_V2 -> {
                 // Adds the SAS public key, and separate by |
-                val sasInfo =  "MATRIX_KEY_VERIFICATION_SAS|$userId|$deviceId|${getSAS().publicKey}|$otherUserId|$otherDeviceId|$otherKey|$transactionId"
+                val sasInfo = "MATRIX_KEY_VERIFICATION_SAS|$userId|$deviceId|${getSAS().publicKey}|$otherUserId|$otherDeviceId|$otherKey|$transactionId"
                 return getSAS().generateShortCode(sasInfo, 6)
             }
             else             -> {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
index b55b1d1f36..6043c21b66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationTransaction.kt
@@ -57,7 +57,7 @@ internal abstract class DefaultVerificationTransaction(
 
     protected fun trust(canTrustOtherUserMasterKey: Boolean,
                         toVerifyDeviceIds: List<String>,
-                        eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone : Boolean = true) {
+                        eventuallyMarkMyMasterKeyAsTrusted: Boolean, autoDone: Boolean = true) {
         Timber.d("## Verification: trust ($otherUserId,$otherDeviceId) , verifiedDevices:$toVerifyDeviceIds")
         Timber.d("## Verification: trust Mark myMSK trusted $eventuallyMarkMyMasterKeyAsTrusted")
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 6c23562d88..cb254eac3c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -68,10 +68,13 @@ internal abstract class SASDefaultVerificationTransaction(
         // Deprecated maybe removed later, use V2
         const val KEY_AGREEMENT_V1 = "curve25519"
         const val KEY_AGREEMENT_V2 = "curve25519-hkdf-sha256"
+
         // ordered by preferred order
         val KNOWN_AGREEMENT_PROTOCOLS = listOf(KEY_AGREEMENT_V2, KEY_AGREEMENT_V1)
+
         // ordered by preferred order
         val KNOWN_HASHES = listOf("sha256")
+
         // ordered by preferred order
         val KNOWN_MACS = listOf(SAS_MAC_SHA256, SAS_MAC_SHA256_LONGKDF)
 
@@ -101,6 +104,7 @@ internal abstract class SASDefaultVerificationTransaction(
 
     // Visible for test
     var startReq: ValidVerificationInfoStart.SasVerificationInfoStart? = null
+
     // Visible for test
     var accepted: ValidVerificationInfoAccept? = null
     protected var otherKey: String? = null
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
index ba5257f26a..a447e659f5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt
@@ -118,7 +118,7 @@ internal class VerificationTransportRoomMessage(
                         ?.firstOrNull { it.id == enqueueInfo.second }
                         ?.let { wInfo ->
                             when (wInfo.state) {
-                                WorkInfo.State.FAILED -> {
+                                WorkInfo.State.FAILED    -> {
                                     tx?.cancel(onErrorReason)
                                     workLiveData.removeObserver(this)
                                 }
@@ -135,7 +135,7 @@ internal class VerificationTransportRoomMessage(
                                     }
                                     workLiveData.removeObserver(this)
                                 }
-                                else -> {
+                                else                     -> {
                                     // nop
                                 }
                             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
index f0f9f66cc3..6c430e8591 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmKeysUtils.kt
@@ -93,7 +93,7 @@ internal class RealmKeysUtils @Inject constructor(context: Context,
     }
 
     // Expose to handle Realm migration to riotX
-    fun getRealmEncryptionKey(alias: String) : ByteArray {
+    fun getRealmEncryptionKey(alias: String): ByteArray {
         val key = if (hasKeyForDatabase(alias)) {
             Timber.i("Found key for alias:$alias")
             extractKeyForDatabase(alias)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
index 704a3d196f..c9c797304a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmQueryLatch.kt
@@ -28,8 +28,8 @@ import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 
 internal suspend fun <T> awaitNotEmptyResult(realmConfiguration: RealmConfiguration,
-                                    timeoutMillis: Long,
-                                    builder: (Realm) -> RealmQuery<T>) {
+                                             timeoutMillis: Long,
+                                             builder: (Realm) -> RealmQuery<T>) {
     withTimeout(timeoutMillis) {
         // Confine Realm interaction to a single thread with Looper.
         withContext(Dispatchers.Main) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
index 14a5200857..9770352a95 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/ChunkEntity.kt
@@ -23,12 +23,12 @@ import io.realm.annotations.Index
 import io.realm.annotations.LinkingObjects
 
 internal open class ChunkEntity(@Index var prevToken: String? = null,
-                                // Because of gaps we can have several chunks with nextToken == null
+        // Because of gaps we can have several chunks with nextToken == null
                                 @Index var nextToken: String? = null,
                                 var stateEvents: RealmList<EventEntity> = RealmList(),
                                 var timelineEvents: RealmList<TimelineEventEntity> = RealmList(),
                                 var numberOfTimelineEvents: Long = 0,
-                                // Only one chunk will have isLastForward == true
+        // Only one chunk will have isLastForward == true
                                 @Index var isLastForward: Boolean = false,
                                 @Index var isLastBackward: Boolean = false
 ) : RealmObject() {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
index a097b8eac8..a82ec41456 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/SyncEntity.kt
@@ -20,5 +20,5 @@ import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 
 internal open class SyncEntity(var nextBatch: String? = null,
-                      @PrimaryKey var id: Long = 0
+                               @PrimaryKey var id: Long = 0
 ) : RealmObject()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
index c51c5aa09f..9a298b7e79 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/EventAnnotationsSummaryEntityQuery.kt
@@ -47,6 +47,7 @@ internal fun EventAnnotationsSummaryEntity.Companion.create(realm: Realm, roomId
     }
     return obj
 }
+
 internal fun EventAnnotationsSummaryEntity.Companion.getOrCreate(realm: Realm, roomId: String, eventId: String): EventAnnotationsSummaryEntity {
     return EventAnnotationsSummaryEntity.where(realm, eventId).findFirst()
             ?: EventAnnotationsSummaryEntity.create(realm, roomId, eventId).apply { this.roomId = roomId }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
index b6bbebdd71..21d069f295 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/HomeServerConnectionConfig.java
@@ -181,7 +181,7 @@ public class HomeServerConnectionConfig {
                 if (!TextUtils.isEmpty(jitsiServerUrl)) {
                     // add trailing "/"
                     if (!jitsiServerUrl.endsWith("/")) {
-                        jitsiServerUrl =jitsiServerUrl + "/";
+                        jitsiServerUrl = jitsiServerUrl + "/";
                     }
 
                     Timber.d("Overriding jitsi server url to " + jitsiServerUrl);
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
index e9ef9e4393..4efb52d61c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/legacy/riot/WellKnownManagerConfig.kt
@@ -20,6 +20,6 @@ package org.matrix.android.sdk.internal.legacy.riot
  */
 
 data class WellKnownManagerConfig(
-        val apiUrl : String,
+        val apiUrl: String,
         val uiUrl: String
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
index a4a9dfe686..513d8c5c86 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/network/UnitConverterFactory.kt
@@ -22,14 +22,14 @@ import retrofit2.Retrofit
 import java.lang.reflect.Type
 
 object UnitConverterFactory : Converter.Factory() {
-  override fun responseBodyConverter(type: Type, annotations: Array<out Annotation>,
-                                     retrofit: Retrofit): Converter<ResponseBody, *>? {
-    return if (type == Unit::class.java) UnitConverter else null
-  }
-
-  private object UnitConverter : Converter<ResponseBody, Unit> {
-    override fun convert(value: ResponseBody) {
-      value.close()
+    override fun responseBodyConverter(type: Type, annotations: Array<out Annotation>,
+                                       retrofit: Retrofit): Converter<ResponseBody, *>? {
+        return if (type == Unit::class.java) UnitConverter else null
+    }
+
+    private object UnitConverter : Converter<ResponseBody, Unit> {
+        override fun convert(value: ResponseBody) {
+            value.close()
+        }
     }
-  }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt
index e0fe410096..1f4ca6d627 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/raw/DefaultGetUrlTask.kt
@@ -43,8 +43,8 @@ internal class DefaultGetUrlTask @Inject constructor(
 
     override suspend fun execute(params: GetUrlTask.Params): String {
         return when (params.rawCacheStrategy) {
-            RawCacheStrategy.NoCache -> doRequest(params.url)
-            is RawCacheStrategy.TtlCache -> doRequestWithCache(
+            RawCacheStrategy.NoCache       -> doRequest(params.url)
+            is RawCacheStrategy.TtlCache   -> doRequestWithCache(
                     params.url,
                     params.rawCacheStrategy.validityDurationInMillis,
                     params.rawCacheStrategy.strict
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
index 39b0e60203..6cf65b867c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageCompressor.kt
@@ -65,16 +65,16 @@ internal class ImageCompressor @Inject constructor() {
                     val orientation = exifInfo.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
                     val matrix = Matrix()
                     when (orientation) {
-                        ExifInterface.ORIENTATION_ROTATE_270 -> matrix.postRotate(270f)
-                        ExifInterface.ORIENTATION_ROTATE_180 -> matrix.postRotate(180f)
-                        ExifInterface.ORIENTATION_ROTATE_90 -> matrix.postRotate(90f)
+                        ExifInterface.ORIENTATION_ROTATE_270      -> matrix.postRotate(270f)
+                        ExifInterface.ORIENTATION_ROTATE_180      -> matrix.postRotate(180f)
+                        ExifInterface.ORIENTATION_ROTATE_90       -> matrix.postRotate(90f)
                         ExifInterface.ORIENTATION_FLIP_HORIZONTAL -> matrix.preScale(-1f, 1f)
-                        ExifInterface.ORIENTATION_FLIP_VERTICAL -> matrix.preScale(1f, -1f)
-                        ExifInterface.ORIENTATION_TRANSPOSE -> {
+                        ExifInterface.ORIENTATION_FLIP_VERTICAL   -> matrix.preScale(1f, -1f)
+                        ExifInterface.ORIENTATION_TRANSPOSE       -> {
                             matrix.preRotate(-90f)
                             matrix.preScale(-1f, 1f)
                         }
-                        ExifInterface.ORIENTATION_TRANSVERSE -> {
+                        ExifInterface.ORIENTATION_TRANSVERSE      -> {
                             matrix.preRotate(90f)
                             matrix.preScale(-1f, 1f)
                         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index dd630cd3d4..03827b90e2 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -312,7 +312,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             val updatedContent = when (messageContent) {
                 is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newImageAttributes)
                 is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo)
-                is MessageFileContent -> messageContent.update(url, encryptedFileInfo)
+                is MessageFileContent  -> messageContent.update(url, encryptedFileInfo)
                 is MessageAudioContent -> messageContent.update(url, encryptedFileInfo)
                 else                   -> messageContent
             }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
index 8942f2fdbe..2e8a0b3884 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/profile/AddThreePidTask.kt
@@ -41,7 +41,7 @@ internal class DefaultAddThreePidTask @Inject constructor(
 
     override suspend fun execute(params: Params) {
         when (params.threePid) {
-            is ThreePid.Email -> addEmail(params.threePid)
+            is ThreePid.Email  -> addEmail(params.threePid)
             is ThreePid.Msisdn -> addMsisdn(params.threePid)
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
index bfedd3afd1..7f3796c1ce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/RoomDisplayNameResolver.kt
@@ -108,9 +108,9 @@ internal class RoomDisplayNameResolver @Inject constructor(
             }
             val otherMembersCount = otherMembersSubset.count()
             name = when (otherMembersCount) {
-                0 -> stringProvider.getString(R.string.room_displayname_empty_room)
-                1 -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
-                2 -> stringProvider.getString(R.string.room_displayname_two_members,
+                0    -> stringProvider.getString(R.string.room_displayname_empty_room)
+                1    -> resolveRoomMemberName(otherMembersSubset[0], roomMembers)
+                2    -> stringProvider.getString(R.string.room_displayname_two_members,
                         resolveRoomMemberName(otherMembersSubset[0], roomMembers),
                         resolveRoomMemberName(otherMembersSubset[1], roomMembers)
                 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
index b357e6905a..ec366cb6aa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/DefaultSendService.kt
@@ -187,7 +187,7 @@ internal class DefaultSendService @AssistedInject constructor(
                     localEchoRepository.updateSendState(localEcho.eventId, SendState.UNSENT)
                     internalSendMedia(listOf(localEcho.root), attachmentData, true)
                 }
-                is MessageFileContent -> {
+                is MessageFileContent  -> {
                     val attachmentData = ContentAttachmentData(
                             size = messageContent.info!!.size,
                             mimeType = messageContent.info.mimeType!!,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index aaf2f9fd30..da3e0429b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -204,7 +204,7 @@ internal class LocalEchoEventFactory @Inject constructor(
             ContentAttachmentData.Type.IMAGE -> createImageEvent(roomId, attachment)
             ContentAttachmentData.Type.VIDEO -> createVideoEvent(roomId, attachment)
             ContentAttachmentData.Type.AUDIO -> createAudioEvent(roomId, attachment)
-            ContentAttachmentData.Type.FILE -> createFileEvent(roomId, attachment)
+            ContentAttachmentData.Type.FILE  -> createFileEvent(roomId, attachment)
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
index e3ae6e4870..030c9deb6a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/MarkdownParser.kt
@@ -68,8 +68,8 @@ internal class MarkdownParser @Inject constructor(
         return this
                 // Remove extra space before and after the content
                 .trim()
-                // There is no need to include new line in an html-like source
-                // But new line can be in embedded code block, so do not remove them
-                // .replace("\n", "")
+        // There is no need to include new line in an html-like source
+        // But new line can be in embedded code block, so do not remove them
+        // .replace("\n", "")
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
index cf2ff38d90..9178759bcc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
@@ -423,14 +423,14 @@ internal class DefaultTimeline(
 
     private fun getState(direction: Timeline.Direction): State {
         return when (direction) {
-            Timeline.Direction.FORWARDS -> forwardsState.get()
+            Timeline.Direction.FORWARDS  -> forwardsState.get()
             Timeline.Direction.BACKWARDS -> backwardsState.get()
         }
     }
 
     private fun updateState(direction: Timeline.Direction, update: (State) -> State) {
         val stateReference = when (direction) {
-            Timeline.Direction.FORWARDS -> forwardsState
+            Timeline.Direction.FORWARDS  -> forwardsState
             Timeline.Direction.BACKWARDS -> backwardsState
         }
         val currentValue = stateReference.get()
@@ -741,10 +741,10 @@ internal class DefaultTimeline(
         return object : MatrixCallback<TokenChunkEventPersistor.Result> {
             override fun onSuccess(data: TokenChunkEventPersistor.Result) {
                 when (data) {
-                    TokenChunkEventPersistor.Result.SUCCESS -> {
+                    TokenChunkEventPersistor.Result.SUCCESS           -> {
                         Timber.v("Success fetching $limit items $direction from pagination request")
                     }
-                    TokenChunkEventPersistor.Result.REACHED_END -> {
+                    TokenChunkEventPersistor.Result.REACHED_END       -> {
                         postSnapshot()
                     }
                     TokenChunkEventPersistor.Result.SHOULD_FETCH_MORE ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
index 94625704e6..e91487eab0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
@@ -58,6 +58,7 @@ internal class TimelineEventDecryptor @Inject constructor(
 
     // Set of eventIds which are currently decrypting
     private val existingRequests = mutableSetOf<DecryptionRequest>()
+
     // sessionId -> list of eventIds
     private val unknownSessionsFailure = mutableMapOf<String, MutableSet<DecryptionRequest>>()
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
index 5d88dbca15..5dcf3fcdd6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/typing/DefaultTypingService.kt
@@ -48,6 +48,7 @@ internal class DefaultTypingService @AssistedInject constructor(
 
     // What the homeserver knows
     private var userIsTyping = false
+
     // Last time the user is typing event has been sent
     private var lastRequestTimestamp: Long = 0
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
index 085a66d37c..a3c5891f68 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/ReadReceiptHandler.kt
@@ -91,9 +91,9 @@ internal class ReadReceiptHandler @Inject constructor() {
         for ((eventId, receiptDict) in content) {
             val userIdsDict = receiptDict[READ_KEY] ?: continue
             val readReceiptsSummary = ReadReceiptsSummaryEntity.where(realm, eventId).findFirst()
-                                      ?: realm.createObject(ReadReceiptsSummaryEntity::class.java, eventId).apply {
-                                          this.roomId = roomId
-                                      }
+                    ?: realm.createObject(ReadReceiptsSummaryEntity::class.java, eventId).apply {
+                        this.roomId = roomId
+                    }
 
             for ((userId, paramsDict) in userIdsDict) {
                 val ts = paramsDict[TIMESTAMP_KEY] ?: 0.0
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
index c18bfc7784..f9ae41bc94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomTagHandler.kt
@@ -33,7 +33,7 @@ internal class RoomTagHandler @Inject constructor() {
             RoomTagEntity(tagName, params["order"] as? Double)
         }
         val roomSummaryEntity = RoomSummaryEntity.where(realm, roomId).findFirst()
-                                ?: RoomSummaryEntity(roomId)
+                ?: RoomSummaryEntity(roomId)
 
         roomSummaryEntity.tags.clear()
         roomSummaryEntity.tags.addAll(tags)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
index 566b752df8..ba7a2be2a5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/widgets/DefaultWidgetPostAPIMediator.kt
@@ -67,6 +67,7 @@ internal class DefaultWidgetPostAPIMediator @Inject constructor(private val mosh
         Timber.d("BRIDGE onWidgetEvent : $jsonEventData")
         try {
             val dataAsDict = jsonAdapter.fromJson(jsonEventData)
+
             @Suppress("UNCHECKED_CAST")
             val eventData = (dataAsDict?.get("event.data") as? JsonDict) ?: return
             onWidgetMessage(eventData)
diff --git a/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt b/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
index 3aad81529c..689c12b6d3 100644
--- a/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
+++ b/vector/src/main/java/im/vector/app/EmojiCompatFontProvider.kt
@@ -23,7 +23,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class EmojiCompatFontProvider @Inject constructor(): FontsContractCompat.FontRequestCallback() {
+class EmojiCompatFontProvider @Inject constructor() : FontsContractCompat.FontRequestCallback() {
 
     var typeface: Typeface? = null
         set(value) {
diff --git a/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt b/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
index dbb0848e74..c1ca3dd21d 100644
--- a/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
+++ b/vector/src/main/java/im/vector/app/EmojiCompatWrapper.kt
@@ -24,7 +24,7 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class EmojiCompatWrapper @Inject constructor(private val context: Context)  {
+class EmojiCompatWrapper @Inject constructor(private val context: Context) {
 
     private var initialized = false
 
diff --git a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
index 753cfd646c..5226a69094 100644
--- a/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
+++ b/vector/src/main/java/im/vector/app/core/dialogs/UnrecognizedCertificateDialog.kt
@@ -72,12 +72,12 @@ class UnrecognizedCertificateDialog @Inject constructor(
      * @param callback                callback to fire when the user makes a decision
      */
     private fun internalShow(activity: Activity,
-                      unrecognizedFingerprint: Fingerprint,
-                      existing: Boolean,
-                      callback: Callback,
-                      userId: String?,
-                      homeServerUrl: String,
-                      homeServerConnectionConfigHasFingerprints: Boolean) {
+                             unrecognizedFingerprint: Fingerprint,
+                             existing: Boolean,
+                             callback: Callback,
+                             userId: String?,
+                             homeServerUrl: String,
+                             homeServerConnectionConfigHasFingerprints: Boolean) {
         val dialogId = userId ?: homeServerUrl + unrecognizedFingerprint.displayableHexRepr
 
         if (openDialogIds.contains(dialogId)) {
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
index 8a75a6bddf..f33b4dccbe 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/VectorEpoxyHolder.kt
@@ -36,7 +36,7 @@ abstract class VectorEpoxyHolder : EpoxyHolder() {
     protected fun <V : View> bind(id: Int): ReadOnlyProperty<VectorEpoxyHolder, V> =
             Lazy { holder: VectorEpoxyHolder, prop ->
                 holder.view.findViewById(id) as V?
-                ?: throw IllegalStateException("View ID $id for '${prop.name}' not found.")
+                        ?: throw IllegalStateException("View ID $id for '${prop.name}' not found.")
             }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
index 4beefeb737..e28bec6874 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetActionItem.kt
@@ -42,18 +42,25 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
     @EpoxyAttribute
     @DrawableRes
     var iconRes: Int = 0
+
     @EpoxyAttribute
     var textRes: Int = 0
+
     @EpoxyAttribute
     var showExpand = false
+
     @EpoxyAttribute
     var expanded = false
+
     @EpoxyAttribute
     var selected = false
+
     @EpoxyAttribute
     var subMenuItem = false
+
     @EpoxyAttribute
     var destructive = false
+
     @EpoxyAttribute
     lateinit var listener: View.OnClickListener
 
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
index a5f19258ef..cf14cc3557 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetMessagePreviewItem.kt
@@ -37,14 +37,19 @@ abstract class BottomSheetMessagePreviewItem : VectorEpoxyModel<BottomSheetMessa
 
     @EpoxyAttribute
     lateinit var avatarRenderer: AvatarRenderer
+
     @EpoxyAttribute
     lateinit var matrixItem: MatrixItem
+
     @EpoxyAttribute
     lateinit var body: CharSequence
+
     @EpoxyAttribute
     var time: CharSequence? = null
+
     @EpoxyAttribute
     var movementMethod: MovementMethod? = null
+
     @EpoxyAttribute
     var userClicked: (() -> Unit)? = null
 
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
index 0c5919e5f3..ca8ef89c68 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetQuickReactionsItem.kt
@@ -33,10 +33,13 @@ abstract class BottomSheetQuickReactionsItem : VectorEpoxyModel<BottomSheetQuick
 
     @EpoxyAttribute
     lateinit var fontProvider: EmojiCompatFontProvider
+
     @EpoxyAttribute
     lateinit var texts: List<String>
+
     @EpoxyAttribute
     lateinit var selecteds: List<Boolean>
+
     @EpoxyAttribute
     var listener: Listener? = null
 
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
index 119950f1b8..8f5ccba158 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetSendStateItem.kt
@@ -34,8 +34,10 @@ abstract class BottomSheetSendStateItem : VectorEpoxyModel<BottomSheetSendStateI
 
     @EpoxyAttribute
     var showProgress: Boolean = false
+
     @EpoxyAttribute
     lateinit var text: CharSequence
+
     @EpoxyAttribute
     @DrawableRes
     var drawableStart: Int = 0
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
index 54fc13194d..aa8075819e 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/BaseProfileMatrixItem.kt
@@ -30,6 +30,7 @@ abstract class BaseProfileMatrixItem<T : ProfileMatrixItem.Holder> : VectorEpoxy
     @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
     @EpoxyAttribute var editable: Boolean = true
+
     @EpoxyAttribute
     var userEncryptionTrustLevel: RoomEncryptionTrustLevel? = null
     @EpoxyAttribute var clickListener: View.OnClickListener? = null
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
index c5d5ee52a8..3bef38d4cb 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileActionItem.kt
@@ -38,6 +38,7 @@ abstract class ProfileActionItem : VectorEpoxyModel<ProfileActionItem.Holder>()
 
     @EpoxyAttribute
     lateinit var title: String
+
     @EpoxyAttribute
     var subtitle: String? = null
 
diff --git a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
index 6fa1ed23be..b38342c057 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/profiles/ProfileSectionItem.kt
@@ -24,7 +24,7 @@ import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 
 @EpoxyModelClass(layout = R.layout.item_profile_section)
-abstract class ProfileSectionItem: VectorEpoxyModel<ProfileSectionItem.Holder>() {
+abstract class ProfileSectionItem : VectorEpoxyModel<ProfileSectionItem.Holder>() {
 
     @EpoxyAttribute
     lateinit var title: String
diff --git a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
index 1e7d662793..6065c74541 100644
--- a/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ErrorFormatter.kt
@@ -55,46 +55,46 @@ class DefaultErrorFormatter @Inject constructor(
             }
             is Failure.ServerError       -> {
                 when {
-                    throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN         -> {
+                    throwable.error.code == MatrixError.M_CONSENT_NOT_GIVEN          -> {
                         // Special case for terms and conditions
                         stringProvider.getString(R.string.error_terms_not_accepted)
                     }
-                    throwable.isInvalidPassword()                                   -> {
+                    throwable.isInvalidPassword()                                    -> {
                         stringProvider.getString(R.string.auth_invalid_login_param)
                     }
-                    throwable.error.code == MatrixError.M_USER_IN_USE               -> {
+                    throwable.error.code == MatrixError.M_USER_IN_USE                -> {
                         stringProvider.getString(R.string.login_signup_error_user_in_use)
                     }
-                    throwable.error.code == MatrixError.M_BAD_JSON                  -> {
+                    throwable.error.code == MatrixError.M_BAD_JSON                   -> {
                         stringProvider.getString(R.string.login_error_bad_json)
                     }
-                    throwable.error.code == MatrixError.M_NOT_JSON                  -> {
+                    throwable.error.code == MatrixError.M_NOT_JSON                   -> {
                         stringProvider.getString(R.string.login_error_not_json)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_DENIED           -> {
+                    throwable.error.code == MatrixError.M_THREEPID_DENIED            -> {
                         stringProvider.getString(R.string.login_error_threepid_denied)
                     }
-                    throwable.error.code == MatrixError.M_LIMIT_EXCEEDED            -> {
+                    throwable.error.code == MatrixError.M_LIMIT_EXCEEDED             -> {
                         limitExceededError(throwable.error)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND        -> {
+                    throwable.error.code == MatrixError.M_THREEPID_NOT_FOUND         -> {
                         stringProvider.getString(R.string.login_reset_password_error_not_found)
                     }
-                    throwable.error.code == MatrixError.M_USER_DEACTIVATED          -> {
+                    throwable.error.code == MatrixError.M_USER_DEACTIVATED           -> {
                         stringProvider.getString(R.string.auth_invalid_login_deactivated_account)
                     }
                     throwable.error.code == MatrixError.M_THREEPID_IN_USE
-                            && throwable.error.message == "Email is already in use" -> {
+                            && throwable.error.message == "Email is already in use"  -> {
                         stringProvider.getString(R.string.account_email_already_used_error)
                     }
                     throwable.error.code == MatrixError.M_THREEPID_IN_USE
                             && throwable.error.message == "MSISDN is already in use" -> {
                         stringProvider.getString(R.string.account_phone_number_already_used_error)
                     }
-                    throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED      -> {
+                    throwable.error.code == MatrixError.M_THREEPID_AUTH_FAILED       -> {
                         stringProvider.getString(R.string.error_threepid_auth_failed)
                     }
-                    else                                                            -> {
+                    else                                                             -> {
                         throwable.error.message.takeIf { it.isNotEmpty() }
                                 ?: throwable.error.code.takeIf { it.isNotEmpty() }
                     }
diff --git a/vector/src/main/java/im/vector/app/core/files/FileSaver.kt b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
index c4acbb5e65..406fa76520 100644
--- a/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
+++ b/vector/src/main/java/im/vector/app/core/files/FileSaver.kt
@@ -59,7 +59,7 @@ fun addEntryToDownloadManager(context: Context,
                               file: File,
                               mimeType: String,
                               title: String = file.name,
-                              description: String = file.name) : Uri? {
+                              description: String = file.name): Uri? {
     try {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             val contentValues = ContentValues().apply {
@@ -71,16 +71,16 @@ fun addEntryToDownloadManager(context: Context,
             return context.contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
                     ?.let { uri ->
                         Timber.v("## addEntryToDownloadManager(): $uri")
-                val source = file.inputStream().source().buffer()
-                context.contentResolver.openOutputStream(uri)?.sink()?.buffer()?.let { sink ->
-                    source.use { input ->
-                        sink.use { output ->
-                            output.writeAll(input)
+                        val source = file.inputStream().source().buffer()
+                        context.contentResolver.openOutputStream(uri)?.sink()?.buffer()?.let { sink ->
+                            source.use { input ->
+                                sink.use { output ->
+                                    output.writeAll(input)
+                                }
+                            }
                         }
-                    }
-                }
                         uri
-            } ?: run {
+                    } ?: run {
                 Timber.v("## addEntryToDownloadManager(): context.contentResolver.insert failed")
 
                 null
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index 0eba78dbf8..b7c440102d 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -118,7 +118,7 @@ class VectorGlideDataFetcher(private val activeSessionHolder: ActiveSessionHolde
                 url = data.url,
                 fileName = data.filename,
                 elementToDecrypt = data.elementToDecrypt,
-                callback = object: MatrixCallback<File> {
+                callback = object : MatrixCallback<File> {
                     override fun onSuccess(data: File) {
                         callback.onDataReady(data.inputStream())
                     }
diff --git a/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
index 24e03b4f40..0d18f808fb 100644
--- a/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
+++ b/vector/src/main/java/im/vector/app/core/intent/ExternalIntentAnalyser.kt
@@ -109,7 +109,7 @@ fun analyseIntent(intent: Intent): List<ExternalIntentData> {
         for (i in 0 until clipData.itemCount) {
             val item = clipData.getItemAt(i)
             val mimeType = mimeTypes?.getOrElse(i) { mimeTypes[0] }
-                        // uris list is not a valid mimetype
+                    // uris list is not a valid mimetype
                     .takeUnless { it == ClipDescription.MIMETYPE_TEXT_URILIST }
 
             externalIntentDataList.add(ExternalIntentData.IntentDataClipData(item, mimeType))
diff --git a/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
index d7dea789d3..bc1ed3609b 100644
--- a/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
+++ b/vector/src/main/java/im/vector/app/core/linkify/VectorLinkify.kt
@@ -121,7 +121,7 @@ object VectorLinkify {
                     remove = if (a.important) i + 1 else i
                 } else {
                     when {
-                        b.end <= a.end ->
+                        b.end <= a.end                    ->
                             // b is inside a -> b should be removed
                             remove = i + 1
                         a.end - a.start > b.end - b.start ->
diff --git a/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt b/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt
index a755903468..1111a9651c 100644
--- a/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/CheckableFrameLayout.kt
@@ -26,11 +26,11 @@ class CheckableFrameLayout : FrameLayout, Checkable {
 
     private var mChecked = false
 
-    constructor(context: Context) : super(context) {}
+    constructor(context: Context) : super(context)
 
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
 
     override fun isChecked(): Boolean {
         return mChecked
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
index 4a251de1a3..e674c277aa 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseBottomSheetDialogFragment.kt
@@ -96,7 +96,7 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
         }
     }
 
-    var resultListener : ResultListener? = null
+    var resultListener: ResultListener? = null
     var bottomSheetResult: Int = ResultListener.RESULT_CANCEL
     var bottomSheetResultData: Any? = null
 
diff --git a/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt b/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt
index 2f6b9aa6d2..c184b04bd9 100644
--- a/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/DrawableProvider.kt
@@ -29,6 +29,7 @@ class DrawableProvider @Inject constructor(private val context: Context) {
     fun getDrawable(@DrawableRes colorRes: Int): Drawable? {
         return ContextCompat.getDrawable(context, colorRes)
     }
+
     fun getDrawable(@DrawableRes colorRes: Int, @ColorInt color: Int): Drawable? {
         return ContextCompat.getDrawable(context, colorRes)?.let {
             ThemeUtils.tintDrawableWithColor(it, color)
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
index 65577d18f3..64ee71edf8 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/PasswordStrengthBar.kt
@@ -56,15 +56,19 @@ class PasswordStrengthBar @JvmOverloads constructor(
     @BindColor(R.color.password_strength_bar_undefined)
     @JvmField
     var colorBackground: Int = 0
+
     @BindColor(R.color.password_strength_bar_weak)
     @JvmField
     var colorWeak: Int = 0
+
     @BindColor(R.color.password_strength_bar_low)
     @JvmField
     var colorLow: Int = 0
+
     @BindColor(R.color.password_strength_bar_ok)
     @JvmField
     var colorOk: Int = 0
+
     @BindColor(R.color.password_strength_bar_strong)
     @JvmField
     var colorStrong: Int = 0
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
index 066f69b555..f715d0cb3f 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentPreviewItems.kt
@@ -55,8 +55,10 @@ abstract class AttachmentPreviewItem<H : AttachmentPreviewItem.Holder> : VectorE
 abstract class AttachmentMiniaturePreviewItem : AttachmentPreviewItem<AttachmentMiniaturePreviewItem.Holder>() {
 
     @EpoxyAttribute override lateinit var attachment: ContentAttachmentData
+
     @EpoxyAttribute
     var clickListener: View.OnClickListener? = null
+
     @EpoxyAttribute
     var checked: Boolean = false
 
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt
index 16f6fe2b97..4364300c3a 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewAction.kt
@@ -22,6 +22,6 @@ import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class AttachmentsPreviewAction : VectorViewModelAction {
     object RemoveCurrentAttachment : AttachmentsPreviewAction()
-    data class SetCurrentAttachment(val index: Int): AttachmentsPreviewAction()
-    data class UpdatePathOfCurrentAttachment(val newUri: Uri): AttachmentsPreviewAction()
+    data class SetCurrentAttachment(val index: Int) : AttachmentsPreviewAction()
+    data class UpdatePathOfCurrentAttachment(val newUri: Uri) : AttachmentsPreviewAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
index f6a6e3abcf..b040101c84 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/preview/AttachmentsPreviewFragment.kt
@@ -102,7 +102,7 @@ class AttachmentsPreviewFragment @Inject constructor(
                 handleRemoveAction()
                 true
             }
-            R.id.attachmentsPreviewEditAction -> {
+            R.id.attachmentsPreviewEditAction   -> {
                 handleEditAction()
                 true
             }
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt b/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt
index e7ece3bb9e..c4631300f1 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/RecyclerViewPresenter.kt
@@ -51,6 +51,7 @@ abstract class RecyclerViewPresenter<T>(context: Context?) : AutocompletePresent
     }
 
     override fun onViewShown() {}
+
     @CallSuper
     override fun onViewHidden() {
         observer?.also {
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt
index 257a2abd6c..0f24b866bf 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/AutocompleteCommandItem.kt
@@ -29,10 +29,13 @@ abstract class AutocompleteCommandItem : VectorEpoxyModel<AutocompleteCommandIte
 
     @EpoxyAttribute
     var name: CharSequence? = null
+
     @EpoxyAttribute
     var parameters: CharSequence? = null
+
     @EpoxyAttribute
     var description: CharSequence? = null
+
     @EpoxyAttribute
     var clickListener: View.OnClickListener? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt b/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt
index 8112fa7866..603ec64a7c 100644
--- a/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt
+++ b/vector/src/main/java/im/vector/app/features/autocomplete/command/CommandAutocompletePolicy.kt
@@ -38,7 +38,7 @@ class CommandAutocompletePolicy @Inject constructor() : AutocompletePolicy {
     // Only if text which starts with '/' and without space
     override fun shouldShowPopup(text: Spannable?, cursorPos: Int): Boolean {
         return enabled && text?.startsWith("/") == true
-               && !text.contains(" ")
+                && !text.contains(" ")
     }
 
     override fun shouldDismissPopup(text: Spannable?, cursorPos: Int): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt b/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt
index f6ce430366..0685928d1c 100644
--- a/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/call/SdpObserverAdapter.kt
@@ -22,7 +22,7 @@ import timber.log.Timber
 
 open class SdpObserverAdapter : SdpObserver {
     override fun onSetFailure(p0: String?) {
-       Timber.e("## SdpObserver: onSetFailure $p0")
+        Timber.e("## SdpObserver: onSetFailure $p0")
     }
 
     override fun onSetSuccess() {
diff --git a/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt b/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt
index 6d3f8b5885..c70b52b09b 100644
--- a/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt
+++ b/vector/src/main/java/im/vector/app/features/call/WebRtcPeerConnectionManager.kt
@@ -183,7 +183,7 @@ class WebRtcPeerConnectionManager @Inject constructor(
 
     fun addIfNeeded(renderer: SurfaceViewRenderer?, list: MutableList<WeakReference<SurfaceViewRenderer>>) {
         if (renderer == null) return
-        val exists = list.firstOrNull() {
+        val exists = list.firstOrNull {
             it.get() == renderer
         } != null
         if (!exists) {
diff --git a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
index bdfa7779fb..2f8531929a 100644
--- a/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
+++ b/vector/src/main/java/im/vector/app/features/command/ParsedCommand.kt
@@ -54,5 +54,5 @@ sealed class ParsedCommand {
     class SendSpoiler(val message: String) : ParsedCommand()
     class SendShrug(val message: CharSequence) : ParsedCommand()
     class SendPoll(val question: String, val options: List<String>) : ParsedCommand()
-    object DiscardSession: ParsedCommand()
+    object DiscardSession : ParsedCommand()
 }
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index d9b136691e..843253b5cf 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -44,7 +44,7 @@ import timber.log.Timber
 private typealias PhoneBookSearch = String
 
 class ContactsBookViewModel @AssistedInject constructor(@Assisted
-                                                     initialState: ContactsBookViewState,
+                                                        initialState: ContactsBookViewState,
                                                         private val contactsDataSource: ContactsDataSource,
                                                         private val session: Session)
     : VectorViewModel<ContactsBookViewState, ContactsBookAction, EmptyViewEvents>(initialState) {
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
index 501d0fdbb7..a1bb12a84b 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt
@@ -114,7 +114,7 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
-                doOnPostResume {  addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
+                doOnPostResume { addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
             }
         }
     }
@@ -140,7 +140,7 @@ class CreateDirectRoomActivity : SimpleFragmentActivity() {
     private fun renderCreationFailure(error: Throwable) {
         hideWaitingView()
         when (error) {
-            is CreateRoomFailure.CreatedWithTimeout -> {
+            is CreateRoomFailure.CreatedWithTimeout           -> {
                 finish()
             }
             is CreateRoomFailure.CreatedWithFederationFailure -> {
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
index 56114cdb4b..c42e10686f 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewModel.kt
@@ -70,7 +70,7 @@ class CreateDirectRoomViewModel @AssistedInject constructor(@Assisted
                     .apply {
                         invitees.forEach {
                             when (it) {
-                                is PendingInvitee.UserPendingInvitee -> invitedUserIds.add(it.user.userId)
+                                is PendingInvitee.UserPendingInvitee     -> invitedUserIds.add(it.user.userId)
                                 is PendingInvitee.ThreePidPendingInvitee -> invite3pids.add(it.threePid)
                             }.exhaustive
                         }
diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt
index 953d415140..27a8cc0a97 100644
--- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomViewState.kt
@@ -21,5 +21,5 @@ import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
 
 data class CreateDirectRoomViewState(
-    val createAndInviteState: Async<String> = Uninitialized
+        val createAndInviteState: Async<String> = Uninitialized
 ) : MvRxState
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
index 30a6cfe696..b4969d28b7 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSuccessFragment.kt
@@ -32,6 +32,7 @@ class KeysBackupRestoreSuccessFragment @Inject constructor() : VectorBaseFragmen
 
     @BindView(R.id.keys_backup_restore_success)
     lateinit var mSuccessText: TextView
+
     @BindView(R.id.keys_backup_restore_success_info)
     lateinit var mSuccessDetailsText: TextView
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
index 6d711ec0e9..72b767e12f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
@@ -531,8 +531,8 @@ class BootstrapSharedViewModel @AssistedInject constructor(
                 _viewEvents.post(
                         when (args.setUpMode) {
                             SetupMode.CROSS_SIGNING_ONLY,
-                            SetupMode.NORMAL              -> BootstrapViewEvents.SkipBootstrap()
-                            else                          -> BootstrapViewEvents.Dismiss(success = false)
+                            SetupMode.NORMAL -> BootstrapViewEvents.SkipBootstrap()
+                            else             -> BootstrapViewEvents.Dismiss(success = false)
                         }
                 )
             }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
index be523a0ce3..10a092ccbb 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapViewEvents.kt
@@ -21,6 +21,6 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class BootstrapViewEvents : VectorViewEvents {
     data class Dismiss(val success: Boolean) : BootstrapViewEvents()
     data class ModalError(val error: String) : BootstrapViewEvents()
-    object RecoveryKeySaved: BootstrapViewEvents()
-    data class SkipBootstrap(val genKeyOption: Boolean = true): BootstrapViewEvents()
+    object RecoveryKeySaved : BootstrapViewEvents()
+    data class SkipBootstrap(val genKeyOption: Boolean = true) : BootstrapViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
index 3c7c6d5745..d12b2c088f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/conclusion/VerificationConclusionController.kt
@@ -46,7 +46,7 @@ class VerificationConclusionController @Inject constructor(
         val state = viewState ?: return
 
         when (state.conclusionState) {
-            ConclusionState.SUCCESS -> {
+            ConclusionState.SUCCESS   -> {
                 bottomSheetVerificationNoticeItem {
                     id("notice")
                     notice(stringProvider.getString(
@@ -61,7 +61,7 @@ class VerificationConclusionController @Inject constructor(
 
                 bottomDone()
             }
-            ConclusionState.WARNING -> {
+            ConclusionState.WARNING   -> {
                 bottomSheetVerificationNoticeItem {
                     id("notice")
                     notice(stringProvider.getString(R.string.verification_conclusion_not_secure))
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
index e87be702db..d738efe3ba 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationActionItem.kt
@@ -38,12 +38,16 @@ abstract class BottomSheetVerificationActionItem : VectorEpoxyModel<BottomSheetV
     @EpoxyAttribute
     @DrawableRes
     var iconRes: Int = -1
+
     @EpoxyAttribute
     var title: CharSequence = ""
+
     @EpoxyAttribute
     var subTitle: CharSequence? = null
+
     @EpoxyAttribute
     var titleColor: Int = 0
+
     @EpoxyAttribute
     var iconColor: Int = -1
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
index 6e98d924e7..c7740e2ac5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/request/VerificationRequestController.kt
@@ -129,13 +129,13 @@ class VerificationRequestController @Inject constructor(
                         listener { listener?.onClickOnVerificationStart() }
                     }
                 }
-                is Loading -> {
+                is Loading       -> {
                     bottomSheetVerificationWaitingItem {
                         id("waiting")
                         title(stringProvider.getString(R.string.verification_request_waiting_for, matrixItem.getBestName()))
                     }
                 }
-                is Success -> {
+                is Success       -> {
                     if (!pr.invoke().isReady) {
                         if (state.isMe) {
                             bottomSheetVerificationWaitingItem {
diff --git a/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
index b3c80b3642..e56887b85f 100644
--- a/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/LoadingFragment.kt
@@ -24,7 +24,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_loading.*
 import javax.inject.Inject
 
-class LoadingFragment @Inject constructor(): VectorBaseFragment() {
+class LoadingFragment @Inject constructor() : VectorBaseFragment() {
 
     override fun getLayoutResId() = R.layout.fragment_loading
 
diff --git a/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt b/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
index d52d4be6dd..f0c707135f 100644
--- a/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
+++ b/vector/src/main/java/im/vector/app/features/home/RoomListDisplayMode.kt
@@ -20,8 +20,8 @@ import androidx.annotation.StringRes
 import im.vector.app.R
 
 enum class RoomListDisplayMode(@StringRes val titleRes: Int) {
-        NOTIFICATIONS(R.string.bottom_action_notification),
-        PEOPLE(R.string.bottom_action_people_x),
-        ROOMS(R.string.bottom_action_rooms),
-        FILTERED(/* Not used */ 0)
-    }
+    NOTIFICATIONS(R.string.bottom_action_notification),
+    PEOPLE(R.string.bottom_action_people_x),
+    ROOMS(R.string.bottom_action_rooms),
+    FILTERED(/* Not used */ 0)
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
index 03809d3c75..88eb1b5109 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
@@ -81,10 +81,10 @@ sealed class RoomDetailAction : VectorViewModelAction {
     data class ReRequestKeys(val eventId: String) : RoomDetailAction()
 
     object SelectStickerAttachment : RoomDetailAction()
-    object OpenIntegrationManager: RoomDetailAction()
-    object ManageIntegrations: RoomDetailAction()
-    data class AddJitsiWidget(val withVideo: Boolean): RoomDetailAction()
-    data class RemoveWidget(val widgetId: String): RoomDetailAction()
+    object OpenIntegrationManager : RoomDetailAction()
+    object ManageIntegrations : RoomDetailAction()
+    data class AddJitsiWidget(val withVideo: Boolean) : RoomDetailAction()
+    data class RemoveWidget(val widgetId: String) : RoomDetailAction()
     data class EnsureNativeWidgetAllowed(val widget: Widget,
                                          val userJustAccepted: Boolean,
                                          val grantedEvents: RoomDetailViewEvents) : RoomDetailAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index eadea299e6..ae64789f67 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -613,8 +613,8 @@ class RoomDetailFragment @Inject constructor(
         withState(roomDetailViewModel) { state ->
             // Set the visual state of the call buttons (voice/video) to enabled/disabled according to user permissions
             val callButtonsEnabled = when (state.asyncRoomSummary.invoke()?.joinedMembersCount) {
-                1 -> false
-                2 -> state.isAllowedToStartWebRTCCall
+                1    -> false
+                2    -> state.isAllowedToStartWebRTCCall
                 else -> state.isAllowedToManageWidgets
             }
             setOf(R.id.voice_call, R.id.video_call).forEach {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
index 29ed43f17d..ee2d193473 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -41,8 +41,8 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     data class NavigateToEvent(val eventId: String) : RoomDetailViewEvents()
     data class JoinJitsiConference(val widget: Widget, val withVideo: Boolean) : RoomDetailViewEvents()
 
-    object ShowWaitingView: RoomDetailViewEvents()
-    object HideWaitingView: RoomDetailViewEvents()
+    object ShowWaitingView : RoomDetailViewEvents()
+    object HideWaitingView : RoomDetailViewEvents()
 
     data class FileTooBigError(
             val filename: String,
@@ -64,14 +64,14 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
 
     abstract class SendMessageResult : RoomDetailViewEvents()
 
-    object DisplayPromptForIntegrationManager: RoomDetailViewEvents()
+    object DisplayPromptForIntegrationManager : RoomDetailViewEvents()
 
-    object DisplayEnableIntegrationsWarning: RoomDetailViewEvents()
+    object DisplayEnableIntegrationsWarning : RoomDetailViewEvents()
 
-    data class OpenStickerPicker(val widget: Widget): RoomDetailViewEvents()
+    data class OpenStickerPicker(val widget: Widget) : RoomDetailViewEvents()
 
-    object OpenIntegrationManager: RoomDetailViewEvents()
-    object OpenActiveWidgetBottomSheet: RoomDetailViewEvents()
+    object OpenIntegrationManager : RoomDetailViewEvents()
+    object OpenActiveWidgetBottomSheet : RoomDetailViewEvents()
     data class RequestNativeWidgetPermission(val widget: Widget,
                                              val domain: String,
                                              val grantedEvents: RoomDetailViewEvents) : RoomDetailViewEvents()
@@ -83,6 +83,7 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
     data class SlashCommandHandled(@StringRes val messageRes: Int? = null) : SendMessageResult()
     object SlashCommandResultOk : SendMessageResult()
     class SlashCommandResultError(val throwable: Throwable) : SendMessageResult()
+
     // TODO Remove
     object SlashCommandNotImplemented : SendMessageResult()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
index 009f8ec802..19cc27a510 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@@ -228,53 +228,53 @@ class RoomDetailViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomDetailAction) {
         when (action) {
-            is RoomDetailAction.UserIsTyping -> handleUserIsTyping(action)
-            is RoomDetailAction.SaveDraft -> handleSaveDraft(action)
-            is RoomDetailAction.SendMessage -> handleSendMessage(action)
-            is RoomDetailAction.SendMedia -> handleSendMedia(action)
-            is RoomDetailAction.SendSticker -> handleSendSticker(action)
-            is RoomDetailAction.TimelineEventTurnsVisible -> handleEventVisible(action)
-            is RoomDetailAction.TimelineEventTurnsInvisible -> handleEventInvisible(action)
-            is RoomDetailAction.LoadMoreTimelineEvents -> handleLoadMore(action)
-            is RoomDetailAction.SendReaction -> handleSendReaction(action)
-            is RoomDetailAction.AcceptInvite -> handleAcceptInvite()
-            is RoomDetailAction.RejectInvite -> handleRejectInvite()
-            is RoomDetailAction.RedactAction -> handleRedactEvent(action)
-            is RoomDetailAction.UndoReaction -> handleUndoReact(action)
-            is RoomDetailAction.UpdateQuickReactAction -> handleUpdateQuickReaction(action)
-            is RoomDetailAction.EnterRegularMode -> handleEnterRegularMode(action)
-            is RoomDetailAction.EnterEditMode -> handleEditAction(action)
-            is RoomDetailAction.EnterQuoteMode -> handleQuoteAction(action)
-            is RoomDetailAction.EnterReplyMode -> handleReplyAction(action)
-            is RoomDetailAction.DownloadOrOpen -> handleOpenOrDownloadFile(action)
-            is RoomDetailAction.NavigateToEvent -> handleNavigateToEvent(action)
-            is RoomDetailAction.HandleTombstoneEvent -> handleTombstoneEvent(action)
-            is RoomDetailAction.ResendMessage -> handleResendEvent(action)
-            is RoomDetailAction.RemoveFailedEcho -> handleRemove(action)
-            is RoomDetailAction.ClearSendQueue -> handleClearSendQueue()
-            is RoomDetailAction.ResendAll -> handleResendAll()
-            is RoomDetailAction.MarkAllAsRead -> handleMarkAllAsRead()
-            is RoomDetailAction.ReportContent -> handleReportContent(action)
-            is RoomDetailAction.IgnoreUser -> handleIgnoreUser(action)
+            is RoomDetailAction.UserIsTyping                     -> handleUserIsTyping(action)
+            is RoomDetailAction.SaveDraft                        -> handleSaveDraft(action)
+            is RoomDetailAction.SendMessage                      -> handleSendMessage(action)
+            is RoomDetailAction.SendMedia                        -> handleSendMedia(action)
+            is RoomDetailAction.SendSticker                      -> handleSendSticker(action)
+            is RoomDetailAction.TimelineEventTurnsVisible        -> handleEventVisible(action)
+            is RoomDetailAction.TimelineEventTurnsInvisible      -> handleEventInvisible(action)
+            is RoomDetailAction.LoadMoreTimelineEvents           -> handleLoadMore(action)
+            is RoomDetailAction.SendReaction                     -> handleSendReaction(action)
+            is RoomDetailAction.AcceptInvite                     -> handleAcceptInvite()
+            is RoomDetailAction.RejectInvite                     -> handleRejectInvite()
+            is RoomDetailAction.RedactAction                     -> handleRedactEvent(action)
+            is RoomDetailAction.UndoReaction                     -> handleUndoReact(action)
+            is RoomDetailAction.UpdateQuickReactAction           -> handleUpdateQuickReaction(action)
+            is RoomDetailAction.EnterRegularMode                 -> handleEnterRegularMode(action)
+            is RoomDetailAction.EnterEditMode                    -> handleEditAction(action)
+            is RoomDetailAction.EnterQuoteMode                   -> handleQuoteAction(action)
+            is RoomDetailAction.EnterReplyMode                   -> handleReplyAction(action)
+            is RoomDetailAction.DownloadOrOpen                   -> handleOpenOrDownloadFile(action)
+            is RoomDetailAction.NavigateToEvent                  -> handleNavigateToEvent(action)
+            is RoomDetailAction.HandleTombstoneEvent             -> handleTombstoneEvent(action)
+            is RoomDetailAction.ResendMessage                    -> handleResendEvent(action)
+            is RoomDetailAction.RemoveFailedEcho                 -> handleRemove(action)
+            is RoomDetailAction.ClearSendQueue                   -> handleClearSendQueue()
+            is RoomDetailAction.ResendAll                        -> handleResendAll()
+            is RoomDetailAction.MarkAllAsRead                    -> handleMarkAllAsRead()
+            is RoomDetailAction.ReportContent                    -> handleReportContent(action)
+            is RoomDetailAction.IgnoreUser                       -> handleIgnoreUser(action)
             is RoomDetailAction.EnterTrackingUnreadMessagesState -> startTrackingUnreadMessages()
-            is RoomDetailAction.ExitTrackingUnreadMessagesState -> stopTrackingUnreadMessages()
-            is RoomDetailAction.ReplyToOptions -> handleReplyToOptions(action)
-            is RoomDetailAction.AcceptVerificationRequest -> handleAcceptVerification(action)
-            is RoomDetailAction.DeclineVerificationRequest -> handleDeclineVerification(action)
-            is RoomDetailAction.RequestVerification -> handleRequestVerification(action)
-            is RoomDetailAction.ResumeVerification -> handleResumeRequestVerification(action)
-            is RoomDetailAction.ReRequestKeys -> handleReRequestKeys(action)
-            is RoomDetailAction.TapOnFailedToDecrypt -> handleTapOnFailedToDecrypt(action)
-            is RoomDetailAction.SelectStickerAttachment -> handleSelectStickerAttachment()
-            is RoomDetailAction.OpenIntegrationManager -> handleOpenIntegrationManager()
-            is RoomDetailAction.StartCall -> handleStartCall(action)
-            is RoomDetailAction.EndCall -> handleEndCall()
-            is RoomDetailAction.ManageIntegrations -> handleManageIntegrations()
-            is RoomDetailAction.AddJitsiWidget -> handleAddJitsiConference(action)
-            is RoomDetailAction.RemoveWidget -> handleDeleteWidget(action.widgetId)
-            is RoomDetailAction.EnsureNativeWidgetAllowed -> handleCheckWidgetAllowed(action)
-            is RoomDetailAction.CancelSend -> handleCancel(action)
-            is RoomDetailAction.JumpToReadReceipt -> handleJumpToReadReceipt(action)
+            is RoomDetailAction.ExitTrackingUnreadMessagesState  -> stopTrackingUnreadMessages()
+            is RoomDetailAction.ReplyToOptions                   -> handleReplyToOptions(action)
+            is RoomDetailAction.AcceptVerificationRequest        -> handleAcceptVerification(action)
+            is RoomDetailAction.DeclineVerificationRequest       -> handleDeclineVerification(action)
+            is RoomDetailAction.RequestVerification              -> handleRequestVerification(action)
+            is RoomDetailAction.ResumeVerification               -> handleResumeRequestVerification(action)
+            is RoomDetailAction.ReRequestKeys                    -> handleReRequestKeys(action)
+            is RoomDetailAction.TapOnFailedToDecrypt             -> handleTapOnFailedToDecrypt(action)
+            is RoomDetailAction.SelectStickerAttachment          -> handleSelectStickerAttachment()
+            is RoomDetailAction.OpenIntegrationManager           -> handleOpenIntegrationManager()
+            is RoomDetailAction.StartCall                        -> handleStartCall(action)
+            is RoomDetailAction.EndCall                          -> handleEndCall()
+            is RoomDetailAction.ManageIntegrations               -> handleManageIntegrations()
+            is RoomDetailAction.AddJitsiWidget                   -> handleAddJitsiConference(action)
+            is RoomDetailAction.RemoveWidget                     -> handleDeleteWidget(action.widgetId)
+            is RoomDetailAction.EnsureNativeWidgetAllowed        -> handleCheckWidgetAllowed(action)
+            is RoomDetailAction.CancelSend                       -> handleCancel(action)
+            is RoomDetailAction.JumpToReadReceipt                -> handleJumpToReadReceipt(action)
         }.exhaustive
     }
 
@@ -695,7 +695,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                         }
                     }.exhaustive
                 }
-                is SendMode.EDIT -> {
+                is SendMode.EDIT    -> {
                     // is original event a reply?
                     val inReplyTo = state.sendMode.timelineEvent.root.getClearContent().toModel<MessageContent>()?.relatesTo?.inReplyTo?.eventId
                             ?: state.sendMode.timelineEvent.root.content.toModel<EncryptedEventContent>()?.relatesTo?.inReplyTo?.eventId
@@ -721,7 +721,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.QUOTE -> {
+                is SendMode.QUOTE   -> {
                     val messageContent: MessageContent? =
                             state.sendMode.timelineEvent.annotations?.editSummary?.aggregatedContent.toModel()
                                     ?: state.sendMode.timelineEvent.root.getClearContent().toModel()
@@ -744,7 +744,7 @@ class RoomDetailViewModel @AssistedInject constructor(
                     _viewEvents.post(RoomDetailViewEvents.MessageSent)
                     popDraft()
                 }
-                is SendMode.REPLY -> {
+                is SendMode.REPLY   -> {
                     state.sendMode.timelineEvent.let {
                         room.replyToMessage(it, action.text.toString(), action.autoMarkdown)
                         _viewEvents.post(RoomDetailViewEvents.MessageSent)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
index ffa56b8219..b31c972d1a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -43,6 +43,7 @@ sealed class SendMode(open val text: String) {
             // This is necessary for forcing refresh on selectSubscribe
             private val ts: Long = System.currentTimeMillis()
     ) : SendMode(text)
+
     data class QUOTE(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
     data class EDIT(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
     data class REPLY(val timelineEvent: TimelineEvent, override val text: String) : SendMode(text)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
index caa8841690..0a6f94af28 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
@@ -54,18 +54,25 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
 
     @BindView(R.id.composer_related_message_sender)
     lateinit var composerRelatedMessageTitle: TextView
+
     @BindView(R.id.composer_related_message_preview)
     lateinit var composerRelatedMessageContent: TextView
+
     @BindView(R.id.composer_related_message_avatar_view)
     lateinit var composerRelatedMessageAvatar: ImageView
+
     @BindView(R.id.composer_related_message_action_image)
     lateinit var composerRelatedMessageActionIcon: ImageView
+
     @BindView(R.id.composer_related_message_close)
     lateinit var composerRelatedMessageCloseButton: ImageButton
+
     @BindView(R.id.composerEditText)
     lateinit var composerEditText: ComposerEditText
+
     @BindView(R.id.composer_avatar_view)
     lateinit var composerAvatarImageView: ImageView
+
     @BindView(R.id.composer_shield)
     lateinit var composerShieldImageView: ImageView
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
index 666f5b3d38..10dc9254d8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchFragment.kt
@@ -90,7 +90,7 @@ class SearchFragment @Inject constructor(
                 is Loading -> {
                     stateView.state = StateView.State.Loading
                 }
-                is Fail -> {
+                is Fail    -> {
                     stateView.state = StateView.State.Error(errorFormatter.toHumanReadable(state.asyncSearchRequest.error))
                 }
                 is Success -> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
index 21a2d18e71..f61bcbd029 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchViewModel.kt
@@ -63,8 +63,8 @@ class SearchViewModel @AssistedInject constructor(
     override fun handle(action: SearchAction) {
         when (action) {
             is SearchAction.SearchWith -> handleSearchWith(action)
-            is SearchAction.LoadMore -> handleLoadMore()
-            is SearchAction.Retry -> handleRetry()
+            is SearchAction.LoadMore   -> handleLoadMore()
+            is SearchAction.Retry      -> handleRetry()
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
index cff9a8c5e2..b6023333b1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageSharedActionViewModel.kt
@@ -22,5 +22,5 @@ import javax.inject.Inject
  * Activity shared view model to handle message actions
  */
 class MessageSharedActionViewModel @Inject constructor() : VectorSharedActionViewModel<EventSharedAction>() {
-    var pendingAction : EventSharedAction? = null
+    var pendingAction: EventSharedAction? = null
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
index 40286678c8..1a4db3bdfc 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactory.kt
@@ -45,7 +45,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
         val computedModel = try {
             when (event.root.getClearType()) {
                 EventType.STICKER,
-                EventType.MESSAGE                       -> messageItemFactory.create(event, nextEvent, highlight, callback)
+                EventType.MESSAGE               -> messageItemFactory.create(event, nextEvent, highlight, callback)
                 // State and call
                 EventType.STATE_ROOM_TOMBSTONE,
                 EventType.STATE_ROOM_NAME,
@@ -65,12 +65,12 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.CALL_ANSWER,
                 EventType.STATE_ROOM_POWER_LEVELS,
                 EventType.REACTION,
-                EventType.REDACTION                     -> noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
-                EventType.STATE_ROOM_ENCRYPTION         -> encryptionItemFactory.create(event, highlight, callback)
+                EventType.REDACTION             -> noticeItemFactory.create(event, highlight, roomSummaryHolder.roomSummary, callback)
+                EventType.STATE_ROOM_ENCRYPTION -> encryptionItemFactory.create(event, highlight, callback)
                 // State room create
-                EventType.STATE_ROOM_CREATE             -> roomCreateItemFactory.create(event, callback)
+                EventType.STATE_ROOM_CREATE     -> roomCreateItemFactory.create(event, callback)
                 // Crypto
-                EventType.ENCRYPTED                     -> {
+                EventType.ENCRYPTED             -> {
                     if (event.root.isRedacted()) {
                         // Redacted event, let the MessageItemFactory handle it
                         messageItemFactory.create(event, nextEvent, highlight, callback)
@@ -83,7 +83,7 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                 EventType.KEY_VERIFICATION_KEY,
                 EventType.KEY_VERIFICATION_READY,
                 EventType.KEY_VERIFICATION_MAC,
-                EventType.CALL_CANDIDATES               -> {
+                EventType.CALL_CANDIDATES       -> {
                     // TODO These are not filtered out by timeline when encrypted
                     // For now manually ignore
                     if (userPreferencesProvider.shouldShowHiddenEvents()) {
@@ -93,12 +93,12 @@ class TimelineItemFactory @Inject constructor(private val messageItemFactory: Me
                     }
                 }
                 EventType.KEY_VERIFICATION_CANCEL,
-                EventType.KEY_VERIFICATION_DONE         -> {
+                EventType.KEY_VERIFICATION_DONE -> {
                     verificationConclusionItemFactory.create(event, highlight, callback)
                 }
 
                 // Unhandled event types
-                else                                    -> {
+                else                            -> {
                     // Should only happen when shouldShowHiddenEvents() settings is ON
                     Timber.v("Type ${event.root.getClearType()} not handled")
                     defaultItemFactory.create(event, highlight, callback)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
index 78d9a49c9c..f4632b0e10 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
@@ -54,16 +54,16 @@ class DisplayableEventFormatter @Inject constructor(
         val senderName = timelineEvent.senderInfo.disambiguatedDisplayName
 
         when (timelineEvent.root.getClearType()) {
-            EventType.STICKER         -> {
+            EventType.STICKER               -> {
                 return simpleFormat(senderName, stringProvider.getString(R.string.send_a_sticker), appendAuthor)
             }
-            EventType.REACTION        -> {
+            EventType.REACTION              -> {
                 timelineEvent.root.getClearContent().toModel<ReactionContent>()?.relatesTo?.let {
                     val emojiSpanned = emojiCompatWrapper.safeEmojiSpanify(stringProvider.getString(R.string.sent_a_reaction, it.key))
                     return simpleFormat(senderName, emojiSpanned, appendAuthor)
                 }
             }
-            EventType.MESSAGE         -> {
+            EventType.MESSAGE               -> {
                 timelineEvent.getLastMessageContent()?.let { messageContent ->
                     when (messageContent.msgType) {
                         MessageType.MSGTYPE_VERIFICATION_REQUEST -> {
@@ -126,10 +126,10 @@ class DisplayableEventFormatter @Inject constructor(
             EventType.KEY_VERIFICATION_MAC,
             EventType.KEY_VERIFICATION_KEY,
             EventType.KEY_VERIFICATION_READY,
-            EventType.CALL_CANDIDATES -> {
+            EventType.CALL_CANDIDATES       -> {
                 return span { }
             }
-            else                      -> {
+            else                            -> {
                 return span {
                     text = noticeEventFormatter.format(timelineEvent, roomSummary) ?: ""
                     textStyle = "italic"
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index 1a5f820831..8055ef9a99 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -57,7 +57,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
 
     private fun Event.isSentByCurrentUser() = senderId != null && senderId == currentUserId
 
-    private fun RoomSummary?.isDm()  = this?.isDirect.orFalse()
+    private fun RoomSummary?.isDm() = this?.isDirect.orFalse()
 
     fun format(timelineEvent: TimelineEvent, rs: RoomSummary?): CharSequence? {
         return when (val type = timelineEvent.root.getClearType()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
index 631cd9ff66..29aca2c4d5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsBaseMessageItem.kt
@@ -136,8 +136,10 @@ abstract class AbsBaseMessageItem<H : AbsBaseMessageItem.Holder> : BaseEventItem
         val messageColorProvider: MessageColorProvider
         val itemLongClickListener: View.OnLongClickListener?
         val itemClickListener: View.OnClickListener?
+
         //        val memberClickListener: View.OnClickListener?
         val reactionPillCallback: TimelineEventController.ReactionPillCallback?
+
         //        val avatarCallback: TimelineEventController.AvatarCallback?
         val readReceiptsCallback: TimelineEventController.ReadReceiptsCallback?
 //        val emojiTypeFace: Typeface?
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
index e8fa23b924..e617489902 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/BaseEventItem.kt
@@ -37,6 +37,7 @@ abstract class BaseEventItem<H : BaseEventItem.BaseHolder> : VectorEpoxyModel<H>
     // To use for instance when opening a permalink with an eventId
     @EpoxyAttribute
     var highlighted: Boolean = false
+
     @EpoxyAttribute
     open var leftGuideline: Int = 0
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
index e7501d98ce..def79e4fe6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageBlockCodeItem.kt
@@ -28,6 +28,7 @@ abstract class MessageBlockCodeItem : AbsMessageItem<MessageBlockCodeItem.Holder
 
     @EpoxyAttribute
     var message: CharSequence? = null
+
     @EpoxyAttribute
     var editedSpan: CharSequence? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
index ffc51f671f..98db0bc9b9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
@@ -35,14 +35,19 @@ abstract class MessageImageVideoItem : AbsMessageItem<MessageImageVideoItem.Hold
 
     @EpoxyAttribute
     lateinit var mediaData: ImageContentRenderer.Data
+
     @EpoxyAttribute
     var playable: Boolean = false
+
     @EpoxyAttribute
     var mode = ImageContentRenderer.Mode.THUMBNAIL
+
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var clickListener: View.OnClickListener? = null
+
     @EpoxyAttribute
     lateinit var imageContentRenderer: ImageContentRenderer
+
     @EpoxyAttribute
     lateinit var contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index fd8a9653e6..e3a8b11508 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -28,7 +28,7 @@ data class MessageInformationData(
         val senderId: String,
         val sendState: SendState,
         val time: CharSequence? = null,
-        val ageLocalTS : Long?,
+        val ageLocalTS: Long?,
         val avatarUrl: String?,
         val memberName: CharSequence? = null,
         val showInformation: Boolean = true,
@@ -41,7 +41,7 @@ data class MessageInformationData(
         val hasPendingEdits: Boolean = false,
         val readReceipts: List<ReadReceiptData> = emptyList(),
         val referencesInfoData: ReferencesInfoData? = null,
-        val sentByMe : Boolean,
+        val sentByMe: Boolean,
         val e2eDecoration: E2EDecoration = E2EDecoration.NONE
 ) : Parcelable {
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
index 6648943ca8..791a3c388f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -30,10 +30,13 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
 
     @EpoxyAttribute
     var searchForPills: Boolean = false
+
     @EpoxyAttribute
     var message: CharSequence? = null
+
     @EpoxyAttribute
     var useBigFont: Boolean = false
+
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var movementMethod: MovementMethod? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
index 9fc5275a81..2d60556fa3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reactions/ReactionInfoSimpleItem.kt
@@ -32,10 +32,13 @@ abstract class ReactionInfoSimpleItem : EpoxyModelWithHolder<ReactionInfoSimpleI
 
     @EpoxyAttribute
     lateinit var reactionKey: CharSequence
+
     @EpoxyAttribute
     lateinit var authorDisplayName: CharSequence
+
     @EpoxyAttribute
     var timeStamp: CharSequence? = null
+
     @EpoxyAttribute
     var userClicked: (() -> Unit)? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt
index 691b6ec4ee..33a6f627a1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetItem.kt
@@ -36,6 +36,7 @@ abstract class RoomWidgetItem : EpoxyModelWithHolder<RoomWidgetItem.Holder>() {
 
     @EpoxyAttribute lateinit var widget: Widget
     @EpoxyAttribute var widgetClicked: ClickListener? = null
+
     @DrawableRes
     @EpoxyAttribute var iconRes: Int? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
index 70e28caee8..9d9a26eb83 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
@@ -31,8 +31,8 @@ class RoomListDisplayModeFilter(private val displayMode: RoomListDisplayMode) :
             RoomListDisplayMode.NOTIFICATIONS ->
                 roomSummary.notificationCount > 0 || roomSummary.membership == Membership.INVITE || roomSummary.userDrafts.isNotEmpty()
             RoomListDisplayMode.PEOPLE        -> roomSummary.isDirect && roomSummary.membership.isActive()
-            RoomListDisplayMode.ROOMS    -> !roomSummary.isDirect && roomSummary.membership.isActive()
-            RoomListDisplayMode.FILTERED -> roomSummary.membership == Membership.JOIN
+            RoomListDisplayMode.ROOMS         -> !roomSummary.isDirect && roomSummary.membership.isActive()
+            RoomListDisplayMode.FILTERED      -> roomSummary.membership == Membership.JOIN
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index 979f364888..f334ab792d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -140,8 +140,8 @@ class RoomListFragment @Inject constructor(
         when (roomListParams.displayMode) {
             RoomListDisplayMode.NOTIFICATIONS -> createChatFabMenu.isVisible = true
             RoomListDisplayMode.PEOPLE        -> createChatRoomButton.isVisible = true
-            RoomListDisplayMode.ROOMS  -> createGroupRoomButton.isVisible = true
-            else                       -> Unit // No button in this mode
+            RoomListDisplayMode.ROOMS         -> createGroupRoomButton.isVisible = true
+            else                              -> Unit // No button in this mode
         }
 
         createChatRoomButton.debouncedClicks {
@@ -166,8 +166,8 @@ class RoomListFragment @Inject constructor(
                                 when (roomListParams.displayMode) {
                                     RoomListDisplayMode.NOTIFICATIONS -> createChatFabMenu.hide()
                                     RoomListDisplayMode.PEOPLE        -> createChatRoomButton.hide()
-                                    RoomListDisplayMode.ROOMS  -> createGroupRoomButton.hide()
-                                    else                       -> Unit
+                                    RoomListDisplayMode.ROOMS         -> createGroupRoomButton.hide()
+                                    else                              -> Unit
                                 }
                             }
                         }
@@ -209,8 +209,8 @@ class RoomListFragment @Inject constructor(
             when (roomListParams.displayMode) {
                 RoomListDisplayMode.NOTIFICATIONS -> createChatFabMenu.show()
                 RoomListDisplayMode.PEOPLE        -> createChatRoomButton.show()
-                RoomListDisplayMode.ROOMS  -> createGroupRoomButton.show()
-                else                       -> Unit
+                RoomListDisplayMode.ROOMS         -> createGroupRoomButton.show()
+                else                              -> Unit
             }
         }
     }
@@ -302,19 +302,19 @@ class RoomListFragment @Inject constructor(
                             getString(R.string.room_list_catchup_empty_body))
                 }
             }
-            RoomListDisplayMode.PEOPLE ->
+            RoomListDisplayMode.PEOPLE        ->
                 StateView.State.Empty(
                         getString(R.string.room_list_people_empty_title),
                         ContextCompat.getDrawable(requireContext(), R.drawable.ic_home_bottom_chat),
                         getString(R.string.room_list_people_empty_body)
                 )
-            RoomListDisplayMode.ROOMS  ->
+            RoomListDisplayMode.ROOMS         ->
                 StateView.State.Empty(
                         getString(R.string.room_list_rooms_empty_title),
                         ContextCompat.getDrawable(requireContext(), R.drawable.ic_home_bottom_group),
                         getString(R.string.room_list_rooms_empty_body)
                 )
-            else                       ->
+            else                              ->
                 // Always display the content in this mode, because if the footer
                 StateView.State.Content
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index dd59abbc8a..e070bff5b8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -158,10 +158,10 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
     private fun handleMarkAllRoomsRead() = withState { state ->
         state.asyncFilteredRooms.invoke()
                 ?.flatMap { it.value }
-                ?.filter { it.membership == Membership.JOIN }
-                ?.map { it.roomId }
-                ?.toList()
-                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
+                .filter { it.membership == Membership.JOIN }
+                .map { it.roomId }
+                .toList()
+                .let { session.markAllAsRead(it, NoOpMatrixCallback()) }
     }
 
     private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index 095262d74b..b3d9e92000 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -67,8 +67,8 @@ data class RoomListViewState(
     val hasUnread: Boolean
         get() = asyncFilteredRooms.invoke()
                 ?.flatMap { it.value }
-                ?.filter { it.membership == Membership.JOIN }
-                ?.any { it.hasUnreadMessages }
+                .filter { it.membership == Membership.JOIN }
+                .any { it.hasUnreadMessages }
                 ?: false
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
index 4cac11af21..ddb51e4e64 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
@@ -42,8 +42,10 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
     @EpoxyAttribute lateinit var typingMessage: CharSequence
     @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
     @EpoxyAttribute lateinit var matrixItem: MatrixItem
+
     // Used only for diff calculation
     @EpoxyAttribute lateinit var lastEvent: String
+
     // We use DoNotHash here as Spans are not implementing equals/hashcode
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash) lateinit var lastFormattedEvent: CharSequence
     @EpoxyAttribute lateinit var lastEventTime: CharSequence
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
index 8f3e11453e..087b7c2f55 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomActivity.kt
@@ -115,7 +115,7 @@ class InviteUsersToRoomActivity : SimpleFragmentActivity() {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (allGranted(grantResults)) {
             if (requestCode == PERMISSION_REQUEST_CODE_READ_CONTACTS) {
-                doOnPostResume {  addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
+                doOnPostResume { addFragmentToBackstack(R.id.container, ContactsBookFragment::class.java) }
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt
index 786fab58c3..87b10f909f 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewEvents.kt
@@ -18,7 +18,7 @@ package im.vector.app.features.invite
 
 import im.vector.app.core.platform.VectorViewEvents
 
-sealed class InviteUsersToRoomViewEvents  : VectorViewEvents {
+sealed class InviteUsersToRoomViewEvents : VectorViewEvents {
     object Loading : InviteUsersToRoomViewEvents()
     data class Failure(val throwable: Throwable) : InviteUsersToRoomViewEvents()
     data class Success(val successMessage: String) : InviteUsersToRoomViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginAction.kt b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
index 9788060ad3..eb5aa86b3b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginAction.kt
@@ -39,6 +39,7 @@ sealed class LoginAction : VectorViewModelAction {
 
     data class AddThreePid(val threePid: RegisterThreePid) : RegisterAction()
     object SendAgainThreePid : RegisterAction()
+
     // TODO Confirm Email (from link in the email, open in the phone, intercepted by RiotX)
     data class ValidateThreePid(val code: String) : RegisterAction()
 
diff --git a/vector/src/main/java/im/vector/app/features/login/SignMode.kt b/vector/src/main/java/im/vector/app/features/login/SignMode.kt
index 9933b92f27..1853a3e10f 100644
--- a/vector/src/main/java/im/vector/app/features/login/SignMode.kt
+++ b/vector/src/main/java/im/vector/app/features/login/SignMode.kt
@@ -18,10 +18,13 @@ package im.vector.app.features.login
 
 enum class SignMode {
     Unknown,
+
     // Account creation
     SignUp,
+
     // Login
     SignIn,
+
     // Login directly with matrix Id
     SignInWithMatrixId
 }
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index d6ab24bfbd..ac7b224de2 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -52,6 +52,7 @@ interface AttachmentData : Parcelable {
     val mimeType: String?
     val url: String?
     val elementToDecrypt: ElementToDecrypt?
+
     // If true will load non mxc url, be careful to set it only for attachments sent by you
     val allowNonMxcUrls: Boolean
 }
@@ -226,12 +227,12 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder:
             // Fallback to base url
                     ?: data.url.takeIf { it?.startsWith("content://") == true }
 
-           glideRequests
+            glideRequests
                     .load(resolvedUrl)
                     .apply {
                         if (mode == Mode.THUMBNAIL) {
                             error(
-                                   glideRequests.load(resolveUrl(data))
+                                    glideRequests.load(resolveUrl(data))
                             )
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
index 2be5650904..a4f099b905 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEvent.kt
@@ -29,12 +29,15 @@ interface NotifiableEvent : Serializable {
     val description: String?
     val type: String?
     val timestamp: Long
+
     // NotificationCompat.VISIBILITY_PUBLIC , VISIBILITY_PRIVATE , VISIBILITY_SECRET
     var lockScreenVisibility: Int
+
     // Compat: Only for android <7, for newer version the sound is defined in the channel
     var soundName: String?
     var hasBeenDisplayed: Boolean
     var isRedacted: Boolean
+
     // Used to know if event should be replaced with the one coming from eventstream
     var isPushGatewayEvent: Boolean
 }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 7147968d49..7f3c0a5beb 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -245,8 +245,8 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
                             roomEvents.add(event)
                         }
                     }
-                    is InviteNotifiableEvent -> invitationEvents.add(event)
-                    is SimpleNotifiableEvent -> simpleEvents.add(event)
+                    is InviteNotifiableEvent  -> invitationEvents.add(event)
+                    is SimpleNotifiableEvent  -> simpleEvents.add(event)
                     else                      -> Timber.w("Type not handled")
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
index b9363864e7..64e40ed748 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/RoomEventGroupInfo.kt
@@ -26,6 +26,7 @@ data class RoomEventGroupInfo(
 ) {
     // An event in the list has not yet been display
     var hasNewEvent: Boolean = false
+
     // true if at least one on the not yet displayed event is noisy
     var shouldBing: Boolean = false
     var customSound: String? = null
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt
index dfcbb470cd..12c264aa65 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/JoinState.kt
@@ -23,6 +23,7 @@ enum class JoinState {
     NOT_JOINED,
     JOINING,
     JOINING_ERROR,
+
     // Room is joined and this is confirmed by the sync
     JOINED
 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 1f89380449..1af5beeda2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -21,8 +21,8 @@ import android.net.Uri
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import im.vector.app.core.platform.VectorViewModelAction
 
-sealed class RoomProfileAction: VectorViewModelAction {
-    object LeaveRoom: RoomProfileAction()
+sealed class RoomProfileAction : VectorViewModelAction {
+    object LeaveRoom : RoomProfileAction()
     data class ChangeRoomNotificationState(val notificationState: RoomNotificationState) : RoomProfileAction()
     data class ChangeRoomAvatar(val uri: Uri, val fileName: String?) : RoomProfileAction()
     object ShareRoomProfile : RoomProfileAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
index 12e88c2dec..922dd995e9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt
@@ -97,11 +97,11 @@ class RoomProfileViewModel @AssistedInject constructor(
 
     override fun handle(action: RoomProfileAction) {
         when (action) {
-            RoomProfileAction.LeaveRoom -> handleLeaveRoom()
+            RoomProfileAction.LeaveRoom                      -> handleLeaveRoom()
             is RoomProfileAction.ChangeRoomNotificationState -> handleChangeNotificationMode(action)
-            is RoomProfileAction.ShareRoomProfile -> handleShareRoomProfile()
-            is RoomProfileAction.ChangeRoomAvatar -> handleChangeAvatar(action)
-            RoomProfileAction.CreateShortcut -> handleCreateShortcut()
+            is RoomProfileAction.ShareRoomProfile            -> handleShareRoomProfile()
+            is RoomProfileAction.ChangeRoomAvatar            -> handleChangeAvatar(action)
+            RoomProfileAction.CreateShortcut                 -> handleCreateShortcut()
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
index 84eccccfae..52c85f9463 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
@@ -75,7 +75,7 @@ class RoomBannedMemberListFragment @Inject constructor(
                             }
                             .show()
                 }
-                is RoomBannedViewEvents.ToastError -> {
+                is RoomBannedViewEvents.ToastError     -> {
                     requireActivity().toast(it.info)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 337610aa46..65ea810ad9 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -102,12 +102,12 @@ class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState:
                     val powerLevelsHelper = PowerLevelsHelper(it)
                     val permissions = RoomSettingsViewState.ActionPermissions(
                             canChangeName = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_NAME),
-                            canChangeTopic =  powerLevelsHelper.isUserAllowedToSend(session.myUserId,  true, EventType.STATE_ROOM_TOPIC),
+                            canChangeTopic = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_TOPIC),
                             canChangeCanonicalAlias = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
                                     EventType.STATE_ROOM_CANONICAL_ALIAS),
                             canChangeHistoryReadability = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true,
                                     EventType.STATE_ROOM_HISTORY_VISIBILITY),
-                            canEnableEncryption =  powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_ENCRYPTION)
+                            canEnableEncryption = powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, EventType.STATE_ROOM_ENCRYPTION)
                     )
                     setState { copy(actionPermissions = permissions) }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
index 876b585a59..fb53d91e09 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsFragment.kt
@@ -68,7 +68,7 @@ class RoomUploadsFragment @Inject constructor(
                 is RoomUploadsViewEvents.FileReadyForSharing -> {
                     shareMedia(requireContext(), it.file, getMimeTypeFromUri(requireContext(), it.file.toUri()))
                 }
-                is RoomUploadsViewEvents.FileReadyForSaving -> {
+                is RoomUploadsViewEvents.FileReadyForSaving  -> {
                     saveMedia(
                             context = requireContext(),
                             file = it.file,
@@ -77,7 +77,7 @@ class RoomUploadsFragment @Inject constructor(
                             notificationUtils = notificationUtils
                     )
                 }
-                is RoomUploadsViewEvents.Failure -> showFailure(it.throwable)
+                is RoomUploadsViewEvents.Failure             -> showFailure(it.throwable)
             }.exhaustive
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt
index 3a042943c2..908e3ba72c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsVideoItem.kt
@@ -39,9 +39,9 @@ abstract class UploadsVideoItem : VectorEpoxyModel<UploadsVideoItem.Holder>() {
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.view.setOnClickListener(
-            DebouncedClickListener(View.OnClickListener { _ ->
-                listener?.onItemClicked(holder.imageView, data)
-            })
+                DebouncedClickListener(View.OnClickListener { _ ->
+                    listener?.onItemClicked(holder.imageView, data)
+                })
         )
         imageContentRenderer.render(data.thumbnailMediaData, holder.imageView, IMAGE_SIZE_DP)
         ViewCompat.setTransitionName(holder.imageView, "videoPreview_${id()}")
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 8bea54fcbe..42d4c0faef 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -71,7 +71,7 @@ class VectorSettingsActivity : VectorBaseActivity(),
                             VectorSettingsDevicesFragment::class.java,
                             null,
                             FRAGMENT_TAG)
-                EXTRA_DIRECT_ACCESS_NOTIFICATIONS                -> {
+                EXTRA_DIRECT_ACCESS_NOTIFICATIONS                    -> {
                     requestHighlightPreferenceKeyOnResume(VectorPreferences.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)
                     replaceFragment(R.id.vector_settings_page, VectorSettingsNotificationPreferenceFragment::class.java, null, FRAGMENT_TAG)
                 }
@@ -136,7 +136,7 @@ class VectorSettingsActivity : VectorBaseActivity(),
         }
     }
 
-    fun <T: Fragment> navigateTo(fragmentClass: Class<T>) {
+    fun <T : Fragment> navigateTo(fragmentClass: Class<T>) {
         supportFragmentManager.beginTransaction()
                 .setCustomAnimations(R.anim.right_in, R.anim.fade_out, R.anim.fade_in, R.anim.right_out)
                 .replace(R.id.vector_settings_page, fragmentClass, null)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
index 9dc6dc1751..1d8e95a18e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -99,7 +99,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
             if (isAdded) {
                 TransitionManager.beginDelayedTransition(mBottomView)
                 when (troubleshootTestManager.diagStatus) {
-                    TroubleshootTest.TestStatus.NOT_STARTED -> {
+                    TroubleshootTest.TestStatus.NOT_STARTED      -> {
                         mSummaryDescription.text = ""
                         mSummaryButton.visibility = View.GONE
                         mRunButton.visibility = View.VISIBLE
@@ -116,7 +116,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                         mSummaryButton.visibility = View.GONE
                         mRunButton.visibility = View.GONE
                     }
-                    TroubleshootTest.TestStatus.FAILED      -> {
+                    TroubleshootTest.TestStatus.FAILED           -> {
                         // check if there are quick fixes
                         val hasQuickFix = testManager?.hasQuickFix().orFalse()
                         if (hasQuickFix) {
@@ -127,7 +127,7 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
                         mSummaryButton.visibility = View.VISIBLE
                         mRunButton.visibility = View.VISIBLE
                     }
-                    TroubleshootTest.TestStatus.SUCCESS     -> {
+                    TroubleshootTest.TestStatus.SUCCESS          -> {
                         mSummaryDescription.text = getString(R.string.settings_troubleshoot_diagnostic_success_status)
                         mSummaryButton.visibility = View.VISIBLE
                         mRunButton.visibility = View.VISIBLE
@@ -177,12 +177,12 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
     override fun onPause() {
         super.onPause()
         tryOrNull {
-           LocalBroadcastManager.getInstance(requireContext())
-                   .unregisterReceiver(broadcastReceiverPush)
+            LocalBroadcastManager.getInstance(requireContext())
+                    .unregisterReceiver(broadcastReceiverPush)
         }
         tryOrNull {
-           LocalBroadcastManager.getInstance(requireContext())
-                   .unregisterReceiver(broadcastReceiverNotification)
+            LocalBroadcastManager.getInstance(requireContext())
+                    .unregisterReceiver(broadcastReceiverNotification)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index 457fc00273..6dd35a7d1d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -428,7 +428,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
             val sharedDataItem = sharedDataItems[0]
 
             val uri = when (sharedDataItem) {
-                is ExternalIntentData.IntentDataUri -> sharedDataItem.uri
+                is ExternalIntentData.IntentDataUri      -> sharedDataItem.uri
                 is ExternalIntentData.IntentDataClipData -> sharedDataItem.clipDataItem.uri
                 else                                     -> null
             }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
index f07e31bb2e..cf811f1611 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsController.kt
@@ -83,7 +83,7 @@ class ThreePidsSettingsController @Inject constructor(
                     loadingText(stringProvider.getString(R.string.loading))
                 }
             }
-            is Fail -> {
+            is Fail    -> {
                 genericFooterItem {
                     id("fail")
                     text(data.threePids.error.localizedMessage)
@@ -243,7 +243,7 @@ class ThreePidsSettingsController @Inject constructor(
         }
 
         when (threePid) {
-            is ThreePid.Email -> {
+            is ThreePid.Email  -> {
                 settingsInformationItem {
                     id("info" + idPrefix + threePid.value)
                     message(stringProvider.getString(R.string.account_email_validation_message))
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
index 519b7132bf..81033281d8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsFragment.kt
@@ -59,7 +59,7 @@ class ThreePidsSettingsFragment @Inject constructor(
 
         viewModel.observeViewEvents {
             when (it) {
-                is ThreePidsSettingsViewEvents.Failure -> displayErrorDialog(it.throwable)
+                is ThreePidsSettingsViewEvents.Failure      -> displayErrorDialog(it.throwable)
                 ThreePidsSettingsViewEvents.RequestPassword -> askUserPassword()
             }.exhaustive
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
index 2001c85a2e..41b6146bb1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/threepids/ThreePidsSettingsViewModel.kt
@@ -141,13 +141,13 @@ class ThreePidsSettingsViewModel @AssistedInject constructor(
 
     override fun handle(action: ThreePidsSettingsAction) {
         when (action) {
-            is ThreePidsSettingsAction.AddThreePid -> handleAddThreePid(action)
+            is ThreePidsSettingsAction.AddThreePid      -> handleAddThreePid(action)
             is ThreePidsSettingsAction.ContinueThreePid -> handleContinueThreePid(action)
-            is ThreePidsSettingsAction.SubmitCode -> handleSubmitCode(action)
-            is ThreePidsSettingsAction.CancelThreePid -> handleCancelThreePid(action)
-            is ThreePidsSettingsAction.AccountPassword -> handleAccountPassword(action)
-            is ThreePidsSettingsAction.DeleteThreePid -> handleDeleteThreePid(action)
-            is ThreePidsSettingsAction.ChangeUiState -> handleChangeUiState(action)
+            is ThreePidsSettingsAction.SubmitCode       -> handleSubmitCode(action)
+            is ThreePidsSettingsAction.CancelThreePid   -> handleCancelThreePid(action)
+            is ThreePidsSettingsAction.AccountPassword  -> handleAccountPassword(action)
+            is ThreePidsSettingsAction.DeleteThreePid   -> handleDeleteThreePid(action)
+            is ThreePidsSettingsAction.ChangeUiState    -> handleChangeUiState(action)
         }.exhaustive
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
index 633d9d05fe..5b96bcb254 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/NotificationTroubleshootRecyclerViewAdapter.kt
@@ -51,12 +51,16 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
 
         @BindView(R.id.troubleshootTestTitle)
         lateinit var titleText: TextView
+
         @BindView(R.id.troubleshootTestDescription)
         lateinit var descriptionText: TextView
+
         @BindView(R.id.troubleshootStatusIcon)
         lateinit var statusIconImage: ImageView
+
         @BindView(R.id.troubleshootProgressBar)
         lateinit var progressBar: ProgressBar
+
         @BindView(R.id.troubleshootTestButton)
         lateinit var fixButton: Button
 
@@ -70,7 +74,7 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
             descriptionText.setTextColor(ThemeUtils.getColor(context, R.attr.riotx_text_secondary))
 
             when (test.status) {
-                TroubleshootTest.TestStatus.NOT_STARTED -> {
+                TroubleshootTest.TestStatus.NOT_STARTED      -> {
                     titleText.setTextColor(ThemeUtils.getColor(context, R.attr.riotx_text_secondary))
 
                     progressBar.visibility = View.INVISIBLE
@@ -87,11 +91,11 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
                     statusIconImage.setImageDrawable(drawable)
                     descriptionText.setTextColor(infoColor)
                 }
-                TroubleshootTest.TestStatus.RUNNING     -> {
+                TroubleshootTest.TestStatus.RUNNING          -> {
                     progressBar.visibility = View.VISIBLE
                     statusIconImage.visibility = View.INVISIBLE
                 }
-                TroubleshootTest.TestStatus.FAILED      -> {
+                TroubleshootTest.TestStatus.FAILED           -> {
                     progressBar.visibility = View.INVISIBLE
                     statusIconImage.visibility = View.VISIBLE
                     statusIconImage.setImageResource(R.drawable.unit_test_ko)
@@ -100,7 +104,7 @@ class NotificationTroubleshootRecyclerViewAdapter(val tests: ArrayList<Troublesh
 
                     descriptionText.setTextColor(ContextCompat.getColor(context, R.color.riotx_notice))
                 }
-                TroubleshootTest.TestStatus.SUCCESS     -> {
+                TroubleshootTest.TestStatus.SUCCESS          -> {
                     progressBar.visibility = View.INVISIBLE
                     statusIconImage.visibility = View.VISIBLE
                     statusIconImage.setImageResource(R.drawable.unit_test_ok)
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index d0415c059c..dad89c909d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -49,15 +49,15 @@ class TestAccountSettings @Inject constructor(private val stringProvider: String
                         if (manager?.diagStatus == TestStatus.RUNNING) return // wait before all is finished
 
                         session.updatePushRuleEnableStatus(RuleKind.OVERRIDE, defaultRule, !defaultRule.enabled,
-                                                           object : MatrixCallback<Unit> {
-                                                               override fun onSuccess(data: Unit) {
-                                                                   manager?.retry(activityResultLauncher)
-                                                               }
+                                object : MatrixCallback<Unit> {
+                                    override fun onSuccess(data: Unit) {
+                                        manager?.retry(activityResultLauncher)
+                                    }
 
-                                                               override fun onFailure(failure: Throwable) {
-                                                                   manager?.retry(activityResultLauncher)
-                                                               }
-                                                           })
+                                    override fun onFailure(failure: Throwable) {
+                                        manager?.retry(activityResultLauncher)
+                                    }
+                                })
                     }
                 }
                 status = TestStatus.FAILED
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
index 5e776fb17a..d46566d20e 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareFragment.kt
@@ -73,7 +73,7 @@ class IncomingShareFragment @Inject constructor(
 
         val intent = vectorBaseActivity.intent
         val isShareManaged = when (intent?.action) {
-            Intent.ACTION_SEND -> {
+            Intent.ACTION_SEND          -> {
                 var isShareManaged = attachmentsHelper.handleShareIntent(requireContext(), intent)
                 if (!isShareManaged) {
                     isShareManaged = handleTextShare(intent)
@@ -103,7 +103,7 @@ class IncomingShareFragment @Inject constructor(
         }
         viewModel.observeViewEvents {
             when (it) {
-                is IncomingShareViewEvents.ShareToRoom -> handleShareToRoom(it)
+                is IncomingShareViewEvents.ShareToRoom            -> handleShareToRoom(it)
                 is IncomingShareViewEvents.EditMediaBeforeSending -> handleEditMediaBeforeSending(it)
                 is IncomingShareViewEvents.MultipleRoomsShareDone -> handleMultipleRoomsShareDone(it)
             }.exhaustive
diff --git a/vector/src/main/java/im/vector/app/features/share/SharedData.kt b/vector/src/main/java/im/vector/app/features/share/SharedData.kt
index 56932d45ab..5634b0df74 100644
--- a/vector/src/main/java/im/vector/app/features/share/SharedData.kt
+++ b/vector/src/main/java/im/vector/app/features/share/SharedData.kt
@@ -20,11 +20,11 @@ import android.os.Parcelable
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import kotlinx.android.parcel.Parcelize
 
-sealed class SharedData: Parcelable {
+sealed class SharedData : Parcelable {
 
     @Parcelize
-    data class Text(val text: String): SharedData()
+    data class Text(val text: String) : SharedData()
 
     @Parcelize
-    data class Attachments(val attachmentData: List<ContentAttachmentData>): SharedData()
+    data class Attachments(val attachmentData: List<ContentAttachmentData>) : SharedData()
 }
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
index a6a20a6717..50437fb4f3 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
@@ -20,7 +20,7 @@ import org.matrix.android.sdk.api.session.events.model.Content
 import im.vector.app.core.platform.VectorViewEvents
 
 sealed class WidgetViewEvents : VectorViewEvents {
-    data class Failure(val throwable: Throwable): WidgetViewEvents()
+    data class Failure(val throwable: Throwable) : WidgetViewEvents()
     data class Close(val content: Content? = null) : WidgetViewEvents()
     data class DisplayIntegrationManager(val integId: String?, val integType: String?) : WidgetViewEvents()
     data class OnURLFormatted(val formattedURL: String) : WidgetViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
index 38344b80ae..ae02707b50 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionActions.kt
@@ -19,7 +19,7 @@ package im.vector.app.features.widgets.permissions
 import im.vector.app.core.platform.VectorViewModelAction
 
 sealed class RoomWidgetPermissionActions : VectorViewModelAction {
-    object AllowWidget: RoomWidgetPermissionActions()
-    object BlockWidget: RoomWidgetPermissionActions()
-    object DoClose: RoomWidgetPermissionActions()
+    object AllowWidget : RoomWidgetPermissionActions()
+    object BlockWidget : RoomWidgetPermissionActions()
+    object DoClose : RoomWidgetPermissionActions()
 }
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
index 2fe984dfc7..830e9beabc 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignOutBottomSheetDialogFragment.kt
@@ -207,7 +207,7 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
                     signOutButton.isVisible = true
                 }
                 KeysBackupState.WillBackUp,
-                KeysBackupState.BackingUp -> {
+                KeysBackupState.BackingUp     -> {
                     sheetTitle.text = getString(R.string.sign_out_bottom_sheet_warning_backing_up)
 
                     // save in progress
@@ -221,7 +221,7 @@ class SignOutBottomSheetDialogFragment : VectorBaseBottomSheetDialogFragment(),
                     exitAnywayButton.isVisible = true
                     signOutButton.isVisible = false
                 }
-                KeysBackupState.NotTrusted -> {
+                KeysBackupState.NotTrusted    -> {
                     sheetTitle.text = getString(R.string.sign_out_bottom_sheet_warning_backup_not_active)
                     // It's not trusted and we know there are unsaved keys..
                     backingUpStatusGroup.isVisible = false

From 55a94d98885e951a8340814cb1cebcc1ddb7d3a2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 15:04:50 +0200
Subject: [PATCH 231/278] Optimize import

---
 .../im/vector/app/ActiveSessionDataSource.kt   |  2 +-
 .../main/java/im/vector/app/AppStateHandler.kt |  6 +++---
 .../core/error/ResourceLimitErrorFormatter.kt  |  2 +-
 .../app/core/glide/VectorGlideModelLoader.kt   |  2 --
 .../core/platform/SimpleFragmentActivity.kt    |  2 +-
 .../app/core/ui/views/NotificationAreaView.kt  |  4 ++--
 .../app/core/utils/ExternalApplicationsUtil.kt |  2 +-
 .../im/vector/app/features/MainActivity.kt     |  4 ++--
 .../im/vector/app/features/badge/BadgeProxy.kt |  2 +-
 .../app/features/call/CallControlsView.kt      |  2 +-
 .../app/features/call/VectorCallActivity.kt    |  6 +++---
 .../contactsbook/ContactsBookFragment.kt       |  2 +-
 .../contactsbook/ContactsBookViewModel.kt      |  4 ++--
 .../app/features/crypto/keys/KeysExporter.kt   |  8 ++++----
 .../app/features/crypto/keys/KeysImporter.kt   |  8 ++++----
 .../KeysBackupRestoreSharedViewModel.kt        |  4 ++--
 .../recover/BootstrapMigrateBackupFragment.kt  |  4 ++--
 .../VerificationBottomSheetViewModel.kt        |  2 +-
 .../epoxy/BottomSheetVerificationEmojisItem.kt |  2 +-
 .../discovery/DiscoverySettingsFragment.kt     |  2 +-
 .../discovery/DiscoverySettingsViewModel.kt    |  2 +-
 .../change/SetIdentityServerFragment.kt        |  2 +-
 .../change/SetIdentityServerViewModel.kt       |  2 +-
 .../features/grouplist/GroupListFragment.kt    |  2 +-
 .../features/grouplist/GroupListViewModel.kt   |  4 ++--
 .../app/features/home/HomeDetailViewModel.kt   |  2 +-
 .../room/breadcrumbs/BreadcrumbsViewModel.kt   |  2 +-
 .../room/detail/composer/TextComposerView.kt   |  2 +-
 .../sticker/StickerPickerActionHandler.kt      |  4 ++--
 .../timeline/factory/EncryptedItemFactory.kt   |  4 ++--
 .../timeline/factory/MessageItemFactory.kt     |  4 ++--
 .../timeline/item/MessageInformationData.kt    |  2 +-
 .../detail/widget/RoomWidgetsBannerView.kt     |  2 +-
 .../detail/widget/RoomWidgetsBottomSheet.kt    |  2 +-
 .../room/list/RoomListDisplayModeFilter.kt     |  2 +-
 .../home/room/list/RoomListFragment.kt         |  4 ++--
 .../home/room/list/RoomListNameFilter.kt       |  2 +-
 .../home/room/list/RoomListViewModel.kt        |  2 +-
 .../vector/app/features/html/FontTagHandler.kt |  2 +-
 .../invite/InviteUsersToRoomViewModel.kt       |  2 +-
 .../app/features/invite/VectorInviteView.kt    |  2 +-
 .../app/features/login/LoginCaptchaFragment.kt |  2 +-
 .../login/LoginGenericTextInputFormFragment.kt |  4 ++--
 ...ginResetPasswordMailConfirmationFragment.kt |  2 +-
 .../login/LoginWaitForEmailFragment.kt         |  2 +-
 .../app/features/login/LoginWebFragment.kt     |  2 +-
 .../features/login/terms/LoginTermsFragment.kt |  2 +-
 .../app/features/media/ImageContentRenderer.kt |  2 +-
 .../app/features/media/VideoContentRenderer.kt |  2 +-
 .../im/vector/app/features/pin/PinCodeStore.kt |  2 +-
 .../powerlevel/PowerLevelsObservableFactory.kt |  4 ++--
 .../app/features/rageshake/BugReporter.kt      |  2 +-
 .../room/RequireActiveMembershipViewModel.kt   |  4 ++--
 .../picker/RoomDirectoryPickerFragment.kt      |  2 +-
 .../devices/DeviceListBottomSheetViewModel.kt  |  1 -
 .../devices/DeviceListEpoxyController.kt       |  2 +-
 .../devices/DeviceTrustInfoEpoxyController.kt  |  2 +-
 .../powerlevel/EditPowerLevelDialogs.kt        |  2 +-
 .../features/roomprofile/RoomProfileAction.kt  |  2 +-
 .../banned/RoomBannedListMemberAction.kt       |  2 +-
 .../banned/RoomBannedListMemberViewModel.kt    | 14 +++++++-------
 .../banned/RoomBannedMemberListFragment.kt     |  4 ++--
 .../banned/RoomBannedMemberListViewState.kt    |  2 +-
 .../roomprofile/banned/RoomBannedViewEvents.kt |  2 +-
 .../members/RoomMemberListFragment.kt          | 10 +++++-----
 .../members/RoomMemberListViewState.kt         |  4 ++--
 .../roomprofile/settings/RoomSettingsAction.kt |  2 +-
 .../settings/RoomSettingsController.kt         |  8 ++++----
 .../settings/RoomSettingsFragment.kt           |  8 ++++----
 .../settings/RoomSettingsViewModel.kt          | 10 +++++-----
 .../settings/RoomSettingsViewState.kt          |  2 +-
 .../roomprofile/uploads/RoomUploadsAction.kt   |  2 +-
 .../uploads/RoomUploadsViewModel.kt            |  6 +++---
 .../uploads/RoomUploadsViewState.kt            |  2 +-
 .../uploads/files/RoomUploadsFilesFragment.kt  |  2 +-
 .../uploads/media/RoomUploadsMediaFragment.kt  |  8 ++++----
 .../uploads/media/UploadsMediaController.kt    | 12 ++++++------
 .../app/features/session/SessionListener.kt    |  4 ++--
 .../settings/VectorSettingsActivity.kt         |  4 ++--
 .../VectorSettingsHelpAboutFragment.kt         |  2 +-
 .../deactivation/DeactivateAccountViewModel.kt |  6 +++---
 .../features/settings/devices/DeviceItem.kt    |  4 ++--
 .../features/settings/devices/DevicesAction.kt |  2 +-
 .../settings/devices/DevicesViewEvents.kt      |  2 +-
 .../features/settings/devices/TrustUtils.kt    |  2 +-
 .../devtools/GossipingEventsEpoxyController.kt | 18 +++++++++---------
 .../GossipingEventsPaperTrailFragment.kt       |  2 +-
 .../GossipingEventsPaperTrailViewModel.kt      |  4 ++--
 .../devtools/KeyRequestListViewModel.kt        |  6 +++---
 .../settings/ignored/IgnoredUsersController.kt |  4 ++--
 .../settings/ignored/IgnoredUsersViewModel.kt  |  4 ++--
 .../app/features/settings/ignored/UserItem.kt  |  2 +-
 .../features/settings/push/PushGatewayItem.kt  |  2 +-
 .../settings/push/PushGatewaysViewModel.kt     |  6 +++---
 .../settings/push/PushRulesViewModel.kt        |  2 +-
 .../troubleshoot/TestAccountSettings.kt        |  6 +++---
 .../troubleshoot/TestPushRulesSettings.kt      |  4 ++--
 .../app/features/share/IncomingShareAction.kt  |  2 +-
 .../features/share/IncomingShareController.kt  |  2 +-
 .../features/share/IncomingShareViewEvents.kt  |  2 +-
 .../features/share/IncomingShareViewModel.kt   | 10 +++++-----
 .../im/vector/app/features/share/SharedData.kt |  2 +-
 .../features/signout/hard/SignedOutActivity.kt |  2 +-
 .../features/signout/soft/SoftLogoutAction.kt  |  2 +-
 .../signout/soft/SoftLogoutActivity.kt         |  4 ++--
 .../app/features/sync/widget/SyncStateView.kt  |  2 +-
 .../app/features/terms/ReviewTermsActivity.kt  |  2 +-
 .../app/features/terms/ReviewTermsFragment.kt  |  2 +-
 .../app/features/terms/ReviewTermsViewModel.kt |  6 +++---
 .../app/features/terms/ServiceTermsArgs.kt     |  2 +-
 .../userdirectory/DirectoryUsersController.kt  |  8 ++++----
 .../userdirectory/KnownUsersController.kt      |  6 +++---
 .../userdirectory/UserDirectoryFragment.kt     |  2 +-
 .../userdirectory/UserDirectoryUserItem.kt     |  2 +-
 .../userdirectory/UserDirectoryViewModel.kt    |  2 +-
 .../webview/ConsentWebViewEventListener.kt     |  4 ++--
 .../features/webview/VectorWebViewActivity.kt  |  2 +-
 .../webview/WebViewEventListenerFactory.kt     |  2 +-
 .../vector/app/features/webview/WebViewMode.kt |  2 +-
 .../app/features/widgets/WidgetAPICallback.kt  |  4 ++--
 .../app/features/widgets/WidgetActivity.kt     |  2 +-
 .../app/features/widgets/WidgetArgsBuilder.kt  |  2 +-
 .../app/features/widgets/WidgetFragment.kt     |  2 +-
 .../features/widgets/WidgetPostAPIHandler.kt   |  6 +++---
 .../app/features/widgets/WidgetViewEvents.kt   |  2 +-
 .../app/features/widgets/WidgetViewModel.kt    |  8 ++++----
 .../app/features/widgets/WidgetViewState.kt    |  2 +-
 .../RoomWidgetPermissionBottomSheet.kt         |  2 +-
 .../RoomWidgetPermissionViewModel.kt           |  6 +++---
 .../RoomWidgetPermissionViewState.kt           |  2 +-
 .../signout/ServerBackupStatusViewModel.kt     | 12 ++++++------
 .../workers/signout/SignoutCheckViewModel.kt   | 10 +++++-----
 132 files changed, 238 insertions(+), 241 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
index 12738e2b0b..f58c685ab9 100644
--- a/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
+++ b/vector/src/main/java/im/vector/app/ActiveSessionDataSource.kt
@@ -18,8 +18,8 @@
 package im.vector.app
 
 import arrow.core.Option
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.utils.BehaviorDataSource
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/AppStateHandler.kt
index 31bc822a22..1e92f7bc67 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/AppStateHandler.kt
@@ -20,9 +20,6 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import arrow.core.Option
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import im.vector.app.features.grouplist.ALL_COMMUNITIES_GROUP_ID
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.home.HomeRoomListDataSource
@@ -32,6 +29,9 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.functions.BiFunction
 import io.reactivex.rxkotlin.addTo
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
index ce0b2d0703..129491fe15 100644
--- a/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
+++ b/vector/src/main/java/im/vector/app/core/error/ResourceLimitErrorFormatter.kt
@@ -20,8 +20,8 @@ import android.content.Context
 import androidx.annotation.StringRes
 import androidx.core.text.HtmlCompat
 import im.vector.app.R
-import org.matrix.android.sdk.api.failure.MatrixError
 import me.gujun.android.span.span
+import org.matrix.android.sdk.api.failure.MatrixError
 
 class ResourceLimitErrorFormatter(private val context: Context) {
 
diff --git a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
index b7c440102d..71bd3ccc05 100644
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@@ -33,8 +33,6 @@ import timber.log.Timber
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
-import java.lang.Exception
-import java.lang.IllegalArgumentException
 
 class VectorGlideModelLoaderFactory(private val activeSessionHolder: ActiveSessionHolder)
     : ModelLoaderFactory<ImageContentRenderer.Data, InputStream> {
diff --git a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
index 12f173d0ac..cfb3e3b656 100644
--- a/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/SimpleFragmentActivity.kt
@@ -25,8 +25,8 @@ import butterknife.BindView
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.hideKeyboard
-import org.matrix.android.sdk.api.session.Session
 import kotlinx.android.synthetic.main.activity.*
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
index 828e0ab687..4620d7a1fb 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/NotificationAreaView.kt
@@ -28,11 +28,11 @@ import im.vector.app.R
 import im.vector.app.core.error.ResourceLimitErrorFormatter
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.api.failure.MatrixError
-import org.matrix.android.sdk.api.session.events.model.Event
 import kotlinx.android.synthetic.main.view_notification_area.view.*
 import me.gujun.android.span.span
 import me.saket.bettermovementmethod.BetterLinkMovementMethod
+import org.matrix.android.sdk.api.failure.MatrixError
+import org.matrix.android.sdk.api.session.events.model.Event
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index 1e19a1231a..847adbfa4e 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -40,13 +40,13 @@ import androidx.core.content.getSystemService
 import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import okio.buffer
 import okio.sink
 import okio.source
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index ce81ba12f1..7977d969e8 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -22,8 +22,6 @@ import android.os.Bundle
 import android.os.Parcelable
 import androidx.appcompat.app.AlertDialog
 import com.bumptech.glide.Glide
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.failure.GlobalError
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ScreenComponent
@@ -47,6 +45,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.failure.GlobalError
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt b/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt
index 96e09f6063..3df33b0c9b 100644
--- a/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt
+++ b/vector/src/main/java/im/vector/app/features/badge/BadgeProxy.kt
@@ -20,8 +20,8 @@ package im.vector.app.features.badge
 
 import android.content.Context
 import android.os.Build
-import org.matrix.android.sdk.api.session.Session
 import me.leolin.shortcutbadger.ShortcutBadger
+import org.matrix.android.sdk.api.session.Session
 
 /**
  * Manage application badge (displayed in the launcher)
diff --git a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
index 27b3310923..d749bcd351 100644
--- a/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
+++ b/vector/src/main/java/im/vector/app/features/call/CallControlsView.kt
@@ -27,8 +27,8 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
 import im.vector.app.R
-import org.matrix.android.sdk.api.session.call.CallState
 import kotlinx.android.synthetic.main.view_call_controls.view.*
+import org.matrix.android.sdk.api.session.call.CallState
 import org.webrtc.PeerConnection
 
 class CallControlsView @JvmOverloads constructor(
diff --git a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
index 44c440c0d1..9ab39bc0a9 100644
--- a/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/VectorCallActivity.kt
@@ -48,13 +48,13 @@ import im.vector.app.core.utils.checkPermissions
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.RoomDetailActivity
 import im.vector.app.features.home.room.detail.RoomDetailArgs
+import io.reactivex.android.schedulers.AndroidSchedulers
+import kotlinx.android.parcel.Parcelize
+import kotlinx.android.synthetic.main.activity_call.*
 import org.matrix.android.sdk.api.session.call.CallState
 import org.matrix.android.sdk.api.session.call.EglUtils
 import org.matrix.android.sdk.api.session.call.MxCallDetail
 import org.matrix.android.sdk.api.session.call.TurnServerResponse
-import io.reactivex.android.schedulers.AndroidSchedulers
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.synthetic.main.activity_call.*
 import org.webrtc.EglBase
 import org.webrtc.PeerConnection
 import org.webrtc.RendererCommon
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
index dd449de989..c4cf9eab39 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookFragment.kt
@@ -33,9 +33,9 @@ import im.vector.app.features.userdirectory.UserDirectoryAction
 import im.vector.app.features.userdirectory.UserDirectorySharedAction
 import im.vector.app.features.userdirectory.UserDirectorySharedActionViewModel
 import im.vector.app.features.userdirectory.UserDirectoryViewModel
+import kotlinx.android.synthetic.main.fragment_contacts_book.*
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.user.model.User
-import kotlinx.android.synthetic.main.fragment_contacts_book.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
index 843253b5cf..167660d11e 100644
--- a/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/contactsbook/ContactsBookViewModel.kt
@@ -33,12 +33,12 @@ import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.createdirect.CreateDirectRoomActivity
 import im.vector.app.features.invite.InviteUsersToRoomActivity
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.FoundThreePid
 import org.matrix.android.sdk.api.session.identity.ThreePid
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import timber.log.Timber
 
 private typealias PhoneBookSearch = String
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
index d35d031286..282f7b1a71 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysExporter.kt
@@ -18,14 +18,14 @@ package im.vector.app.features.crypto.keys
 
 import android.content.Context
 import android.net.Uri
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.extensions.foldToCallback
-import org.matrix.android.sdk.internal.util.awaitCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.extensions.foldToCallback
+import org.matrix.android.sdk.internal.util.awaitCallback
 
 class KeysExporter(private val session: Session) {
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
index d2227841b5..8932bb9489 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keys/KeysImporter.kt
@@ -20,15 +20,15 @@ import android.content.Context
 import android.net.Uri
 import im.vector.app.core.intent.getMimeTypeFromUri
 import im.vector.app.core.resources.openResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
 import org.matrix.android.sdk.internal.extensions.foldToCallback
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 class KeysImporter(private val session: Session) {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
index 7d2d74db2f..d2cf871701 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/restore/KeysBackupRestoreSharedViewModel.kt
@@ -23,6 +23,8 @@ import im.vector.app.R
 import im.vector.app.core.platform.WaitingViewData
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.LiveEvent
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.listeners.StepProgressListener
 import org.matrix.android.sdk.api.session.Session
@@ -34,8 +36,6 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionR
 import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
 import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
index 69c809c773..0e3ba4c526 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapMigrateBackupFragment.kt
@@ -37,11 +37,11 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.core.utils.startImportTextFromFileIntent
-import org.matrix.android.sdk.api.extensions.tryOrNull
-import org.matrix.android.sdk.internal.crypto.keysbackup.util.isValidRecoveryKey
 import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.fragment_bootstrap_enter_passphrase.bootstrapDescriptionText
 import kotlinx.android.synthetic.main.fragment_bootstrap_migrate_backup.*
+import org.matrix.android.sdk.api.extensions.tryOrNull
+import org.matrix.android.sdk.internal.crypto.keysbackup.util.isValidRecoveryKey
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
index e65fb6042b..2720c20fb0 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
@@ -32,6 +32,7 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
@@ -57,7 +58,6 @@ import org.matrix.android.sdk.internal.crypto.keysbackup.model.rest.KeysVersionR
 import org.matrix.android.sdk.internal.crypto.keysbackup.util.computeRecoveryKey
 import org.matrix.android.sdk.internal.crypto.model.ImportRoomKeysResult
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.launch
 import timber.log.Timber
 
 data class VerificationBottomSheetViewState(
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
index daa9a913c9..decb9eaad5 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationEmojisItem.kt
@@ -27,10 +27,10 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
-import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
 import me.gujun.android.span.Span
 import me.gujun.android.span.image
 import me.gujun.android.span.span
+import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation
 
 /**
  * A emoji list for bottom sheet.
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
index 145dfc56c3..bfbc00b15a 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsFragment.kt
@@ -32,10 +32,10 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.features.discovery.change.SetIdentityServerFragment
 import im.vector.app.features.settings.VectorSettingsActivity
+import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.api.session.terms.TermsService
-import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import javax.inject.Inject
 
 class DiscoverySettingsFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
index 7ec6082111..0bfcdd9984 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsViewModel.kt
@@ -28,13 +28,13 @@ import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.identity.IdentityServiceListener
 import org.matrix.android.sdk.api.session.identity.SharedState
 import org.matrix.android.sdk.api.session.identity.ThreePid
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.launch
 import org.matrix.android.sdk.rx.rx
 
 class DiscoverySettingsViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
index 05708089ea..8fb4fc4156 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerFragment.kt
@@ -34,8 +34,8 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.colorizeMatchingText
 import im.vector.app.features.discovery.DiscoverySharedViewModel
-import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.synthetic.main.fragment_set_identity_server.*
+import org.matrix.android.sdk.api.session.terms.TermsService
 import javax.inject.Inject
 
 class SetIdentityServerFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
index e7faf79f9d..9331f67812 100644
--- a/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/discovery/change/SetIdentityServerViewModel.kt
@@ -27,13 +27,13 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.ensureProtocol
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.identity.IdentityServiceError
 import org.matrix.android.sdk.api.session.terms.GetTermsResponse
 import org.matrix.android.sdk.api.session.terms.TermsService
 import org.matrix.android.sdk.internal.util.awaitCallback
-import kotlinx.coroutines.launch
 import java.net.UnknownHostException
 
 class SetIdentityServerViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
index 434ab7f1ec..d4ba4f3150 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListFragment.kt
@@ -31,8 +31,8 @@ import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.home.HomeActivitySharedAction
 import im.vector.app.features.home.HomeSharedActionViewModel
-import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import kotlinx.android.synthetic.main.fragment_group_list.*
+import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import javax.inject.Inject
 
 class GroupListFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
index 51831e8fb9..588d939635 100644
--- a/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/grouplist/GroupListViewModel.kt
@@ -26,14 +26,14 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.R
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import io.reactivex.Observable
+import io.reactivex.functions.BiFunction
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.group.groupSummaryQueryParams
 import org.matrix.android.sdk.api.session.group.model.GroupSummary
 import org.matrix.android.sdk.api.session.room.model.Membership
-import io.reactivex.Observable
-import io.reactivex.functions.BiFunction
 import org.matrix.android.sdk.rx.rx
 
 const val ALL_COMMUNITIES_GROUP_ID = "+ALL_COMMUNITIES_GROUP_ID"
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index c381f998c7..88c310fde8 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -27,9 +27,9 @@ import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.grouplist.SelectedGroupDataSource
 import im.vector.app.features.ui.UiStateRepository
+import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
-import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.rx.rx
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
index 4ddc4bf972..8a32157097 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsViewModel.kt
@@ -24,11 +24,11 @@ import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
-import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.rx.rx
 
 class BreadcrumbsViewModel @AssistedInject constructor(@Assisted initialState: BreadcrumbsViewState,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
index 0a6f94af28..9266186a59 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
@@ -34,8 +34,8 @@ import androidx.transition.TransitionManager
 import butterknife.BindView
 import butterknife.ButterKnife
 import im.vector.app.R
-import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import kotlinx.android.synthetic.main.merge_composer_layout.view.*
+import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 
 /**
  * Encapsulate the timeline composer UX.
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt
index 9cdc9eeabc..d24b41ffb0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/sticker/StickerPickerActionHandler.kt
@@ -17,10 +17,10 @@
 package im.vector.app.features.home.room.detail.sticker
 
 import im.vector.app.features.home.room.detail.RoomDetailViewEvents
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import javax.inject.Inject
 
 class StickerPickerActionHandler @Inject constructor(private val session: Session) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
index 42d5596300..f77e39c245 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt
@@ -28,13 +28,13 @@ import im.vector.app.features.home.room.detail.timeline.helper.MessageItemAttrib
 import im.vector.app.features.home.room.detail.timeline.item.MessageTextItem_
 import im.vector.app.features.home.room.detail.timeline.tools.createLinkMovementMethod
 import im.vector.app.features.settings.VectorPreferences
+import me.gujun.android.span.image
+import me.gujun.android.span.span
 import org.matrix.android.sdk.api.session.crypto.MXCryptoError
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
-import me.gujun.android.span.image
-import me.gujun.android.span.span
 import javax.inject.Inject
 
 // This class handles timeline events who haven't been successfully decrypted
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 1e809d9ab5..dd7a87cce6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -63,6 +63,8 @@ import im.vector.app.features.html.EventHtmlRenderer
 import im.vector.app.features.html.VectorHtmlCompressor
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
+import me.gujun.android.span.span
+import org.commonmark.node.Document
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -86,8 +88,6 @@ import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import org.matrix.android.sdk.internal.crypto.model.event.EncryptedEventContent
-import me.gujun.android.span.span
-import org.commonmark.node.Document
 import javax.inject.Inject
 
 class MessageItemFactory @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
index e3a8b11508..b0fc293fda 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
@@ -17,10 +17,10 @@
 package im.vector.app.features.home.room.detail.timeline.item
 
 import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.util.MatrixItem
 import org.matrix.android.sdk.internal.session.room.VerificationState
-import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class MessageInformationData(
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt
index 19897a9300..7fe8b87fe0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBannerView.kt
@@ -21,8 +21,8 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.RelativeLayout
 import im.vector.app.R
-import org.matrix.android.sdk.api.session.widgets.model.Widget
 import kotlinx.android.synthetic.main.view_room_widgets_banner.view.*
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 class RoomWidgetsBannerView @JvmOverloads constructor(
         context: Context,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
index 24f1299c19..923f9d8e2e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/widget/RoomWidgetsBottomSheet.kt
@@ -32,8 +32,8 @@ import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.RoomDetailViewModel
 import im.vector.app.features.home.room.detail.RoomDetailViewState
 import im.vector.app.features.navigation.Navigator
-import org.matrix.android.sdk.api.session.widgets.model.Widget
 import kotlinx.android.synthetic.main.bottom_sheet_generic_list_with_title.*
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
index 9d9a26eb83..b8cdac19cf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListDisplayModeFilter.kt
@@ -17,9 +17,9 @@
 package im.vector.app.features.home.room.list
 
 import im.vector.app.features.home.RoomListDisplayMode
+import io.reactivex.functions.Predicate
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import io.reactivex.functions.Predicate
 
 class RoomListDisplayModeFilter(private val displayMode: RoomListDisplayMode) : Predicate<RoomSummary> {
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
index f334ab792d..aa10196956 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
@@ -47,12 +47,12 @@ import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedA
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
 import im.vector.app.features.home.room.list.widget.FabMenuView
 import im.vector.app.features.notifications.NotificationDrawerManager
+import kotlinx.android.parcel.Parcelize
+import kotlinx.android.synthetic.main.fragment_room_list.*
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.synthetic.main.fragment_room_list.*
 import javax.inject.Inject
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
index 6e787b8b95..274cf7c869 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListNameFilter.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.home.room.list
 
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import io.reactivex.functions.Predicate
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class RoomListNameFilter @Inject constructor() : Predicate<RoomSummary> {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index e070bff5b8..37b448668d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -22,6 +22,7 @@ import com.airbnb.mvrx.ViewModelContext
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.utils.DataSource
+import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -29,7 +30,6 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
-import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
index 72e337b48f..6a925997b7 100644
--- a/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/html/FontTagHandler.kt
@@ -16,8 +16,8 @@
 package im.vector.app.features.html
 
 import android.graphics.Color
-import android.text.style.ForegroundColorSpan
 import android.text.style.BackgroundColorSpan
+import android.text.style.ForegroundColorSpan
 import io.noties.markwon.MarkwonConfiguration
 import io.noties.markwon.RenderProps
 import io.noties.markwon.html.HtmlTag
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
index 23325a9c41..21a998d8e2 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
@@ -25,9 +25,9 @@ import im.vector.app.R
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.userdirectory.PendingInvitee
+import io.reactivex.Observable
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.rx.rx
-import io.reactivex.Observable
 
 class InviteUsersToRoomViewModel @AssistedInject constructor(@Assisted
                                                              initialState: InviteUsersToRoomViewState,
diff --git a/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
index 2de587e52b..881c446eb2 100644
--- a/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/VectorInviteView.kt
@@ -25,10 +25,10 @@ import im.vector.app.R
 import im.vector.app.core.di.HasScreenInjector
 import im.vector.app.core.platform.ButtonStateView
 import im.vector.app.features.home.AvatarRenderer
+import kotlinx.android.synthetic.main.vector_invite_view.view.*
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.util.toMatrixItem
-import kotlinx.android.synthetic.main.vector_invite_view.view.*
 import javax.inject.Inject
 
 class VectorInviteView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
index f84c4b7022..6dd17a7d58 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginCaptchaFragment.kt
@@ -33,9 +33,9 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import im.vector.app.R
 import im.vector.app.core.utils.AssetReader
-import org.matrix.android.sdk.internal.di.MoshiProvider
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_captcha.*
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import timber.log.Timber
 import java.net.URLDecoder
 import java.util.Formatter
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
index 1b5502eb34..453575b91b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginGenericTextInputFormFragment.kt
@@ -32,11 +32,11 @@ import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setTextOrHide
+import kotlinx.android.parcel.Parcelize
+import kotlinx.android.synthetic.main.fragment_login_generic_text_input_form.*
 import org.matrix.android.sdk.api.auth.registration.RegisterThreePid
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.failure.is401
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.synthetic.main.fragment_login_generic_text_input_form.*
 import javax.inject.Inject
 
 enum class TextInputFormFragmentMode {
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
index c12f10e191..577edf754b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginResetPasswordMailConfirmationFragment.kt
@@ -21,8 +21,8 @@ import butterknife.OnClick
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Success
 import im.vector.app.R
-import org.matrix.android.sdk.api.failure.is401
 import kotlinx.android.synthetic.main.fragment_login_reset_password_mail_confirmation.*
+import org.matrix.android.sdk.api.failure.is401
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
index 7202ffc950..6f86f1c9d6 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWaitForEmailFragment.kt
@@ -21,9 +21,9 @@ import android.os.Parcelable
 import android.view.View
 import com.airbnb.mvrx.args
 import im.vector.app.R
-import org.matrix.android.sdk.api.failure.is401
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_wait_for_email.*
+import org.matrix.android.sdk.api.failure.is401
 import javax.inject.Inject
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
index 6d943fd99f..78a24abfd3 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginWebFragment.kt
@@ -35,11 +35,11 @@ import im.vector.app.core.extensions.appendParamToUrl
 import im.vector.app.core.utils.AssetReader
 import im.vector.app.features.signout.soft.SoftLogoutAction
 import im.vector.app.features.signout.soft.SoftLogoutViewModel
+import kotlinx.android.synthetic.main.fragment_login_web.*
 import org.matrix.android.sdk.api.auth.LOGIN_FALLBACK_PATH
 import org.matrix.android.sdk.api.auth.REGISTER_FALLBACK_PATH
 import org.matrix.android.sdk.api.auth.data.Credentials
 import org.matrix.android.sdk.internal.di.MoshiProvider
-import kotlinx.android.synthetic.main.fragment_login_web.*
 import timber.log.Timber
 import java.net.URLDecoder
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
index 529713af37..624167dd91 100755
--- a/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/terms/LoginTermsFragment.kt
@@ -29,9 +29,9 @@ import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.features.login.AbstractLoginFragment
 import im.vector.app.features.login.LoginAction
 import im.vector.app.features.login.LoginViewState
-import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_login_terms.*
+import org.matrix.android.sdk.internal.auth.registration.LocalizedFlowDataLoginTerms
 import javax.inject.Inject
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
index ac7b224de2..4f1c52b240 100644
--- a/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
@@ -38,9 +38,9 @@ import im.vector.app.core.ui.model.Size
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.isLocalFile
 import kotlinx.android.parcel.Parcelize
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentUrlResolver
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
index 4eb14592e0..f8cd09ce2f 100644
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@@ -25,10 +25,10 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.utils.isLocalFile
+import kotlinx.android.parcel.Parcelize
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.internal.crypto.attachments.ElementToDecrypt
-import kotlinx.android.parcel.Parcelize
 import timber.log.Timber
 import java.io.File
 import java.net.URLEncoder
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt b/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt
index 630b165214..fb7c6897e2 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinCodeStore.kt
@@ -21,9 +21,9 @@ import androidx.core.content.edit
 import com.beautycoder.pflockscreen.security.PFResult
 import com.beautycoder.pflockscreen.security.PFSecurityManager
 import com.beautycoder.pflockscreen.security.callbacks.PFPinCodeHelperCallback
-import org.matrix.android.sdk.api.extensions.orFalse
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
diff --git a/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt b/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt
index 416964c418..a9d4578bf0 100644
--- a/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/powerlevel/PowerLevelsObservableFactory.kt
@@ -16,6 +16,8 @@
 
 package im.vector.app.features.powerlevel
 
+import io.reactivex.Observable
+import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -24,8 +26,6 @@ import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.rx.mapOptional
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
 
 class PowerLevelsObservableFactory(private val room: Room) {
 
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 0d92d170a5..e7382a17e9 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -36,7 +36,6 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.locale.SystemLocaleProvider
 import im.vector.app.features.themes.ThemeUtils
 import im.vector.app.features.version.VersionProvider
-import org.matrix.android.sdk.api.Matrix
 import okhttp3.Call
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
@@ -45,6 +44,7 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.Response
 import org.json.JSONException
 import org.json.JSONObject
+import org.matrix.android.sdk.api.Matrix
 import timber.log.Timber
 import java.io.File
 import java.io.IOException
diff --git a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
index 783d4d45a2..868a4e4dd6 100644
--- a/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/room/RequireActiveMembershipViewModel.kt
@@ -27,6 +27,8 @@ import im.vector.app.R
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.resources.StringProvider
+import io.reactivex.Observable
+import io.reactivex.schedulers.Schedulers
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -36,8 +38,6 @@ import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import io.reactivex.Observable
-import io.reactivex.schedulers.Schedulers
 
 /**
  * This ViewModel observe a room summary and notify when the room is left
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index 963f842304..4bfd60394a 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -31,8 +31,8 @@ import im.vector.app.features.roomdirectory.RoomDirectoryAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedAction
 import im.vector.app.features.roomdirectory.RoomDirectorySharedActionViewModel
 import im.vector.app.features.roomdirectory.RoomDirectoryViewModel
-import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import kotlinx.android.synthetic.main.fragment_room_directory_picker.*
+import org.matrix.android.sdk.api.session.room.model.thirdparty.RoomDirectoryData
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
index 28af45797e..0f1ac3bfea 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListBottomSheetViewModel.kt
@@ -22,7 +22,6 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import com.airbnb.mvrx.args
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.app.core.di.HasScreenInjector
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
index f68965f42c..035df8caa2 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceListEpoxyController.kt
@@ -33,8 +33,8 @@ import im.vector.app.core.ui.list.genericItem
 import im.vector.app.core.ui.list.genericItemWithValue
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.settings.VectorPreferences
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import me.gujun.android.span.span
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
 class DeviceListEpoxyController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
index fad1a35d6a..200d268b27 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/devices/DeviceTrustInfoEpoxyController.kt
@@ -27,8 +27,8 @@ import im.vector.app.core.ui.list.genericItemWithValue
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
 import im.vector.app.features.settings.VectorPreferences
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import me.gujun.android.span.span
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import javax.inject.Inject
 
 class DeviceTrustInfoEpoxyController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
index b871a3690e..eee0cc4081 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/powerlevel/EditPowerLevelDialogs.kt
@@ -23,8 +23,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
-import org.matrix.android.sdk.api.session.room.powerlevels.Role
 import kotlinx.android.synthetic.main.dialog_edit_power_level.view.*
+import org.matrix.android.sdk.api.session.room.powerlevels.Role
 
 object EditPowerLevelDialogs {
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
index 1af5beeda2..ece221d884 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt
@@ -18,8 +18,8 @@
 package im.vector.app.features.roomprofile
 
 import android.net.Uri
-import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.notification.RoomNotificationState
 
 sealed class RoomProfileAction : VectorViewModelAction {
     object LeaveRoom : RoomProfileAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
index 67cacf4541..ca7d567d90 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberAction.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.roomprofile.banned
 
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 
 sealed class RoomBannedListMemberAction : VectorViewModelAction {
     data class QueryInfo(val roomMemberSummary: RoomMemberSummary) : RoomBannedListMemberAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
index d1acd80c25..1cce2f96cb 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedListMemberViewModel.kt
@@ -22,6 +22,13 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.R
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -34,13 +41,6 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import im.vector.app.R
-import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 
 class RoomBannedListMemberViewModel @AssistedInject constructor(@Assisted initialState: RoomBannedMemberListViewState,
                                                                 private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
index 52c85f9463..81b977ac97 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListFragment.kt
@@ -24,8 +24,6 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -34,6 +32,8 @@ import im.vector.app.core.utils.toast
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomBannedMemberListFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
index 6d8bb2f42a..2861b30222 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedMemberListViewState.kt
@@ -19,9 +19,9 @@ package im.vector.app.features.roomprofile.banned
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomBannedMemberListViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt
index ea2d775a29..6b59debe96 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/banned/RoomBannedViewEvents.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.roomprofile.banned
 
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 
 sealed class RoomBannedViewEvents : VectorViewEvents {
     data class ShowBannedInfo(val bannedByUserId: String, val banReason: String, val roomMemberSummary: RoomMemberSummary) : RoomBannedViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
index 66745fef25..1b3e33a161 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListFragment.kt
@@ -25,11 +25,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
-import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -38,6 +33,11 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_member_list.*
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
+import org.matrix.android.sdk.api.session.room.model.RoomThirdPartyInviteContent
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomMemberListFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
index 787ae920e1..6fe8df3d36 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListViewState.kt
@@ -20,12 +20,12 @@ import androidx.annotation.StringRes
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.R
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.crypto.RoomEncryptionTrustLevel
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import im.vector.app.R
-import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomMemberListViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
index cac6994952..5d35586cce 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsAction.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.roomprofile.settings
 
-import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 
 sealed class RoomSettingsAction : VectorViewModelAction {
     data class SetRoomName(val newName: String) : RoomSettingsAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
index a60f223532..f680e28aa8 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.kt
@@ -17,10 +17,6 @@
 package im.vector.app.features.roomprofile.settings
 
 import com.airbnb.epoxy.TypedEpoxyController
-import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import im.vector.app.R
 import im.vector.app.core.epoxy.profiles.buildProfileAction
 import im.vector.app.core.epoxy.profiles.buildProfileSection
@@ -28,6 +24,10 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.form.formEditTextItem
 import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibilityFormatter
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class RoomSettingsController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
index 6a27d5ee0a..68c631b391 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsFragment.kt
@@ -25,10 +25,6 @@ import androidx.core.view.isVisible
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
-import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -40,6 +36,10 @@ import im.vector.app.features.home.room.detail.timeline.format.RoomHistoryVisibi
 import im.vector.app.features.roomprofile.RoomProfileArgs
 import kotlinx.android.synthetic.main.fragment_room_setting_generic.*
 import kotlinx.android.synthetic.main.merge_overlay_waiting_view.*
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
+import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibilityContent
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomSettingsFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
index 65ea810ad9..0fdb6139c2 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewModel.kt
@@ -21,17 +21,17 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
+import io.reactivex.Completable
+import io.reactivex.Observable
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.powerlevel.PowerLevelsObservableFactory
-import io.reactivex.Completable
-import io.reactivex.Observable
 
 class RoomSettingsViewModel @AssistedInject constructor(@Assisted initialState: RoomSettingsViewState,
                                                         private val session: Session)
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
index b20861ae8a..fe04c8b508 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsViewState.kt
@@ -19,10 +19,10 @@ package im.vector.app.features.roomprofile.settings
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.room.model.RoomHistoryVisibility
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomSettingsViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt
index f383122561..ea5312469d 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsAction.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.roomprofile.uploads
 
-import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
 
 sealed class RoomUploadsAction : VectorViewModelAction {
     data class Download(val uploadEvent: UploadEvent) : RoomUploadsAction()
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
index db8de1f974..76b1a9e0c3 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@@ -26,6 +26,9 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewModel
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.file.FileService
 import org.matrix.android.sdk.api.session.room.model.message.MessageType
@@ -35,9 +38,6 @@ import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.VectorViewModel
-import kotlinx.coroutines.launch
 import java.io.File
 
 class RoomUploadsViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt
index b983a6d074..b85e4f04de 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewState.kt
@@ -19,9 +19,9 @@ package im.vector.app.features.roomprofile.uploads
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.features.roomprofile.RoomProfileArgs
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
-import im.vector.app.features.roomprofile.RoomProfileArgs
 
 data class RoomUploadsViewState(
         val roomId: String = "",
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
index 66b4dfda33..3c52f2e107 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/files/RoomUploadsFilesFragment.kt
@@ -24,7 +24,6 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -34,6 +33,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.roomprofile.uploads.RoomUploadsAction
 import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel
 import kotlinx.android.synthetic.main.fragment_generic_state_view_recycler.*
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
 import javax.inject.Inject
 
 class RoomUploadsFilesFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
index eabeab9183..d25277d9f5 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/RoomUploadsMediaFragment.kt
@@ -29,10 +29,6 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.parentFragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.appbar.AppBarLayout
-import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
-import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
-import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.trackItemsVisibilityChange
@@ -48,6 +44,10 @@ import im.vector.app.features.roomprofile.uploads.RoomUploadsViewModel
 import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState
 import kotlinx.android.synthetic.main.fragment_generic_state_view_recycler.*
 import kotlinx.android.synthetic.main.fragment_room_uploads.*
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import javax.inject.Inject
 
 class RoomUploadsMediaFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
index 6f60a77296..2a77e65b9e 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/media/UploadsMediaController.kt
@@ -19,12 +19,6 @@ package im.vector.app.features.roomprofile.uploads.media
 import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.epoxy.VisibilityState
-import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
-import org.matrix.android.sdk.api.session.room.model.message.MessageType
-import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
-import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
-import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
-import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import im.vector.app.core.epoxy.squareLoadingItem
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.resources.StringProvider
@@ -32,6 +26,12 @@ import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
 import im.vector.app.features.roomprofile.uploads.RoomUploadsViewState
+import org.matrix.android.sdk.api.session.room.model.message.MessageImageContent
+import org.matrix.android.sdk.api.session.room.model.message.MessageType
+import org.matrix.android.sdk.api.session.room.model.message.MessageVideoContent
+import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
+import org.matrix.android.sdk.api.session.room.uploads.UploadEvent
+import org.matrix.android.sdk.internal.crypto.attachments.toElementToDecrypt
 import javax.inject.Inject
 
 class UploadsMediaController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/session/SessionListener.kt b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
index 89e02f3600..66b1bae70d 100644
--- a/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
+++ b/vector/src/main/java/im/vector/app/features/session/SessionListener.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.session
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import org.matrix.android.sdk.api.failure.GlobalError
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.extensions.postLiveEvent
 import im.vector.app.core.utils.LiveEvent
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
index 42d4c0faef..28702940ee 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsActivity.kt
@@ -21,14 +21,14 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import org.matrix.android.sdk.api.failure.GlobalError
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.features.settings.devices.VectorSettingsDevicesFragment
 import kotlinx.android.synthetic.main.activity_vector_settings.*
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index f011702dca..861e0dea1f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -21,7 +21,6 @@ import android.net.Uri
 import android.provider.Settings
 import androidx.preference.Preference
 import im.vector.app.BuildConfig
-import org.matrix.android.sdk.api.Matrix
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreference
 import im.vector.app.core.utils.copyToClipboard
@@ -29,6 +28,7 @@ import im.vector.app.core.utils.displayInWebView
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.features.version.VersionProvider
 import im.vector.app.openOssLicensesMenuActivity
+import org.matrix.android.sdk.api.Matrix
 import javax.inject.Inject
 
 class VectorSettingsHelpAboutFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
index 56bd50d057..e08147d54f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
@@ -21,12 +21,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.failure.isInvalidPassword
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.failure.isInvalidPassword
+import org.matrix.android.sdk.api.session.Session
 
 data class DeactivateAccountViewState(
         val passwordShown: Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
index 7affdbf25b..49840cdd64 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceItem.kt
@@ -23,14 +23,14 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
-import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.DimensionConverter
 import me.gujun.android.span.span
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
 
 /**
  * A list item for Device.
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
index 98fed61340..2b0991ab4e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesAction.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.settings.devices
 
-import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 
 sealed class DevicesAction : VectorViewModelAction {
     object Refresh : DevicesAction()
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
index 14a4b32be2..60d7491603 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewEvents.kt
@@ -17,10 +17,10 @@
 
 package im.vector.app.features.settings.devices
 
+import im.vector.app.core.platform.VectorViewEvents
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo
-import im.vector.app.core.platform.VectorViewEvents
 
 /**
  * Transient events for Ignored users screen
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
index 54a81883f3..80cd91664d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/TrustUtils.kt
@@ -17,8 +17,8 @@
 package im.vector.app.features.settings.devices
 
 import androidx.annotation.DrawableRes
-import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
 import im.vector.app.R
+import org.matrix.android.sdk.internal.crypto.crosssigning.DeviceTrustLevel
 
 object TrustUtils {
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt
index 66bf6d4ff4..cf93bc14e7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsEpoxyController.kt
@@ -21,15 +21,6 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.events.model.Event
-import org.matrix.android.sdk.api.session.events.model.EventType
-import org.matrix.android.sdk.api.session.events.model.toModel
-import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
-import org.matrix.android.sdk.internal.crypto.model.event.SecretSendEventContent
-import org.matrix.android.sdk.internal.crypto.model.rest.ForwardedRoomKeyContent
-import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
-import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
-import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
 import im.vector.app.core.date.VectorDateFormatter
@@ -42,6 +33,15 @@ import im.vector.app.core.ui.list.genericFooterItem
 import im.vector.app.core.ui.list.genericItem
 import im.vector.app.core.ui.list.genericItemHeader
 import me.gujun.android.span.span
+import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.internal.crypto.model.event.OlmEventContent
+import org.matrix.android.sdk.internal.crypto.model.event.SecretSendEventContent
+import org.matrix.android.sdk.internal.crypto.model.rest.ForwardedRoomKeyContent
+import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
+import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
+import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
 import javax.inject.Inject
 
 class GossipingEventsEpoxyController @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
index f105a35021..e2c855a9e3 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailFragment.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.View
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.events.model.Event
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -29,6 +28,7 @@ import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.utils.createJSonViewerStyleProvider
 import kotlinx.android.synthetic.main.fragment_generic_recycler.*
 import org.billcarsonfr.jsonviewer.JSonViewerDialog
+import org.matrix.android.sdk.api.session.events.model.Event
 import javax.inject.Inject
 
 class GossipingEventsPaperTrailFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
index 7a2700abb7..d903725b22 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/GossipingEventsPaperTrailViewModel.kt
@@ -27,12 +27,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.events.model.Event
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.Event
 
 data class GossipingEventsPaperTrailState(
         val events: Async<List<Event>> = Uninitialized
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
index 3a6382a023..22093763e1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestListViewModel.kt
@@ -26,13 +26,13 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
-import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.crypto.IncomingRoomKeyRequest
+import org.matrix.android.sdk.internal.crypto.OutgoingRoomKeyRequest
 
 data class KeyRequestListViewState(
         val incomingRequests: Async<List<IncomingRoomKeyRequest>> = Uninitialized,
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
index 2a2fb21a7d..8080f2e032 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersController.kt
@@ -17,12 +17,12 @@
 package im.vector.app.features.settings.ignored
 
 import com.airbnb.epoxy.EpoxyController
-import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class IgnoredUsersController @Inject constructor(private val stringProvider: StringProvider,
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
index cc5c8b436c..98c9f8e4f1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/IgnoredUsersViewModel.kt
@@ -27,11 +27,11 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.user.model.User
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.platform.VectorViewModelAction
 import org.matrix.android.sdk.rx.rx
 
 data class IgnoredUsersViewState(
diff --git a/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt b/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt
index 3349acef10..286ebbb2a7 100644
--- a/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/ignored/UserItem.kt
@@ -20,12 +20,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
-import org.matrix.android.sdk.api.util.MatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 /**
  * A list item for User.
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index 266bcc39c6..dc66e1983b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -20,9 +20,9 @@ import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.airbnb.epoxy.EpoxyModelWithHolder
-import org.matrix.android.sdk.api.session.pushers.Pusher
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
+import org.matrix.android.sdk.api.session.pushers.Pusher
 
 @EpoxyModelClass(layout = R.layout.item_pushgateway)
 abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
index b1b2c43f4e..2c8b902188 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewaysViewModel.kt
@@ -24,12 +24,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.pushers.Pusher
-import org.matrix.android.sdk.rx.RxSession
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.pushers.Pusher
+import org.matrix.android.sdk.rx.RxSession
 
 data class PushGatewayViewState(
         val pushGateways: Async<List<Pusher>> = Uninitialized
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
index ce42cbb12f..64ddc275eb 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushRulesViewModel.kt
@@ -18,11 +18,11 @@ package im.vector.app.features.settings.push
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
-import org.matrix.android.sdk.api.pushrules.rest.PushRule
 import im.vector.app.core.di.HasScreenInjector
 import im.vector.app.core.platform.EmptyAction
 import im.vector.app.core.platform.EmptyViewEvents
 import im.vector.app.core.platform.VectorViewModel
+import org.matrix.android.sdk.api.pushrules.rest.PushRule
 
 data class PushRulesViewState(
         val rules: List<PushRule> = emptyList()
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
index dad89c909d..0c3390d0b0 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestAccountSettings.kt
@@ -17,12 +17,12 @@ package im.vector.app.features.settings.troubleshoot
 
 import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.RuleKind
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.RuleKind
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
index 31b4e213ca..8dcf9ab6ce 100644
--- a/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestPushRulesSettings.kt
@@ -17,12 +17,12 @@ package im.vector.app.features.settings.troubleshoot
 
 import android.content.Intent
 import androidx.activity.result.ActivityResultLauncher
-import org.matrix.android.sdk.api.pushrules.RuleIds
-import org.matrix.android.sdk.api.pushrules.getActions
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.notifications.toNotificationAction
+import org.matrix.android.sdk.api.pushrules.RuleIds
+import org.matrix.android.sdk.api.pushrules.getActions
 import javax.inject.Inject
 
 class TestPushRulesSettings @Inject constructor(private val activeSessionHolder: ActiveSessionHolder,
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
index eef4e32dff..4e2eb226bf 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareAction.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.share
 
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 sealed class IncomingShareAction : VectorViewModelAction {
     data class SelectRoom(val roomSummary: RoomSummary, val enableMultiSelect: Boolean) : IncomingShareAction()
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
index 912f4c50d7..35c6de24c7 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareController.kt
@@ -18,12 +18,12 @@ package im.vector.app.features.share
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Incomplete
-import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import im.vector.app.R
 import im.vector.app.core.epoxy.loadingItem
 import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.room.list.RoomSummaryItemFactory
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
 class IncomingShareController @Inject constructor(private val roomSummaryItemFactory: RoomSummaryItemFactory,
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
index 8b42384ec6..3f5a43e103 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewEvents.kt
@@ -16,9 +16,9 @@
 
 package im.vector.app.features.share
 
+import im.vector.app.core.platform.VectorViewEvents
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
-import im.vector.app.core.platform.VectorViewEvents
 
 sealed class IncomingShareViewEvents : VectorViewEvents {
     data class ShareToRoom(val roomSummary: RoomSummary,
diff --git a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
index aa4d8ad03e..edf72ecf67 100644
--- a/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/share/IncomingShareViewModel.kt
@@ -22,17 +22,17 @@ import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.query.QueryStringValue
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.content.ContentAttachmentData
-import org.matrix.android.sdk.api.session.room.model.Membership
-import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.toggle
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.attachments.isPreviewable
 import im.vector.app.features.attachments.toGroupedContentAttachmentData
 import im.vector.app.features.home.room.list.BreadcrumbsRoomComparator
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import org.matrix.android.sdk.api.session.room.model.Membership
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
diff --git a/vector/src/main/java/im/vector/app/features/share/SharedData.kt b/vector/src/main/java/im/vector/app/features/share/SharedData.kt
index 5634b0df74..02d00ae401 100644
--- a/vector/src/main/java/im/vector/app/features/share/SharedData.kt
+++ b/vector/src/main/java/im/vector/app/features/share/SharedData.kt
@@ -17,8 +17,8 @@
 package im.vector.app.features.share
 
 import android.os.Parcelable
-import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import kotlinx.android.parcel.Parcelize
+import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 sealed class SharedData : Parcelable {
 
diff --git a/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt
index 03fafe1e47..adb87a3bc5 100644
--- a/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/hard/SignedOutActivity.kt
@@ -19,11 +19,11 @@ package im.vector.app.features.signout.hard
 import android.content.Context
 import android.content.Intent
 import butterknife.OnClick
-import org.matrix.android.sdk.api.failure.GlobalError
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
+import org.matrix.android.sdk.api.failure.GlobalError
 import timber.log.Timber
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt
index b9f485ebbc..d4edd2bc99 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutAction.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.signout.soft
 
-import org.matrix.android.sdk.api.auth.data.Credentials
 import im.vector.app.core.platform.VectorViewModelAction
+import org.matrix.android.sdk.api.auth.data.Credentials
 
 sealed class SoftLogoutAction : VectorViewModelAction {
     // In case of failure to get the login flow
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
index 8a1c14f4f6..5fb7a3e315 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutActivity.kt
@@ -23,8 +23,6 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.viewModel
-import org.matrix.android.sdk.api.failure.GlobalError
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.error.ErrorFormatter
@@ -33,6 +31,8 @@ import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.login.LoginActivity
 import kotlinx.android.synthetic.main.activity_login.*
+import org.matrix.android.sdk.api.failure.GlobalError
+import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
index 6a524dba5d..e5e28dcabb 100755
--- a/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
+++ b/vector/src/main/java/im/vector/app/features/sync/widget/SyncStateView.kt
@@ -21,10 +21,10 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
 import androidx.core.view.isVisible
-import org.matrix.android.sdk.api.session.sync.SyncState
 import im.vector.app.R
 import im.vector.app.core.utils.isAirplaneModeOn
 import kotlinx.android.synthetic.main.view_sync_state.view.*
+import org.matrix.android.sdk.api.session.sync.SyncState
 
 class SyncStateView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
     : FrameLayout(context, attrs, defStyle) {
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
index 9d1f10f39e..95468c12c4 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsActivity.kt
@@ -20,13 +20,13 @@ import android.content.Context
 import android.content.Intent
 import androidx.appcompat.app.AlertDialog
 import com.airbnb.mvrx.viewModel
-import org.matrix.android.sdk.api.session.terms.TermsService
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
+import org.matrix.android.sdk.api.session.terms.TermsService
 import javax.inject.Inject
 
 class ReviewTermsActivity : SimpleFragmentActivity() {
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
index 9f7b6cdeb0..10fcb65e12 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsFragment.kt
@@ -22,7 +22,6 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.terms.TermsService
 import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.cleanup
@@ -32,6 +31,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import kotlinx.android.synthetic.main.fragment_review_terms.*
+import org.matrix.android.sdk.api.session.terms.TermsService
 import javax.inject.Inject
 
 class ReviewTermsFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
index 6458646643..df822807ee 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ReviewTermsViewModel.kt
@@ -24,12 +24,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.terms.GetTermsResponse
-import org.matrix.android.sdk.internal.util.awaitCallback
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.terms.GetTermsResponse
+import org.matrix.android.sdk.internal.util.awaitCallback
 import timber.log.Timber
 
 class ReviewTermsViewModel @AssistedInject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt b/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt
index ec97c98627..50c9568204 100644
--- a/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt
+++ b/vector/src/main/java/im/vector/app/features/terms/ServiceTermsArgs.kt
@@ -16,8 +16,8 @@
 package im.vector.app.features.terms
 
 import android.os.Parcelable
-import org.matrix.android.sdk.api.session.terms.TermsService
 import kotlinx.android.parcel.Parcelize
+import org.matrix.android.sdk.api.session.terms.TermsService
 
 @Parcelize
 data class ServiceTermsArgs(
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt
index 1ade177010..e68d9855dd 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/DirectoryUsersController.kt
@@ -21,10 +21,6 @@ import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.MatrixPatterns
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.errorWithRetryItem
 import im.vector.app.core.epoxy.loadingItem
@@ -32,6 +28,10 @@ import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.error.ErrorFormatter
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.MatrixPatterns
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class DirectoryUsersController @Inject constructor(private val session: Session,
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt
index f0bd4e67cf..4fbb9bbb41 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/KnownUsersController.kt
@@ -21,9 +21,6 @@ import com.airbnb.epoxy.paging.PagedListEpoxyController
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Incomplete
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.api.session.user.model.User
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.EmptyItem_
 import im.vector.app.core.epoxy.loadingItem
@@ -31,6 +28,9 @@ import im.vector.app.core.epoxy.noResultItem
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.createUIHandler
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.user.model.User
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class KnownUsersController @Inject constructor(private val session: Session,
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt
index f2e090d966..8787946bf4 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryFragment.kt
@@ -21,7 +21,6 @@ import android.view.View
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
 import com.jakewharton.rxbinding3.widget.textChanges
-import org.matrix.android.sdk.api.session.user.model.User
 import im.vector.app.R
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
@@ -31,6 +30,7 @@ import im.vector.app.core.extensions.showKeyboard
 import im.vector.app.core.platform.VectorBaseFragment
 import kotlinx.android.synthetic.main.fragment_create_direct_room_directory_users.recyclerView
 import kotlinx.android.synthetic.main.fragment_user_directory.*
+import org.matrix.android.sdk.api.session.user.model.User
 import javax.inject.Inject
 
 class UserDirectoryFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
index c78dc7518d..cbde5273fa 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
@@ -23,11 +23,11 @@ import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.amulyakhare.textdrawable.TextDrawable
-import org.matrix.android.sdk.api.util.MatrixItem
 import im.vector.app.R
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.features.home.AvatarRenderer
+import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass(layout = R.layout.item_known_user)
 abstract class UserDirectoryUserItem : VectorEpoxyModel<UserDirectoryUserItem.Holder>() {
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt
index fb84daecee..b8c42a0f08 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryViewModel.kt
@@ -25,7 +25,6 @@ import com.airbnb.mvrx.ViewModelContext
 import com.jakewharton.rxrelay2.BehaviorRelay
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.extensions.toggle
 import im.vector.app.core.platform.VectorViewModel
@@ -33,6 +32,7 @@ import im.vector.app.features.createdirect.CreateDirectRoomActivity
 import im.vector.app.features.invite.InviteUsersToRoomActivity
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.util.toMatrixItem
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
diff --git a/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
index 7ac6a3344b..17e6fa4202 100644
--- a/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/ConsentWebViewEventListener.kt
@@ -16,10 +16,10 @@
 
 package im.vector.app.features.webview
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.utils.weak
+import org.matrix.android.sdk.api.MatrixCallback
+import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 
 private const val SUCCESS_URL_SUFFIX = "/_matrix/consent"
diff --git a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
index e49109b1d6..5b761d1b3a 100644
--- a/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/VectorWebViewActivity.kt
@@ -21,11 +21,11 @@ import android.content.Intent
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.annotation.CallSuper
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.platform.VectorBaseActivity
 import kotlinx.android.synthetic.main.activity_vector_web_view.*
+import org.matrix.android.sdk.api.session.Session
 import javax.inject.Inject
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt
index 412f2e5033..64e08852b3 100644
--- a/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/WebViewEventListenerFactory.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.webview
 
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.platform.VectorBaseActivity
+import org.matrix.android.sdk.api.session.Session
 
 interface WebViewEventListenerFactory {
 
diff --git a/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt b/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt
index 742302c61e..edf98f66d8 100644
--- a/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt
+++ b/vector/src/main/java/im/vector/app/features/webview/WebViewMode.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.webview
 
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.core.platform.VectorBaseActivity
+import org.matrix.android.sdk.api.session.Session
 
 /**
  * This enum indicates the WebView mode. It's responsible for creating a WebViewEventListener
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
index 3eaedd9f4d..ad17a5ae87 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetAPICallback.kt
@@ -16,11 +16,11 @@
 
 package im.vector.app.features.widgets
 
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
 import org.matrix.android.sdk.api.util.JsonDict
-import im.vector.app.R
-import im.vector.app.core.resources.StringProvider
 
 class WidgetAPICallback(private val postAPIMediator: WidgetPostAPIMediator,
                         private val eventData: JsonDict,
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
index 37f1d3a192..d28fc134a9 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetActivity.kt
@@ -23,7 +23,6 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.viewModel
-import org.matrix.android.sdk.api.session.events.model.Content
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.addFragment
@@ -34,6 +33,7 @@ import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewEvents
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewModel
 import im.vector.app.features.widgets.permissions.RoomWidgetPermissionViewState
 import kotlinx.android.synthetic.main.activity_widget.*
+import org.matrix.android.sdk.api.session.events.model.Content
 import java.io.Serializable
 import javax.inject.Inject
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
index badec16a27..198278a794 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetArgsBuilder.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.widgets
 
-import org.matrix.android.sdk.api.session.widgets.model.Widget
 import im.vector.app.core.di.ActiveSessionHolder
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 import javax.inject.Inject
 
 class WidgetArgsBuilder @Inject constructor(private val sessionHolder: ActiveSessionHolder) {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
index 2d3e5e4e69..35d7867db3 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetFragment.kt
@@ -35,7 +35,6 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.session.terms.TermsService
 import im.vector.app.R
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.OnBackPressed
@@ -46,6 +45,7 @@ import im.vector.app.features.widgets.webview.clearAfterWidget
 import im.vector.app.features.widgets.webview.setupForWidget
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_widget.*
+import org.matrix.android.sdk.api.session.terms.TermsService
 import timber.log.Timber
 import java.net.URISyntaxException
 import javax.inject.Inject
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
index 69c907b4e2..a4d759250d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetPostAPIHandler.kt
@@ -19,8 +19,11 @@ package im.vector.app.features.widgets
 import android.text.TextUtils
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.R
+import im.vector.app.core.resources.StringProvider
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
@@ -31,9 +34,6 @@ import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
 import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.widgets.WidgetPostAPIMediator
 import org.matrix.android.sdk.api.util.JsonDict
-import org.matrix.android.sdk.api.session.accountdata.UserAccountDataTypes
-import im.vector.app.R
-import im.vector.app.core.resources.StringProvider
 import timber.log.Timber
 import java.util.ArrayList
 import java.util.HashMap
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
index 50437fb4f3..34e5c794f7 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewEvents.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features.widgets
 
-import org.matrix.android.sdk.api.session.events.model.Content
 import im.vector.app.core.platform.VectorViewEvents
+import org.matrix.android.sdk.api.session.events.model.Content
 
 sealed class WidgetViewEvents : VectorViewEvents {
     data class Failure(val throwable: Throwable) : WidgetViewEvents()
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
index 9ecafb1020..1bc10e26d4 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewModel.kt
@@ -27,6 +27,10 @@ import com.airbnb.mvrx.Success
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.features.widgets.permissions.WidgetPermissionsHelper
+import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.Content
@@ -40,10 +44,6 @@ import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.mapOptional
 import org.matrix.android.sdk.rx.rx
 import org.matrix.android.sdk.rx.unwrap
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.StringProvider
-import im.vector.app.features.widgets.permissions.WidgetPermissionsHelper
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.net.ssl.HttpsURLConnection
 
diff --git a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt
index 3289ee8b54..845ee81a2d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/WidgetViewState.kt
@@ -20,9 +20,9 @@ import androidx.annotation.StringRes
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
+import im.vector.app.R
 import org.matrix.android.sdk.api.session.widgets.model.Widget
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-import im.vector.app.R
 
 enum class WidgetStatus {
     UNKNOWN,
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
index 2c0aff3289..45ac9e7b1d 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
@@ -23,7 +23,6 @@ import butterknife.OnClick
 import com.airbnb.mvrx.MvRx
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.withState
-import org.matrix.android.sdk.api.util.toMatrixItem
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.withArgs
@@ -31,6 +30,7 @@ import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.widgets.WidgetArgs
 import kotlinx.android.synthetic.main.bottom_sheet_room_widget_permission.*
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() {
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
index ea55e04103..cb40e5672b 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
@@ -22,12 +22,12 @@ import com.airbnb.mvrx.MvRxViewModelFactory
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
-import org.matrix.android.sdk.api.extensions.orFalse
-import org.matrix.android.sdk.api.query.QueryStringValue
-import org.matrix.android.sdk.api.session.Session
 import im.vector.app.R
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
+import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
 import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
diff --git a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt
index 8d2e9b95b8..1cc14a91c2 100644
--- a/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewState.kt
@@ -19,8 +19,8 @@ package im.vector.app.features.widgets.permissions
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
 import com.airbnb.mvrx.Uninitialized
-import org.matrix.android.sdk.api.session.widgets.model.Widget
 import im.vector.app.features.widgets.WidgetArgs
+import org.matrix.android.sdk.api.session.widgets.model.Widget
 
 data class RoomWidgetPermissionViewState(
         val roomId: String,
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
index 1c887f91be..48f83b6c54 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/ServerBackupStatusViewModel.kt
@@ -26,6 +26,12 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import io.reactivex.Observable
+import io.reactivex.functions.Function4
+import io.reactivex.subjects.PublishSubject
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.accountdata.UserAccountDataEvent
@@ -37,12 +43,6 @@ import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.crypto.store.PrivateKeysInfo
-import im.vector.app.core.platform.EmptyAction
-import im.vector.app.core.platform.EmptyViewEvents
-import im.vector.app.core.platform.VectorViewModel
-import io.reactivex.Observable
-import io.reactivex.functions.Function4
-import io.reactivex.subjects.PublishSubject
 import org.matrix.android.sdk.rx.rx
 import java.util.concurrent.TimeUnit
 
diff --git a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
index 5fd2f7c838..48426be723 100644
--- a/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/workers/signout/SignoutCheckViewModel.kt
@@ -28,17 +28,17 @@ import com.airbnb.mvrx.Uninitialized
 import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
+import im.vector.app.core.extensions.exhaustive
+import im.vector.app.core.platform.VectorViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.features.crypto.keys.KeysExporter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupState
 import org.matrix.android.sdk.api.session.crypto.keysbackup.KeysBackupStateListener
-import im.vector.app.core.extensions.exhaustive
-import im.vector.app.core.platform.VectorViewEvents
-import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.platform.VectorViewModelAction
-import im.vector.app.features.crypto.keys.KeysExporter
 import org.matrix.android.sdk.rx.rx
 
 data class SignoutCheckViewState(

From 35b94d70e2b8b5d22f9d53874f0f69ef95a9e156 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 13 Oct 2020 16:04:44 +0200
Subject: [PATCH 232/278] Fix compilation issue introduced when formatting code
 :/

---
 .../app/features/home/room/list/RoomListViewModel.kt      | 8 ++++----
 .../app/features/home/room/list/RoomListViewState.kt      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 37b448668d..d94a8010ba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -158,10 +158,10 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
     private fun handleMarkAllRoomsRead() = withState { state ->
         state.asyncFilteredRooms.invoke()
                 ?.flatMap { it.value }
-                .filter { it.membership == Membership.JOIN }
-                .map { it.roomId }
-                .toList()
-                .let { session.markAllAsRead(it, NoOpMatrixCallback()) }
+                ?.filter { it.membership == Membership.JOIN }
+                ?.map { it.roomId }
+                ?.toList()
+                ?.let { session.markAllAsRead(it, NoOpMatrixCallback()) }
     }
 
     private fun handleChangeNotificationMode(action: RoomListAction.ChangeRoomNotificationState) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
index b3d9e92000..095262d74b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
@@ -67,8 +67,8 @@ data class RoomListViewState(
     val hasUnread: Boolean
         get() = asyncFilteredRooms.invoke()
                 ?.flatMap { it.value }
-                .filter { it.membership == Membership.JOIN }
-                .any { it.hasUnreadMessages }
+                ?.filter { it.membership == Membership.JOIN }
+                ?.any { it.hasUnreadMessages }
                 ?: false
 }
 

From d8f2deb5d9aa1e35b43a8388468cd21d25cef40b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 17:18:13 +0200
Subject: [PATCH 233/278] Update build tools from 4.0.1 to 4.1.0

---
 CHANGES.md   | 2 +-
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 732a70222c..8c145ec946 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -40,7 +40,7 @@ Build 🧱:
  - Use Update Gradle Wrapper Action
  - Updates Gradle Wrapper from 5.6.4 to 6.6.1. (#2193)
  - Upgrade kotlin version from `1.3.72` to `1.4.10` and kotlin coroutines version from `1.3.8` to `1.3.9`
- - Upgrade build tools from `3.5.3` to `4.0.1`
+ - Upgrade build tools from `3.5.3` to `4.0.1`, then to `4.1.0`
  - Upgrade com.google.gms:google-services from `4.3.2` to `4.3.4`
  - Upgrade Moshi to `1.11.0`, Dagger to `2.29.1`, Epoxy to `4.1.0`
 
diff --git a/build.gradle b/build.gradle
index e68d545c91..05dcaa43ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath 'com.google.gms:google-services:4.3.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'

From 7bee558e01c222a69b8a6def412260b9aa67c7b3 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Tue, 13 Oct 2020 20:17:56 +0200
Subject: [PATCH 234/278] Using ApplicationId from BuildConfig

---
 vector/src/debug/res/xml/shortcuts.xml                     | 7 +++++++
 .../java/im/vector/app/features/home/ShortcutCreator.kt    | 3 ++-
 vector/src/{main => release}/res/xml/shortcuts.xml         | 0
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/debug/res/xml/shortcuts.xml
 rename vector/src/{main => release}/res/xml/shortcuts.xml (100%)

diff --git a/vector/src/debug/res/xml/shortcuts.xml b/vector/src/debug/res/xml/shortcuts.xml
new file mode 100644
index 0000000000..100eac5691
--- /dev/null
+++ b/vector/src/debug/res/xml/shortcuts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <share-target android:targetClass="im.vector.app.features.share.IncomingShareActivity">
+        <data android:mimeType="*/*" />
+        <category android:name="im.vector.app.debug.SHORTCUT_SHARE" />
+    </share-target>
+</shortcuts>
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
index 1edfbff64f..db396cf990 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
@@ -23,6 +23,7 @@ import androidx.annotation.WorkerThread
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
+import im.vector.app.BuildConfig
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.RoomDetailActivity
@@ -33,7 +34,7 @@ import javax.inject.Inject
 private val useAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 private const val adaptiveIconSizeDp = 108
 private const val adaptiveIconOuterSidesDp = 18
-private const val directShareCategory = "im.vector.app.SHORTCUT_SHARE"
+private const val directShareCategory = BuildConfig.APPLICATION_ID + ".SHORTCUT_SHARE"
 
 class ShortcutCreator @Inject constructor(
         private val context: Context,
diff --git a/vector/src/main/res/xml/shortcuts.xml b/vector/src/release/res/xml/shortcuts.xml
similarity index 100%
rename from vector/src/main/res/xml/shortcuts.xml
rename to vector/src/release/res/xml/shortcuts.xml

From 17d1a4b6fb90a8d5cdc01ed776bb403f956c29d9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 13 Oct 2020 22:15:23 +0200
Subject: [PATCH 235/278] revert change from AS

---
 .idea/codeStyles/Project.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b3719669fd..89a7c466fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,7 +4,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />

From 79d7032e3a16333f081ffc2516a9dcd2ba14f387 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 22:34:08 +0200
Subject: [PATCH 236/278] Don't set presence when handling a push notification
 or polling (#2156)

---
 CHANGES.md                                    |  1 +
 .../sdk/internal/session/sync/SyncPresence.kt | 31 +++++++++++++++++++
 .../sdk/internal/session/sync/SyncTask.kt     |  8 +++--
 .../internal/session/sync/job/SyncService.kt  |  3 +-
 .../internal/session/sync/job/SyncThread.kt   |  3 +-
 .../internal/session/sync/job/SyncWorker.kt   |  3 +-
 6 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt

diff --git a/CHANGES.md b/CHANGES.md
index 8c145ec946..dbb0bf51ce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Bugfix 🐛:
  - Simplifies draft management and should fix bunch of draft issues (#952, #683)
  - Very long topic cannot be fully visible (#1957)
  - Properly detect cross signing keys reset
+ - Don't set presence when handling a push notification or polling (#2156)
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
new file mode 100644
index 0000000000..18e17c7d13
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncPresence.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.session.sync
+
+/**
+ * For `set_presence` parameter in the /sync request
+ *
+ * Controls whether the client is automatically marked as online by polling this API. If this parameter
+ * is omitted then the client is automatically marked as online when it uses this API. Otherwise if the
+ * parameter is set to "offline" then the client is not marked as being online when it uses this API.
+ * When set to "unavailable", the client is marked as being idle. One of: ["offline", "online", "unavailable"]
+ */
+enum class SyncPresence(val value: String) {
+    Offline("offline"),
+    Online("online"),
+    Unavailable("unavailable")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index 9393d4703f..303bb45419 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -16,6 +16,7 @@
 
 package org.matrix.android.sdk.internal.session.sync
 
+import org.greenrobot.eventbus.EventBus
 import org.matrix.android.sdk.R
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.network.executeRequest
@@ -25,13 +26,15 @@ import org.matrix.android.sdk.internal.session.homeserver.GetHomeServerCapabilit
 import org.matrix.android.sdk.internal.session.sync.model.SyncResponse
 import org.matrix.android.sdk.internal.session.user.UserStore
 import org.matrix.android.sdk.internal.task.Task
-import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
 import javax.inject.Inject
 
 internal interface SyncTask : Task<SyncTask.Params, Unit> {
 
-    data class Params(var timeout: Long = 6_000L)
+    data class Params(
+            val timeout: Long,
+            val presence: SyncPresence?
+    )
 }
 
 internal class DefaultSyncTask @Inject constructor(
@@ -63,6 +66,7 @@ internal class DefaultSyncTask @Inject constructor(
         }
         requestParams["timeout"] = timeout.toString()
         requestParams["filter"] = filterRepository.getFilter()
+        params.presence?.let { requestParams["set_presence"] = it.value }
 
         val isInitialSync = token == null
         if (isInitialSync) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
index ccd7f770fb..6d100a71f9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncService.kt
@@ -30,6 +30,7 @@ import org.matrix.android.sdk.api.failure.isTokenError
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
+import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
@@ -147,7 +148,7 @@ abstract class SyncService : Service() {
 
     private suspend fun doSync() {
         Timber.v("## Sync: Execute sync request with timeout $syncTimeoutSeconds seconds")
-        val params = SyncTask.Params(syncTimeoutSeconds * 1000L)
+        val params = SyncTask.Params(syncTimeoutSeconds * 1000L, SyncPresence.Offline)
         try {
             // never do that in foreground, let the syncThread work
             syncTask.execute(params)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
index 4aaca991dd..cfd7865269 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncThread.kt
@@ -38,6 +38,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.matrix.android.sdk.api.session.call.MxCall
 import org.matrix.android.sdk.internal.session.call.ActiveCallHandler
+import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import timber.log.Timber
 import java.net.SocketTimeoutException
 import java.util.Timer
@@ -161,7 +162,7 @@ internal class SyncThread @Inject constructor(private val syncTask: SyncTask,
                 // No timeout after a pause
                 val timeout = state.let { if (it is SyncState.Running && it.afterPause) 0 else DEFAULT_LONG_POOL_TIMEOUT }
                 Timber.v("Execute sync request with timeout $timeout")
-                val params = SyncTask.Params(timeout)
+                val params = SyncTask.Params(timeout, SyncPresence.Online)
                 val sync = syncScope.launch {
                     doSync(params)
                 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
index 17baa91cec..211b643516 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
@@ -24,6 +24,7 @@ import org.matrix.android.sdk.api.failure.isTokenError
 import org.matrix.android.sdk.internal.di.WorkManagerProvider
 import org.matrix.android.sdk.internal.network.NetworkConnectivityChecker
 import org.matrix.android.sdk.internal.session.SessionComponent
+import org.matrix.android.sdk.internal.session.sync.SyncPresence
 import org.matrix.android.sdk.internal.session.sync.SyncTask
 import org.matrix.android.sdk.internal.task.TaskExecutor
 import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker
@@ -94,7 +95,7 @@ internal class SyncWorker(context: Context,
     }
 
     private suspend fun doSync(timeout: Long) {
-        val taskParams = SyncTask.Params(timeout * 1000)
+        val taskParams = SyncTask.Params(timeout * 1000, SyncPresence.Offline)
         syncTask.execute(taskParams)
     }
 

From 7f5c7c3beded6d6c9db2c5d175ad834c822d3a2e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 23:05:33 +0200
Subject: [PATCH 237/278] Trick to fix a change due to upgrade to build-tools
 4.1.0 (?)

---
 matrix-sdk-android/build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 0bf4819d25..e4a8b8884a 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -35,6 +35,10 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
+        // Seems that the build tools 4.1.0 does not generate BuildConfig.VERSION_NAME anymore.
+        // Add it manually here. We may remove this trick in the future
+        buildConfigField "String", "VERSION_NAME", "\"0.0.1\""
+
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision_unix_date", "\"${gitRevisionUnixDate()}\""

From 2b026b6bc618d45cd1052dd9d4cd0eb7dbaf6697 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Oct 2020 23:15:06 +0200
Subject: [PATCH 238/278] Fix vector tint compilation error. Tint at runtime.
 Also remove unused icon.

---
 .../settings/VectorSettingsRootFragment.kt         |  6 +-----
 .../res/drawable/ic_settings_root_advanced.xml     |  2 +-
 .../main/res/drawable/ic_settings_root_call.xml    |  4 ++--
 .../main/res/drawable/ic_settings_root_flair.xml   |  2 +-
 .../main/res/drawable/ic_settings_root_general.xml |  2 +-
 .../res/drawable/ic_settings_root_help_about.xml   |  2 +-
 .../drawable/ic_settings_root_ignored_users.xml    |  2 +-
 .../main/res/drawable/ic_settings_root_labs.xml    |  4 ++--
 .../main/res/drawable/ic_settings_root_legacy.xml  | 14 --------------
 .../res/drawable/ic_settings_root_notification.xml |  2 +-
 .../res/drawable/ic_settings_root_preferences.xml  |  2 +-
 .../drawable/ic_settings_root_security_privacy.xml |  2 +-
 12 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 vector/src/main/res/drawable/ic_settings_root_legacy.xml

diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
index 3f3811ce76..79eb0216ee 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsRootFragment.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.settings
 
-import android.os.Build
 import im.vector.app.R
 import im.vector.app.core.preference.VectorPreference
 import javax.inject.Inject
@@ -27,10 +26,7 @@ class VectorSettingsRootFragment @Inject constructor() : VectorSettingsBaseFragm
     override val preferenceXmlRes = R.xml.vector_settings_root
 
     override fun bindPref() {
-        // Tint icon on API < 24
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            tintIcons()
-        }
+        tintIcons()
     }
 
     private fun tintIcons() {
diff --git a/vector/src/main/res/drawable/ic_settings_root_advanced.xml b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
index fbcd165cda..ff229af4d6 100644
--- a/vector/src/main/res/drawable/ic_settings_root_advanced.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_advanced.xml
@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?riotx_header_panel_text_secondary" android:fillType="evenOdd" android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12ZM12.25,13.5C13.0784,13.5 13.75,12.8284 13.75,12C13.75,11.1716 13.0784,10.5 12.25,10.5C11.4216,10.5 10.75,11.1716 10.75,12C10.75,12.8284 11.4216,13.5 12.25,13.5ZM19,12C19,12.8284 18.3284,13.5 17.5,13.5C16.6716,13.5 16,12.8284 16,12C16,11.1716 16.6716,10.5 17.5,10.5C18.3284,10.5 19,11.1716 19,12Z"/>
+    <path android:fillColor="@color/riotx_header_panel_text_secondary_light" android:fillType="evenOdd" android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12ZM12.25,13.5C13.0784,13.5 13.75,12.8284 13.75,12C13.75,11.1716 13.0784,10.5 12.25,10.5C11.4216,10.5 10.75,11.1716 10.75,12C10.75,12.8284 11.4216,13.5 12.25,13.5ZM19,12C19,12.8284 18.3284,13.5 17.5,13.5C16.6716,13.5 16,12.8284 16,12C16,11.1716 16.6716,10.5 17.5,10.5C18.3284,10.5 19,11.1716 19,12Z"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_call.xml b/vector/src/main/res/drawable/ic_settings_root_call.xml
index 0742e16e0d..7dad271556 100644
--- a/vector/src/main/res/drawable/ic_settings_root_call.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_call.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="25">
   <path
       android:pathData="M0.5,8C0.5,6.3432 1.8432,5 3.5,5H14.5C16.1569,5 17.5,6.3432 17.5,8V17C17.5,18.6569 16.1569,20 14.5,20H3.5C1.8432,20 0.5,18.6569 0.5,17V8Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
   <path
       android:pathData="M19.4229,9.4388L23.5259,6.8221C23.9142,6.5744 24.4229,6.8533 24.4229,7.3139V17.545C24.4229,18.0326 23.8601,18.305 23.4777,18.0025L19.4229,14.7959V9.4388Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_flair.xml b/vector/src/main/res/drawable/ic_settings_root_flair.xml
index 36b282455b..6ca6fceaf9 100644
--- a/vector/src/main/res/drawable/ic_settings_root_flair.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_flair.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="25">
   <path
       android:pathData="M12.4893,23C13.1012,23 13.6058,22.5491 13.6917,21.9156C14.6258,15.3344 15.5169,14.4325 21.8727,13.7132C22.5169,13.638 23,13.112 23,12.5C23,11.8773 22.5276,11.3727 21.8834,11.2868C15.5598,10.4601 14.7439,9.6549 13.6917,3.0736C13.5844,2.4402 13.1012,2 12.4893,2C11.888,2 11.3834,2.4402 11.2868,3.0844C10.3635,9.6656 9.4724,10.5675 3.1166,11.2868C2.4724,11.362 2,11.8773 2,12.5C2,13.112 2.4617,13.6273 3.1166,13.7132C9.4402,14.5936 10.2239,15.3451 11.2868,21.9264C11.4049,22.5598 11.8988,23 12.4893,23Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_general.xml b/vector/src/main/res/drawable/ic_settings_root_general.xml
index a07bf7a164..ca16d3c982 100644
--- a/vector/src/main/res/drawable/ic_settings_root_general.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_general.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M20.5988,9.5162C20.8188,10.0938 21.3825,10.4788 22.0013,10.4788C22.8263,10.4788 23.5,11.1525 23.5,11.9775V13.0225C23.5,13.8475 22.8263,14.5213 22.0013,14.5213C21.3825,14.5213 20.8188,14.9062 20.5988,15.4838C20.5806,15.5292 20.5624,15.5753 20.5441,15.6218C20.4792,15.7863 20.4125,15.9555 20.3375,16.1163C20.0763,16.68 20.2,17.34 20.64,17.78C21.2313,18.3575 21.2313,19.3062 20.64,19.8975L19.8975,20.64C19.32,21.2313 18.3713,21.2313 17.78,20.64C17.3538,20.2 16.68,20.0763 16.1163,20.3375C15.91,20.4338 15.7037,20.5163 15.4838,20.5988C14.9062,20.8188 14.5213,21.3825 14.5213,22.0013C14.5213,22.8263 13.8475,23.5 13.0225,23.5H11.9775C11.1525,23.5 10.4788,22.8263 10.4788,22.0013C10.4788,21.3825 10.0938,20.8188 9.5162,20.5988C9.4708,20.5806 9.4247,20.5624 9.3781,20.544C9.2137,20.4792 9.0445,20.4125 8.8837,20.3375C8.32,20.0763 7.66,20.2 7.22,20.64C6.6425,21.2313 5.6937,21.2313 5.1025,20.64L4.36,19.8975C3.7687,19.32 3.7687,18.3713 4.36,17.78C4.8,17.3538 4.9237,16.68 4.6625,16.1163C4.5662,15.91 4.4837,15.7037 4.4012,15.4838C4.1813,14.9062 3.6175,14.5213 2.9987,14.5213C2.1737,14.5213 1.5,13.8475 1.5,13.0225V11.9775C1.5,11.1525 2.1737,10.4788 2.9987,10.4788C3.6175,10.4788 4.1813,10.0938 4.4012,9.5162C4.4446,9.3774 4.499,9.2441 4.5539,9.1093C4.586,9.0305 4.6183,8.9512 4.6487,8.87C4.91,8.3062 4.7863,7.6462 4.3463,7.2063C3.755,6.6287 3.755,5.68 4.3463,5.0887L5.1025,4.36C5.68,3.7687 6.6287,3.7687 7.22,4.36C7.6462,4.8 8.32,4.9237 8.8837,4.6625C9.09,4.5662 9.2963,4.47 9.5162,4.4012C10.0938,4.1813 10.4788,3.6175 10.4788,2.9987C10.4788,2.1737 11.1525,1.5 11.9775,1.5H13.0225C13.8475,1.5 14.5213,2.1737 14.5213,2.9987C14.5213,3.6312 14.9062,4.1813 15.4838,4.4012C15.5292,4.4194 15.5753,4.4376 15.6218,4.4559C15.7863,4.5208 15.9555,4.5875 16.1163,4.6625C16.68,4.9237 17.34,4.8 17.78,4.36C18.3575,3.7687 19.3062,3.7687 19.8975,4.36L20.64,5.1025C21.2313,5.68 21.2313,6.6287 20.64,7.22C20.2,7.6462 20.0763,8.32 20.3375,8.8837C20.4338,9.09 20.5163,9.2963 20.5988,9.5162ZM12.5,18C9.4613,18 7,15.5387 7,12.5C7,9.4613 9.4613,7 12.5,7C15.5387,7 18,9.4613 18,12.5C18,15.5387 15.5387,18 12.5,18Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_help_about.xml b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
index 0c79955cba..2905df331f 100644
--- a/vector/src/main/res/drawable/ic_settings_root_help_about.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_help_about.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M12.5,22.5C18.0228,22.5 22.5,18.0228 22.5,12.5C22.5,6.9771 18.0228,2.5 12.5,2.5C6.9771,2.5 2.5,6.9771 2.5,12.5C2.5,18.0228 6.9771,22.5 12.5,22.5ZM12.5002,18.6458C13.1905,18.6458 13.7502,18.0862 13.7502,17.3958C13.7502,16.7055 13.1905,16.1458 12.5002,16.1458C11.8098,16.1458 11.2502,16.7055 11.2502,17.3958C11.2502,18.0862 11.8098,18.6458 12.5002,18.6458ZM10.7636,10.6163C10.7636,9.6542 11.5442,8.8802 12.4997,8.8802C13.4524,8.8802 14.2358,9.6636 14.2358,10.6163C14.2358,11.0576 14.0471,11.215 13.3036,11.7287C12.9741,11.9563 12.5223,12.2725 12.1705,12.7362C11.7939,13.2327 11.5622,13.8517 11.5622,14.6389H13.4372C13.4372,14.2533 13.5396,14.0339 13.6643,13.8695C13.8138,13.6724 14.0304,13.5055 14.3694,13.2713C14.405,13.2467 14.4426,13.2212 14.4818,13.1945C15.0963,12.7765 16.1108,12.0865 16.1108,10.6163C16.1108,8.6281 14.4879,7.0052 12.4997,7.0052C10.5142,7.0052 8.8885,8.6132 8.8885,10.6163H10.7636Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
index cf039d55dc..468d88879a 100644
--- a/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M22.5,12.5C22.5,18.0228 18.0228,22.5 12.5,22.5C6.9771,22.5 2.5,18.0228 2.5,12.5C2.5,6.9771 6.9771,2.5 12.5,2.5C18.0228,2.5 22.5,6.9771 22.5,12.5ZM7,11.25C6.7239,11.25 6.5,11.4739 6.5,11.75V13.25C6.5,13.5261 6.7239,13.75 7,13.75H18C18.2761,13.75 18.5,13.5261 18.5,13.25V11.75C18.5,11.4739 18.2761,11.25 18,11.25H7Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_labs.xml b/vector/src/main/res/drawable/ic_settings_root_labs.xml
index 5416ad7089..0e137ecce7 100644
--- a/vector/src/main/res/drawable/ic_settings_root_labs.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_labs.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="25">
   <path
       android:pathData="M5.25,22.5C4.5596,22.5 4,21.9404 4,21.25V12.8687C4,12.6622 4.275,12.5 4.625,12.5H5.875C6.225,12.5 6.5,12.6622 6.5,12.8687V21.25C6.5,21.9404 5.9404,22.5 5.25,22.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
   <path
       android:pathData="M7.3481,2.5C4.8899,2.5 4.0004,4.1544 4.0004,5.1811V15.9785H5.8277C9.6771,14.2291 13.4294,17.5377 17.3919,17.4997C21.3545,17.4616 21.5,15.3319 21.5,14.267V5.7136C21.5,2.2337 19.0904,5.5804 14.9982,4.2304C11.4458,3.0584 10.8053,2.5 7.3481,2.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"/>
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_legacy.xml b/vector/src/main/res/drawable/ic_settings_root_legacy.xml
deleted file mode 100644
index c56a7d31f8..0000000000
--- a/vector/src/main/res/drawable/ic_settings_root_legacy.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="20dp"
-    android:viewportWidth="24"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M21,6v13H3V6M1,1h22v5H1zM10,10h4"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#7E899C"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_notification.xml b/vector/src/main/res/drawable/ic_settings_root_notification.xml
index bf3786aeab..ced6133844 100644
--- a/vector/src/main/res/drawable/ic_settings_root_notification.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_notification.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M13.4923,3.0211C13.4974,2.9731 13.5,2.9243 13.5,2.875C13.5,2.1156 12.8844,1.5 12.125,1.5C11.3656,1.5 10.75,2.1156 10.75,2.875C10.75,2.9243 10.7526,2.9731 10.7577,3.0211C7.7183,3.6742 5.25,6.4401 5.25,9.75V14.425C5.25,15.6625 4.5625,16.4875 3.7513,16.9688C3.2013,17.2988 2.5,17.7525 2.5,18.3025C2.5,18.935 2.8988,19.3613 3.7238,19.3613H12.125H20.5263C21.3513,19.3613 21.75,18.9213 21.75,18.3025C21.75,17.7525 21.0625,17.2988 20.4988,16.9688C19.6738,16.4875 19,15.6763 19,14.425V9.75C19,6.4401 16.5317,3.6742 13.4923,3.0211ZM10.1863,20.75C10.1038,20.97 10.0625,21.19 10.0625,21.4375C10.0625,22.5788 10.9838,23.5 12.125,23.5C13.2663,23.5 14.1875,22.5788 14.1875,21.4375C14.1875,21.19 14.1325,20.97 14.0638,20.75H10.1863Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_preferences.xml b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
index 1aa5e338f0..8549924314 100644
--- a/vector/src/main/res/drawable/ic_settings_root_preferences.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_preferences.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M8.5,4.5C4.0817,4.5 0.5,8.0817 0.5,12.5C0.5,16.9183 4.0817,20.5 8.5,20.5H16.5C20.9183,20.5 24.5,16.9183 24.5,12.5C24.5,8.0817 20.9183,4.5 16.5,4.5H8.5ZM13.5,12.5C13.5,15.2614 11.2614,17.5 8.5,17.5C5.7386,17.5 3.5,15.2614 3.5,12.5C3.5,9.7386 5.7386,7.5 8.5,7.5C11.2614,7.5 13.5,9.7386 13.5,12.5Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
index 194eec1be3..1da0f2e288 100644
--- a/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
+++ b/vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="25">
   <path
       android:pathData="M11.8333,2.5C8.8878,2.5 6.5,4.8878 6.5,7.8333V10.5C5.3954,10.5 4.5,11.3954 4.5,12.5V20.5C4.5,21.6046 5.3954,22.5 6.5,22.5H18.5C19.6046,22.5 20.5,21.6046 20.5,20.5V12.5C20.5,11.3954 19.6046,10.5 18.5,10.5V7.8333C18.5,4.8878 16.1122,2.5 13.1667,2.5H11.8333ZM15.8333,10.5V7.8333C15.8333,6.3606 14.6394,5.1667 13.1667,5.1667H11.8333C10.3606,5.1667 9.1667,6.3606 9.1667,7.8333V10.5H15.8333Z"
-      android:fillColor="?riotx_header_panel_text_secondary"
+      android:fillColor="@color/riotx_header_panel_text_secondary_light"
       android:fillType="evenOdd"/>
 </vector>

From ea576972150e50a58fe3fb64da3f14f04fcf48bb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Wed, 14 Oct 2020 11:20:01 +0200
Subject: [PATCH 239/278] Fix warning with enum

---
 tools/check/forbidden_strings_in_code.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 9c00dca278..6e879df7ab 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -163,8 +163,8 @@ Formatter\.formatShortFileSize===1
 # DISABLED
 # android\.text\.TextUtils
 
-### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If it is ok, change the value in file forbidden_strings_in_code.txt
-enum class===81
+### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
+enum class===82
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

From 95df786227508ef1f541b8b4525f9ad5177c78a3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 14 Oct 2020 12:21:27 +0200
Subject: [PATCH 240/278] Add a click action at the top of the drawer to open
 the general settings

---
 .../java/im/vector/app/features/home/HomeDrawerFragment.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index b8eb054076..12689cd983 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -25,6 +25,7 @@ import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.features.grouplist.GroupListFragment
 import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity
 import im.vector.app.features.workers.signout.SignOutUiWorker
 import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import org.matrix.android.sdk.api.session.Session
@@ -57,6 +58,11 @@ class HomeDrawerFragment @Inject constructor(
                 homeDrawerUserIdView.text = user.userId
             }
         }
+        // Profile
+        homeDrawerHeader.debouncedClicks {
+            sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
+            navigator.openSettings(requireActivity(), directAccess = VectorSettingsActivity.EXTRA_DIRECT_ACCESS_GENERAL)
+        }
         // Settings
         homeDrawerHeaderSettingsView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)

From d31a047467955fd8ea9b267553061464a2625178 Mon Sep 17 00:00:00 2001
From: Constantin Wartenburger <ginnythecat@lelux.net>
Date: Wed, 14 Oct 2020 15:55:51 +0200
Subject: [PATCH 241/278] Added line to changelog

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index 4a158086a2..ed86d1b6e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
  - PIN code: request PIN code if phone has been locked
  - Small optimisation of scrolling experience in timeline (#2114)
  - Allow user to reset cross signing if he has no way to recover (#2052)
+ - Ability to share text
  - Create home shortcut for any room (#1525)
 
 Bugfix 🐛:

From f64a6d4ca4e8b1589d372d96dae2dd5e3d29e13d Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Thu, 15 Oct 2020 00:56:45 +0000
Subject: [PATCH 242/278] Update Gradle Wrapper from 6.6.1 to 6.7.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
---
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e42234001..99d667ccdc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionSha256Sum=0080de8491f0918e4f529a6db6820fa0b9e818ee2386117f4394f95feb1d5583
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From f68eb449bda60ec48b01280858998197af3830b8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 15 Oct 2020 15:27:32 +0200
Subject: [PATCH 243/278] Be robust against `StrandHogg` task injection

---
 CHANGES.md                          | 1 +
 vector/src/main/AndroidManifest.xml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d9ab78db82..320df0b6e7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -31,6 +31,7 @@ Bugfix 🐛:
  - Very long topic cannot be fully visible (#1957)
  - Properly detect cross signing keys reset
  - Don't set presence when handling a push notification or polling (#2156)
+ - Be robust against `StrandHogg` task injection
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index bfd09a65dc..643d5599de 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -63,6 +63,8 @@
 
         <activity
             android:name=".features.MainActivity"
+            android:launchMode="singleTask"
+            android:taskAffinity=""
             android:theme="@style/AppTheme.Launcher" />
 
         <!-- Activity alias for the launcher Activity (must be declared after the Activity it targets) -->

From 95142274fad45a4fef19a33f79e6da51c0d9ecba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 15 Oct 2020 14:23:45 +0200
Subject: [PATCH 244/278] Clear alerts if user sign out

---
 CHANGES.md                                        |  1 +
 .../java/im/vector/app/features/MainActivity.kt   |  5 +++++
 .../app/features/popup/PopupAlertManager.kt       | 15 +++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 320df0b6e7..8f3dfd8489 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,6 +32,7 @@ Bugfix 🐛:
  - Properly detect cross signing keys reset
  - Don't set presence when handling a push notification or polling (#2156)
  - Be robust against `StrandHogg` task injection
+ - Clear alerts if user sign out
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt
index 7977d969e8..b5552e4d62 100644
--- a/vector/src/main/java/im/vector/app/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt
@@ -36,6 +36,7 @@ import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.pin.PinCodeStore
 import im.vector.app.features.pin.PinLocker
 import im.vector.app.features.pin.UnlockedActivity
+import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.signout.hard.SignedOutActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
@@ -89,6 +90,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity {
     @Inject lateinit var shortcutsHandler: ShortcutsHandler
     @Inject lateinit var pinCodeStore: PinCodeStore
     @Inject lateinit var pinLocker: PinLocker
+    @Inject lateinit var popupAlertManager: PopupAlertManager
 
     override fun injectWith(injector: ScreenComponent) {
         injector.inject(this)
@@ -115,6 +117,9 @@ class MainActivity : VectorBaseActivity(), UnlockedActivity {
 
         // Also clear the dynamic shortcuts
         shortcutsHandler.clearShortcuts()
+
+        // Also clear the alerts
+        popupAlertManager.cancelAll()
     }
 
     private fun parseArgs(): MainActivityArgs {
diff --git a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
index 59386ffff0..665eb93428 100644
--- a/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
+++ b/vector/src/main/java/im/vector/app/features/popup/PopupAlertManager.kt
@@ -78,6 +78,21 @@ class PopupAlertManager @Inject constructor(private val avatarRenderer: Lazy<Ava
         }
     }
 
+    /**
+     * Cancel all alerts, after a sign out for instance
+     */
+    fun cancelAll() {
+        synchronized(alertFiFo) {
+            alertFiFo.clear()
+        }
+
+        // Cancel any displayed alert
+        weakCurrentActivity?.get()?.runOnUiThread {
+            Alerter.hide()
+            currentIsDismissed()
+        }
+    }
+
     fun onNewActivityDisplayed(activity: Activity) {
         // we want to remove existing popup on previous activity and display it on new one
         if (currentAlerter != null) {

From 6a3eed49fccb0e9946e507edc2b673b044c12b4c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 15 Oct 2020 15:46:18 +0200
Subject: [PATCH 245/278] Enable file system watch to reduce compilation time

---
 gradle.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle.properties b/gradle.properties
index 99fd9d64fd..b3f11e08a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,6 +14,8 @@ org.gradle.jvmargs=-Xmx2048m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+# Enable file system watch (https://docs.gradle.org/6.7/release-notes.html)
+org.gradle.vfs.watch=true
 
 vector.debugPrivateData=false
 vector.httpLogLevel=NONE

From 9c451ffdd11cb7b8019b228a969f16301dbca5a4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 15 Oct 2020 15:49:22 +0200
Subject: [PATCH 246/278] Weblate is now hosted at https://translate.element.io

---
 CHANGES.md      | 3 ++-
 CONTRIBUTING.md | 2 +-
 README.md       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8f3dfd8489..cb31d2f40e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,7 @@ Bugfix 🐛:
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
+ - Weblate is now hosted at https://translate.element.io
 
 SDK API changes ⚠️:
  - Search messages in a room by using Session.searchService() or Room.search()
@@ -137,7 +138,7 @@ Bugfix 🐛:
  - Replies to poll appears in timeline as unsupported events during sending (#1004)
 
 Translations 🗣:
- - The SDK is now using SAS string translations from [Weblate Matrix-doc project](https://translate.riot.im/projects/matrix-doc/) (#1909)
+ - The SDK is now using SAS string translations from [Weblate Matrix-doc project](https://translate.element.io/projects/matrix-doc/) (#1909)
  - New translation to kabyle
 
 Build 🧱:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f10c87cdbe..3464fd9e76 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ For now, the Matrix SDK and the Element application are in the same project. So
 ## I want to help translating Element
 
 If you want to fix an issue with an English string, please submit a PR.
-If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.riot.im/projects/element-android/).
+If you want to fix an issue in other languages, or add a missing translation, or even add a new language, please use [Weblate](https://translate.element.io/projects/element-android/).
 
 ## I want to submit a PR to fix an issue
 
diff --git a/README.md b/README.md
index 64c6c9d04d..e89fb15010 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/engage/element-android/?utm_source=widget)
+[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
 [![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
 [![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)

From f83a0d027a6be8b716b5198db98559b090fa04b5 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 15 Oct 2020 14:54:42 +0000
Subject: [PATCH 247/278] Translated using Weblate (Italian)

Currently translated at 100.0% (3 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
---
 .../metadata/android/it/full_description.txt  | 30 +++++++++++++++++++
 .../metadata/android/it/short_description.txt |  1 +
 fastlane/metadata/android/it/title.txt        |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 fastlane/metadata/android/it/full_description.txt
 create mode 100644 fastlane/metadata/android/it/short_description.txt
 create mode 100644 fastlane/metadata/android/it/title.txt

diff --git a/fastlane/metadata/android/it/full_description.txt b/fastlane/metadata/android/it/full_description.txt
new file mode 100644
index 0000000000..b6f7cf449c
--- /dev/null
+++ b/fastlane/metadata/android/it/full_description.txt
@@ -0,0 +1,30 @@
+Element è un nuovo tipo di app di messaggistica e collaborazione che:
+
+1. Ti mette al controllo per preservare la tua privacy
+2. Ti lascia comunicare con chiunque nella rete Matrix e oltre, integrandosi con app come Slack
+3. Ti protegge da pubblicità, raccolta di dati e piattaforme chiuse
+4. Ti protegge con la crittografia end-to-end, con la firma incrociata per verificare gli altri
+
+Element è completamente diverso dalle altre app di messaggistica e collaborazione perchè è decentralizzato e open source.
+
+Element può essere gestito in locale - o puoi scegliere un host - in modo che tu abbia privacy, possesso e controllo dei tuoi dati e conversazioni. Ti dà accesso ad una rete aperta, quindi non sei limitato a parlare solo con altri utenti Element. Ed è molto sicuro.
+
+Element può fare tutto ciò perchè funziona su Matrix - lo standard per comunicazioni aperte e decentralizzate.
+
+Element ti mette al controllo lasciandoti scegliere chi gestisce il server delle tue conversazioni. Dall'app Element, hai diverse opzioni:
+
+1. Crea un account gratuito sul server pubblico matrix.org gestito dagli sviluppatori di Matrix, o scegli tra migliaia di server pubblici gestiti da volontari
+2. Gestisci autonomamente un account installando un server sul tuo hardware
+3. Registra un account su un server personalizzato iscrivendoti alla piattaforma Element Matrix Services
+
+<b>Perchè scegliere Element?</b>
+
+<b>POSSIEDI I TUOI DATI</b>: decidi dove tenere i tuoi dati e messaggi. Sono tuoi e li controlli tu, non qualche MEGADITTA che raccoglie i tuoi dati o ne dà l'accesso a terze parti.
+
+<b>MESSAGGISTICA E COLLABORAZIONE APERTE</b>: puoi chattare con chiunque nella rete Matrix, usando Element o un'altra app Matrix, o anche se si sta usando un sistema di messaggistica diverso come Slack, IRC o XMPP.
+
+<b>SUPER SICURO</b>: vera crittografia end-to-end (solo chi è nella conversazione può decifrare i messaggi) e firma incrociata per verificare i dispositivi dei partecipanti.
+
+<b>COMUNICAZIONE COMPLETA</b>: messaggi, chiamate audio e video, condivisione file e schermo, un vasto numero di integrazioni, bot e widget. Crea stanze, comunità, resta in contatto e porta a termine gli impegni.
+
+<b>OVUNQUE TU SIA</b>: resta in contatto ovunque tu sia con la cronologia dei messaggi sincronizzata tra tutti i tuoi dispositivi e in rete su https://app.element.io.
diff --git a/fastlane/metadata/android/it/short_description.txt b/fastlane/metadata/android/it/short_description.txt
new file mode 100644
index 0000000000..8c0c8fbee0
--- /dev/null
+++ b/fastlane/metadata/android/it/short_description.txt
@@ -0,0 +1 @@
+Chat e VoIP decentralizzati sicuri. Tieni lontani i tuoi dati dalle terze parti.
diff --git a/fastlane/metadata/android/it/title.txt b/fastlane/metadata/android/it/title.txt
new file mode 100644
index 0000000000..54e3b456c7
--- /dev/null
+++ b/fastlane/metadata/android/it/title.txt
@@ -0,0 +1 @@
+Element (ex Riot.im)

From 63dff842f642b42a23919f0ae5289389691bc53d Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 14 Oct 2020 08:51:24 +0000
Subject: [PATCH 248/278] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 vector/src/main/res/values-zh-rTW/strings.xml | 577 ++----------------
 1 file changed, 67 insertions(+), 510 deletions(-)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 07f1303554..e4ece6c83f 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1,19 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="resources_language">zh</string>
     <string name="resources_country_code">TW</string>
-
     <string name="light_theme">淺色主題</string>
     <string name="dark_theme">深色主題</string>
     <string name="black_them">黑色主題</string>
-
     <string name="notification_sync_in_progress">正在同步……</string>
     <string name="notification_listening_for_events">聆聽事件</string>
-
     <string name="call_notification_answer">接受</string>
     <string name="call_notification_reject">拒絕</string>
     <string name="call_notification_hangup">掛斷</string>
-
     <string name="title_activity_home">訊息</string>
     <string name="title_activity_room">聊天室</string>
     <string name="title_activity_settings">設定</string>
@@ -24,17 +20,14 @@
     <string name="leave">離開</string>
     <string name="save">儲存</string>
     <string name="loading">載入中…</string>
-
     <string name="send">發送</string>
     <string name="resend">重新發送</string>
     <string name="share">分享</string>
     <string name="view_source">查看源代碼</string>
     <string name="notification_noisy_notifications">通知音效</string>
     <string name="notification_silent_notifications">靜音通知</string>
-
     <string name="title_activity_historical">歷史</string>
     <string name="title_activity_group_details">社群細節</string>
-
     <string name="redact">移除</string>
     <string name="quote">引用</string>
     <string name="later">稍後</string>
@@ -59,7 +52,6 @@
     <string name="or">或</string>
     <string name="invite">邀請</string>
     <string name="offline">離線</string>
-
     <string name="action_exit">離開</string>
     <string name="actions">動作</string>
     <string name="action_sign_out">登出</string>
@@ -73,25 +65,20 @@
     <string name="action_close">關閉</string>
     <string name="copied_to_clipboard">複製到剪貼簿</string>
     <string name="disable">停用</string>
-
     <string name="dialog_title_confirmation">確認</string>
     <string name="dialog_title_warning">警告</string>
-
     <string name="bottom_action_home">首頁</string>
     <string name="bottom_action_favourites">最愛</string>
     <string name="bottom_action_people">聯絡人</string>
     <string name="bottom_action_rooms">聊天室</string>
     <string name="bottom_action_groups">社群</string>
-
     <string name="home_filter_placeholder_home">過濾聊天室名稱</string>
     <string name="home_filter_placeholder_favorites">過濾最愛</string>
     <string name="home_filter_placeholder_people">過濾人</string>
     <string name="home_filter_placeholder_rooms">過濾聊天室名稱</string>
     <string name="home_filter_placeholder_groups">過濾社群名稱</string>
-
     <string name="invitations_header">邀請</string>
     <string name="low_priority_header">低優先度</string>
-
     <string name="direct_chats_header">聊天</string>
     <string name="local_address_book_header">裝置上的通訊錄</string>
     <string name="user_directory_header">使用者目錄</string>
@@ -99,7 +86,6 @@
     <string name="no_conversation_placeholder">沒有對話</string>
     <string name="no_contact_access_placeholder">您沒有允許 Element 存取裝置上的聯絡資訊</string>
     <string name="no_result_placeholder">沒有結果</string>
-
     <string name="rooms_header">聊天室</string>
     <string name="rooms_directory_header">聊天室目錄</string>
     <string name="no_room_placeholder">沒有聊天室</string>
@@ -107,11 +93,9 @@
     <plurals name="public_room_nb_users">
         <item quantity="other">%d 個使用者</item>
     </plurals>
-
     <string name="groups_invite_header">邀請</string>
     <string name="groups_header">社群</string>
     <string name="no_group_placeholder">沒有群組</string>
-
     <string name="send_bug_report_include_logs">傳送記錄</string>
     <string name="send_bug_report_include_crash_logs">傳送當機紀錄</string>
     <string name="send_bug_report_include_screenshot">傳送螢幕截圖</string>
@@ -122,14 +106,11 @@
     <string name="send_bug_report_alert_message">您似乎沮喪的搖晃著手機。您要開啟錯誤回報畫面嗎？</string>
     <string name="send_bug_report_app_crashed">這個應用程式上次當掉了。您想要開啟錯誤回報畫面嗎？</string>
     <string name="send_bug_report_rage_shake">憤怒搖晃來回報臭蟲</string>
-
     <string name="send_bug_report_sent">此錯誤回報已成功送出</string>
     <string name="send_bug_report_failed">此錯誤回報無法送出（%s）</string>
     <string name="send_bug_report_progress">進度（%s%%）</string>
-
     <string name="send_files_in">傳送到</string>
     <string name="read_receipt">讀取</string>
-
     <string name="join_room">加入聊天室</string>
     <string name="username">使用者名稱</string>
     <string name="create_account">建立帳號</string>
@@ -138,20 +119,16 @@
     <string name="hs_url">家伺服器網址</string>
     <string name="identity_url">身份識別伺服器網址</string>
     <string name="search">搜尋</string>
-
     <string name="start_new_chat">開始新聊天</string>
     <string name="start_voice_call">開始語音通話</string>
     <string name="start_video_call">開始視訊通話</string>
-
     <string name="start_new_chat_prompt_msg">您確定想要與 %s 開始新的聊天？</string>
     <string name="start_voice_call_prompt_msg">您確定想要與開始語音通話？</string>
     <string name="start_video_call_prompt_msg">您確定想要與開始視訊通話？</string>
-
     <string name="option_send_files">傳送檔案</string>
     <string name="option_take_photo_video">拍照或錄影</string>
     <string name="option_take_photo">拍照</string>
     <string name="option_take_video">錄影</string>
-
     <string name="auth_login">登入</string>
     <string name="auth_register">建立帳號</string>
     <string name="auth_submit">傳送</string>
@@ -197,7 +174,6 @@
     <string name="auth_reset_password_email_validation_message">電子郵件已傳送至 %s，點擊下方的連結來前往。</string>
     <string name="auth_reset_password_error_unauthorized">電子郵件地址驗證失敗： 請確保您已點擊郵件中的連結</string>
     <string name="auth_reset_password_success_message">您的密碼已重設。 您已登出所有工作階段，並且不會再收到推送通知。要重新啟用通知，再次於每個裝置上登入。</string>
-
     <string name="login_error_must_start_http">網址必須是 http[s]:// 開頭</string>
     <string name="login_error_network_error">無法登入：網路錯誤</string>
     <string name="login_error_unable_login">無法登入</string>
@@ -205,7 +181,6 @@
     <string name="login_error_unable_register">無法註冊</string>
     <string name="login_error_unable_register_mail_ownership">無法註冊：電子郵件的擁有權失敗</string>
     <string name="login_error_invalid_home_server">請輸入有效的網址</string>
-
     <string name="login_error_forbidden">無效的使用者名稱/密碼</string>
     <string name="login_error_unknown_token">指定的存取權杖無法被認可</string>
     <string name="login_error_bad_json">異常的 JSON</string>
@@ -213,28 +188,21 @@
     <string name="login_error_limit_exceeded">傳送太多請求</string>
     <string name="login_error_user_in_use">此使用者名稱已被使用</string>
     <string name="login_error_login_email_not_yet">此電子郵件連結已經被點擊過</string>
-
     <string name="read_receipts_list">讀取接收者清單</string>
-
     <string name="groups_list">群組清單</string>
-
     <string name="compression_options">傳送為</string>
     <string name="compression_opt_list_original">原始</string>
     <string name="compression_opt_list_large">大</string>
     <string name="compression_opt_list_medium">中</string>
     <string name="compression_opt_list_small">小</string>
-
     <string name="attachment_cancel_download">取消下載？</string>
     <string name="attachment_cancel_upload">取消上傳？</string>
     <string name="attachment_remaining_time_seconds">%d 秒</string>
     <string name="attachment_remaining_time_minutes">%1$d 分 %2$d 秒</string>
-
     <string name="yesterday">昨天</string>
     <string name="today">今天</string>
-
     <string name="room_info_room_name">聊天室名稱</string>
     <string name="room_info_room_topic">聊天室主題</string>
-
     <string name="call">通話</string>
     <string name="call_connected">通話已連接</string>
     <string name="call_connecting">通話正在連接…</string>
@@ -244,15 +212,12 @@
     <string name="incoming_video_call">視訊來電</string>
     <string name="incoming_voice_call">語音來電</string>
     <string name="call_in_progress">通話進行中……</string>
-
     <string name="call_error_user_not_responding">遠端未能接聽。</string>
     <string name="call_error_ice_failed">媒體連線失敗</string>
     <string name="call_error_camera_init_failed">無法初始化相機</string>
     <string name="call_error_answered_elsewhere">電話在另一處已答覆</string>
-
     <string name="media_picker_both_capture_title">拍照或錄影</string>
     <string name="media_picker_cannot_record_video">無法錄影</string>
-
     <string name="permissions_rationale_popup_title">資訊</string>
     <string name="permissions_rationale_msg_storage">Element 需要權限來存取你的照片與影片庫，以傳送及儲存附件。
 
@@ -272,31 +237,25 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element 可以檢查您的電話簿並以電子郵件與電話號碼為基礎來尋找其他 Matrix 使用者。
 \n
 \n您同意為此用途分享您的電話簿嗎？</string>
-
     <string name="permissions_action_not_performed_missing_permissions">抱歉。由於缺少權限，所以無法執行動作</string>
-
     <string name="media_slider_saved">已儲存</string>
     <string name="media_slider_saved_message">儲存到下載?</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="_continue">繼續</string>
-
     <string name="remove">移除</string>
     <string name="join">加入</string>
     <string name="preview">預覽</string>
     <string name="reject">拒絕</string>
-
     <string name="list_members">列出成員</string>
     <string name="open_chat_header">打開標頭</string>
     <string name="room_sync_in_progress">正在同步……</string>
     <string name="room_jump_to_first_unread">跳到第一個未讀的訊息。</string>
-
     <string name="room_preview_invitation_format">你已經被 %s 邀請加入此聊天室</string>
     <string name="room_preview_unlinked_email_warning">邀請已經被傳送給 %s，但與此帳號沒有進行關連。 你也許希望以不同帳號登入，或將電子郵件加入到您的帳號。</string>
     <string name="room_preview_try_join_an_unknown_room">您正在嘗試存取 %s，您想要加入討論嗎？</string>
     <string name="room_preview_try_join_an_unknown_room_default">聊天室</string>
     <string name="room_preview_room_interactions_disabled">這是聊天室的預覽，聊天室互動已停用。</string>
-
     <string name="room_creation_title">新聊天</string>
     <string name="room_creation_add_member">加入成員</string>
     <plurals name="room_header_active_members_count">
@@ -306,21 +265,17 @@
         <item quantity="other">%d 個成員</item>
     </plurals>
     <string name="room_title_one_member">1 個成員</string>
-
     <string name="room_participants_leave_prompt_title">離開聊天室</string>
     <string name="room_participants_leave_prompt_msg">您確定想要離開聊天室？</string>
     <string name="room_participants_remove_prompt_msg">你確定想從此聊天室移除 %s？</string>
     <string name="room_participants_create">建立</string>
-
     <string name="room_participants_online">線上</string>
     <string name="room_participants_offline">離線</string>
     <string name="room_participants_idle">閒置</string>
-
     <string name="room_participants_header_admin_tools">管理者工具</string>
     <string name="room_participants_header_call">通話</string>
     <string name="room_participants_header_direct_chats">私人訊息</string>
     <string name="room_participants_header_devices">工作階段</string>
-
     <string name="room_participants_action_invite">邀請</string>
     <string name="room_participants_action_leave">離開聊天室</string>
     <string name="room_participants_action_remove">從此房間移除</string>
@@ -336,22 +291,18 @@
     <string name="room_participants_action_devices_list">顯示工作階段清單</string>
     <string name="room_participants_invite_prompt_msg">您確定想要邀請 %s 到聊天室？</string>
     <string name="room_participants_ban_prompt_msg">封鎖使用者將會把他們從此聊天室中踢除，並避免他們再次加入。</string>
-
     <string name="people_search_invite_by_id"><u>透過 ID 邀請</u></string>
     <string name="people_search_local_contacts">裝置上的聯絡人（%d）</string>
     <string name="people_search_user_directory">使用者目錄 (%s)</string>
     <string name="people_search_filter_text">只顯示 Matrix 使用者</string>
-
     <string name="people_search_invite_by_id_dialog_title">透過 ID 邀請使用者</string>
     <string name="people_search_invite_by_id_dialog_description">請輸入一或多個電子郵件地址或 Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">電子郵件或 Matrix ID</string>
-
     <string name="room_menu_search">搜尋</string>
     <string name="room_one_user_is_typing">%s 正在打字…</string>
     <string name="room_two_users_are_typing">%1$s 和 %2$s 正在打字…</string>
     <string name="room_participants_power_level_prompt">由於您提升此使用者擁有的權限等級與你自己相同，因此您將無法還原此變更。
 你確定？</string>
-
     <string name="room_many_users_are_typing">%1$s 及 %2$s 和其他人正在打字…</string>
     <string name="room_message_placeholder_encrypted">傳送加密的訊息…</string>
     <string name="room_message_placeholder_not_encrypted">傳送訊息（未加密）…</string>
@@ -367,7 +318,6 @@
     <plurals name="room_new_messages_notification">
         <item quantity="other">%d 則新訊息</item>
     </plurals>
-
     <string name="ssl_trust">信任</string>
     <string name="ssl_do_not_trust">不信任</string>
     <string name="ssl_logout_account">登出</string>
@@ -377,37 +327,27 @@
     <plurals name="membership_changes">
         <item quantity="other">%d 會員變動</item>
     </plurals>
-
     <string name="ssl_cert_not_trust">這可能表示有人正惡意的攔截你的流量，或你的手機不信任由遠端伺服器提供的憑證。</string>
     <string name="ssl_cert_new_account_expl">如果伺服器管理員說這是正常的，請確保底下的指紋與他們所提供的指紋符合。</string>
     <string name="ssl_unexpected_existing_expl">你的手機曾經信任的憑證已經變動。這非常不尋常。建議你不要接受此新的憑證。</string>
     <string name="title_activity_choose_sticker">發送貼圖</string>
-
     <string name="dialog_title_third_party_licences">第三方開放原始碼授權</string>
-
     <string name="download">下載</string>
     <string name="speak">說話</string>
     <string name="clear">清除</string>
     <string name="option_send_voice">發送語音訊息</string>
-
     <string name="option_send_sticker">發送貼圖</string>
     <string name="no_sticker_application_dialog_content">您目前沒有任何貼圖。
 
 要新增一些貼圖嗎？</string>
-
     <string name="go_on_with">開啟以……</string>
     <string name="error_no_external_application_found">對不起，沒有應用程式可以完成此操作。</string>
-
     <string name="e2e_re_request_encryption_key">從其他工作階段重新請求金鑰。<u>重新請求金鑰</u>。</string>
-
     <string name="e2e_re_request_encryption_key_sent">已發送金鑰分享請求。</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">已發送請求</string>
     <string name="e2e_re_request_encryption_key_dialog_content">"請在另一個可以解密訊息的裝置上啟動  Element, 以便它將金鑰發送到此工作階段。"</string>
-
     <string name="ssl_expected_existing_expl">憑證已從以前受信任的更改為不受信任的憑證。伺服器可能已續訂其憑證。請與伺服器管理員聯繫以尋找所需的指紋。</string>
     <string name="ssl_only_accept">僅當伺服器管理員發佈的指紋與上面的指紋匹配時才接受此憑證。</string>
-
     <string name="room_details_title">聊天室詳情</string>
     <string name="room_details_people">成員</string>
     <string name="room_details_files">檔案</string>
@@ -415,15 +355,12 @@
     <string name="malformed_id">ID 格式不正確。它應該是電子郵件地址或 Matrix ID，如 ‘@localpart:domain’</string>
     <string name="room_details_people_invited_group_name">已邀請</string>
     <string name="room_details_people_present_group_name">已加入</string>
-
     <string name="room_event_action_report_prompt_reason">報告此內容的原因</string>
     <string name="room_event_action_report_prompt_ignore_user">您想要隱藏此使用者的所有訊息嗎？
 
 注意此動作將會重新啟動應用程式，而其可能需要一點時間。</string>
     <string name="room_event_action_cancel_upload">取消上載</string>
     <string name="room_event_action_cancel_download">取消下載</string>
-
-
     <string name="search_hint">搜尋</string>
     <string name="search_members_hint">過濾聊天室成員</string>
     <string name="search_no_results">沒有結果</string>
@@ -431,7 +368,6 @@
     <string name="tab_title_search_messages">訊息</string>
     <string name="tab_title_search_people">聯絡人</string>
     <string name="tab_title_search_files">檔案</string>
-
     <string name="room_recents_join">加入</string>
     <string name="room_recents_directory">目錄</string>
     <string name="room_recents_favourites">最愛</string>
@@ -443,16 +379,14 @@
     <string name="room_recents_join_room">加入聊天室</string>
     <string name="room_recents_join_room_title">加入聊天室</string>
     <string name="room_recents_join_room_prompt">輸入聊天室 ID 或聊天室別名</string>
-
     <string name="directory_search_results_title">瀏覽目錄</string>
     <plurals name="directory_search_rooms">
-        <item quantity="other">%1$d 個聊天室</item>
+        <item quantity="other">%d 個聊天室</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="other">有 %1$d 個聊天室匹配 “%2$s”</item>
     </plurals>
     <string name="directory_searching_title">正在搜尋目錄……</string>
-
     <string name="room_settings_all_messages_noisy">所有訊息（通知並震動）</string>
     <string name="room_settings_all_messages">所有訊息</string>
     <string name="room_settings_mention_only">僅限提及</string>
@@ -462,8 +396,7 @@
     <string name="room_settings_direct_chat">私人訊息</string>
     <string name="room_settings_leave_conversation">離開對話</string>
     <string name="room_settings_forget">忘記</string>
-    <string name="room_settings_add_homescreen_shortcut">添加主熒幕快捷方式</string>
-
+    <string name="room_settings_add_homescreen_shortcut">新增到主畫面</string>
     <string name="room_sliding_menu_messages">訊息</string>
     <string name="room_sliding_menu_settings">設定</string>
     <string name="room_sliding_menu_version">版本</string>
@@ -471,7 +404,6 @@
     <string name="room_sliding_menu_third_party_notices">第三方通知</string>
     <string name="room_sliding_menu_copyright">版權</string>
     <string name="room_sliding_menu_privacy_policy">隱私權政策</string>
-
     <string name="settings_profile_picture">個人檔案圖片</string>
     <string name="settings_display_name">顯示名稱</string>
     <string name="settings_email_address">電子郵件地址</string>
@@ -480,7 +412,6 @@
     <string name="settings_add_phone_number">新增電話號碼</string>
     <string name="settings_app_info_link_summary">顯示在系統設定中的應用程式資訊。</string>
     <string name="settings_app_info_link_title">應用程式資訊</string>
-
     <string name="settings_notification_privacy">通知隱私</string>
     <string name="settings_notification_privacy_normal">標準</string>
     <string name="settings_notification_privacy_reduced">低隱私模式</string>
@@ -490,12 +421,10 @@
     <string name="settings_notification_privacy_secure_message_content">• 通知的消息內容<b>將從 Matrix 主服務器安全取得</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• 通知含有<b>訊息與中繼資料</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• 通知<b>不會顯示訊息內容</b></string>
-
     <string name="settings_notification_ringtone">通知音效</string>
     <string name="settings_enable_all_notif">啟用這個帳號的通知</string>
     <string name="settings_enable_this_device">啟用此工作階段的通知</string>
     <string name="settings_turn_screen_on">將螢幕開啟 3 秒</string>
-
     <string name="settings_containing_my_display_name">包含我顯示名稱的訊息</string>
     <string name="settings_containing_my_user_name">包含我用戶名稱的訊息</string>
     <string name="settings_messages_in_one_to_one">來自私訊的訊息</string>
@@ -503,13 +432,11 @@
     <string name="settings_invited_to_room">當我被邀請進聊天室時</string>
     <string name="settings_call_invitations">通話請求</string>
     <string name="settings_messages_sent_by_bot">來自機器人的訊息</string>
-
     <string name="settings_start_on_boot">在裝置啓動時自動啓動</string>
     <string name="settings_background_sync">後臺同步</string>
     <string name="settings_enable_background_sync">開啓後臺同步</string>
     <string name="settings_set_sync_timeout">同步請求超時</string>
     <string name="settings_set_sync_delay">每次同步間的延遲</string>
-
     <string name="settings_version">版本</string>
     <string name="settings_olm_version">olm 版本</string>
     <string name="settings_app_term_conditions">條款與條件</string>
@@ -519,7 +446,6 @@
     <string name="settings_clear_cache">清空暫存檔</string>
     <string name="settings_clear_media_cache">清除媒體暫存檔</string>
     <string name="settings_keep_media">保留媒體檔案</string>
-
     <string name="settings_user_settings">使用者設定</string>
     <string name="settings_notifications">通知</string>
     <string name="settings_ignored_users">已忽略的使用者</string>
@@ -538,23 +464,18 @@
     <string name="settings_always_show_timestamps">對所有訊息顯示時間戳</string>
     <string name="settings_12_24_timestamps">用12小時制顯示時間戳</string>
     <string name="settings_vibrate_on_mention">提及使用者時震動</string>
-
     <string name="settings_deactivate_account_section">停用帳號</string>
     <string name="settings_deactivate_my_account">停用我的帳號</string>
-
     <string name="startup_notification_privacy_title">通知隱私</string>
     <string name="startup_notification_privacy_message">Element 可以在後臺安全隱密地管理通知。這可能會影響電池的使用。</string>
     <string name="startup_notification_privacy_button_grant">獲取權限</string>
     <string name="startup_notification_privacy_button_other">選擇其他選項</string>
-
     <string name="settings_analytics">傳送分析資料</string>
     <string name="settings_opt_in_of_analytics">傳送分析資料</string>
     <string name="settings_opt_in_of_analytics_summary">Element 會收集匿名分析以讓我們可以改進此應用程式。</string>
     <string name="settings_opt_in_of_analytics_prompt">請允許收集匿名分析以讓我們可以改進此應用程式。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我想要協助！</string>
-
     <string name="settings_data_save_mode">節省流量模式</string>
-
     <string name="devices_details_dialog_title">工作階段資訊</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">公開名稱</string>
@@ -566,22 +487,18 @@
     <string name="devices_delete_dialog_title">授權</string>
     <string name="devices_delete_pswd">密碼：</string>
     <string name="devices_delete_submit_button_label">傳送</string>
-
     <string name="settings_logged_in">登入爲</string>
     <string name="settings_home_server">家伺服器</string>
     <string name="settings_identity_server">身份認證伺服器</string>
-
     <string name="settings_user_interface">使用者介面</string>
     <string name="settings_interface_language">語言</string>
     <string name="settings_select_language">選擇語言</string>
-
     <string name="account_email_validation_title">等待驗證</string>
     <string name="account_email_validation_message">請檢查您的電子郵件並點選其中包含的連結。只要這個完成了，就點選選繼續。</string>
     <string name="account_email_validation_error">無法驗證電子郵件地址。請檢查您的電子郵件，並點選它所包含的連結。完成此動作後，按一下「繼續」。</string>
     <string name="account_email_already_used_error">此電子郵件地址已經被使用。</string>
     <string name="account_email_not_found_error">找不到該電子郵件信箱。</string>
     <string name="account_phone_number_already_used_error">這個電話號碼已被使用。</string>
-
     <string name="settings_change_password">變更密碼</string>
     <string name="settings_old_password">目前的密碼</string>
     <string name="settings_new_password">新密碼</string>
@@ -591,13 +508,9 @@
     <string name="settings_unignore_user">顯示所有來自 %s 的訊息？
 
 注意此動作將會重新啟動應用程式，而其可能需要一點時間。</string>
-
     <string name="settings_delete_notification_targets_confirmation">確實要刪除此通知目標嗎？</string>
-
     <string name="settings_delete_threepid_confirmation">您確認要移除 %1$s %2$s 嗎?</string>
-
     <string name="settings_select_country">選擇國家</string>
-
     <string name="settings_phone_number_country_label">國家</string>
     <string name="settings_phone_number_country_error">請選擇一個國家</string>
     <string name="settings_phone_number_label">電話號碼</string>
@@ -607,25 +520,19 @@
     <string name="settings_phone_number_verification_error_empty_code">輸入驗證碼</string>
     <string name="settings_phone_number_verification_error">驗證您的電話號碼時出錯</string>
     <string name="settings_phone_number_code">代碼</string>
-
-
     <string name="settings_flair">特色</string>
-
     <string name="media_saving_period_3_days">3 天</string>
     <string name="media_saving_period_1_week">1 週</string>
     <string name="media_saving_period_1_month">1 個月</string>
     <string name="media_saving_period_forever">永遠</string>
-
     <string name="room_settings_room_photo">聊天室圖片</string>
     <string name="room_settings_room_name">聊天室名稱</string>
     <string name="room_settings_topic">主題</string>
     <string name="room_settings_room_tag">聊天室標籤</string>
     <string name="room_settings_tag_pref_dialog_title">標記為：</string>
-
     <string name="room_settings_tag_pref_entry_favourite">我的最愛</string>
     <string name="room_settings_tag_pref_entry_low_priority">低優先度</string>
     <string name="room_settings_tag_pref_entry_none">無</string>
-
     <string name="room_settings_category_access_visibility_title">訪問和可見度</string>
     <string name="room_settings_directory_visibility">將此聊天室列入聊天室目錄</string>
     <string name="room_settings_room_notifications_title">通知</string>
@@ -633,19 +540,15 @@
     <string name="room_settings_room_read_history_rules_pref_title">房間歷史可讀性</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">誰能檢視歷史訊息？</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">誰能進入這個聊天室？</string>
-
     <string name="room_settings_read_history_entry_anyone">任何人</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">僅成員（自選取此選項開始）</string>
     <string name="room_settings_read_history_entry_members_only_invited">僅成員（自他們被邀請開始）</string>
     <string name="room_settings_read_history_entry_members_only_joined">僅成員（自他們加入開始）</string>
-
     <string name="room_settings_room_access_warning">要連結一個聊天室，該聊天室必須設定地址。</string>
     <string name="room_settings_room_access_entry_only_invited">僅有被邀請的人</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">任何知道該聊天室連結的人，但訪客除外</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">任何知道該聊天室連結的人，包括訪客</string>
-
     <string name="room_settings_banned_users_title">被封鎖的用戶</string>
-
     <string name="room_settings_category_advanced_title">進階</string>
     <string name="room_settings_room_internal_id">此聊天室的內部 ID 為</string>
     <string name="room_settings_addresses_pref_title">地址</string>
@@ -656,38 +559,28 @@
     <string name="room_settings_labs_end_to_end_warnings">您需要登出才能啟用加密。</string>
     <string name="room_settings_never_send_to_unverified_devices_title">只匯出到已驗證的工作階段</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">從不在此房間中從此工作階段上傳送未加密的訊息到未驗證的工作階段。</string>
-
     <string name="room_settings_addresses_no_local_addresses">此房間沒有本機地址</string>
     <string name="room_settings_addresses_add_new_address">新地址 （如 #foo:matrix.org）</string>
-
     <string name="room_settings_no_flair">此聊天室並未對任何社群顯示特色</string>
     <string name="room_settings_add_new_group">新社群地址（如 +foo:matrix.org）</string>
     <string name="room_settings_invalid_group_format_dialog_title">無效的社群地址</string>
     <string name="room_settings_invalid_group_format_dialog_body">“%s”不是一個有效的社群 ID</string>
-
-
     <string name="room_settings_addresses_invalid_format_dialog_title">別名格式錯誤</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' 不是有效的別名格式</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">您沒有為此聊天室指定主要地址。</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">主地址警告</string>
-
     <string name="room_settings_set_main_address">設定為主地址</string>
     <string name="room_settings_unset_main_address">取消設定為主地址</string>
     <string name="room_settings_copy_room_id">複製聊天室 ID</string>
     <string name="room_settings_copy_room_address">複製聊天室地址</string>
-
     <string name="room_settings_addresses_e2e_enabled">此聊天室已啟用加密。</string>
     <string name="room_settings_addresses_e2e_disabled">此聊天室未啟用加密。</string>
     <string name="room_settings_addresses_e2e_encryption_warning">啟用加密
  (警告: 啟用後無法停用)</string>
-
     <string name="directory_title">目錄</string>
     <string name="settings_theme">主題</string>
-
     <string name="failed_to_load_timeline_position">%s 試圖載入此聊天室的一個特定的時間點, 但無法找到它。</string>
-
     <string name="encryption_information_title">端到端加密資訊</string>
-
     <string name="encryption_information_device_info">事件資訊</string>
     <string name="encryption_information_user_id">使用者 ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519 認證金鑰</string>
@@ -695,7 +588,6 @@
     <string name="encryption_information_algorithm">演算法</string>
     <string name="encryption_information_session_id">會話 ID</string>
     <string name="encryption_information_decryption_error">解密錯誤</string>
-
     <string name="encryption_information_sender_device_information">發送者的工作階段訊息</string>
     <string name="encryption_information_device_name">公開名稱</string>
     <string name="encryption_information_name">公開名稱</string>
@@ -703,7 +595,6 @@
     <string name="encryption_information_device_key">工作階段金鑰</string>
     <string name="encryption_information_verification">驗證</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 指紋</string>
-
     <string name="encryption_export_e2e_room_keys">匯出聊天室的端到端加密金鑰</string>
     <string name="encryption_export_room_keys">匯出聊天室的加密金鑰</string>
     <string name="encryption_export_room_keys_summary">匯出金鑰到本機檔案</string>
@@ -713,60 +604,49 @@
     <string name="encryption_export_saved_as">聊天室的端到端加密金鑰已儲存爲「%s」。
 
 警告：如果應用程式被解除安裝，這個檔案可能會被刪除。</string>
-
     <string name="encryption_import_e2e_room_keys">匯入聊天室端到端加密密鑰</string>
     <string name="encryption_import_room_keys">匯入聊天室金鑰</string>
     <string name="encryption_import_room_keys_summary">從本機檔案匯入金鑰</string>
     <string name="encryption_import_import">匯入</string>
     <string name="encryption_never_send_to_unverified_devices_title">僅加密驗證過的工作階段</string>
     <string name="encryption_never_send_to_unverified_devices_summary">從不自此工作階段傳送加密的訊息到未驗證的工作階段。</string>
-
     <string name="encryption_information_not_verified">未驗證</string>
     <string name="encryption_information_verified">已驗證</string>
     <string name="encryption_information_blocked">已列入黑名單</string>
-
     <string name="encryption_information_unknown_device">未知工作階段</string>
     <string name="encryption_information_none">無</string>
-
     <string name="encryption_information_verify">驗證</string>
     <string name="encryption_information_unverify">取消驗證</string>
     <string name="encryption_information_block">列入黑名單</string>
     <string name="encryption_information_unblock">解除黑名單</string>
-
     <string name="encryption_information_verify_device">驗證工作階段</string>
     <string name="encryption_information_verify_device_warning">透過將以下內容與您的其他工作階段中的使用者設定來確認：</string>
     <string name="encryption_information_verify_device_warning2">如果不符合的話，您的通訊安全可能正受到威脅。</string>
     <string name="encryption_information_verify_key_match">我驗證金鑰相符</string>
-
     <string name="unknown_devices_alert_title">聊天室包含未知工作階段</string>
     <string name="unknown_devices_alert_message">此聊天室包含未經驗證的工作階段。
 \n無法保證這些工作階段屬於他們聲稱的使用者。
 \n我們建議在繼續操作前驗證每一個工作階段，但是你也可以選擇不驗證而重新傳送該訊息。
 \n
 \n未知工作階段：</string>
-
     <string name="select_room_directory">選擇一個聊天室目錄</string>
     <string name="directory_server_fail_to_retrieve_server">伺服器可能不可用或超載</string>
     <string name="directory_server_type_homeserver">輸入一個主伺服器來列出所有公開聊天室</string>
     <string name="directory_server_placeholder">家伺服器 URL</string>
     <string name="directory_server_all_rooms_on_server">在 %s 伺服器上的所有聊天室</string>
     <string name="directory_server_native_rooms">所有本地 %s 聊天室</string>
-
     <string name="lock_screen_hint">在此輸入…</string>
-
     <plurals name="notification_unread_notified_messages">
-        <item quantity="other">%d 條未讀訊息</item>
+        <item quantity="other">%d 條未讀的已通知訊息</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="other">%d 條未讀訊息</item>
+        <item quantity="other">%d 條未讀的已通知訊息</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="other">%d 個聊天室</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s 條在 %2$s 中</string>
-
     <string name="historical_placeholder">搜尋歷史</string>
-
     <string name="font_size">文字大小選擇</string>
     <string name="tiny">微小</string>
     <string name="small">小</string>
@@ -775,15 +655,13 @@
     <string name="larger">更大</string>
     <string name="largest">最大</string>
     <string name="huge">巨大</string>
-
     <string name="widget_no_power_to_manage">您需要相關權限以管理此聊天室的小部件</string>
     <string name="widget_creation_failure">創建小部件失敗</string>
     <string name="settings_labs_create_conference_with_jitsi">使用 jitsi 建立會議通話</string>
     <string name="widget_delete_message_confirmation">您確定要從聊天室刪除小工具嗎？</string>
     <plurals name="active_widgets">
-        <item quantity="other">已啓用 %d 個小部件</item>
+        <item quantity="other">%d 個作用中的小工具</item>
     </plurals>
-
     <string name="widget_integration_unable_to_create">無法建立小部件。</string>
     <string name="widget_integration_failed_to_send_request">發送請求失敗。</string>
     <string name="widget_integration_positive_power_level">權限等級必需為正整數。</string>
@@ -797,57 +675,44 @@
     <string name="room_add_matrix_apps">新增 Matrix 應用程式</string>
     <string name="settings_labs_native_camera">使用原生相機</string>
     <string name="settings_labs_enable_send_voice">傳送語音訊息</string>
-
     <string name="you_added_a_new_device">您新增的工作階段「%s」正在請求加密金鑰。</string>
     <string name="your_unverified_device_requesting">您未驗證的工作階段「%s」正在請求加密金鑰。</string>
     <string name="start_verification">開始驗證</string>
     <string name="share_without_verifying">不驗證就分享</string>
     <string name="ignore_request">忽略請求</string>
-
     <string name="conference_call_warning_title">警告！</string>
     <string name="conference_call_warning_message">會議通話正在開發階段，可能不可靠。</string>
-
     <string name="command_error">指令出錯</string>
     <string name="unrecognized_command">無法辨識的指令：%s</string>
-
     <string name="notification_off">關閉</string>
     <string name="notification_noisy">通知並震動</string>
-
     <string name="encrypted_message">已加密的訊息</string>
-
     <string name="create">建立</string>
     <string name="create_community">建立社群</string>
     <string name="community_name">社群名稱</string>
     <string name="community_name_hint">範例</string>
     <string name="community_id">社群地址</string>
     <string name="community_id_hint">範例</string>
-
     <string name="group_details_home">首頁</string>
     <string name="group_details_people">成員</string>
     <string name="group_details_rooms">聊天室</string>
     <string name="no_users_placeholder">沒有使用者</string>
-
     <string name="rooms">聊天室</string>
     <string name="joined">已加入</string>
     <string name="invited">已邀請</string>
     <string name="filter_group_members">篩選社群成員</string>
     <string name="filter_group_rooms">篩選社群聊天室</string>
-
     <string name="group_no_long_description">社群管理員未提供此社群的具體描述。</string>
-
     <string name="has_been_kicked">您已被 %2$s 從 %1$s 踢出</string>
     <string name="has_been_banned">您已被 %2$s 從 %1$s 封鎖</string>
     <string name="reason_colon">理由：%1$s</string>
     <string name="rejoin">重新加入</string>
     <string name="forget_room">忘記聊天室</string>
-
     <string name="receipt_avatar">已讀提示用戶資料圖片</string>
     <string name="notice_avatar">通知用戶資料圖片</string>
     <string name="avatar">用戶資料圖片</string>
-
     <string name="dialog_user_consent_content">如要繼續使用此 %1$s 主伺服器，您必須同意該合約條款。</string>
     <string name="dialog_user_consent_submit">現在檢視</string>
-
     <string name="deactivate_account_title">停用帳號</string>
     <string name="deactivate_account_content">這將使您的帳戶永久不可用。您將無法登錄, 並且沒有人能夠重新註冊相同的使用者 ID。這將導致您的帳戶離開它所參與的所有房間, 它將從您的身份伺服器上刪除您的帳戶詳細資訊。<b>此操作是不可逆轉</b>的。
 
@@ -857,16 +722,12 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="deactivate_account_delete_checkbox">請在我的帳號停用時忘記我傳送過的所有訊息（<b>警告：</b>這將會造成未來的使用者無法看見完整的對話紀錄）</string>
     <string name="deactivate_account_prompt_password">若要繼續進行，請輸入您的密碼：</string>
     <string name="deactivate_account_submit">停用帳號</string>
-
     <string name="error_empty_field_your_password">請輸入您的密碼。</string>
-
     <string name="send_bug_report_description_in_english">如果可以，請使用英文撰寫描述。</string>
     <string name="room_message_placeholder_reply_to_encrypted">傳送加密回覆……</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">傳送回覆（未加密）……</string>
     <string name="settings_preview_media_before_sending">在傳送前預覽媒體</string>
-
     <string name="settings_without_flair">您目前並非任何社群的成員。</string>
-
     <string name="settings_labs_keyboard_options_to_send_message">使用鍵盤 Enter 以傳送訊息</string>
     <string name="command_description_emote">顯示動作</string>
     <string name="command_description_ban_user">阻擋指定 id 的使用者</string>
@@ -881,12 +742,10 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="command_description_nick">變更您的顯示暱稱</string>
     <string name="command_description_markdown">開啟／關閉 markdown</string>
     <string name="command_description_clear_scalar_token">為了修復 Matrix 應用程式管理</string>
-
     <string name="room_tombstone_versioned_description">這個聊天室已被取代，且不再活躍</string>
     <string name="room_tombstone_continuation_link">對話在此繼續</string>
     <string name="room_tombstone_continuation_description">這個聊天示是其他對話的延續</string>
     <string name="room_tombstone_predecessor_link">點選這裡以檢視更舊的訊息</string>
-
     <string name="missing_permissions_error">因為沒有權限，此動作無法執行。</string>
     <plurals name="format_time_s">
         <item quantity="other">%d 秒</item>
@@ -900,61 +759,45 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <plurals name="format_time_d">
         <item quantity="other">%d 天</item>
     </plurals>
-
     <string name="room_participants_now">目前 %1$s</string>
     <string name="room_participants_ago">%1$s %2$s 前</string>
-
     <string name="room_participants_invite_join_names">"%1$s， "</string>
     <string name="room_participants_invite_join_names_and">%1$s 與 %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <plurals name="room_details_selected">
         <item quantity="other">%d 已選取</item>
     </plurals>
     <plurals name="group_members">
         <item quantity="other">%d 個成員</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="other">%d 個聊天室</item>
     </plurals>
     <string name="system_alerts_header">系統警告</string>
-
     <string name="resource_limit_exceeded_title">超過資源限制</string>
     <string name="resource_limit_contact_action">聯絡管理員</string>
-
     <string name="resource_limit_contact_admin">聯絡您的服務管理員</string>
-
     <string name="resource_limit_soft_default">此家伺服器已經超過其中一項資源限制，所以<b>有一些使用者將會無法登入</b>。</string>
     <string name="resource_limit_hard_default">此家伺服器已經超過其中一項資源限制。</string>
-
     <string name="resource_limit_soft_mau"> 此家伺服器已經達到了每月活躍使用者限制，所以<b>有一些使用者將會無法登入</b>。</string>
     <string name="resource_limit_hard_mau">此家伺服器已經達到其每月活躍使用者限制。</string>
-
     <string name="resource_limit_soft_contact">請 %s 以讓此限制增加。</string>
     <string name="resource_limit_hard_contact">請 %s 以繼續使用此服務。</string>
-
     <string name="dialog_title_error">錯誤</string>
-
     <string name="settings_lazy_loading_title">延遲載入聊天室成員</string>
     <string name="settings_lazy_loading_description">透過僅載入在第一次看到的地方的聊天室成員來增進效能。</string>
     <string name="error_lazy_loading_not_supported_by_home_server">您的家伺服器尚不支援延遲載入聊天室成員。請稍後再試。</string>
-
     <string name="unknown_error">抱歉，遇到錯誤</string>
-
     <string name="status_theme">Status.im 主題</string>
-
     <string name="room_sliding_menu_version_x">版本 %s</string>
     <string name="encryption_export_notice">請建立密語以加密您匯出的金鑰。您將需要輸入這些密語以匯入金鑰。</string>
     <string name="passphrase_create_passphrase">建立密語</string>
     <string name="passphrase_passphrase_does_not_match">密語必須符合</string>
     <string name="merged_events_expand">展開</string>
     <string name="merged_events_collapse">摺疊</string>
-
     <string name="call_anyway">無論如何都要通話</string>
     <string name="room_participants_action_kick">踢出</string>
     <string name="reason_hint">理由</string>
-
     <string name="settings_inline_url_preview_summary">當您的家伺服器支援此功能時在聊天中預覽連結。</string>
     <string name="settings_send_typing_notifs">傳送輸入通知</string>
     <string name="settings_send_typing_notifs_summary">讓其他使用者知道您正在輸入。</string>
@@ -969,30 +812,23 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_password">密碼</string>
     <string name="settings_labs_native_camera_summary">啟動系統相機而非自訂的相機畫面。</string>
     <string name="settings_labs_enable_send_voice_summary">這個選項需要第三方應用程式來錄製訊息。</string>
-
     <string name="command_problem_with_parameters">指令「%s」需要更多參數，或是有一些參數不正確。</string>
     <string name="markdown_has_been_enabled">Markdown 已啟用。</string>
     <string name="markdown_has_been_disabled">Markdown 已停用。</string>
-
     <string name="settings_info_area_show">顯示資訊區域</string>
     <string name="show_info_area_always">總是</string>
     <string name="show_info_area_messages_and_errors">訊息與錯誤</string>
     <string name="show_info_area_only_errors">僅錯誤</string>
-
     <string name="generic_label">%1$s：</string>
     <string name="generic_label_and_value">%1$s：%2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
-
     <string name="settings_call_category">通話</string>
     <string name="settings_call_ringtone_use_app_ringtone">為來電使用預設的 Element 鈴聲</string>
     <string name="settings_call_ringtone_title">來電鈴聲</string>
     <string name="settings_call_ringtone_dialog_title">選取通話鈴聲：</string>
-
     <string name="accept">接受</string>
-
     <string name="auth_accept_policies">請審閱並接受此家伺服器的政策：</string>
-
     <string name="settings_notification_troubleshoot">疑難排解通知</string>
     <string name="settings_troubleshoot_diagnostic">疑難排解診斷</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">執行測試</string>
@@ -1000,57 +836,47 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_troubleshoot_diagnostic_success_status">基本診斷正常。如果您仍然沒有收到通知，請遞交錯誤回報以協助我們調查原因。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">一個或更多的測試失敗，嘗試建議的修復。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">一個或更多的測試失敗，請遞交錯誤回報以協助我們調查原因。</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">系統設定。</string>
     <string name="settings_troubleshoot_test_system_settings_success">通知已在系統設定中啟用。</string>
     <string name="settings_troubleshoot_test_system_settings_failed">通知已在系統設定中停用。
 請檢查系統設定。</string>
     <string name="open_settings">開啟設定</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">帳號設定。</string>
     <string name="settings_troubleshoot_test_account_settings_success">通知已為您的帳號啟用。</string>
     <string name="settings_troubleshoot_test_account_settings_failed">通知已為您的帳號停用。
 \n請檢查帳號設定。</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">啟用</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">工作階段設定。</string>
     <string name="settings_troubleshoot_test_device_settings_success">通知已為此工作階段啟用。</string>
     <string name="settings_troubleshoot_test_device_settings_failed">此工作階段未啟用通知。
 \n請檢查 Element 設定。</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">啟用</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Play 服務檢查</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 服務 APK 可用且已為最新。</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element 使用 Google Play 服務來傳遞推送訊息，但它似乎並未正確設定：
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修復 Play 服務</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Firebase 權杖</string>
     <string name="settings_troubleshoot_test_fcm_success">成功擷取 FCM token：
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">擷取 FCM token 失敗：
 %1$s</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">註冊 token</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM token 成功註冊至家伺服器。</string>
     <string name="settings_troubleshoot_test_token_registration_failed">FCM token 註冊至家伺服器失敗：
 %1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">通知服務</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">通知服務正在執行。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">通知服務並未執行。
 嘗試重新啟動應用程式。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">啟動服務</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">通知服務自動重新啟動</string>
     <string name="settings_troubleshoot_test_service_restart_success">服務被自動砍除並重新啟動。</string>
     <string name="settings_troubleshoot_test_service_restart_failed">服務重新啟動失敗</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">開機時啟動</string>
     <string name="settings_troubleshoot_test_service_boot_success">服務將會在裝置重新啟動時自行啟動。</string>
     <string name="settings_troubleshoot_test_service_boot_failed">服務不會在裝置重心啟動時自行啟動，您將不能在 Element 開啟前收到通知。</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">啟用開機時啟動</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">檢查背景限制</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">背景限制已為 Element 停用。本測試應該使用行動數據執行（不是 WiFi）。
 %1$s</string>
@@ -1058,42 +884,31 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 應用程式要在背景執行的工作將被顏格限制，這可能會影響通知。
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">停用限制</string>
-
     <string name="settings_troubleshoot_test_battery_title">電池最佳化</string>
     <string name="settings_troubleshoot_test_battery_success">Element 不會被電池最佳化影響。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果使用者不為裝置充電，並讓其靜置一段時間，且將螢幕關閉，裝置將會進入 Doze 模式。這可能會導致應用程式無法存取網路，並延遲它們的工作、同步與標準警報。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略最佳化</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">背景連線</string>
     <string name="startup_notification_fdroid_battery_optim_message">Element 需要保持最低影響的背景連線以接收可靠的通知。
 在下一個畫面，您必須允許 Element 總是在背景執行，請接受。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予權限</string>
-
     <string name="account_email_error">當驗證您的電子郵件地址時遇到錯誤。</string>
-
     <string name="account_phone_number_error">當驗證您的手機號碼時遇到錯誤。</string>
     <string name="account_additional_info">額外資訊：%s</string>
-
     <string name="no_valid_google_play_services_apk">找不到有效的 Google Play 服務 APK。通知可能無法正常運作。</string>
-
     <string name="video_call_in_progress">視訊通話進行中……</string>
-
     <string name="title_activity_keys_backup_setup">金鑰備份</string>
     <string name="title_activity_keys_backup_restore">使用金鑰備份</string>
     <string name="keys_backup_is_not_finished_please_wait">金鑰備份尚未完成，請稍候……</string>
-
     <string name="skip">略過</string>
     <string name="done">完成</string>
-
     <string name="settings_notification_advanced">進階通知設定</string>
     <string name="settings_notification_by_event">活動通知重要程度</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">自訂設定。</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">注意，某些訊息類型會被設定為靜音（將會生成沒有音效的通知）。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">有一些通知在您的自訂設定中被停用了。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">載入自訂規則失敗，請重試。</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">檢查設定</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 這個錯誤並非 Element 所能控制，而是與 Google 有關，這個錯誤代表裝置註冊了太多使用 FCM 的應用程式。這個錯誤只會發生在有超大量的應用程式的裝置上，所以不應該影響一般的使用者。</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -1101,23 +916,17 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 這個錯誤並非 Element 所能控制。手機上沒有 Google 帳號。請開啟帳號管理員並新增一個 Google 帳號。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">新增帳號</string>
-
     <string name="settings_noisy_notifications_preferences">設定吵鬧的通知</string>
     <string name="settings_call_notifications_preferences">設定通話通知</string>
     <string name="settings_silent_notifications_preferences">設定安靜的通知</string>
     <string name="settings_system_preferences_summary">選擇 LED 顏色、震動、音效……</string>
-
-
     <string name="settings_cryptography_manage_keys">加密金鑰管理</string>
     <string name="encryption_settings_manage_message_recovery_summary">管理金鑰備份</string>
-
     <string name="notification_silent">安靜</string>
     <string name="passphrase_empty_error_message">請輸入通關密語</string>
     <string name="passphrase_passphrase_too_weak">通關密語太弱了</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">如果您想要讓 Element 生成復原金鑰的話，請刪除通關密語。</string>
     <string name="keys_backup_no_session_error">沒有可用的 Matrix 工作階段</string>
-
     <string name="keys_backup_setup_step1_title">永不遺失已加密的訊息</string>
     <string name="keys_backup_setup_step1_description">在加密聊天室裡的訊息是使用端到端加密。只有您和接收者有金鑰可以閱讀這些訊息。
 
@@ -1129,7 +938,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="recovery_key_export_saved_as_warning">復原金鑰已被儲存為「%s」。
 
 警告：如果應用程式被解除安裝的話，此檔案可能會被刪除。</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">請複製</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">分享復原金鑰與……</string>
     <string name="keys_backup_setup_step3_generating_key_status">正在使用通關密語生成復原金鑰，這個過程可能需要數秒鐘。</string>
@@ -1137,30 +945,22 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="unexpected_error">未預期的錯誤</string>
     <string name="keys_backup_setup_backup_started_title">備份已開始</string>
     <string name="keys_backup_setup_backup_started_message">您的加密金鑰現在已背景備份到您的家伺服器。初始備份可能需要數分鐘。</string>
-
-
     <string name="keys_backup_setup_skip_title">您確定嗎？</string>
     <string name="keys_backup_setup_skip_msg">如果您登出或遺失您的裝置的話，您可能會失去對您的訊息的存取權。</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">正在擷取……</string>
     <string name="keys_backup_restore_with_passphrase">使用您的復原通關密語以解鎖您的加密訊息歷史</string>
     <string name="keys_backup_restore_use_recovery_key">使用您的復原金鑰</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">不知道您的復原通關密語，您可以 %s。</string>
-
     <string name="keys_backup_restore_with_recovery_key">使用您的復原金鑰以解鎖您的加密訊息歷史</string>
     <string name="keys_backup_restore_key_enter_hint">輸入復原金鑰</string>
-
     <string name="keys_backup_restore_setup_recovery_key">訊息復原</string>
-
     <string name="keys_backup_restore_with_key_helper">遺失您的復原金鑰？您可以在設定中設定一個新的。</string>
     <string name="keys_backup_passphrase_error_decrypt">備份可能無法使用此通關密語解密：請驗證您是否輸入正確的復原通關密語。</string>
     <string name="network_error_please_check_and_retry">網路錯誤：請檢查您的連線並重試。</string>
-
     <string name="keys_backup_restoring_waiting_message">正在復原備份：</string>
     <string name="keys_backup_unlock_button">解鎖歷史紀錄</string>
     <string name="keys_backup_recovery_code_empty_error_message">請輸入復原金鑰</string>
     <string name="keys_backup_recovery_code_error_decrypt">備份可能無法使用此復原金鑰解密：請驗證您是否輸入正確的復原金鑰。</string>
-
     <string name="keys_backup_restore_success_title">備份已復原 %s！</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="other">使用 %d 金鑰復原備份。</item>
@@ -1168,19 +968,13 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="other">%d 新的金鑰已加入到此工作階段。</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">取得最新的復原金鑰版本 (%s0。</string>
     <string name="keys_backup_no_keysbackup_sdk_error">工作階段加密未啟用</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">自備份復原</string>
     <string name="keys_backup_settings_delete_backup_button">刪除備份</string>
-
     <string name="keys_backup_settings_status_ok">金鑰備份已為此工作階段正確設定。</string>
     <string name="keys_backup_settings_status_ko">金鑰備份未在此工作階段上啟用。</string>
     <string name="keys_backup_settings_status_not_setup">您的金鑰尚未從此工作階段中備份。</string>
-
-
     <string name="keys_backup_settings_signature_from_unknown_device">備份有從 ID %s 的未知工作階段而來的簽章。</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">備份有從此工作階段而來的有效簽章。</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">備份有從已驗證的 %s 工作階段而來的有效簽章。</string>
@@ -1188,13 +982,10 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_settings_invalid_signature_from_verified_device">備份有從已驗證的 %s 工作階段而來的無效簽章</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">備份有從未驗證的 %s 工作階段而來的無效簽章</string>
     <string name="keys_backup_get_trust_error">取得備份的信任資訊失敗 (%s)。</string>
-
     <string name="keys_backup_settings_deleting_backup">請刪除備份……</string>
     <string name="keys_backup_settings_delete_backup_error">刪除備份失敗 (%s)</string>
-
     <string name="keys_backup_settings_delete_confirm_title">刪除備份</string>
     <string name="keys_backup_settings_delete_confirm_message">要從伺服器刪除您已備份的加密金鑰？您將無法使用您的復原金鑰來讀取已加密的訊息歷史。</string>
-
     <string name="sign_out_bottom_sheet_warning_no_backup">如果您現在登出的話，您將會失去您的加密訊息</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">金鑰備份進行中。如果您現在登出，您將會失去您的加密訊息。</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">安全金鑰備份應該在您所有的工作階段中啟用以避免失去對您的加密訊息的存取權。</string>
@@ -1204,19 +995,15 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="are_you_sure">您確定嗎？</string>
     <string name="backup">備份</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">除非您在登出前備份您的金鑰，否則您將會失去對您的加密訊息的存取權。</string>
-
     <string name="stay">保留</string>
     <string name="abort">放棄</string>
-
     <string name="action_sign_out_confirmation_simple">您想要登出嗎？</string>
     <string name="settings_data_save_mode_summary">數據節省模式會套用特定的過濾器，這樣狀態更新與輸入通知就會被過濾掉。</string>
-
     <string name="encryption_message_recovery">加密訊息復原</string>
     <string name="error_empty_field_enter_user_name">請輸入使用者名稱。</string>
     <string name="keys_backup_setup">開始使用金鑰備份</string>
     <string name="keys_backup_setup_step1_advanced">（進階）</string>
     <string name="keys_backup_setup_step1_manual_export">手動匯出金鑰</string>
-
     <string name="keys_backup_setup_step2_text_title">以通關密語保護您的備份。</string>
     <string name="keys_backup_setup_step2_text_description">我們將會在您的家伺服器上儲存一份加密過的您的金鑰副本。使用通關密語保護您的備份以確保其安全。
 \n
@@ -1233,24 +1020,18 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_setup_step3_share_recovery_file">分享</string>
     <string name="keys_backup_banner_setup_line1">永遠不失去加密訊息</string>
     <string name="keys_backup_banner_setup_line2">開始使用金鑰備份</string>
-
     <string name="keys_backup_banner_recover_line1">永遠不失去加密訊息</string>
     <string name="keys_backup_banner_recover_line2">使用金鑰備份</string>
-
     <string name="keys_backup_banner_update_line1">新安全訊息金鑰</string>
     <string name="keys_backup_banner_update_line2">管理金鑰備份</string>
-
     <string name="keys_backup_banner_in_progress">正在備份金鑰……</string>
-
     <string name="keys_backup_info_keys_all_backup_up">所有金鑰都已備份</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="other">正在備份 %d 金鑰……</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">版本</string>
     <string name="keys_backup_info_title_algorithm">演算法</string>
     <string name="keys_backup_info_title_signature">簽章</string>
-
     <string name="keys_backup_settings_untrusted_backup">要在此工作階段上使用金鑰備份，現在就使用您的通關密語或復原金鑰復原。</string>
     <string name="new_recovery_method_popup_title">新的金鑰備份</string>
     <string name="new_recovery_method_popup_description">已偵測到新的安全訊息金鑰備份。
@@ -1261,23 +1042,19 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="keys_backup_restoring_downloading_backup_waiting_message">正在下載金鑰……</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">正在匯出金鑰……</string>
     <string name="ignore">忽略</string>
-
     <string name="auth_login_sso">使用單一登入系統登入</string>
     <string name="login_error_unknown_host">這個 URL 不可用，請檢查</string>
     <string name="login_error_ssl_handshake">您的裝置正在使用過期的 TLS 安全協定，容易遭受攻擊，為了您的安全將不會連線</string>
     <string name="settings_send_message_with_enter">使用 Enter 傳送訊息</string>
     <string name="settings_send_message_with_enter_summary">軟體鍵盤的 Enter 按鈕將會傳送訊息而非換行</string>
-
     <string name="settings_change_password_submit">更新密碼</string>
     <string name="settings_fail_to_update_password_invalid_current_password">密碼無效</string>
     <string name="passwords_do_not_match">密碼不符合</string>
-
     <string name="autodiscover_invalid_response">無效的家伺服器探索回應</string>
     <string name="autodiscover_well_known_autofill_dialog_title">自動完成伺服器選項</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element 偵測到您的 userId 網域「%1$s」有自訂的伺服器設定：
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">使用設定</string>
-
     <string name="notification_sync_init">正在初始化服務</string>
     <string name="settings_media">媒體</string>
     <string name="settings_default_compression">預設壓縮</string>
@@ -1285,7 +1062,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_default_media_source">預設媒體來源</string>
     <string name="media_source_choose">選擇</string>
     <string name="settings_play_shutter_sound">播放快門聲</string>
-
     <string name="action_mark_room_read">標示為已讀</string>
     <string name="settings_notification_privacy_no_background_sync">應用程式<b>不</b>需要在背景連線到家伺服器，它應該可以降低耗電量</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -1294,18 +1070,14 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <plurals name="notification_compat_summary_title">
         <item quantity="other">%d 個通知</item>
     </plurals>
-
     <string name="notification_unknown_new_event">新活動</string>
     <string name="notification_unknown_room_name">聊天室</string>
     <string name="notification_new_messages">新訊息</string>
     <string name="notification_new_invitation">新邀請</string>
     <string name="notification_sender_me">我</string>
     <string name="notification_inline_reply_failed">** 傳送失敗 - 請開啟聊天室</string>
-
     <string name="error_jitsi_not_supported_on_old_device">抱歉，使用 Jitsi 建立會議通話在舊裝置上並不支援（Android 系統版本小於 5.0 的裝置）</string>
-
     <string name="title_activity_verify_device">驗證工作階段</string>
-
     <string name="encryption_information_unknown_ip">未知的 IP</string>
     <string name="you_added_a_new_device_with_info">有新工作階段正在要求加密金鑰。 
 \n工作階段名稱：%1$s 
@@ -1315,45 +1087,36 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n工作階段名稱：%1$s 
 \n上次檢視：%2$s 
 \n如果您沒有登入其他工作階段，請忽略本請求。</string>
-
     <string name="start_verification_short_label">驗證</string>
     <string name="share_without_verifying_short_label">分享</string>
     <string name="key_share_request">金鑰分享請求</string>
     <string name="ignore_request_short_label">忽略</string>
-
     <string name="sas_verify_title">透過比較短文字字串來驗證。</string>
     <string name="sas_security_advise">為了最佳的安全性，我們建議您面對面或以其他可信的通訊方式執行此操作。</string>
     <string name="sas_verify_start_button_title">開始驗證</string>
     <string name="sas_incoming_request_title">傳來的驗證請求</string>
     <string name="sas_incoming_request_description">驗證此工作階段以將其標記為可信任。在使用端到端加密訊息時，信任夥伴的工作階段可以讓您更安心。</string>
     <string name="sas_incoming_request_description_2">驗證此工作階段會將其標記為可信任，同時也會在對方的裝置上將您的工作階段標記為可信任。</string>
-
     <string name="sas_emoji_description">透過確認出現在夥伴螢幕下方的顏文字來驗證此工作階段</string>
     <string name="sas_decimal_description">透過確認出現在夥伴螢幕下方的數字來驗證此工作階段</string>
-
     <string name="sas_incoming_verification_request_dialog">您已收到傳來的驗證請求。</string>
     <string name="sas_view_request_action">檢視請求</string>
     <string name="sas_waiting_for_partner">正在等待夥伴確認……</string>
-
     <string name="sas_verified">已驗證！</string>
     <string name="sas_verified_successful">您已成功驗證此工作階段。</string>
     <string name="sas_verified_successful_description">與此使用者的安全訊息是端到端加密，無法被第三方讀取。</string>
     <string name="sas_got_it">知道了</string>
-
     <string name="sas_verifying_keys">沒有出現東西嗎？不是所有客戶端都支援互動式驗證。使用舊版驗證方式。</string>
     <string name="sas_legacy_verification_button_title">使用舊版驗證方式。</string>
-
     <string name="sas_verification_request_notification_channel_title">金鑰驗證</string>
     <string name="sas_cancelled_dialog_title">請求已取消</string>
     <string name="sas_cancelled_by_other">其他夥伴已取消驗證。
 \n%s</string>
     <string name="sas_cancelled_by_me">驗證已取消。
 \n理由：%s</string>
-
     <string name="sas_verification_request_notification_channel">互動式工作階段驗證</string>
     <string name="sas_incoming_request_notif_title">驗證請求</string>
     <string name="sas_incoming_request_notif_content">%s 想要驗證您的工作階段</string>
-
     <string name="sas_error_m_user">使用者已取消驗證</string>
     <string name="sas_error_m_timeout">驗證程序逾時</string>
     <string name="sas_error_m_unknown_transaction">工作階段不知道該處理過程</string>
@@ -1365,23 +1128,18 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="sas_error_m_key_mismatch">金鑰不符合</string>
     <string name="sas_error_m_user_error">使用者不符合</string>
     <string name="sas_error_unknown">未知錯誤</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">您的家伺服器上已有備份</string>
     <string name="keys_backup_setup_override_backup_prompt_description">看起來您已經從其他工作階段設定金鑰備份了。您想要用您正在建立的這個來取代它嗎？</string>
     <string name="keys_backup_setup_override_replace">取代</string>
     <string name="keys_backup_setup_override_stop">停止</string>
-
     <string name="keys_backup_settings_checking_backup_state">正在檢查備份狀態</string>
     <string name="invalid_or_expired_credentials">您已經因為無效或過期的憑證而登出。</string>
-
     <string name="edit">編輯</string>
     <string name="reply">回覆</string>
-
     <string name="global_retry">重試</string>
     <string name="room_list_empty">加入聊天室以開始使用應用程式。</string>
     <string name="send_you_invite">傳送給您邀請</string>
     <string name="invited_by">由 %s 邀請</string>
-
     <string name="room_list_catchup_empty_title">您都看完了！</string>
     <string name="room_list_catchup_empty_body">您已經沒有未讀的訊息了</string>
     <string name="room_list_catchup_welcome_title">歡迎回家！</string>
@@ -1390,19 +1148,15 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="room_list_people_empty_body">您的直接訊息對話將會在此顯示</string>
     <string name="room_list_rooms_empty_title">聊天室</string>
     <string name="room_list_rooms_empty_body">您的聊天室將會在此顯示</string>
-
     <string name="title_activity_emoji_reaction_picker">反應</string>
     <string name="reactions_agree">同意</string>
     <string name="reactions_like">喜歡</string>
     <string name="message_add_reaction">新增反應</string>
     <string name="message_view_reaction">檢視反應</string>
     <string name="reactions">反應</string>
-
     <string name="event_redacted_by_user_reason">由使用者刪除的活動</string>
     <string name="event_redacted_by_admin_reason">由聊天室管理員審核的活動</string>
     <string name="last_edited_info_message">最後編輯由 %1$s 於 %2$s</string>
-
-
     <string name="malformed_message">活動格式錯誤，無法顯示</string>
     <string name="create_new_room">建立新聊天室</string>
     <string name="error_no_network">沒有網路。請檢查您的網路連線。</string>
@@ -1410,13 +1164,10 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="change_room_directory_network">變更網路</string>
     <string name="please_wait">請稍候……</string>
     <string name="group_all_communities">所有社群</string>
-
     <string name="room_preview_no_preview">無法預覽此聊天室</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Element 尚不支援預覽所有人皆可讀的聊天室</string>
-
     <string name="fab_menu_create_room">聊天室</string>
     <string name="fab_menu_create_chat">直接訊息</string>
-
     <string name="create_room_title">新聊天室</string>
     <string name="create_room_action_create">建立</string>
     <string name="create_room_name_hint">聊天室名稱</string>
@@ -1424,18 +1175,13 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="create_room_public_description">任何人都可以加入此聊天室</string>
     <string name="create_room_directory_title">聊天室目錄</string>
     <string name="create_room_directory_description">將此聊天室公開於聊天室目錄中</string>
-
     <string name="keys_backup_unable_to_get_trust_info">取得信任資訊時發生錯誤</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">取得金鑰備份資料時發生錯誤</string>
-
     <string name="import_e2e_keys_from_file">從檔案「%1$s」匯入 e2e 金鑰。</string>
-
     <string name="settings_sdk_version">Matrix SDK 版本</string>
     <string name="settings_other_third_party_notices">其他第三方提醒</string>
     <string name="navigate_to_room_when_already_in_the_room">您已在檢視此聊天室了！</string>
-
     <string name="quick_reactions">快速反應</string>
-
     <string name="settings_general_title">一般</string>
     <string name="settings_preferences">偏好設定</string>
     <string name="settings_security_and_privacy">安全與隱私</string>
@@ -1443,94 +1189,67 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_push_rules">推送規則</string>
     <string name="settings_push_rules_no_rules">未定義通送規則</string>
     <string name="settings_push_gateway_no_pushers">沒有已註冊的推送閘道</string>
-
     <string name="push_gateway_item_app_id">app_id：</string>
     <string name="push_gateway_item_push_key">push_key：</string>
     <string name="push_gateway_item_app_display_name">app_display_name：</string>
     <string name="push_gateway_item_device_name">session_name：</string>
     <string name="push_gateway_item_url">Url：</string>
     <string name="push_gateway_item_format">格式：</string>
-
     <string name="preference_voice_and_video">音訊與視訊</string>
     <string name="preference_root_help_about">說明與關於</string>
-
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">註冊代符</string>
-
     <string name="send_suggestion">建議</string>
     <string name="send_suggestion_content">請在下面編寫您的建議。</string>
     <string name="send_suggestion_report_placeholder">在此描述您的建議</string>
     <string name="send_suggestion_sent">感謝，建議已成功傳送</string>
     <string name="send_suggestion_failed">建議傳送失敗 (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">在時間軸中顯示隱藏的活動</string>
-
     <string name="bottom_action_people_x">直接訊息</string>
-
     <string name="send_file_step_idle">正在等待……</string>
     <string name="send_file_step_encrypting_thumbnail">正在加密縮圖……</string>
     <string name="send_file_step_sending_thumbnail">正在傳送縮圖 (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">正在加密檔案……</string>
     <string name="send_file_step_sending_file">正在傳送檔案 (%1$s / %2$s)</string>
-
     <string name="downloading_file">正在下載檔案 %1$s……</string>
     <string name="downloaded_file">檔案 %1$s 已下載！</string>
-
     <string name="edited_suffix">（已編輯）</string>
-
-
     <string name="message_edits">訊息編輯</string>
     <string name="no_message_edits_found">找不到編輯</string>
-
     <string name="room_filtering_filter_hint">過濾對話……</string>
     <string name="room_filtering_footer_title">找不到您要尋找的東西？</string>
     <string name="room_filtering_footer_create_new_room">建立新聊天室</string>
     <string name="room_filtering_footer_create_new_direct_message">傳送新直接訊息</string>
     <string name="room_filtering_footer_open_room_directory">檢視聊天室目錄</string>
-
     <string name="room_directory_search_hint">名稱或 ID (#example:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">啟用滑動以在時間軸上回覆</string>
-
     <string name="link_copied_to_clipboard">連結已複製到剪貼簿</string>
-
     <string name="settings_integration_manager">整合管理員</string>
-
     <string name="integration_manager_not_configured">未設定整合管理員。</string>
     <string name="add_by_matrix_id">透過 matrix ID 新增</string>
     <string name="creating_direct_room">正在建立聊天室……</string>
     <string name="direct_room_no_known_users">找不到結果，在伺服器上使用透過 matrix ID 新增。</string>
     <string name="direct_room_start_search">開始輸入以取得結果</string>
     <string name="direct_room_filter_hint">透過使用者名稱或 ID 過濾……</string>
-
     <string name="joining_room">正在加入聊天室……</string>
-
     <string name="message_view_edit_history">檢視編輯歷史</string>
-
     <string name="review">審閱</string>
     <string name="decline">婉拒</string>
-
     <string name="widget_integration_review_terms">要繼續，您必須接受此服務的條款。</string>
-
     <string name="terms_of_service">服務條款</string>
     <string name="review_terms">審閱條款</string>
     <string name="terms_description_for_identity_server">可被其他人探索</string>
     <string name="terms_description_for_integration_manager">使用機器人、橋接、小工具與貼紙包</string>
-
     <string name="read_at">閱讀於</string>
-
     <string name="none">無</string>
     <string name="revoke">撤銷</string>
     <string name="disconnect">斷線</string>
     <string name="people_no_identity_server">未設定身份識別伺服器。</string>
-
     <string name="call_failed_no_ice_title">因為錯誤設定的伺服器導致通話失敗</string>
     <string name="call_failed_no_ice_description">請要求您家伺服器 (%1$s) 的管理員設定 TURN 伺服器以讓通話正常運作。
 \n
 \n或者您也可以試用看看位於 %2$s 的公開伺服器，但這可能不太可靠，而且也會將您的 IP 位置與伺服器分享。您也可以在設定中管理這個。</string>
     <string name="call_failed_no_ice_use_alt">嘗試使用 %s</string>
     <string name="call_failed_dont_ask_again">不要再問我</string>
-
     <string name="auth_add_email_message_2">設定電子郵件以供帳號復原，然後就可以讓認識您的人選擇性探索到您。</string>
     <string name="auth_add_phone_message_2">設定電話，然後就可以讓認識您的人選擇性探索到您。</string>
     <string name="auth_add_email_phone_message_2">設定電子郵件以供帳號復原。然後就可以讓認識您的人用電子郵件或電話選擇性探索到您。</string>
@@ -1549,8 +1268,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_background_fdroid_sync_mode_disabled">無背景同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">當應用程式在背景時，您將不會收到訊息通知。</string>
     <string name="settings_background_sync_update_error">更新設定失敗。</string>
-
-
     <string name="settings_set_workmanager_delay">偏好同步間隔</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \n取決於資源（電池）或裝置狀態（休眠），同步可能會被延遲。</string>
@@ -1560,9 +1277,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="device_name_warning">工作階段的公開名稱對您通訊的對象可見</string>
     <string name="identity_server_not_defined">您未使用任何身份識別伺服器</string>
     <string name="identity_server_not_defined_for_password_reset">未設定身份識別伺服器，這在重設您的密碼時是必要的。</string>
-
     <string name="error_user_already_logged_in">看起來您正在嘗試連線到其它家伺服器。您想要登出嗎？</string>
-
     <string name="identity_server">身份識別伺服器</string>
     <string name="disconnect_identity_server">取消連線到身份識別伺服器</string>
     <string name="add_identity_server">設定身份識別伺服器</string>
@@ -1576,27 +1291,19 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_discovery_msisdn_title">可探索的電話號碼</string>
     <string name="settings_discovery_confirm_mail">我們將會傳送確認電子郵件到 %s 給您，請檢查您的電子郵件並在確認連結上點選</string>
     <string name="settings_discovery_mail_pending">擱置中</string>
-
     <string name="settings_discovery_enter_identity_server">輸入身份識別伺服器 URL</string>
     <string name="settings_discovery_bad_identity_server">無法連線到身份識別伺服器</string>
     <string name="settings_discovery_please_enter_server">請輸入身份識別伺服器 URL</string>
     <string name="settings_discovery_no_terms_title">身份識別伺服器無服務條款</string>
     <string name="settings_discovery_no_terms">您選擇的身份識別伺服器沒有任何服務條款。僅在您信任服務擁有者時才繼續</string>
     <string name="settings_text_message_sent">文字訊息已傳送給 %s。請輸入其中包含的驗證碼。</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">您目前正在身份識別伺服器 %1$s 上分享電子郵件地址或電話號碼。您將必須重新連線到 %2$s 以停止分享它們。</string>
     <string name="settings_agree_to_terms">同意身份識別伺服器 (%s) 的服務條款以允許您被透過電子郵件地址或電話號碼探索。</string>
-
     <string name="labs_allow_extended_logging">啟用詳細紀錄。</string>
     <string name="labs_allow_extended_logging_summary">詳細紀錄可以協助開發者在您傳送憤怒搖晃時取得更多紀錄。即使啟用這個設定，應用程式依然不會紀錄訊息內容或任何個人資料。</string>
-
-
     <string name="error_terms_not_accepted">請在您接受您家伺服器的條款與條件前繼續重試。</string>
-
     <string name="error_network_timeout">看起來伺服器回應時間似乎太久了，這可能是不良的網路連線或伺服器錯誤所造成。請稍後再試。</string>
-
     <string name="send_attachment">傳送附件</string>
-
     <string name="a11y_open_drawer">開啟導航選單</string>
     <string name="a11y_create_menu_open">開啟建立聊天室選單</string>
     <string name="a11y_create_menu_close">關閉建立聊天室選單……</string>
@@ -1606,16 +1313,13 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="a11y_show_password">顯示密碼</string>
     <string name="a11y_hide_password">隱藏密碼</string>
     <string name="a11y_jump_to_bottom">跳到底部</string>
-
     <string name="three_users_read">%1$s、%2$s 與 %3$s 已閱讀</string>
     <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
     <string name="one_user_read">%s 已閱讀</string>
     <plurals name="fallback_users_read">
         <item quantity="other">%d 個使用者已閱讀</item>
     </plurals>
-
     <string name="error_file_too_big">檔案「%1$s」(%2$s) 太大無法上傳。限制為 %3$s。</string>
-
     <string name="error_attachment">在擷取附件時遇到錯誤。</string>
     <string name="attachment_type_file">檔案</string>
     <string name="attachment_type_contact">聯絡人</string>
@@ -1624,7 +1328,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="attachment_type_gallery">相簿</string>
     <string name="attachment_type_sticker">貼圖</string>
     <string name="error_handling_incoming_share">無法處理分享資料</string>
-
     <string name="report_content_spam">垃圾訊息</string>
     <string name="report_content_inappropriate">不合適</string>
     <string name="report_content_custom">自訂回報……</string>
@@ -1632,33 +1335,26 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="report_content_custom_hint">回報此內容的理由</string>
     <string name="report_content_custom_submit">回報</string>
     <string name="block_user">忽略使用者</string>
-
     <string name="content_reported_title">內容已回報</string>
-    <string name="content_reported_content">此內容已回報。
-\n
-\n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
+    <string name="content_reported_content">此內容已回報。 
+\n 
+\n如果您不想要看到從此使用者而來的更多內容，您可以忽略他們以隱藏他們的訊息。</string>
     <string name="content_reported_as_spam_title">回報為垃圾訊息</string>
-    <string name="content_reported_as_spam_content">此內容已被回報為垃圾訊息。
-\n
-\n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
+    <string name="content_reported_as_spam_content">此內容已被回報為垃圾訊息。 
+\n 
+\n如果您不想要看到從此使用者而來的更多內容，您可以忽略他們以隱藏他們的訊息。</string>
     <string name="content_reported_as_inappropriate_title">回報為不合適</string>
-    <string name="content_reported_as_inappropriate_content">此內容已被回報為不合適。
-\n
-\n如果您不想要看到從此使用者而來的更多內容，您可以封鎖他以隱藏他的訊息</string>
-
+    <string name="content_reported_as_inappropriate_content">此內容已被回報為不合適。 
+\n 
+\n如果您不想要看到從此使用者而來的更多內容，您可以忽略他們以隱藏他們的訊息。</string>
     <string name="permissions_rationale_msg_keys_backup_export">Element 需要權限以在磁碟上儲存您的 E2E 金鑰。
 \n
 \n請在下個彈出視窗中允許存取以讓您可以手動匯出您的金鑰。</string>
-
     <string name="no_network_indicator">目前沒有網路連線</string>
-
     <string name="resources_script">Latn</string>
-
     <string name="settings_add_3pid_confirm_password_title">確認您的密碼</string>
     <string name="settings_add_3pid_flow_not_supported">您無法在行動裝置上的 Element 做這件事</string>
     <string name="settings_add_3pid_authentication_needed">需要驗證</string>
-
-
     <string name="settings_integrations">整合</string>
     <string name="settings_integrations_summary">使用整合管理員以管理機器人、橋接、小工具與貼紙包。
 \n整合管理員可以代表您接收設定資料，調整小工具、傳送聊天室邀請並設定權力等級。</string>
@@ -1673,25 +1369,20 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="room_widget_reload">重新載入小工具</string>
     <string name="room_widget_open_in_browser">在瀏覽器中開啟</string>
     <string name="room_widget_revoke_access">撤銷我的存取權限</string>
-
     <string name="room_widget_permission_display_name">您的顯示名稱</string>
     <string name="room_widget_permission_avatar_url">您的大頭貼 URL</string>
     <string name="room_widget_permission_user_id">您的使用者 ID</string>
     <string name="room_widget_permission_theme">您的佈景主題</string>
     <string name="room_widget_permission_widget_id">小工具 ID</string>
     <string name="room_widget_permission_room_id">聊天室 ID</string>
-
-
     <string name="room_widget_resource_permission_title">此小工具想要使用下列資源：</string>
     <string name="room_widget_resource_grant_permission">允許</string>
     <string name="room_widget_resource_decline_permission">阻擋所有</string>
     <string name="room_widget_webview_access_camera">使用相機</string>
     <string name="room_widget_webview_access_microphone">使用麥克風</string>
     <string name="room_widget_webview_read_protected_media">讀取 DRM 保護的媒體</string>
-
     <string name="login_error_no_homeserver_found">這不是有效的 Matrix 伺服器位置</string>
     <string name="message_ignore_user">忽略使用者</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">所有訊息（吵雜）</string>
     <string name="room_list_quick_actions_notifications_all">所有訊息</string>
     <string name="room_list_quick_actions_notifications_mentions">僅提及</string>
@@ -1702,22 +1393,16 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="command_description_spoiler">傳送為擾亂者指定的訊息</string>
     <string name="spoiler">擾亂者</string>
     <string name="reaction_search_type_hint">輸入關鍵字以尋找反應。</string>
-
     <string name="no_ignored_users">您未忽略任何使用者</string>
-
     <string name="help_long_click_on_room_for_more_options">長按聊天室以檢視更多選項</string>
-
-
     <string name="room_join_rules_public">%1$s 將聊天室設為公開給所有知道連結的人。</string>
     <string name="room_join_rules_invite">%1$s 將聊天室設為僅邀請可進入。</string>
     <string name="timeline_unread_messages">未讀訊息</string>
-
     <string name="login_splash_title">這是您的通訊。您才是所有者。</string>
     <string name="login_splash_text1">直接或在群組中與夥伴們聊天</string>
     <string name="login_splash_text2">透過加密讓對話保持隱密</string>
     <string name="login_splash_text3">擴展並自訂您的體驗</string>
     <string name="login_splash_submit">開始</string>
-
     <string name="login_server_title">選取伺服器</string>
     <string name="login_server_text">就像電子郵件，帳號也有一個家，不過您還是可以跟任何人交談</string>
     <string name="login_server_matrix_org_text">在最大的公開伺服器上免費加入數百萬人之中</string>
@@ -1725,7 +1410,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_server_modular_learn_more">了解更多</string>
     <string name="login_server_other_title">其他</string>
     <string name="login_server_other_text">自訂與進階設定</string>
-
     <string name="login_continue">繼續</string>
     <string name="login_connect_to">連線到 %1$s</string>
     <string name="login_connect_to_modular">連線到 Element Matrix Services</string>
@@ -1734,13 +1418,11 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_signup">註冊</string>
     <string name="login_signin">登入</string>
     <string name="login_signin_sso">以 SSO 繼續</string>
-
     <string name="login_server_url_form_modular_hint">Element Matrix Services 位置</string>
     <string name="login_server_url_form_other_hint">位置</string>
     <string name="login_server_url_form_modular_text">組織有專業主機</string>
     <string name="login_server_url_form_modular_notice">輸入 Modular Element 或您想要使用的伺服器位置</string>
     <string name="login_server_url_form_other_notice">輸入您想要連線的伺服器或 Element 的位置</string>
-
     <string name="login_sso_error_message">載入頁面時發生錯誤：%1$s (%2$d)</string>
     <string name="login_mode_not_supported">應用程式無法登入此家伺服器。家伺服器支援以下登入類型：%1$s。
 \n
@@ -1749,58 +1431,46 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_registration_not_supported">應用程式無法在此家伺服器上建立帳號。
 \n
 \n您想要使用網路客戶端註冊嗎？</string>
-
     <string name="login_login_with_email_error">此電子郵件未關聯到任何帳號。</string>
-
     <string name="login_reset_password_on">在 %1$s 上重設密碼</string>
     <string name="login_reset_password_notice">驗證郵件已傳送到您的收件匣以確認您要設定新密碼。</string>
     <string name="login_reset_password_submit">下一步</string>
     <string name="login_reset_password_email_hint">電子郵件</string>
     <string name="login_reset_password_password_hint">新密碼</string>
-
     <string name="login_reset_password_warning_title">警告！</string>
     <string name="login_reset_password_warning_content">變更您的密碼將會重設在您所有工作階段中任何的端到端加密金鑰，讓已加密的聊天歷史無法讀取。請在重設您的密碼前從其他工作階段設定金鑰備份或匯出您的聊天室金鑰。</string>
     <string name="login_reset_password_warning_submit">繼續</string>
-
     <string name="login_reset_password_error_not_found">此電子郵件未被連結到任何帳號</string>
-
     <string name="login_reset_password_mail_confirmation_title">檢查您的收件匣</string>
     <string name="login_reset_password_mail_confirmation_notice">驗證電子郵件已傳送至 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">輕點連結以確認您的新密碼。在您使用了其中包含的連結後，請點擊下方。</string>
     <string name="login_reset_password_mail_confirmation_submit">我已經驗證了我的電子郵件地址</string>
-
     <string name="login_reset_password_success_title">成功！</string>
     <string name="login_reset_password_success_notice">您的密碼已被重設。</string>
     <string name="login_reset_password_success_notice_2">您已登出所有工作階段，且不會再收到推播通知。要重新啟用通知，請在裝置上再次登入。</string>
     <string name="login_reset_password_success_submit">返回登入</string>
-
     <string name="login_reset_password_cancel_confirmation_title">警告</string>
     <string name="login_reset_password_cancel_confirmation_content">您的密碼未變更。
 \n
 \n停止密碼變更流程？</string>
-
     <string name="login_set_email_title">設定電子郵件地址</string>
     <string name="login_set_email_notice">設定電子郵件以復原您的帳號。之後您也可以選擇性地讓您認識的人透過您的電子郵件找到您。</string>
     <string name="login_set_email_mandatory_hint">電子郵件</string>
     <string name="login_set_email_optional_hint">電子郵件（選擇性）</string>
     <string name="login_set_email_submit">下一個</string>
-
     <string name="login_set_msisdn_title">設定電話號碼</string>
     <string name="login_set_msisdn_notice">設定電話號碼以讓您認識的人找到您。</string>
     <string name="login_set_msisdn_notice2">請使用國際格式。</string>
     <string name="login_set_msisdn_mandatory_hint">電話號碼</string>
     <string name="login_set_msisdn_optional_hint">電話號碼（選擇性）</string>
     <string name="login_set_msisdn_submit">下一個</string>
-
     <string name="login_msisdn_confirm_title">確認電話號碼</string>
     <string name="login_msisdn_confirm_notice">我們剛傳送了驗證碼給 %1$s。在下方輸入以驗證是您。</string>
     <string name="login_msisdn_confirm_hint">輸入驗證碼</string>
     <string name="login_msisdn_confirm_send_again">再次傳送</string>
     <string name="login_msisdn_confirm_submit">下一個</string>
-
     <string name="login_msisdn_error_not_international">國際電話號碼必須以加號開頭</string>
     <string name="login_msisdn_error_other">電話號碼似乎無效。請檢查</string>
-
     <string name="login_signup_to">註冊至 %1$s</string>
     <string name="login_signin_username_hint">使用者名稱或電子郵件</string>
     <string name="login_signup_password_hint">密碼</string>
@@ -1810,26 +1480,21 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_signup_cancel_confirmation_content">尚未建立您的帳號。
 \n
 \n停止註冊程序？</string>
-
     <string name="login_a11y_choose_matrix_org">選取 matrix.org</string>
     <string name="login_a11y_choose_modular">選取 Element Matrix Services</string>
     <string name="login_a11y_choose_other">選取自訂的家伺服器</string>
     <string name="login_a11y_captcha_container">請執行 captcha 挑戰</string>
     <string name="login_terms_title">接受條款以繼續</string>
-
     <string name="login_wait_for_email_title">請檢查您的電子郵件</string>
     <string name="login_wait_for_email_notice">我們剛傳送電子郵件給 %1$s。
 \n請點擊其中所包含的連結以繼續建立帳號。</string>
     <string name="login_validation_code_is_not_correct">輸入的驗證碼不正確。請檢查。</string>
     <string name="login_error_outdated_homeserver_title">未更新的家伺服器</string>
     <string name="login_error_outdated_homeserver_content">此家伺服器所執行的版本太舊，所以無法連線。請要求您的家伺服器管理員升級。</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="other">傳送了太多請求。您可以在 %1$d 秒後重試……</item>
     </plurals>
-
     <string name="seen_by">檢視由</string>
-
     <string name="signed_out_title">您已登出</string>
     <string name="signed_out_notice">這可能有多種原因： 
 \n 
@@ -1839,7 +1504,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n 
 \n• 您伺服器的管理員為了安全性讓您的存取無效。</string>
     <string name="signed_out_submit">再次登入</string>
-
     <string name="soft_logout_title">您已登出</string>
     <string name="soft_logout_signin_title">登入</string>
     <string name="soft_logout_signin_notice">您的家伺服器 (%1$s) 管理員已將您的帳號 %2$s (%3$s) 登出。</string>
@@ -1851,7 +1515,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n
 \n如果您已不想使用此裝置，請將其清除，或是登入到其他帳號。</string>
     <string name="soft_logout_clear_data_submit">清除所有資料</string>
-
     <string name="soft_logout_clear_data_dialog_title">清除資料</string>
     <string name="soft_logout_clear_data_dialog_content">清除目前儲存在此裝置上的所有資料嗎？
 \n再次登入以存取您的帳號資料與訊息。</string>
@@ -1859,12 +1522,9 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="soft_logout_clear_data_dialog_submit">清除資料</string>
     <string name="soft_logout_sso_not_same_user_error">使用者 %1$s 目前的工作階段與您提供的使用者 %2$s 憑證。Element 並不支援。
 \n請先清除您的資料，然後再以其他帳號登入。</string>
-
     <string name="permalink_malformed">您的 matrix.to 連結格式錯誤</string>
     <string name="bug_report_error_too_short">描述太短了</string>
-
     <string name="notification_initial_sync">初始化同步……</string>
-
     <string name="settings_show_devices_list">檢視我的所有工作階段</string>
     <string name="settings_advanced_settings">進階設定</string>
     <string name="settings_developer_mode">開發者模式</string>
@@ -1876,25 +1536,19 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings">設定</string>
     <string name="devices_current_device">目前的工作階段</string>
     <string name="devices_other_devices">其他工作階段</string>
-
     <string name="autocomplete_limited_results">僅顯示第一個結果，輸入更多字母……</string>
-
     <string name="settings_developer_mode_fail_fast_title">快速失敗</string>
     <string name="settings_developer_mode_fail_fast_summary">在發生非預期的錯誤時，Element 可能更常當機</string>
     <string name="command_description_shrug">"將  ¯\\_(ツ)_/¯ 附加到純文字訊息中"</string>
-
     <string name="create_room_encryption_title">啟用加密</string>
     <string name="create_room_encryption_description">加密一旦啟用就無法停用。</string>
-
     <string name="login_error_threepid_denied">您的電子郵件網域無法在此伺服器上註冊</string>
-
     <string name="verification_conclusion_warning">未受信任的登入</string>
     <string name="verification_sas_match">它們相符</string>
     <string name="verification_sas_do_not_match">它們不相符</string>
     <string name="verify_user_sas_emoji_help_text">透過驗證以下出現在他們的畫面上獨一無二的顏文字是否有相同的順序來驗證使用者。</string>
     <string name="verify_user_sas_emoji_security_tip">為了得到最佳的安全性，使用其他受信任的通訊方式或面對面來進行。</string>
     <string name="verification_green_shield">尋找綠色盾牌以確保使用者受信任。信任所有聊天室中的使用者來確保聊天室是安全的。</string>
-
     <string name="verification_conclusion_not_secure">不安全</string>
     <string name="verification_conclusion_compromised">以下的其中一項可能會受到威脅：
 \n
@@ -1902,12 +1556,10 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n- 您正在驗證的使用者連線的家伺服器
 \n- 您的或其他使用者的網際網路連線
 \n- 您的或其他使用者的裝置</string>
-
     <string name="sent_a_video">影片。</string>
     <string name="sent_an_image">圖片。</string>
     <string name="sent_an_audio_file">音訊</string>
     <string name="sent_a_file">檔案</string>
-
     <string name="verification_request_waiting">正在等待……</string>
     <string name="verification_request_other_cancelled">%s 已取消</string>
     <string name="verification_request_you_cancelled">您已取消</string>
@@ -1915,25 +1567,17 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="verification_request_you_accepted">您已接受</string>
     <string name="verification_sent">已傳送驗證</string>
     <string name="verification_request">驗證請求</string>
-
-
     <string name="verification_verify_device">驗證此工作階段</string>
     <string name="verification_verify_device_manually">手動驗證</string>
-
     <string name="you">您</string>
-
     <string name="verification_scan_notice">掃描其他使用者裝置的條碼以安全地相互驗證</string>
     <string name="verification_scan_their_code">掃描他們的條碼</string>
     <string name="verification_scan_emoji_title">無法掃描</string>
     <string name="verification_scan_emoji_subtitle">如果您無法面對面進行，請用比較顏文字代替</string>
-
     <string name="verification_no_scan_emoji_title">透過比較顏文字驗證</string>
-
     <string name="verify_by_emoji_title">透過顏文字驗證</string>
     <string name="verify_by_emoji_description">如果您無法掃描上面的條碼，請比較一小段獨一無二的顏文字來驗證。</string>
-
     <string name="a13n_qr_code_description">QR code 圖片</string>
-
     <string name="verification_verify_user">驗證 %s</string>
     <string name="verification_verified_user">已驗證 %s</string>
     <string name="verification_request_waiting_for">正在等待驗證 %s……</string>
@@ -1955,54 +1599,38 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="room_profile_section_more_uploads">上傳</string>
     <string name="room_profile_section_more_leave">離開聊天室</string>
     <string name="room_profile_leaving_room">正在離開聊天室……</string>
-
     <string name="room_member_power_level_admins">管理員</string>
     <string name="room_member_power_level_moderators">板主</string>
     <string name="room_member_power_level_custom">自訂</string>
     <string name="room_member_power_level_invites">邀請</string>
     <string name="room_member_power_level_users">使用者</string>
-
     <string name="room_member_power_level_admin_in">%1$s 中的管理員</string>
     <string name="room_member_power_level_moderator_in">%1$s 中的板主</string>
     <string name="room_member_power_level_custom_in">%2$s 中的自訂 (%1$d)</string>
-
     <string name="room_member_jump_to_read_receipt">跳至讀取回條</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element 無法處理類型為「%1$s」的事件</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element 無法處理類型為「%1$s」的訊息</string>
     <string name="rendering_event_error_exception">在彩現 id「%1$s」事件的內容時，Element 遇到問題</string>
-
     <string name="unignore">取消忽略</string>
-
     <string name="verify_cannot_cross_sign">此工作階段無法與您其他的工作階段分享此驗證。
 \n驗證將會儲存在本機並在未來版本的應用程式中共享。</string>
-
     <string name="room_list_sharing_header_recent_rooms">最近的聊天室</string>
     <string name="room_list_sharing_header_other_rooms">其他聊天室</string>
-
     <string name="command_description_rainbow">將指定的訊息以彩虹的方式上色後傳送</string>
     <string name="command_description_rainbow_emote">將指定的表情符號以彩虹的方式上色後傳送</string>
-
     <string name="settings_category_timeline">時間軸</string>
-
     <string name="settings_category_composer">訊息編輯器</string>
-
     <string name="room_settings_enable_encryption">啟用端到端加密</string>
     <string name="room_settings_enable_encryption_warning">一旦啟用加密就無法停用。</string>
-
     <string name="room_settings_enable_encryption_dialog_title">啟用加密？</string>
     <string name="room_settings_enable_encryption_dialog_content">一旦啟用對聊天室的加密就無法停用。傳送到已加密聊天室的訊息無法被伺服器看見，僅有聊天室的參與者可見。啟用加密可能會讓許多機器人與橋接無法運作。</string>
     <string name="room_settings_enable_encryption_dialog_submit">啟用加密</string>
-
     <string name="verification_request_notice">要確定安全，請透過一次性的代碼驗證 %s。</string>
     <string name="verification_request_start_notice">要確定安全，請面對面進行或使用其他方式來通訊。</string>
-
     <string name="verification_emoji_notice">比較獨一無二的顏文字，並確保它們以相同的順序出現。</string>
     <string name="verification_code_notice">以其中一方的畫面上顯示的代碼與其他使用者的畫面比較。</string>
     <string name="verification_conclusion_ok_notice">與此使用者的訊息是端到端加密的，無法被第三方讀取。</string>
     <string name="verification_conclusion_ok_self_notice">您的新工作階段已被驗證。其已存取您已加密的訊息，其他使用者也會看到其已受信任。</string>
-
-
     <string name="encryption_information_cross_signing_state">交叉簽署</string>
     <string name="encryption_information_dg_xsigning_complete">交叉簽署已啟用
 \n私鑰在裝置上。</string>
@@ -2012,52 +1640,36 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="encryption_information_dg_xsigning_not_trusted">交叉簽署已啟用。
 \n金鑰未受信任</string>
     <string name="encryption_information_dg_xsigning_disabled">交叉簽署未啟用</string>
-
-
     <string name="settings_active_sessions_list">活躍的工作階段</string>
     <string name="settings_active_sessions_show_all">顯示所有工作階段</string>
     <string name="settings_active_sessions_manage">管理工作階段</string>
     <string name="settings_active_sessions_signout_device">登出此工作階段</string>
-
     <string name="settings_failed_to_get_crypto_device_info">無可用的密碼學資訊</string>
-
     <string name="settings_active_sessions_verified_device_desc">因為您已驗證此工作階段，所以其在安全通訊上是可受信任的：</string>
     <string name="settings_active_sessions_unverified_device_desc">驗證此工作階段以將其標記為受信任並讓其可以存取已加密的訊息。如果您並未登入此工作階段，您的帳號可能已被盜用：</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d 活躍的工作階段</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">驗證此登入</string>
     <string name="crosssigning_other_user_not_trust">其他使用者可能不會信任它</string>
     <string name="complete_security">全面的安全性</string>
-
     <string name="verification_open_other_to_verify">使用既有的工作階段來驗證這個，讓它可以存取已加密的訊息。</string>
-
-
     <string name="verification_profile_verify">驗證</string>
     <string name="verification_profile_verified">已驗證</string>
     <string name="verification_profile_warning">警告</string>
-
     <string name="room_member_profile_failed_to_get_devices">取得工作階段失敗</string>
     <string name="room_member_profile_sessions_section_title">工作階段</string>
     <string name="trusted">受信任</string>
     <string name="not_trusted">未受信任</string>
-
     <string name="verification_profile_device_verified_because">因為 %1$s (%2$s) 已驗證此工作階段，所以其在安全通訊上是可受信任的：</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) 使用新的工作階段登入：</string>
     <string name="verification_profile_device_untrust_info">直到此使用者信任此工作階段為止，傳送到該工作階段與從它傳送的訊息都會以警告標記。或者您可以手動進行驗證。</string>
-
-
     <string name="initialize_cross_signing">初始化交叉簽署</string>
     <string name="reset_cross_signing">重設金鑰</string>
-
     <string name="a11y_qr_code_for_verification">QR code</string>
-
     <string name="qr_code_scanned_by_other_notice">就快完成了！%s 有顯示相同的盾牌嗎？</string>
     <string name="qr_code_scanned_by_other_yes">是</string>
     <string name="qr_code_scanned_by_other_no">否</string>
-
     <string name="no_connectivity_to_the_server_indicator">到伺服器的連線已遺失</string>
     <string name="login_signup_username_hint">使用者名稱</string>
     <string name="settings_dev_tools">開發者工具</string>
@@ -2072,48 +1684,35 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="command_description_poll">建立簡易投票</string>
     <string name="verification_cannot_access_other_session">使用復原通關密語或金鑰</string>
     <string name="verification_use_passphrase">如果您無法存取既有的工作階段的話</string>
-
     <string name="new_signin">新登入</string>
-
     <string name="enter_secret_storage_invalid">在儲存空間中找不到秘密</string>
     <string name="enter_secret_storage_passphrase">輸入秘密儲存空間通關密語</string>
     <string name="enter_secret_storage_passphrase_warning">警告：</string>
     <string name="enter_secret_storage_passphrase_warning_text">您僅能從受信任的裝置存取秘密儲存空間</string>
-
     <string name="message_action_item_redact">移除……</string>
     <string name="share_confirm_room">您想要傳送此附件到 %1$s 嗎？</string>
     <plurals name="send_images_with_original_size">
         <item quantity="other">使用原始大小傳送圖片</item>
     </plurals>
-
     <string name="delete_event_dialog_title">確認移除</string>
     <string name="delete_event_dialog_content">您確定您想要移除（刪除）此活動嗎？注意，如果您刪除聊天室名稱或變更主題，則可能會撤銷變更。</string>
     <string name="delete_event_dialog_reason_checkbox">包含理由</string>
     <string name="delete_event_dialog_reason_hint">修改原因</string>
-
     <string name="event_redacted_by_user_reason_with_reason">被使用者刪除的活動，理由：%1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">由聊天室管理員管理的活動，理由：%1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">金鑰已為最新！</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="settings_key_requests">金鑰請求</string>
-
     <string name="e2e_use_keybackup">解鎖已加密的訊息歷史</string>
-
     <string name="refresh">重新整理</string>
-
     <string name="new_session">新登入。是您嗎？</string>
     <string name="new_session_review">輕觸即可以審閱並驗證</string>
     <string name="verify_new_session_notice">使用此工作階段來驗證新的，讓它可以存取已加密的訊息。</string>
     <string name="verify_new_session_was_not_me">這不是我</string>
     <string name="verify_new_session_compromized">您的帳號可能已被盜用</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">如果您取消，您可能無法在此裝置上讀取已加密的訊息，而其他使用者也不會信任它</string>
     <string name="verify_cancel_self_verification_from_trusted">如果您取消，您可能無法在您新的裝置上讀取已加密的訊息，而其他使用者也不會信任它</string>
     <string name="verify_cancel_other">如果您現在取消，您將無法驗證 %1$s (%2$s)。在他們的使用者檔案中重新開始。</string>
-
     <string name="verify_not_me_self_verification">下列其中一項可能已被盜用：
 \n
 \n- 您的密碼
@@ -2122,35 +1721,25 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n- 任一裝置正在使用的網際網路連線
 \n
 \n我們建議您立刻在設定中變更您的密碼與復原金鑰。</string>
-
     <string name="verify_cancelled_notice">透過設定驗證您的裝置。</string>
     <string name="verification_cancelled">驗證已取消</string>
-
     <string name="recovery_passphrase">復原通關密語</string>
     <string name="message_key">訊息金鑰</string>
     <string name="account_password">帳號密碼</string>
-
     <string name="set_recovery_passphrase">設定 %s</string>
     <string name="generate_message_key">生成訊息金鑰</string>
-
     <string name="confirm_recovery_passphrase">確認 %s</string>
-
     <string name="enter_account_password">輸入您的 %s 以繼續。</string>
-
     <string name="bootstrap_info_text">保護與解鎖已加密的訊息並信任 %s。</string>
     <string name="bootstrap_info_confirm_text">再次輸入您的 %s 以確認。</string>
     <string name="bootstrap_dont_reuse_pwd">不要重用您的帳號密碼。</string>
-
-
     <string name="bootstrap_loading_text">這可能需要數秒，請稍候。</string>
     <string name="bootstrap_loading_title">設定復原。</string>
     <string name="your_recovery_key">您的復原金鑰</string>
     <string name="bootstrap_finish_title">已完成！</string>
     <string name="keep_it_safe">把它放在安全的地方</string>
     <string name="finish">完成</string>
-
     <string name="bootstrap_save_key_description">使用這個 %1$s 做為安全網以避免您忘記您的 %2$s。</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">正在發佈已建立的識別金鑰</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">正在從通關密語生成安全金鑰</string>
     <string name="bootstrap_crosssigning_progress_default_key">正在定義 SSSS 預設金鑰</string>
@@ -2158,37 +1747,26 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="bootstrap_crosssigning_progress_save_usk">正在同步使用者金鑰</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">正在同步自行簽署金鑰</string>
     <string name="bootstrap_crosssigning_progress_key_backup">設定金鑰備份</string>
-
-
     <string name="bootstrap_cross_signing_success">您的 %2$s 與 %1$s 設定好了。
 \n
 \n請保護它們的安全！如果您遺失所有作用中的工作階段，您將會需要它們來解鎖已加密的訊息並保護資訊。</string>
-
     <string name="bootstrap_crosssigning_print_it">列印並將其存放在安全的地方</string>
     <string name="bootstrap_crosssigning_save_usb">將其儲存在 USB 隨身碟或備份磁碟上</string>
     <string name="bootstrap_crosssigning_save_cloud">將其複製到您的私人雲端儲存空間</string>
-
     <string name="auth_flow_not_supported">您不能從行動裝置上做這件事</string>
-
     <string name="bootstrap_skip_text">設定訊息密碼可讓您保護並解鎖已加密的訊息並信任。
 \n
 \n如果您不想要設定訊息密碼，請生成訊息金鑰來代替。</string>
     <string name="bootstrap_skip_text_no_gen_key">設定復原通關密語可讓您保護並解鎖已加密的訊息並信任。</string>
-
-
     <string name="encryption_enabled">加密已啟用</string>
     <string name="encryption_enabled_tile_description">在此聊天室中的訊息已端到端加密。取得更多資訊並在使用者的個人檔案中驗證他們。</string>
     <string name="encryption_not_enabled">加密未啟用</string>
     <string name="encryption_unknown_algorithm_tile_description">用於此聊天室的加密未受支援</string>
-
     <string name="room_created_summary_item">%s 建立並設定聊天室。</string>
-
     <string name="qr_code_scanned_self_verif_notice">就快完成了！其他裝置有顯示相同的盾牌嗎？</string>
     <string name="qr_code_scanned_verif_waiting_notice">就快完成了！正在等待確認……</string>
     <string name="qr_code_scanned_verif_waiting">正在等待 %s……</string>
-
     <string name="error_failed_to_import_keys">匯入金鑰失敗</string>
-
     <string name="settings_notification_configuration">通知設定</string>
     <string name="settings_messages_at_room">訊息包含 @room</string>
     <string name="settings_messages_in_e2e_one_to_one">在一對一的聊天中已加密的訊息</string>
@@ -2196,24 +1774,17 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_when_rooms_are_upgraded">當聊天室升級時</string>
     <string name="settings_troubleshoot_title">疑難排解</string>
     <string name="settings_notification_advanced_summary">按事件設定通知重要性</string>
-
     <string name="command_description_plain">傳送純文字訊息，不將它們解譯為 markdown</string>
-
     <string name="auth_invalid_login_param_space_in_password">不正確的使用者名稱及／或密碼。輸入的密碼以空格開頭或結尾，請檢查。</string>
-
     <string name="room_message_placeholder">訊息……</string>
-
     <string name="upgrade_security">提供加密升級</string>
     <string name="security_prompt_text">驗證您自己與其他人以保證聊天安全</string>
-
     <string name="bootstrap_enter_recovery">輸入您的 %s 以繼續</string>
     <string name="use_file">使用檔案</string>
-
     <string name="enter_backup_passphrase">輸入 %s</string>
     <string name="backup_recovery_passphrase">復源通關密語</string>
     <string name="bootstrap_invalid_recovery_key">這不是有效的復原金鑰</string>
     <string name="recovery_key_empty_error_message">請輸入復原金鑰</string>
-
     <string name="bootstrap_progress_checking_backup">正在檢查備份金鑰</string>
     <string name="bootstrap_progress_checking_backup_with_info">正在檢查備份金鑰 (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">正在取得曲線金鑰</string>
@@ -2222,19 +1793,15 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="bootstrap_progress_generating_ssss_recovery">正在從復原金鑰生成 SSSS 金鑰</string>
     <string name="bootstrap_progress_storing_in_sss">正在 SSSS 中儲存金鑰備份秘密</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_enter_backup_password">輸入您的金鑰備份通關密語以繼續。</string>
     <string name="bootstrap_migration_use_recovery_key">使用您的金鑰備份復原金鑰</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道您的金鑰備份通關密語，您可以 %s。</string>
     <string name="bootstrap_migration_backup_recovery_key">金鑰備份復原金鑰</string>
-
     <string name="settings_security_prevent_screenshots_title">避免對應用程式進行螢幕截圖</string>
     <string name="settings_security_prevent_screenshots_summary">啟用此設定會新增 FLAG_SECURE 到所有活動。重新啟動應用程式以讓變動生效。</string>
-
     <string name="media_file_added_to_gallery">媒體檔案已新增至媒體庫中</string>
     <string name="error_adding_media_file_to_gallery">無法新增媒體檔案到媒體庫中</string>
     <string name="change_password_summary">設定新的帳號密碼……</string>
-
     <string name="use_other_session_content_description">在您的其他裝置上使用最新的 Element、Element Web、Element 桌面版、Element iOS、Element for Android 或其他有交叉簽章功能的 Matrix 客戶端</string>
     <string name="app_desktop_web">Element Web
 \nElement 桌面版</string>
@@ -2249,30 +1816,25 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="enter_secret_storage_input_key">選取您的復原金鑰，或是透過打字或從您的剪貼簿貼上來手動輸入</string>
     <string name="keys_backup_recovery_key_error_decrypt">無法使用此復原金鑰解密備份：請驗證您是否輸入了正確的復原金鑰。</string>
     <string name="failed_to_access_secure_storage">存取安全儲存空間失敗</string>
-
     <string name="cross_signing_verify_by_text">透過文字手動驗證</string>
     <string name="crosssigning_verify_session">驗證登入</string>
     <string name="cross_signing_verify_by_emoji">透過顏文字來進行互動驗證</string>
     <string name="confirm_your_identity">從您的其他工作階段驗證此登入以確認您的身份並授予存取加密訊息的權限。</string>
     <string name="mark_as_verified">標記為受信任</string>
-
     <string name="error_empty_field_choose_user_name">請選擇使用者名稱。</string>
     <string name="error_empty_field_choose_password">請選擇密碼。</string>
     <string name="external_link_confirmation_title">仔細檢查此連結</string>
     <string name="external_link_confirmation_message">連結 %1$s 正在將您帶往其他網站：%2$s。
 \n
 \n您確定您想要繼續嗎？</string>
-
     <string name="create_room_dm_failure">我們無法建立您的直接訊息。請檢查您想要邀請的使用者，然後再試一次。</string>
     <string name="unencrypted">未加密</string>
     <string name="encrypted_unverified">由未驗證的裝置加密</string>
     <string name="review_logins">審閱您從何處登入</string>
     <string name="verify_other_sessions">驗證您所有的工作階段以確保您的帳號與訊息都安全</string>
     <string name="verify_this_session">驗證正在存取您帳號的新登入：%1$s</string>
-
     <string name="notification_ticker_text_dm">%1$s：%2$s</string>
     <string name="notification_ticker_text_group">%1$s：%2$s %3$s</string>
-
     <string name="add_members_to_room">新增成員</string>
     <string name="invite_users_to_room_action_invite">邀請</string>
     <string name="inviting_users_to_room">正在邀請使用者……</string>
@@ -2283,19 +1845,16 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
         <item quantity="other">邀請已傳送給 %1$s 與其他 %2$d 個人</item>
     </plurals>
     <string name="invite_users_to_room_failure">我們無法邀請使用者。請檢查您想要邀請的使用者並再試一次。</string>
-
     <string name="event_redacted">訊息已刪除</string>
     <string name="settings_show_redacted">顯示已移除的訊息</string>
     <string name="settings_show_redacted_summary">為已移除的訊息顯示佔位符</string>
     <string name="settings_discovery_confirm_mail_not_clicked">我們已傳送確認電子郵件給 %s，請先檢查您的電子郵件並點擊確認連結</string>
     <string name="settings_text_message_sent_wrong_code">驗證代碼不正確。</string>
-
     <string name="uploads_media_title">媒體</string>
     <string name="uploads_media_no_result">此聊天室中沒有媒體</string>
     <string name="uploads_files_title">檔案</string>
     <string name="uploads_files_subtitle">%1$s 在 %2$s</string>
     <string name="uploads_files_no_result">此聊天室中沒有檔案</string>
-
     <string name="login_connect_using_matrix_id_notice">或者如果您已有帳號，而且您也知道您 Matrix 的識別符與密碼，您可以使用此方式：</string>
     <string name="login_connect_using_matrix_id_submit">使用我的 Matrix 識別符登入</string>
     <string name="login_signin_matrix_id_title">登入</string>
@@ -2303,13 +1862,10 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="login_signin_matrix_id_hint">使用者識別符</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">這不是有效的使用者識別符。預期中的格式：\'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">找不到有效的家伺服器。請檢查您的識別符</string>
-
     <string name="no_connectivity_to_the_server_indicator_airplane">飛航模式開啟</string>
-
     <string name="choose_locale_current_locale_title">目前語言</string>
     <string name="choose_locale_other_locales_title">其他可用的語言</string>
     <string name="choose_locale_loading_locales">正在載入可用的語言……</string>
-
     <string name="open_terms_of">開啟 %s 的條款</string>
     <string name="disconnect_identity_server_dialog_content">從身份識別伺服器 %s 斷線？</string>
     <string name="identity_server_error_outdated_identity_server">此身份識別伺服器太舊了。Element 僅支援 API V2。</string>
@@ -2319,26 +1875,20 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="identity_server_error_bulk_sha256_not_supported">為了保護您的隱私，Element 僅支援傳送雜湊過的使用者電子郵件與電話號碼。</string>
     <string name="identity_server_error_binding_error">關聯失敗。</string>
     <string name="identity_server_error_no_current_binding_error">目前沒有此識別符的關聯。</string>
-
     <string name="identity_server_set_default_notice">您的家伺服器 (%1$s) 建議將 %2$s 用於您的身份識別伺服器</string>
     <string name="identity_server_set_default_submit">使用 %1$s</string>
     <string name="identity_server_set_alternative_notice">或者您可以輸入任何身份識別伺服器 URL</string>
     <string name="identity_server_set_alternative_notice_no_default">輸入身份識別伺服器 URL</string>
     <string name="identity_server_set_alternative_submit">遞交</string>
-
     <string name="play_video">播放</string>
     <string name="pause_video">暫停</string>
     <string name="dismiss">忽略</string>
-
-
     <string name="action_copy">複製</string>
     <string name="dialog_title_success">成功</string>
-
     <string name="bottom_action_notification">通知</string>
     <string name="call_failed_no_connection">Element 呼叫失敗</string>
     <string name="call_failed_no_connection_description">建立即時連線失敗。
 \n請要求您家伺服器的管理員設定 TURN 伺服器以讓通話的運作更可靠。</string>
-
     <string name="call_select_sound_device">選取音效裝置</string>
     <string name="sound_device_phone">電話</string>
     <string name="sound_device_speaker">喇叭</string>
@@ -2349,18 +1899,14 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="call_camera_back">後</string>
     <string name="call_format_turn_hd_off">關閉 HD</string>
     <string name="call_format_turn_hd_on">開啟 HD</string>
-
     <string name="login_error_ssl_peer_unverified">SSL 錯誤：對方的身份未驗證。</string>
     <string name="login_error_ssl_other">SSL 錯誤。</string>
     <string name="active_call_with_duration">有效通話 (%s)</string>
     <string name="return_to_call">回到通話</string>
-
     <string name="room_participants_action_cancel_invite">取消邀請</string>
     <string name="room_participants_power_level_demote_warning_title">將您自己降級？</string>
     <string name="room_participants_power_level_demote_warning_prompt">您將無法復原此變更，因為您要把自己降級，如果您是聊天室中最後一個有此權限的使用者，那將無法重新取得權限。</string>
     <string name="room_participants_power_level_demote">降級</string>
-
-
     <string name="room_participants_action_ignore_title">忽略使用者</string>
     <string name="room_participants_action_ignore_prompt_msg">忽略此使用者將會從您分享的聊天室移除他們的訊息。
 \n
@@ -2378,7 +1924,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="room_participants_ban_reason">封鎖的理由</string>
     <string name="room_participants_unban_title">取消封鎖使用者</string>
     <string name="room_participants_unban_prompt_msg">取消封鎖使用者將會再次允許他們加入聊天室。</string>
-
     <string name="settings_secure_backup_section_title">安全備份</string>
     <string name="settings_secure_backup_manage">管理</string>
     <string name="settings_secure_backup_setup">設定安全備份</string>
@@ -2387,52 +1932,36 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_secure_backup_section_info">透過備份加密金鑰到您的伺服器上以防止遺失對加密訊息與資料的存取權。</string>
     <string name="reset_secure_backup_title">為您現有的備份生成新的安全金鑰或設定新的安全密語。</string>
     <string name="reset_secure_backup_warning">這將會取代您目前的金鑰或密語。</string>
-
     <string name="disabled_integration_dialog_title">整合被停用</string>
     <string name="disabled_integration_dialog_content">在設定中啟用「允許整合」以執行此動作。</string>
-
     <plurals name="room_settings_banned_users_count">
         <item quantity="other">%d 封鎖了使用者</item>
     </plurals>
-
     <string name="encryption_exported_successfully">金鑰已成功匯出</string>
-
     <string name="active_widget_view_action">檢視</string>
     <string name="active_widgets_title">作用中的小工具</string>
-
-
     <string name="recovery_key_export_saved">復原金鑰已儲存。</string>
-
     <string name="secure_backup_banner_setup_line1">安全備份</string>
     <string name="secure_backup_banner_setup_line2">防止遺失對加密訊息與資料的存取權</string>
-
     <string name="secure_backup_setup">設定安全備份</string>
-
     <string name="labs_show_unread_notifications_as_tab">在主畫面上新增專用的未讀通知分頁。</string>
-
     <string name="room_list_quick_actions_favorite_add">新增到最愛</string>
     <string name="room_list_quick_actions_favorite_remove">從最愛移除</string>
     <string name="notice_member_no_changes_by_you">您未做出變更</string>
     <string name="room_join_rules_public_by_you">您讓聊天室對所有知道連結的人公開。</string>
     <string name="room_join_rules_invite_by_you">您讓聊天室變為僅邀請可加入。</string>
     <string name="login_server_url_form_common_notice">輸入您想要使用的伺服器地址</string>
-
     <string name="login_signin_matrix_id_password_notice">如果您不知道您的密碼，請返回並重設。</string>
     <string name="send_a_sticker">貼圖</string>
-
     <string name="room_profile_section_admin">管理動作</string>
     <string name="room_member_power_level_default_in">在 %1$s 中的預設</string>
     <string name="settings_hs_admin_e2e_disabled">您的伺服器管理員已在私人聊天室與直接訊息中預設停用端到端加密。</string>
     <string name="bootstrap_info_text_2">輸入只有您知道的安全密語，用於保護您伺服器上的安全祕密。</string>
-
     <string name="bootstrap_cancel_text">如果您現在取消，您可能會失去對加密訊息與資料的存取權，如果您失去對您登入的存取權的話。
 \n
 \n您也可以在設定中設定安全備份與管理您的金鑰。</string>
-
     <string name="room_created_summary_item_by_you">您建立並設定了聊天室。</string>
-
     <string name="auth_invalid_login_deactivated_account">此帳號已被停用。</string>
-
     <string name="setup_cross_signing">啟用交叉簽章</string>
     <string name="error_saving_media_file">無法儲存媒體檔案</string>
     <string name="power_level_edit_title">設定角色</string>
@@ -2442,9 +1971,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="a11y_unmute_microphone">取消麥克風靜音</string>
     <string name="a11y_stop_camera">停止相機</string>
     <string name="a11y_start_camera">開啟相機</string>
-
     <string name="settings_setup_secure_backup">設定安全備份</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">安全備份</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">透過備份加密金鑰到您的伺服器上以防止遺失對加密訊息與資料的存取權。</string>
     <string name="bottom_sheet_setup_secure_backup_submit">設定</string>
@@ -2452,22 +1979,17 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全金鑰並儲存在安全的地方，如密碼管理員或保險櫃。</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全密語</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">輸入只有您知道的密語，並生成金鑰備份。</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">儲存您的安全金鑰</string>
     <string name="bottom_sheet_save_your_recovery_key_content">將您的安全金鑰儲存在安全的地方，如密碼管理員或保險櫃。</string>
-
     <string name="set_a_security_phrase_title">設定安全密語</string>
     <string name="set_a_security_phrase_notice">輸入僅有您知道的安全密語，用於保護在您伺服器上的安全祕密。</string>
     <string name="set_a_security_phrase_hint">安全密語</string>
     <string name="set_a_security_phrase_again_notice">再次輸入您的安全密語以確認。</string>
-
     <string name="save_your_security_key_title">儲存您的安全金鑰</string>
     <string name="save_your_security_key_notice">將您的安全金鑰儲存在安全的地方，如密碼管理員或保險櫃。</string>
-
     <string name="room_settings_name_hint">聊天室設定</string>
     <string name="room_settings_topic_hint">主題</string>
     <string name="room_settings_save_success">您成功變更了聊天室設定</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">您無法存取此訊息</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此訊息，可能需要花一點時間</string>
     <string name="crypto_utd">無法解密</string>
@@ -2476,17 +1998,12 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="crypto_error_withheld_unverified">您無法存取此訊息，因為您的工作階段未被傳送者所信任</string>
     <string name="crypto_error_withheld_generic">您無法存取此訊息，因為傳送者刻意未傳送金鑰</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密歷史</string>
-
     <string name="element_disclaimer_title">Riot 現在是 Element 了！</string>
     <string name="element_disclaimer_content">我們很高興地我們已變更名稱！您的應用程式是最新的，而您也登入了您的帳號。</string>
     <string name="element_disclaimer_negative_button">知道了</string>
     <string name="element_disclaimer_positive_button">取得更多資訊</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">儲存復原金鑰於</string>
-
     <string name="add_from_phone_book">從我的電話簿新增</string>
     <string name="empty_phone_book">您的電話簿是空的</string>
     <string name="phone_book_title">電話簿</string>
@@ -2494,13 +2011,10 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="loading_contact_book">正在擷取您的聯絡人……</string>
     <string name="empty_contact_book">您的通訊錄為空</string>
     <string name="contacts_book_title">通訊錄</string>
-
     <string name="three_pid_revoke_invite_dialog_title">撤銷邀請</string>
     <string name="three_pid_revoke_invite_dialog_content">撤銷對 %1$s 的邀請？</string>
-
     <string name="member_banned_by">被 %1$s 封鎖</string>
     <string name="failed_to_unban">取消封鎖使用者失敗</string>
-
     <string name="alert_push_are_disabled_title">推送通知已停用</string>
     <string name="alert_push_are_disabled_description">審閱您的設定以啟用推送通知</string>
     <string name="create_pin_title">選擇 PIN 碼以確保安全</string>
@@ -2528,13 +2042,11 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <plurals name="encryption_import_room_keys_success">
         <item quantity="other">%1$d/%2$d 金鑰匯入成功。</item>
     </plurals>
-
     <string name="room_manage_integrations">管理整合</string>
     <string name="room_no_active_widgets">無作用中的小工具</string>
     <string name="create_room_federation_error">已建立聊天室，但因為以下理由而未傳送某些邀請：
 \n
 \n%s</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="other">%1$s, %2$s 與 %3$d 個其他人已讀取</item>
     </plurals>
@@ -2550,32 +2062,77 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="settings_phone_numbers">電話號碼</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">確保您已經點擊我們傳送給您的電子郵件中的連結。</string>
-
     <string name="settings_emails_and_phone_numbers_title">電子郵件與電話號碼</string>
     <string name="settings_emails_and_phone_numbers_summary">管理連結到您 Matrix 帳號的電子郵件與電話號碼</string>
-
     <string name="settings_text_message_sent_hint">代碼</string>
     <string name="login_msisdn_notice">請使用國際格式（電話號碼必須以 \'+\' 開頭）</string>
     <string name="confirm_your_identity_quad_s">透過確認此登入來驗證您的身份，以及授予存取加密訊息的權限。</string>
     <string name="error_sso_flow_not_supported_yet">抱歉，對於使用單一登入的帳號，還無法執行此動作。</string>
-
     <string name="error_opening_banned_room">無法開啟禁止您進入的聊天室。</string>
     <string name="room_error_not_found">找不到此聊天室。請確定它存在。</string>
     <plurals name="seconds">
         <item quantity="other">%d 秒</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">顯示聊天室成員狀態活動</string>
     <string name="settings_show_room_member_state_events_summary">包含邀請／加入／離開／踢除／封鎖事件與大頭貼／顯示名稱變更等。</string>
     <string name="sent_a_poll">投票</string>
     <string name="sent_a_bot_buttons">機器人按鈕</string>
     <string name="sent_a_reaction">反應：%s</string>
     <string name="sent_verification_conclusion">驗證結論</string>
-
     <string name="universal_link_malformed">連結格式錯誤</string>
     <string name="no_permissions_to_start_webrtc_call">您沒有在此聊天室開始通話的權限</string>
     <string name="delete_account_data_warning">刪除類型為 %1$s 的帳號資料？
 \n
 \n小心使用，它可能會導致意料之外的行為。</string>
-
-</resources>
+    <string name="settings_security_pin_code_grace_period_summary_off">每次打開 Element 時都需要 PIN 碼。</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">未使用 Element 2分鐘後，要求輸入 PIN 碼。</string>
+    <string name="settings_security_pin_code_grace_period_title">2分鐘後要求輸入 PIN 碼</string>
+    <string name="settings_security_pin_code_notifications_summary_off">在簡易通知中僅顯示未讀訊息數量。</string>
+    <string name="settings_security_pin_code_notifications_summary_on">顯示如聊天是名稱與訊息內容等詳細資訊。</string>
+    <string name="settings_security_pin_code_notifications_title">在通知中顯示內容</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN 碼是解鎖 Element 的唯一方式。</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">啟用特定裝置的生物識別技術，如指紋與臉部辨識。</string>
+    <string name="settings_security_application_protection_screen_title">設定保護</string>
+    <string name="settings_security_application_protection_summary">使用 PIN 碼與生物識別技術來保護存取權。</string>
+    <string name="settings_security_application_protection_title">保護存取權</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="other">顯示您現在可以驗證的 %s 個裝置</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">您將會重新啟動，沒有歷史紀錄，已信任的裝置或已信任的使用者</string>
+    <string name="secure_backup_reset_if_you_reset_all">如果您重設了所有東西</string>
+    <string name="secure_backup_reset_all_no_other_devices">僅在您沒有其他裝置可以驗證此裝置時才使用這個。</string>
+    <string name="secure_backup_reset_all">重設所有東西</string>
+    <string name="bad_passphrase_key_reset_all_action">忘記或遺失所有復原選項？重設所有東西</string>
+    <string name="direct_room_created_summary_item_by_you">您已加入。</string>
+    <string name="direct_room_created_summary_item">%s 已加入。</string>
+    <string name="direct_room_encryption_enabled_tile_description">此聊天適中的訊息有端到端加密。</string>
+    <string name="direct_room_profile_section_more_leave">離開</string>
+    <string name="direct_room_profile_section_more_settings">設定</string>
+    <string name="direct_room_profile_encrypted_subtitle">這裡的訊息有端到端加密。
+\n
+\n您的訊息已使用鎖來保護，只有您與收件者才有獨特的金鑰來解鎖他們。</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">這裡的訊息沒有端到端加密。</string>
+    <string name="login_error_outdated_homeserver_warning_content">此家伺服器正在執行較舊的版本。請要求您的家伺服器管理原升級。您可以繼續，但某些功能可能無法正常運作。</string>
+    <string name="direct_room_join_rules_invite_by_you">您讓此變為僅邀請。</string>
+    <string name="direct_room_join_rules_invite">%1$s 讓此變為僅邀請。</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">在已加密的聊天適中顯示完整歷史紀錄</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s 與 %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s 在 %2$s 與 %3$s</string>
+    <plurals name="notification_invitations">
+        <item quantity="other">%d 個邀請</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">通知已被點擊！</string>
+    <string name="settings_troubleshoot_test_notification_notice">請點擊通知。如果您沒有看到通知，請檢查系統設定。</string>
+    <string name="settings_troubleshoot_test_notification_title">通知顯示</string>
+    <string name="settings_troubleshoot_test_push_notification_content">您正在檢視通知！點擊我！</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">接收推播失敗。解決方法可能是重新安裝應用程式。</string>
+    <string name="settings_troubleshoot_test_push_loop_success">應用程式正在接收 PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">應用程式正在等待 PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_title">測試推播</string>
+    <string name="search_is_not_supported_in_e2e_room">目前尚不支援在已加密的聊天室中搜尋。</string>
+    <string name="search_banned_user_hint">過濾被封鎖的使用者</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">您沒有開始通話的權限</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">您沒有開始會議通話的權限</string>
+    <string name="reset">重設</string>
+    <string name="settings_security_pin_code_use_biometrics_title">啟用生物識別技術</string>
+</resources>
\ No newline at end of file

From 572b0942bab95957e2655305b8f85ae25c540ca0 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 14 Oct 2020 18:17:04 +0000
Subject: [PATCH 249/278] Translated using Weblate (Swedish)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
---
 vector/src/main/res/values-sv/strings.xml | 555 ++++------------------
 1 file changed, 83 insertions(+), 472 deletions(-)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index fe80632d99..7f68136071 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -1,20 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="resources_language">sv</string>
     <string name="resources_country_code">SE</string>
     <string name="resources_script">Latn</string>
-
     <string name="light_theme">Ljust tema</string>
     <string name="dark_theme">Mörkt tema</string>
     <string name="black_them">Svart tema</string>
     <string name="status_theme">Status.im-tema</string>
-
     <string name="notification_sync_init">Initialiserar tjänst</string>
     <string name="notification_sync_in_progress">Synkroniserar…</string>
     <string name="notification_listening_for_events">Lyssnar efter händelser</string>
     <string name="notification_noisy_notifications">Högljudda aviseringar</string>
     <string name="notification_silent_notifications">Tysta aviseringar</string>
-
     <string name="title_activity_home">Meddelanden</string>
     <string name="title_activity_room">Rum</string>
     <string name="title_activity_settings">Inställningar</string>
@@ -26,7 +23,6 @@
     <string name="title_activity_keys_backup_setup">Säkerhetskopiering av nycklar</string>
     <string name="title_activity_keys_backup_restore">Använd nyckelsäkerhetskopiering</string>
     <string name="title_activity_verify_device">Verifiera session</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Säkerhetskopiering av nycklar är inte färdig, vänligen vänta…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Du kommer att förlora dina krypterade meddelanden om du loggar ut nu</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Säkerhetskopiering av nycklar pågår. Om du loggar ut nu så kommer du att förlora åtkomst till dina krypterade meddelanden.</string>
@@ -37,11 +33,8 @@
     <string name="are_you_sure">Är du säker\?</string>
     <string name="backup">Säkerhetskopiera</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du kommer att förlora åtkomst till dina krypterade meddelanden om du inte säkerhetskopierar dina nycklar innan du loggar ut.</string>
-
     <string name="dialog_title_third_party_licences">Tredjepartslicenser</string>
-
     <string name="loading">Laddar…</string>
-
     <string name="ok">OK</string>
     <string name="cancel">Avbryt</string>
     <string name="save">Spara</string>
@@ -90,7 +83,6 @@
     <string name="ignore">Ignorera</string>
     <string name="review">Granska</string>
     <string name="decline">Avslå</string>
-
     <string name="action_exit">Avsluta</string>
     <string name="actions">Handlingar</string>
     <string name="action_sign_out">Logga ut</string>
@@ -106,27 +98,22 @@
     <string name="action_close">Stäng</string>
     <string name="copied_to_clipboard">Kopierat till klippbordet</string>
     <string name="disable">Stäng av</string>
-
     <string name="dialog_title_confirmation">Bekräftelse</string>
     <string name="dialog_title_warning">Varning</string>
     <string name="dialog_title_error">Fel</string>
-
     <string name="bottom_action_home">Hem</string>
     <string name="bottom_action_favourites">Favoriter</string>
     <string name="bottom_action_people">Personer</string>
     <string name="bottom_action_rooms">Rum</string>
     <string name="bottom_action_groups">Gemenskaper</string>
-
     <string name="home_filter_placeholder_home">Filtrera rumsnamn</string>
     <string name="home_filter_placeholder_favorites">Filtrera favoriter</string>
     <string name="home_filter_placeholder_people">Filtrera personer</string>
     <string name="home_filter_placeholder_rooms">Filtrera rumsnamn</string>
     <string name="home_filter_placeholder_groups">Filtrera gemenskapsnamn</string>
-
     <string name="invitations_header">Inbjudningar</string>
     <string name="low_priority_header">Låg prioritet</string>
     <string name="system_alerts_header">Systemvarningar</string>
-
     <string name="direct_chats_header">Konversationer</string>
     <string name="local_address_book_header">Lokal adressbok</string>
     <string name="user_directory_header">Användarkatalog</string>
@@ -135,20 +122,17 @@
     <string name="no_contact_access_placeholder">Du gav inte Element tillgång till dina lokala kontakter</string>
     <string name="no_result_placeholder">Inga resultat</string>
     <string name="people_no_identity_server">Ingen identitetsserver konfigurerad.</string>
-
     <string name="rooms_header">Rum</string>
     <string name="rooms_directory_header">Rumskatalog</string>
     <string name="no_room_placeholder">Inga rum</string>
     <string name="no_public_room_placeholder">Inga offentliga rum tillgängliga</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 användare</item>
+        <item quantity="one">%d användare</item>
         <item quantity="other">%d användare</item>
     </plurals>
-
     <string name="groups_invite_header">Bjud in</string>
     <string name="groups_header">Gemenskaper</string>
     <string name="no_group_placeholder">Inga grupper</string>
-
     <string name="send_bug_report_include_logs">Skicka loggar</string>
     <string name="send_bug_report_include_crash_logs">Skicka kraschloggar</string>
     <string name="send_bug_report_include_screenshot">Skicka skärmdump</string>
@@ -160,14 +144,11 @@
     <string name="send_bug_report_alert_message">Du verkar skaka din telefon i frustration. Vill du skicka en buggrapport\?</string>
     <string name="send_bug_report_app_crashed">Appen kraschade senaste gången. Vill du skicka en buggrapport\?</string>
     <string name="send_bug_report_rage_shake">Raseriskaka för att rapportera bugg</string>
-
     <string name="send_bug_report_sent">Buggrapporten har skickats framgångsrikt</string>
     <string name="send_bug_report_failed">Sändning av buggrapporten misslyckades (%s)</string>
     <string name="send_bug_report_progress">Framsteg (%s%%)</string>
-
     <string name="send_files_in">Skicka in i</string>
     <string name="read_receipt">Läs</string>
-
     <string name="join_room">Gå med i rummet</string>
     <string name="username">Användarnamn</string>
     <string name="create_account">Skapa konto</string>
@@ -176,13 +157,10 @@
     <string name="hs_url">URL för hemserver</string>
     <string name="identity_url">URL för identitetsserver</string>
     <string name="search">Sök</string>
-
     <string name="start_new_chat">Starta ny chatt</string>
     <string name="start_voice_call">Starta röstsamtal</string>
     <string name="start_video_call">Starta videosamtal</string>
-
     <string name="option_send_voice">Skicka röst</string>
-
     <string name="start_new_chat_prompt_msg">Är du säker på att du vill skapa en ny chatt med %s\?</string>
     <string name="start_voice_call_prompt_msg">Är du säker på att du vill starta ett röstsamtal\?</string>
     <string name="start_video_call_prompt_msg">Är du säker på att du vill skapa ett videosamtal\?</string>
@@ -192,20 +170,16 @@
 \nAlternativt så kan du försöka använda den publika servern på %2$s, men detta kommer inte att vara lika pålitligt, och kommer att dela din IP-adress med den servern. Du kan också hantera detta i inställningarna.</string>
     <string name="call_failed_no_ice_use_alt">Försök med %s</string>
     <string name="call_failed_dont_ask_again">Fråga mig inte igen</string>
-
     <string name="option_send_files">Skicka filer</string>
     <string name="option_send_sticker">Skicka dekal</string>
     <string name="option_take_photo_video">Ta foto eller video</string>
     <string name="option_take_photo">Ta ett foto</string>
     <string name="option_take_video">Ta en video</string>
-
     <string name="no_sticker_application_dialog_content">Du har för närvarande inga dekalpaket aktiva. 
 \n 
 \nLägg till några nu\?</string>
-
     <string name="go_on_with">fortsätt med…</string>
     <string name="error_no_external_application_found">Tyvärr har ingen extern applikation hittats som kan fullfölja denna handling.</string>
-
     <string name="auth_login">Logga in</string>
     <string name="auth_login_sso">Logga in med externt konto</string>
     <string name="auth_register">Skapa konto</string>
@@ -259,7 +233,6 @@
 \n 
 \nDu har loggats ut ur alla sessioner och kommer inte längre motta pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.</string>
     <string name="auth_accept_policies">Vänligen granska och acceptera villkoren för denna hemserver:</string>
-
     <string name="login_error_must_start_http">URLen måste börja med http[s]://</string>
     <string name="login_error_network_error">Kan inte logga in: Nätverksfel</string>
     <string name="login_error_unable_login">Kan inte logga in</string>
@@ -271,7 +244,6 @@
     <string name="login_error_no_homeserver_found">Det här är inte en giltig Matrixserveradress</string>
     <string name="login_error_homeserver_not_found">Kan inte nå en hemserver på den här URLen, vänligen kolla den</string>
     <string name="login_error_ssl_handshake">Din enhet använder ett utdaterat TLS-protokoll, sårbart för anfall, så för din säkerhets skull så kommer du inte kunna ansluta</string>
-
     <string name="login_error_forbidden">Felaktigt användarnamn/lösenord</string>
     <string name="login_error_unknown_token">Den åtkomsttoken du specificerade kändes inte igen</string>
     <string name="login_error_bad_json">Felformaterad JSON</string>
@@ -279,47 +251,35 @@
     <string name="login_error_limit_exceeded">För många förfrågningar har skickats</string>
     <string name="login_error_user_in_use">Det här användarnamnet är upptaget</string>
     <string name="login_error_login_email_not_yet">E-postlänken har inte klickats på än</string>
-
     <string name="e2e_re_request_encryption_key">Efterfråga krypteringsnycklarna igen från dina andra sessioner.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Nyckelförfrågan har skickats.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Förfrågan har skickats</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Vänligen öppna Element på en annan enhet som kan dekryptera meddelandet så att den kan skicka nycklarna till den här sessionen.</string>
-
     <string name="read_receipts_list">Läsindikationslista</string>
-
     <string name="groups_list">Grupplista</string>
-
     <plurals name="membership_changes">
-        <item quantity="one">1 medlemsskapsändring</item>
+        <item quantity="one">%d medlemsskapsändring</item>
         <item quantity="other">%s medlemsskapsändringar</item>
     </plurals>
-
     <string name="compression_options">Skicka som</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Stor</string>
     <string name="compression_opt_list_medium">Medium</string>
     <string name="compression_opt_list_small">Liten</string>
-
     <string name="attachment_cancel_download">Avbryt nedladdningen\?</string>
     <string name="attachment_cancel_upload">Avbryt uppladdningen\?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-
     <string name="yesterday">Igår</string>
     <string name="today">Idag</string>
-
     <string name="room_info_room_name">Rumsnamn</string>
     <string name="room_info_room_topic">Rumsämne</string>
-
     <string name="settings_call_category">Samtal</string>
     <string name="settings_call_ringtone_use_app_ringtone">Använd förvald Element-ringsignal för inkommande samtal</string>
     <string name="settings_call_ringtone_use_default_stun">Tillåt reservassistansserver för samtal</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Kommer att använda %s som reserv när din hemserver inte erbjuder en (din IP-adress kommer att delas under samtalet)</string>
     <string name="settings_call_ringtone_title">Ringsignal för inkommande samtal</string>
     <string name="settings_call_ringtone_dialog_title">Välj ringsignal för samtal:</string>
-
     <string name="call">Ring</string>
     <string name="call_connected">Samtal anslutet</string>
     <string name="call_connecting">Samtal ansluter…</string>
@@ -330,15 +290,12 @@
     <string name="incoming_voice_call">Inkommande röstsamtal</string>
     <string name="call_in_progress">Samtal pågår…</string>
     <string name="video_call_in_progress">Videosamtal pågår…</string>
-
     <string name="call_error_user_not_responding">Den andra parten svarade inte.</string>
     <string name="call_error_ice_failed">Mediaanslutning misslyckades</string>
     <string name="call_error_camera_init_failed">Kan inte initialisera kameran</string>
     <string name="call_error_answered_elsewhere">samtal besvarat någon annanstans</string>
-
     <string name="media_picker_both_capture_title">Ta en bild eller en video</string>
     <string name="media_picker_cannot_record_video">Kan inte spela in video</string>
-
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="permissions_rationale_msg_storage">Element behöver tillstånd att komma åt ditt foto- och videobibliotek för att skicka och spara bilagor. 
 \n 
@@ -358,25 +315,20 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element kan kolla i din adressbok för att hitta andra Matrixanvändare baserat på deras e-postadresser och telefonnummer.
 \n
 \nVill du dela din adressbok för detta ändamål\?</string>
-
     <string name="permissions_action_not_performed_missing_permissions">Tyvärr. Handlingen utfördes inte på grund av saknade rättigheter</string>
-
     <string name="media_slider_saved">Sparad</string>
     <string name="media_slider_saved_message">Spara till nedladdningar\?</string>
     <string name="yes">JA</string>
     <string name="no">NEJ</string>
     <string name="_continue">Fortsätt</string>
-
     <string name="remove">Ta bort</string>
     <string name="join">Gå med</string>
     <string name="preview">Förhandsvisning</string>
     <string name="reject">Avslå</string>
-
     <string name="list_members">Lista medlemmar</string>
     <string name="open_chat_header">Öppna rubrik</string>
     <string name="room_sync_in_progress">Synkroniserar…</string>
     <string name="room_jump_to_first_unread">Hoppa till det första olästa meddelandet.</string>
-
     <string name="room_preview_invitation_format">Du har blivit inbjuden till det här rummet av %s</string>
     <string name="room_preview_unlinked_email_warning">Denna inbjudan skickades till %s, vilket inte är associerat med det här kontot.
 \nDu kanske vill logga in på ett annat konto eller lägga till den här e-postadressen till det här kontot.</string>
@@ -387,48 +339,43 @@
     <string name="room_creation_title">Ny chatt</string>
     <string name="room_creation_add_member">Lägg till medlem</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">1 aktiv medlem</item>
+        <item quantity="one">%d aktiv medlem</item>
         <item quantity="other">%d aktiva medlemmar</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="one">1 medlem</item>
+        <item quantity="one">%d medlem</item>
         <item quantity="other">%d medlemmar</item>
     </plurals>
     <string name="room_title_one_member">1 medlem</string>
-
     <plurals name="format_time_s">
-        <item quantity="one">1s</item>
+        <item quantity="one">%ds</item>
         <item quantity="other">%ds</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">1m</item>
+        <item quantity="one">%dm</item>
         <item quantity="other">%dm</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">1t</item>
+        <item quantity="one">%dt</item>
         <item quantity="other">%dt</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">1d</item>
+        <item quantity="one">%dd</item>
         <item quantity="other">%dd</item>
     </plurals>
-
     <string name="room_participants_leave_prompt_title">Lämna rum</string>
     <string name="room_participants_leave_prompt_msg">Är du säker på att du vill lämna rummet\?</string>
     <string name="room_participants_remove_prompt_msg">Är du säker på att du vill ta bort %s från den här chatten\?</string>
     <string name="room_participants_create">Skapa</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Inaktiv</string>
     <string name="room_participants_now">%1$s nu</string>
     <string name="room_participants_ago">%1$s för %2$s sen</string>
-
     <string name="room_participants_header_admin_tools">ADMINISTRATIONSVERKTYG</string>
     <string name="room_participants_header_call">RING</string>
     <string name="room_participants_header_direct_chats">DIREKTCHATT</string>
     <string name="room_participants_header_devices">SESSIONER</string>
-
     <string name="room_participants_action_invite">Bjud in</string>
     <string name="room_participants_action_leave">Lämna det här rummet</string>
     <string name="room_participants_action_remove">Ta bort från det här rummet</string>
@@ -443,7 +390,7 @@
     <string name="tab_title_search_rooms">RUM</string>
     <string name="room_recents_conversations">RUM</string>
     <plurals name="directory_search_rooms">
-        <item quantity="one">1 rum</item>
+        <item quantity="one">%d rum</item>
         <item quantity="other">%d rum</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
@@ -454,25 +401,20 @@
     <string name="settings_pin_missed_notifications">Fäst rum med missade aviseringar</string>
     <string name="settings_pin_unread_messages">Fäst rum med olästa meddelanden</string>
     <string name="settings_data_save_mode_summary">Datasparningsläge använder ett specifikt filter så att närvarouppdateringar och \"skriver\"-statusar filtreras ut.</string>
-
     <string name="failed_to_load_timeline_position">%s försökte ladda en specifik punkt i det här rummets tidslinje, men kunde inte hitta den.</string>
-
     <string name="directory_server_type_homeserver">Skriv en hemserver att visa listan över offentliga rum från</string>
     <string name="directory_server_all_rooms_on_server">Alla rum på %s-servern</string>
     <string name="directory_server_native_rooms">Alla %s-rum på Matrix</string>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="one">1 rum</item>
+        <item quantity="one">%d rum</item>
         <item quantity="other">%d rum</item>
     </plurals>
-
     <string name="group_details_rooms">Rum</string>
     <string name="rooms">Rum</string>
     <string name="filter_group_members">Filtrera gruppmedlemmar</string>
     <string name="filter_group_rooms">Filtrera grupprum</string>
-
     <plurals name="group_rooms">
-        <item quantity="one">1 rum</item>
+        <item quantity="one">%d rum</item>
         <item quantity="other">%d rum</item>
     </plurals>
     <string name="deactivate_account_content">Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte kunna logga in, och ingen kommer kunna registrera sig med samma användar-ID. Detta kommer att få ditt konto att lämna alla rum det är med i, och det kommer att ta bort din kontoinformation från din identitetsserver. <b>Den här handlingen går inte att ångra</b>.
@@ -486,36 +428,27 @@
     <string name="room_list_catchup_empty_body">Du har inga olästa meddelanden kvar</string>
     <string name="room_list_rooms_empty_title">Rum</string>
     <string name="room_list_rooms_empty_body">Dina rum kommer att visas här</string>
-
     <string name="create_new_room">Skapa ett nytt rum</string>
     <string name="fab_menu_create_room">Rum</string>
     <string name="fab_menu_create_chat">Direktmeddelanden</string>
-
     <string name="send_suggestion">Ge ett förslag</string>
     <string name="send_suggestion_content">Vänligen skriv ditt förslag nedan.</string>
     <string name="send_suggestion_report_placeholder">Beskriv ditt förslag här</string>
     <string name="send_suggestion_sent">Tack, ditt förslag har skickats framgångsrikt</string>
     <string name="send_suggestion_failed">Förslaget misslyckades att skickas (%s)</string>
-
     <string name="bottom_action_people_x">Direktmeddelanden</string>
-
     <string name="room_filtering_filter_hint">Filtrera konversationer…</string>
     <string name="room_filtering_footer_title">Kan du inte hitta det du letar efter\?</string>
     <string name="room_filtering_footer_create_new_room">Skapa ett nytt rum</string>
     <string name="room_filtering_footer_create_new_direct_message">Skicka ett nytt direktmeddelande</string>
     <string name="room_filtering_footer_open_room_directory">Se rumskatalogen</string>
-
     <string name="direct_room_filter_hint">Filtrera efter användarnamn eller ID…</string>
-
     <string name="a11y_create_direct_message">Skapa en ny direktkonversation</string>
     <string name="a11y_create_room">Skapa ett nytt rum</string>
     <string name="reaction_search_type_hint">Skriv nyckelord för att hitta en reaktion.</string>
-
     <string name="autodiscover_well_known_error">Kan inte hitta en giltig hemserver. Vänligen kontrollera din identifierare</string>
-
     <string name="room_list_sharing_header_recent_rooms">Nyliga rum</string>
     <string name="room_list_sharing_header_other_rooms">Andra rum</string>
-
     <string name="enter_secret_storage_invalid">Kan inte hitta hemligheter i lagringen</string>
     <string name="settings_when_rooms_are_upgraded">När rum uppgraderas</string>
     <string name="command_description_discard_session_not_handled">Stöds endast I krypterade rum</string>
@@ -539,7 +472,6 @@
     <string name="settings_fail_to_update_password_invalid_current_password">Lösenordet är ogiltigt</string>
     <string name="settings_password_updated">Ditt lösenord har uppdaterats</string>
     <string name="settings_without_flair">Du är för närvarande inte medlem in någon gemenskap.</string>
-
     <string name="encryption_information_verify_device_warning">Bekräfta genom att jämföra följande nyckel med användarinställningarna i din andra session:</string>
     <string name="room_widget_permission_display_name">Ditt visningsnamn</string>
     <string name="deactivate_account_prompt_password">För att fortsätta, skriv in ditt lösenord:</string>
@@ -554,16 +486,12 @@
 \n
 \nOm det inte var du som satte upp den nya återställningsmetoden så kan det vara en angripare som försöker komma åt ditt konto. Ändra ditt kontolösenord och sätt en ny återställningsmetod omedelbart i inställningarna.</string>
     <string name="identity_server_not_defined_for_password_reset">Ingen identitetsserver är konfigurerad, vilket krävs för att återställa ditt lösenord.</string>
-
     <string name="change_room_directory_network">Byt nätverk</string>
     <string name="group_all_communities">Alla gemenskaper</string>
-
     <string name="settings_general_title">Allmänt</string>
     <string name="settings_preferences">Alternativ</string>
     <string name="room_directory_search_hint">Namn eller ID (#example:matrix.org)</string>
-
     <string name="verify_cancel_other">Du kommer inte att verifiera %1$s (%2$s) om du avbryter nu. Börja igen i hens användarprofil.</string>
-
     <string name="encryption_enabled_tile_description">Meddelanden i det här rummet är totalsträckskrypterade. Lär dig mer och verifiera användare i deras profiler.</string>
     <string name="room_participants_action_unignore">Avignorera</string>
     <string name="room_participants_invite_prompt_msg">Är du säker på att du vill bjuda in %s till den här chatten\?</string>
@@ -571,7 +499,6 @@
     <string name="people_search_invite_by_id_dialog_title">Bjud in användare med ID</string>
     <string name="people_search_invite_by_id_dialog_description">Vänligen skriv in en eller flera e-postadresser eller Matrix-IDn</string>
     <string name="people_search_invite_by_id_dialog_hint">E-postadress eller Matrix-ID</string>
-
     <string name="ssl_could_not_verify">Kunde inte verifiera den externa serverns identitet.</string>
     <string name="room_details_title">Rumsdetaljer</string>
     <string name="room_details_people">Personer</string>
@@ -582,7 +509,6 @@
 \nObservera att den har handlingen kommer att starta om appen, och det kan ta lite tid.</string>
     <string name="tab_title_search_people">PERSONER</string>
     <string name="tab_title_search_files">FILER</string>
-
     <string name="room_settings_all_messages_noisy">Alla meddelanden (högljutt)</string>
     <string name="room_settings_all_messages">Alla meddelanden</string>
     <string name="room_settings_mention_only">Endast omnämnande</string>
@@ -597,19 +523,16 @@
     <string name="settings_app_info_link_summary">Visa info om appen i systeminställningarna.</string>
     <string name="settings_notification_advanced">Avancerade aviseringsinställningar</string>
     <string name="settings_notification_by_event">Aviseringsprioritet för händelser</string>
-
     <string name="settings_notification_privacy">Aviseringssekretess</string>
     <string name="settings_notification_troubleshoot">Felsök aviseringar</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Grundläggande felsökning lyckades. Om du fortfarande inte får aviseringar, vänligen skicka en buggrapport för att hjälpa oss att undersöka.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Ett eller flera tester har misslyckats, testa de föreslagna fixarna.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Ett eller flera tester har misslyckats, vänligen skicka en buggrapport för att hjälpa oss att undersöka.</string>
-
     <string name="settings_troubleshoot_test_system_settings_success">Aviseringar är aktiverade i systeminställningarna.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Aviseringar är inaktiverade i systeminställningarna.
 \nVänligen kolla systeminställningarna.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Aviseringar är aktiverade för ditt konto.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Aviseringar är inaktiverade för ditt konto.
-\n
 \nVänligen kolla kontoinställningarna.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Aviseringar är aktiverade för den här sessionen.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Aviseringar är inaktiverade för den här sessionen.
@@ -624,7 +547,6 @@
     <string name="settings_troubleshoot_test_service_boot_failed">Tjänsten kommer inte att starta när enheten startas om, så du kommer inte att få aviseringar förrens Element har öppnats en gång.</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">Bakgrundsbegränsningar är aktiverade för Element.
 \nSaker som appen försöker göra kommer att kraftigt begränsas när appen är bakgrunden, och detta kan påverka aviseringar.
-\n
 \n%1$s</string>
     <string name="settings_troubleshoot_test_battery_failed">Om en användare lämnar sin enhet urkopplad och stilla en längre tid, med skärmen av, så går enheten in i Doze-läget. Detta hindrar appar från att komma åt nätverket och skjuter upp deras uppgifter, synkroniseringar och standardlarm.</string>
     <string name="settings_notification_privacy_fcm">• Aviseringar skickas via Firebase Cloud Messaging</string>
@@ -632,7 +554,6 @@
     <string name="settings_notification_privacy_secure_message_content">• Meddelandeinnehåll i aviseringen <b>hämtas på ett säkert sätt från Matrix-hemservern</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Aviseringar innehåller <b>meta- och meddeladedata</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Aviseringar kommer <b>inte att visa meddelandeinnehåll</b></string>
-
     <string name="settings_notification_ringtone">Aviseringsljud</string>
     <string name="settings_enable_all_notif">Aktivera aviseringar för det här kontot</string>
     <string name="settings_enable_this_device">Aktivera aviseringar för den här sessionen</string>
@@ -640,8 +561,6 @@
     <string name="settings_call_notifications_preferences">Konfigurera samtalsaviseringar</string>
     <string name="settings_silent_notifications_preferences">Konfigurera tysta aviseringar</string>
     <string name="settings_system_preferences_summary">Välj LED-färg, vibration, ljud…</string>
-
-
     <string name="settings_containing_my_user_name">Meddelanden innehållande mitt användarnamn</string>
     <string name="settings_messages_in_one_to_one">Meddelanden i direktchattar</string>
     <string name="settings_messages_in_group_chat">Meddelanden i gruppchattar</string>
@@ -652,7 +571,6 @@
     <string name="settings_keep_media">Behåll media</string>
     <string name="settings_clear_cache">Rensa cache</string>
     <string name="settings_clear_media_cache">Rensa mediacache</string>
-
     <string name="settings_notifications">Aviseringar</string>
     <string name="settings_ignored_users">Ignorerade användare</string>
     <string name="settings_advanced">Avancerat</string>
@@ -678,12 +596,10 @@
     <string name="account_email_already_used_error">Den här e-postadressen är upptagen.</string>
     <string name="account_email_not_found_error">Den här e-postadressen kunde inte hittas.</string>
     <string name="account_email_error">Ett fel hände vid verifiering av din e-postadress.</string>
-
     <string name="settings_unignore_user">Visa alla meddelanden från %s\?
 \n
 \nObservera att den har handlingen kommer att starta om appen, och det kan ta lite tid.</string>
     <string name="settings_delete_notification_targets_confirmation">Är du säker på att du vill ta bort det här aviseringsmålet\?</string>
-
     <string name="settings_media">Media</string>
     <string name="settings_default_media_source">Förvald mediakälla</string>
     <string name="settings_flair">Emblem</string>
@@ -694,37 +610,29 @@
     <string name="room_settings_labs_end_to_end">Totalsträckskryptering</string>
     <string name="room_settings_labs_end_to_end_is_active">Totalsträckskryptering är aktiv</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Skicka aldrig krypterade meddelanden till overifierade sessioner i det här rummet från den här sessionen.</string>
-
     <string name="room_settings_no_flair">Det här rummet visar inte emblem för några gemenskaper</string>
     <string name="room_settings_addresses_e2e_enabled">Kryptering är aktiverat i det här rummet.</string>
     <string name="encryption_information_title">Totalsträckskrypteringsinformation</string>
-
     <string name="encryption_information_device_name_with_warning">Publikt namn (synligt för folk som du pratar med)</string>
     <string name="device_name_warning">En sessions publika namn är synligt för personer du pratar med</string>
     <string name="encryption_message_recovery">Återställning av krypterade meddelanden</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Skicka aldrig krypterade meddelanden till overifierade sessioner från den här sessionen.</string>
-
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d avisering</item>
         <item quantity="other">%d aviseringar</item>
     </plurals>
-
     <string name="room_widget_webview_read_protected_media">Läs DRM-skyddad media</string>
-
     <string name="command_problem_with_parameters">Kommandot \"%s\" behöver fler parametrar, eller så är några av parametrarna felaktiga.</string>
     <string name="command_description_part_room">Lämna rummet</string>
     <string name="command_description_markdown">På/av Markdown</string>
     <string name="notification_off">Av</string>
     <string name="notification_silent">Tysta</string>
     <string name="notification_noisy">Högljudda</string>
-
     <string name="group_details_people">Personer</string>
     <string name="deactivate_account_title">Inaktivera konto</string>
     <string name="deactivate_account_delete_checkbox">Vänligen glöm alla meddelanden jag har skickat när mitt konto avaktiveras (varning: detta får framtida användare att se en inkomplett vy av konversationer)</string>
     <string name="deactivate_account_submit">Inaktivera konto</string>
-
     <string name="no_valid_google_play_services_apk">Ingen giltig \"Google Play-tjänster\"-APK hittades. Aviseringar kanske inte funkar ordentligt.</string>
-
     <string name="keys_backup_setup_step1_title">Bli aldrig av med krypterade meddelanden</string>
     <string name="keys_backup_setup_step1_description">Meddelanden i krypterade rum är säkrade med totalsträckskryptering. Bara du och mottagaren har nycklarna för att läsa dessa meddelanden.
 \n
@@ -740,17 +648,13 @@
     <string name="keys_backup_info_title_version">Version</string>
     <string name="autodiscover_invalid_response">Ogiltigt hemserversvar</string>
     <string name="invalid_or_expired_credentials">Du har blivit utloggad på grund av ogiltiga eller utgångna uppgifter.</string>
-
     <string name="sas_incoming_request_description">Verifiera den här sessionen för att markera den som betrodd. Att lita på folks sessioner ger dig extra sinnesro när du skickar totalsträckskrypterade meddelanden.</string>
     <string name="sas_verified_successful_description">Säkra meddelanden mellan dig och den här användaren är totalsträckskrypterade och kommer inte att vara läsbara för tredje parter.</string>
     <string name="identity_server_not_defined">Du använder ingen identitetsserver</string>
-
     <string name="settings_sdk_version">Matrix-SDK-version</string>
     <string name="settings_security_and_privacy">Säkerhet och sekretess</string>
     <string name="preference_voice_and_video">Röst &amp; video</string>
     <string name="preference_root_help_about">Hjälp &amp; om</string>
-
-
     <string name="terms_description_for_identity_server">Bli upptäckbar av andra</string>
     <string name="identity_server">Identitetsserver</string>
     <string name="disconnect_identity_server">Koppla bort identitetsserver</string>
@@ -772,54 +676,42 @@
     <string name="settings_discovery_no_terms">Identitetsservern du har valt har inga användarvillkor. Fortsätt endast om du litar på ägaren av servern</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Du delar för närvarande e-postadresser och telefonnummer på hemservern %1$s. Du kommer behöva återansluta till %2$s för att sluta dela dem.</string>
     <string name="settings_agree_to_terms">Acceptera identitetsserverns (%s) användarvillkor för att låta dig själv vara upptäckbar med e-postadress eller telefonnummer.</string>
-
     <string name="labs_allow_extended_logging_summary">Mångordiga loggar kommer att hjälpa utvecklare genom att skicka mer loggar när du skickar en raseriskakning. Även när det är aktiverat, så loggar appen inga meddelandeinnehåll eller annan privat data.</string>
-
-
     <string name="a11y_show_password">Visa lösenord</string>
     <string name="a11y_hide_password">Dölj lösenord</string>
     <string name="uploads_media_title">MEDIA</string>
     <string name="uploads_media_no_result">Det finns ingen media i det här rummet</string>
     <string name="uploads_files_title">FILER</string>
     <string name="uploads_files_no_result">Det finns inga filer i det här rummet</string>
-
     <string name="content_reported_content">Det här innehållet rapporterades.
 \n
-\nOm du inte vill se något mer innehåll från den här användaren så kan du blockera hen för att dölja hens meddelanden</string>
+\nOm du inte vill se något mer innehåll från den här användaren så kan du ignorera denne för att dölja dennes meddelanden.</string>
     <string name="content_reported_as_spam_content">Det här innehållet rapporterades som spam.
 \n
-\nOm du inte vill se något mer innehåll från den här användaren så kan du blockera hen för att dölja hens meddelanden</string>
+\nOm du inte vill se något mer innehåll från den här användaren så kan du ignorera denne för att dölja dennes meddelanden.</string>
     <string name="content_reported_as_inappropriate_content">Det här innehållet rapporterades som olämpligt.
 \n
-\nOm du inte vill se något mer innehåll från den här användaren så kan du blockera hen för att dölja hens meddelanden</string>
-
+\nOm du inte vill se något mer innehåll från den här användaren så kan du ignorera denne för att dölja dennes meddelanden.</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Alla meddelanden (högljutt)</string>
     <string name="room_list_quick_actions_notifications_all">Alla meddelanden</string>
     <string name="room_list_quick_actions_notifications_mentions">Endast omnämnande</string>
     <string name="room_list_quick_actions_notifications_mute">Tysta</string>
     <string name="room_list_quick_actions_leave">Lämna rummet</string>
     <string name="help_long_click_on_room_for_more_options">Långklicka på ett rum för att se fler alternativ</string>
-
-
     <string name="room_join_rules_invite">%1$s ändrade rummet till endast inbjudna.</string>
     <string name="login_splash_text1">Chatta med folk direkt eller i grupp</string>
     <string name="login_server_text">Precis som med e-post så har konton ett hem, fast du kan prata med vem som helst</string>
     <string name="login_server_modular_learn_more">Lär dig mer</string>
     <string name="login_server_other_text">Anpassade &amp; avancerade inställningar</string>
-
     <string name="login_login_with_email_error">Den här e-postadressen är inte associerad med något konto.</string>
-
     <string name="login_reset_password_on">Återställ lösenordet på %1$s</string>
     <string name="login_reset_password_notice">Ett verifikations-e-brev kommer att skickas till din inkorg för att bekräfta bytet av ditt lösenord.</string>
     <string name="login_reset_password_email_hint">E-post</string>
     <string name="login_reset_password_password_hint">Nytt lösenord</string>
-
     <string name="login_reset_password_warning_content">Att ändra ditt lösenord kommer att återställa alla nycklar för totalsträckskryptering på alla dina sessioner, och göra krypterad chatthistorik oläslig. Sätt upp nyckelsäkerhetskopiering eller exportera dina rumsnycklar från en annan session innan du återställer ditt lösenord.</string>
     <string name="login_reset_password_error_not_found">Den här e-postadressen är inte länkad till något konto</string>
-
     <string name="login_reset_password_mail_confirmation_notice">Ett verifikations-e-brev skickades till %1$s.</string>
     <string name="login_reset_password_mail_confirmation_submit">Jag har verifierat min e-postadress</string>
-
     <string name="login_reset_password_success_notice_2">Du har blivit utloggad ur alla sessioner och kommer inte längre motta pushnotiser. För att återaktivera pushnotiser, logga in igen på varje enhet.</string>
     <string name="login_set_email_title">Sätt e-postadress</string>
     <string name="login_set_email_notice">Sätt en e-postadress för att kunna återförva ditt konto. Senare kan du valfritt låta personer du känner upptäcka dig med din e-postadress.</string>
@@ -831,19 +723,14 @@
     <string name="login_wait_for_email_notice">Vi skickade just ett e-brev till %1$s. 
 \nKlicka på länken i det för att fortsätta med kontoskapandet.</string>
     <string name="login_error_outdated_homeserver_content">Den här hemservern kör en för gammal version för att ansluta till. Be administratören för hemservern att uppdatera.</string>
-
     <string name="soft_logout_signin_e2e_warning_notice">Logga in för att återfå krypteringsnycklar som endast lagras på den här enheten. Du behöver dem för att läsa alla dina säkra meddelanden på andra enheter.</string>
     <string name="soft_logout_clear_data_dialog_content">Rensa all data lagrad på den här enheten\?
 \nLogga in igen för att komma åt din kontodata och dina meddelanden.</string>
     <string name="settings_advanced_settings">Avancerade inställningar</string>
     <string name="autocomplete_limited_results">Visar endast de första resultaten, skriv mer…</string>
-
     <string name="settings_developer_mode_fail_fast_summary">Element kan krascha mer när ett oväntat fel inträffar</string>
-
     <string name="create_room_encryption_description">Efter aktivering så kan kryptering inte avaktiveras.</string>
-
     <string name="login_error_threepid_denied">Din e-postdomän är inte auktoriserad för att registrera på den här servern</string>
-
     <string name="room_profile_not_encrypted_subtitle">Meddelanden i det här rummet är inte totalsträckskrypterade.</string>
     <string name="room_profile_encrypted_subtitle">Meddelanden i det här rummet är totalsträckskrypterade.
 \n
@@ -862,36 +749,26 @@
     <string name="room_member_power_level_moderators">Moderatorer</string>
     <string name="verify_cannot_cross_sign">Den här sessionen kan inte dela den här verifikationen med dina andra sessioner.
 \nVerifikationen kommer att sparas lokalt och delas i en framtida version av appen.</string>
-
     <string name="room_settings_enable_encryption">Aktivera totalsträckskryptering</string>
     <string name="room_settings_enable_encryption_warning">Efter aktivering så kan kryptering inte avaktiveras.</string>
-
     <string name="room_settings_enable_encryption_dialog_content">Efter aktivering så kan kryptering inte avaktiveras. Meddelanden som skickas i ett krypterat rum kan inte läsas av servern, bara av deltagarna i rummet. Att aktivera kryptering kan kan göra att många bottar och bryggor inte funkar ordentligt.</string>
     <string name="verification_conclusion_ok_notice">Meddelanden mellan dig och den här användaren är totalsträckskrypterade och kan inte läsas av tredje parter.</string>
     <string name="verification_conclusion_ok_self_notice">Din nya session är nu verifierad. Den har tillgång till dina krypterade meddelanden, och andra användare kommer att se den som betrodd.</string>
-
-
     <string name="settings_active_sessions_unverified_device_desc">Verifiera den här sessionen gör att markera den som betrodd och ge den tillgång till dina krypterade meddelanden. Om det inte var du som loggade in i den här sessionen så kan ditt konto vara kapat:</string>
-
     <string name="verification_open_other_to_verify">Använd en existerande session för att verifiera den här och ge den tillgång till krypterade meddelanden.</string>
-
-
     <string name="bootstrap_cross_signing_success">Din %2$s &amp; %1$s är nu satta.
 \n
 \nHåll dem säkra! Du kommer att behöva dem för att låsa upp krypterade meddelanden och säker information om du förlorar alla dina aktiva sessioner.</string>
-
     <string name="encryption_enabled">Kryptering aktiverat</string>
     <string name="encryption_not_enabled">Kryptering inte aktiverat</string>
     <string name="settings_notification_configuration">Aviseringskonfiguration</string>
     <string name="settings_messages_at_room">Meddelanden som innehåller @room</string>
     <string name="settings_notification_advanced_summary">Sätt aviseringsprioritet för händelser</string>
-
     <string name="media_file_added_to_gallery">Mediafiler tillagda till galleriet</string>
     <string name="error_adding_media_file_to_gallery">Kunde inte lägga till mediafilen till galleriet</string>
     <string name="review_logins">Granska var du är inloggad</string>
     <string name="verify_other_sessions">Verifiera alla dina sessioner för att se till att ditt konto och dina meddelanden är säkra</string>
     <string name="create_room_dm_failure">Vi kunde inte skapa ditt DM. Vänligen kolla användarna du vill bjuda in och försök igen.</string>
-
     <string name="invite_users_to_room_action_invite">BJUD IN</string>
     <string name="invite_users_to_room_title">Bjud in användare</string>
     <plurals name="invitations_sent_to_one_and_more_users">
@@ -899,7 +776,6 @@
         <item quantity="other">Inbjudan skickad till %1$s och %2$d till</item>
     </plurals>
     <string name="invite_users_to_room_failure">Vi kunde inte bjuda in användarna. Vänligen kolla användarna du vill bjuda in och försök igen.</string>
-
     <string name="disconnect_identity_server_dialog_content">Koppla bort från identitetsservern %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Den här identitetsservern är utdaterat. Element stöder endast API V2.</string>
     <string name="identity_server_error_no_identity_server_configured">Vänligen konfigurera en identitetsserver.</string>
@@ -908,7 +784,6 @@
     <string name="identity_server_set_alternative_notice">Alternativt så kan du skriva in en annan identitetsserver-URL</string>
     <string name="identity_server_set_alternative_notice_no_default">Skriv in URL för en identitetsserver</string>
     <string name="e2e_use_keybackup">Lås upp krypterad meddelandehistorik</string>
-
     <string name="verify_new_session_notice">Använd den här sessionen för att verifiera din nya och ge den tillgång till krypterade meddelanden.</string>
     <string name="verify_cancel_self_verification_from_untrusted">Om du avbryter så kommer du inte kunna läsa krypterade meddelanden på den här enheten, och andra användare kommer inte att lita på den</string>
     <string name="verify_cancel_self_verification_from_trusted">Om du avbryter så kommer du inte kunna läsa krypterade meddelanden på din nya enhet, och andra användare kommer inte att lita på den</string>
@@ -917,31 +792,22 @@
 \n
 \nOm du inte vill sätta ett meddelandelösenord, generera en meddelandenyckel istället.</string>
     <string name="bootstrap_skip_text_no_gen_key">Att sätta en återställningslösenfras låter dig säkra och låsa upp krypterade meddelanden och pålitlighet.</string>
-
-
     <string name="settings_invited_to_room">När jag bjuds in till ett rum</string>
     <string name="settings_call_invitations">Samtalsinbjudningar</string>
     <string name="settings_messages_sent_by_bot">Meddelanden skickade av en bott</string>
-
     <string name="settings_user_interface">Användargränssnitt</string>
     <string name="settings_interface_language">Språk</string>
     <string name="settings_select_language">Välj språk</string>
-
     <string name="settings_theme">Tema</string>
-
     <string name="room_widget_permission_theme">Ditt tema</string>
     <string name="choose_locale_current_locale_title">Nuvarande språk</string>
     <string name="choose_locale_other_locales_title">Andra tillgängliga språk</string>
     <string name="choose_locale_loading_locales">Laddar tillgängliga språk…</string>
-
     <string name="play_video">Spela</string>
     <string name="pause_video">Pausa</string>
     <string name="dismiss">Avfärda</string>
-
-
     <string name="action_copy">Kopiera</string>
     <string name="dialog_title_success">Framgång</string>
-
     <string name="bottom_action_notification">Aviseringar</string>
     <string name="call_switch_camera">Byt kamera</string>
     <string name="room_participants_action_ignore_prompt_msg">Att ignorera den här användaren kommer att ta bort hens meddelanden från rum ni delar.
@@ -951,33 +817,28 @@
     <string name="room_message_placeholder_not_encrypted">Skicka ett meddelande (okrypterat)…</string>
     <string name="room_message_file_not_found">Filen hittades inte</string>
     <plurals name="room_new_messages_notification">
-        <item quantity="one">1 nytt meddelande</item>
+        <item quantity="one">%d nytt meddelande</item>
         <item quantity="other">%d nya meddelanden</item>
     </plurals>
-
     <string name="ssl_expected_existing_expl">Certifikatet har ändrats från ett betrott till ett som inte är betrott. Servern kan ha förnyat sitt certifikat. Kontakta serveradministratören för det förväntade fingeravtrycket.</string>
     <string name="room_details_settings">Inställningar</string>
     <string name="room_sliding_menu_settings">Inställningar</string>
     <string name="settings_troubleshoot_test_system_settings_title">Systeminställningar.</string>
     <string name="open_settings">Öppna inställningar</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Kontoinställningar.</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sessionsinställningar.</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Anpassade inställningar.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Kolla inställningar</string>
-
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_integrations">Integrationer</string>
     <string name="settings_integrations_summary">Använd en integrationshanterare för att hantera bottar, bryggor, widgets och dekalpaket. 
 \nIntegrationshanterare får konfigurationsdata, och kan ändra widgets, skicka rumsinbjudningar, och ändra behörighetsnivåer å dina vägnar.</string>
     <string name="settings_send_message_with_enter">Skicka meddelande med retur</string>
     <string name="settings_send_message_with_enter_summary">Returtangenten på mjukvarutangentbordet kommer att skicka ett meddelande istället för att lägga till ett radslut</string>
-
     <string name="settings_secure_backup_section_info">Skydda dig mot att tappa åtkomst till krypterade meddelanden och data genom att säkerhetskopiera krypteringsnycklarna på din server.</string>
     <string name="settings_integration_allow">Tillåt integrationer</string>
     <string name="disabled_integration_dialog_title">Integrationer är avstängda</string>
     <string name="disabled_integration_dialog_content">Aktivera \'Tillåt integrationer\' I inställningarna för att göra detta.</string>
-
     <string name="encryption_export_room_keys_summary">Exportera nycklarna till en lokal fil</string>
     <string name="encryption_export_saved_as">Krypteringsnycklarna har sparats till \'%s\'.
 \n
@@ -988,18 +849,17 @@
 \nVi rekommenderar att du går igenom verifieringsprocessen för varje session innan du fortsätter, men du kan skicka meddelandet utan att verifiera om du föredrar.
 \n
 \nOkända sessioner:</string>
-
     <string name="select_room_directory">Välj en rumskatalog</string>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">1 oläst aviserat meddelande</item>
+        <item quantity="one">%d oläst aviserat meddelande</item>
         <item quantity="other">%s olästa aviserade meddelanden</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">1 oläst aviserat meddelande</item>
+        <item quantity="one">%d oläst aviserat meddelande</item>
         <item quantity="other">%s olästa aviserade meddelanden</item>
     </plurals>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: 1 meddelande</item>
+        <item quantity="one">%1$s: %2$d meddelande</item>
         <item quantity="other">%1$s: %2$d meddelanden</item>
     </plurals>
     <string name="font_size">Teckenstorlek</string>
@@ -1010,49 +870,37 @@
     <string name="larger">Större</string>
     <string name="largest">Störst</string>
     <string name="huge">Enorm</string>
-
     <string name="room_widget_webview_access_camera">Använd kameran</string>
     <string name="room_add_matrix_apps">Lägg till Matrix-appar</string>
     <string name="settings_labs_native_camera">Använd den inbyggda kameran</string>
     <string name="settings_labs_native_camera_summary">Starta systemets kamera istället för den inbyggda kameraskärmen.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Använd returtangenten för att skicka meddelande</string>
     <string name="encrypted_message">Krypterat meddelande</string>
-
     <string name="resource_limit_contact_action">Kontakta administratören</string>
-
     <string name="resource_limit_contact_admin">kontakta din tjänstadministratör</string>
-
     <string name="keys_backup_setup_step3_save_button_title">Spara som fil</string>
     <string name="recovery_key_export_saved_as_warning">Återställningsnyckeln har sparats till \'%s\'.
 \n
 \nVarning: den har filen kan komma att raderas om appen avinstalleras.</string>
     <string name="keys_backup_restore_setup_recovery_key">Meddelandeåterställning</string>
-
     <string name="keys_backup_settings_delete_confirm_message">Radera dina säkerhetskopierade krypteringsnycklar från servern\? Du kommer inte längre kunna använda din återställningsnyckel för att läsa krypterad meddelandehistorik.</string>
-
     <string name="secure_backup_banner_setup_line2">Skydda dig mot att tappa åtkomst till krypterade meddelanden och data</string>
-
     <string name="keys_backup_banner_update_line1">Nya säkra meddelandenycklar</string>
     <string name="sas_error_m_unexpected_message">Den här sessionen fick ett oväntat meddelande</string>
     <string name="sas_error_m_invalid_message">Ett ogiltigt meddelande mottogs</string>
     <string name="room_list_people_empty_body">Dina direktmeddelandekonversationer kommer att visas här</string>
     <string name="event_redacted">Meddelande raderat</string>
     <string name="import_e2e_keys_from_file">Importera krypteringsnycklar från filen \"%1$s\".</string>
-
     <string name="send_file_step_encrypting_file">Krypterar fil…</string>
     <string name="send_file_step_sending_file">Skickar fil (%1$s / %2$s)</string>
-
     <string name="downloading_file">Laddar ner filen %1$s…</string>
     <string name="downloaded_file">Filen %1$s har laddats ner!</string>
-
     <string name="message_edits">Meddelanderedigeringar</string>
     <string name="add_by_matrix_id">Lägg till med Matrix-ID</string>
     <string name="direct_room_no_known_users">Inga resultat hittade, använd \"Lägg till med Matrix-ID\" för att söka på servern.</string>
     <string name="terms_description_for_integration_manager">Använd bottar, bryggor, widgets och dekalpaket</string>
-
     <string name="settings_text_message_sent">Ett textmeddelande har skickats till %s. Vänligen skriv in verifieringskoden det innehåller.</string>
     <string name="error_file_too_big">Filen \'%1$s\' (%2$s) är för stor för att laddas upp. Gränsen är %3$s.</string>
-
     <string name="attachment_type_file">Fil</string>
     <string name="attachment_type_contact">Kontakt</string>
     <string name="attachment_type_camera">Kamera</string>
@@ -1062,38 +910,28 @@
     <string name="command_description_spoiler">Skickar det valda meddelandet som en spoiler</string>
     <string name="login_server_matrix_org_text">Gå med miljontals användare gratis på den största publika servern</string>
     <string name="command_description_shrug">Lägger till ¯\\_(ツ)_/¯ till början av ett textmeddelande</string>
-
     <string name="sent_an_audio_file">Ljud</string>
     <string name="sent_a_file">Fil</string>
     <string name="send_a_sticker">Dekal</string>
-
     <string name="rendering_event_error_type_of_message_not_handled">Element hanterar inte meddelanden av typen \'%1$s\'</string>
     <string name="command_description_rainbow">Skickar det valda meddelandet I regnbågsfärger</string>
     <string name="settings_category_composer">Meddelanderedigering</string>
-
     <string name="message_key">Meddelandenyckel</string>
     <string name="generate_message_key">Generera en meddelandenyckel</string>
-
     <string name="bootstrap_cancel_text">Om du avbryter nu så kan du komma att förlora krypterade meddelanden och data om du förlorar åtkomst till dina inloggade sessioner.
 \n
 \nDu kan också sätta upp säker säkerhetskopiering och hantera dina nycklar in inställningarna.</string>
-
     <string name="settings_messages_in_e2e_one_to_one">Krypterade meddelanden i en-till-en-chattar</string>
     <string name="settings_messages_in_e2e_group_chat">Krypterade meddelanden i gruppchattar</string>
     <string name="settings_troubleshoot_title">Felsökning</string>
     <string name="command_description_plain">Skicka ett meddelande som vanlig text, utan att tolka det som Markdown</string>
-
     <string name="room_message_placeholder">Meddelande…</string>
-
     <string name="use_file">Använd fil</string>
-
     <string name="error_saving_media_file">Kunde inte spara mediefil</string>
     <string name="change_password_summary">Sätt ett nytt kontolösenord…</string>
-
     <string name="confirm_your_identity">Bekräfta din identitet genom att verifiera den här inloggningen från en av dina andra sessioner, och ge den åtkomst till dina krypterade meddelanden.</string>
     <string name="a11y_stop_camera">Stoppa kameran</string>
     <string name="a11y_start_camera">Starta kameran</string>
-
     <string name="bottom_sheet_setup_secure_backup_subtitle">Skydda dig mot att tappa åtkomst till krypterade meddelanden och data genom att säkerhetskopiera krypteringsnycklarna på din server.</string>
     <string name="notice_crypto_unable_to_decrypt_final">Du kan inte komma åt det här meddelandet</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Väntar på det här meddelandet, det här kan ta ett tag</string>
@@ -1115,7 +953,6 @@
     <string name="call_failed_no_connection">Elementsamtal misslyckades</string>
     <string name="call_failed_no_connection_description">Misslyckades att upprätta en realtidsuppkoppling.
 \nVänligen be administratören för din hemserver att konfigurera en TURN-server för att samtal ska fungera pålitligt.</string>
-
     <string name="call_select_sound_device">Välj ljudenhet</string>
     <string name="sound_device_phone">Telefon</string>
     <string name="sound_device_speaker">Högtalare</string>
@@ -1125,25 +962,20 @@
     <string name="call_camera_back">Bak</string>
     <string name="call_format_turn_hd_off">Stäng av HD</string>
     <string name="call_format_turn_hd_on">Sätt på HD</string>
-
     <string name="login_error_ssl_peer_unverified">SSL-fel: andra partens identitet har inte verifierats.</string>
     <string name="login_error_ssl_other">SSL-fel.</string>
     <string name="settings_call_show_confirmation_dialog_title">Förhindra oavsiktligt samtal</string>
     <string name="settings_call_show_confirmation_dialog_summary">Fråga efter bekräftelse innan ett samtal startas</string>
     <string name="active_call_with_duration">Aktivt samtal (%s)</string>
     <string name="return_to_call">Återgå till samtal</string>
-
     <string name="room_participants_action_cancel_invite">Avbryt inbjudan</string>
     <string name="room_participants_action_mention">Omnämn</string>
     <string name="room_participants_action_devices_list">Visa sessionslista</string>
     <string name="room_participants_power_level_prompt">Du kommer inte kunna ångra den här ändringen eftersom du befordrar användaren till samma behörighetsnivå som dig själv.
 \nÄr du säker\?</string>
-
     <string name="room_participants_power_level_demote_warning_title">Degradera dig själv\?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Du kommer inte kunna ångra den här ändringen eftersom du degraderar dig själv. Om du är den sista privilegierade användaren i det här rummet så kommer det att vara omöjligt att återfå privilegier.</string>
     <string name="room_participants_power_level_demote">Degradera</string>
-
-
     <string name="room_participants_action_ignore_title">Ignorera användare</string>
     <string name="room_participants_action_unignore_title">Avignorera användare</string>
     <string name="room_participants_action_unignore_prompt_msg">Att avignorera den här användaren kommer att visa alla meddelanden från hen igen.</string>
@@ -1159,17 +991,13 @@
     <string name="room_participants_unban_title">Avbanna användaren</string>
     <string name="room_participants_ban_prompt_msg">Att banna användaren kommer att kicka hen från det här rummet och hindra hen från att gå med igen.</string>
     <string name="room_participants_unban_prompt_msg">Att avbanna användaren kommer att låta hen gå med i rummet igen.</string>
-
     <string name="reason_hint">Anledning</string>
-
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s och %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="people_search_local_contacts">LOKALA KONTAKTER (%d)</string>
     <string name="people_search_user_directory">ANVÄNDARKATALOG (%s)</string>
     <string name="people_search_filter_text">Endast Matrixanvändare</string>
-
     <string name="room_menu_search">Sök</string>
     <string name="room_one_user_is_typing">%s skriver…</string>
     <string name="room_two_users_are_typing">%1$s och %2$s skriver…</string>
@@ -1193,18 +1021,15 @@
     <string name="ssl_cert_new_account_expl">Om serveradministratören har sagt att detta är förväntat, försäkra att fingeravtrycket nedan matchar fingeravtrycket de angav.</string>
     <string name="ssl_unexpected_existing_expl">Certifikatet har ändrats från ett som var betrott av din mobil. Detta är HÖGST OVANLIGT. Du rekommenderas att INTE ACCEPTERA det nya certifikatet.</string>
     <string name="ssl_only_accept">Acceptera endast certifikatet om serveradministratören har publicerat ett fingeravtryck som matchar det ovan.</string>
-
     <plurals name="room_details_selected">
-        <item quantity="one">1 valt</item>
+        <item quantity="one">%d valt</item>
         <item quantity="other">%d valda</item>
     </plurals>
     <string name="room_details_people_invited_group_name">INBJUDNA</string>
     <string name="room_details_people_present_group_name">ANSLUTNA</string>
-
     <string name="room_event_action_report_prompt_reason">Anledning för att rapportera det här innehållet</string>
     <string name="room_event_action_cancel_upload">Avbryt uppladdning</string>
     <string name="room_event_action_cancel_download">Avbryt nedladdning</string>
-
     <string name="search_hint">Sök</string>
     <string name="search_no_results">Inga resultat</string>
     <string name="tab_title_search_messages">MEDDELANDEN</string>
@@ -1218,40 +1043,31 @@
     <string name="room_recents_join_room">Gå med i rum</string>
     <string name="room_recents_join_room_title">Gå med i ett rum</string>
     <string name="room_recents_join_room_prompt">Skriv ett rums-ID eller ett rumsalias</string>
-
     <string name="directory_search_results_title">Bläddra i katalogen</string>
     <string name="directory_searching_title">Söker i katalog…</string>
-
     <string name="room_settings_favourite">Favorit</string>
     <string name="room_settings_de_prioritize">Nedprioritera</string>
     <string name="room_settings_forget">Glöm</string>
-    <string name="room_settings_add_homescreen_shortcut">Lägg till en genväg på hemskärmen</string>
-
+    <string name="room_settings_add_homescreen_shortcut">Lägg till på hemskärmen</string>
     <string name="room_sliding_menu_messages">Meddelanden</string>
     <string name="room_sliding_menu_term_and_conditions">Användarvillkor</string>
     <string name="room_sliding_menu_third_party_notices">Meddelanden från tredje part</string>
     <string name="room_sliding_menu_copyright">Upphovsrätt</string>
     <string name="room_sliding_menu_privacy_policy">Integritetspolicy</string>
-
     <string name="settings_phone_number">Telefon</string>
     <string name="settings_add_3pid_flow_not_supported">Du kan inte göra detta från element på mobilen</string>
     <string name="settings_add_3pid_authentication_needed">Autentisering krävs</string>
-
-
     <string name="settings_troubleshoot_diagnostic">Diagnostik för felsökning</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Kör tester</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Kör… (%1$d av %2$d)</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Sätt på</string>
-
     <string name="settings_troubleshoot_test_device_settings_quickfix">Sätt på</string>
-
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Misslyckades att ladda anpassade regler, vänligen försök igen.</string>
     <string name="settings_troubleshoot_test_play_services_title">Kolla Play-tjänster</string>
     <string name="settings_troubleshoot_test_play_services_success">APK:n Google Play-tjänster är tillgänglig och uppdaterad.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element använder Google Play-tjänster för att skicka pushmeddelanden, men den verkar inte vara korrekt konfigurerad:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Fixa Play-tjänster</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Firebase-token</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM-token hämtades framgångsrikt:
 \n%1$s</string>
@@ -1264,30 +1080,23 @@
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDet här felet är ur Elements kontroll. Det finns inget Google-konto på telefonen. Vänligen öppna kontohanteraren och lägg till ett Google-konto.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lägg till konto</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">Token-registrering</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM-token registrerades framgångsrikt på hemservern.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Misslyckades att registrera FCM-token på hemservern:
 \n%1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Starta tjänst</string>
-
     <string name="settings_troubleshoot_test_service_restart_success">Tjänsten dödades och startades om automatiskt.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Tjänsten misslyckades att starta om</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Starta vid boot</string>
     <string name="settings_troubleshoot_test_service_boot_success">Tjänsten kommer att startas när enheten startas om.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktivera start på boot</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Kolla bakgrundsrestriktioner</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Bakgrundsrestriktioner är inaktiverade för Element. Detta test bör köras med mobildata (inte Wi-Fi).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Inaktivera restriktioner</string>
-
     <string name="settings_troubleshoot_test_battery_title">Batterioptimering</string>
     <string name="settings_troubleshoot_test_battery_success">Element påverkas inte av batterioptimering.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorera optimering</string>
-
     <string name="settings_notification_privacy_reduced">Reducerad sekretess</string>
     <string name="settings_notification_privacy_need_permission">Den här appen behöver behörighet att köra i bakgrunden</string>
     <string name="settings_notification_privacy_no_background_sync">Apparna behöver <b>inte</b> ansluta till hemservern i bakgrunden, det bör reducera batterianvändning</string>
@@ -1325,7 +1134,6 @@
     <string name="encryption_export_export">Exportera</string>
     <string name="encryption_export_notice">Vänligen skapa en lösenfras för att kryptera de exporterade nycklarna. Du kommer behöva skriva in samma lösenfras för att kunna importera nycklarna.</string>
     <string name="encryption_settings_manage_message_recovery_summary">Hantera nyckelsäkerhetskopiering</string>
-
     <string name="encryption_import_e2e_room_keys">Importera krypteringsnycklar</string>
     <string name="encryption_import_room_keys">Importera rumsnycklar</string>
     <string name="encryption_import_import">Importera</string>
@@ -1343,26 +1151,19 @@
 \nSessionsnamn: %1$s
 \nSenast sedd: %2$s
 \nOm du inte loggade in i en annan session, ignorera denna begäran.</string>
-
     <string name="markdown_has_been_enabled">Markdown har aktiverats.</string>
     <string name="markdown_has_been_disabled">Markdown har inaktiverats.</string>
-
     <string name="dialog_user_consent_content">För att fortsätta använda hemservern %1$s så måste du läsa och godkänna användarvillkoren.</string>
     <string name="keys_backup_no_session_error">Ingen Matrixsession tillgänglig</string>
-
     <string name="keys_backup_setup">Börja använda nyckelsäkerhetskopiering</string>
     <string name="keys_backup_setup_step1_manual_export">Exportera nycklar manuellt</string>
-
     <string name="keys_backup_setup_step2_text_title">Säkra din säkerhetskopia med en lösenfras.</string>
     <string name="keys_backup_setup_step1_recovery_key_alternative">Eller säkra din säkerhetskopia med en återställningsnyckel och spara den någonstans säkert.</string>
     <string name="keys_backup_setup_step3_text_line1">Dina nycklar säkerhetskopieras.</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Det ser ut som att du redan har konfigurerat säker säkerhetskopiering från en annan session. Vill du ersätta den med den du skapar\?</string>
     <string name="keys_backup_setup_backup_started_message">Dina krypteringsnycklar säkerhetskopieras just nu till din hemserver i bakgrunden. Den initiala säkerhetskopieringen kan ta flera minuter.</string>
-
-
     <string name="keys_backup_restore_with_key_helper">Förlorat din återställningsnyckel\? Du kan sätta upp en ny i inställningarna.</string>
     <string name="keys_backup_recovery_code_error_decrypt">Säkerhetskopieringen kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du skrev in rätt återställningsnyckel.</string>
-
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Återställde en säkerhetskopia med %d nyckel.</item>
         <item quantity="other">Återställde en säkerhetskopia med %d nycklar.</item>
@@ -1371,17 +1172,12 @@
         <item quantity="one">%d ny nyckel har lagts till till den här sessionen.</item>
         <item quantity="other">%d nya nycklar har lagts till till den här sessionen.</item>
     </plurals>
-
     <string name="keys_backup_no_keysbackup_sdk_error">Sessionskrypto är inte aktiverats</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">Återställ från säkerhetskopia</string>
     <string name="keys_backup_settings_delete_backup_button">Radera säkerhetskopia</string>
-
     <string name="keys_backup_settings_status_ok">Nyckelsäkerhetskopiering har blivit korrekt konfigurerad för den här sessionen.</string>
     <string name="keys_backup_settings_status_ko">Nyckelsäkerhetskopiering är inte aktiverad på den här sessionen.</string>
     <string name="keys_backup_settings_status_not_setup">Dina nycklar säkerhetskopieras inte från den här sessionen.</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">Säkerhetskopian har en signatur från en okänd session med ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Säkerhetskopian har en giltig signatur från den här sessionen.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Säkerhetskopian har en giltig signatur från den verifierade sessionen %s.</string>
@@ -1390,31 +1186,23 @@
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Säkerhetskopian har en ogiltig signatur från den overifierade sessionen %s</string>
     <string name="keys_backup_settings_untrusted_backup">För att använda nyckelsäkerhetskopiering i den här sessionen, återställ med din lösenfras eller återställningsnyckel nu.</string>
     <string name="keys_backup_settings_delete_backup_error">Misslyckades att radera säkerhetskopia (%s)</string>
-
     <string name="keys_backup_settings_delete_confirm_title">Radera säkerhetskopia</string>
     <string name="new_recovery_method_popup_title">Ny nyckelsäkerhetskopia</string>
     <string name="keys_backup_banner_setup_line2">Börja använda nyckelsäkerhetskopiering</string>
-
     <string name="secure_backup_banner_setup_line1">Säker säkerhetskopiering</string>
     <string name="keys_backup_banner_recover_line2">Använd nyckelsäkerhetskopiering</string>
-
     <string name="keys_backup_banner_update_line2">Hantera i nyckelsäkerhetskopieringen</string>
-
     <string name="secure_backup_setup">Sätt upp säker säkerhetskopiering</string>
-
     <string name="keys_backup_info_keys_all_backup_up">Alla nycklar säkerhetskopierade</string>
     <string name="keys_backup_info_title_algorithm">Algoritm</string>
     <string name="sas_incoming_request_description_2">Att verifiera den här sessionen kommer att markera den som betrodd, och även markera din session som betrodd för den andra parten.</string>
-
     <string name="sas_emoji_description">Verifiera den här sessionen genom att bekräfta att följande emojier visas på den andra partens skärm</string>
     <string name="sas_decimal_description">Verifiera den här sessionen genom att bekräfta att följande nummer visas på den andra partens skärm</string>
-
     <string name="sas_verified_successful">Du har framgångsrikt verifierat den här sessionen.</string>
     <string name="sas_cancelled_by_other">Den andra parten avbröt verifikationen.
 \n%s</string>
     <string name="sas_verification_request_notification_channel">Interaktiv sessionsverifiering</string>
     <string name="sas_incoming_request_notif_content">%s vill verifiera din session</string>
-
     <string name="sas_error_m_unknown_transaction">Sessionen känner inte till den överföringen</string>
     <string name="sas_error_m_unknown_method">Sessionen kan inte komma överens om ett nyckelavtal, hash, MAC eller SAS-metod</string>
     <string name="settings_show_redacted">Visa borttagna meddelanden</string>
@@ -1423,13 +1211,10 @@
     <string name="settings_push_rules">Pushregler</string>
     <string name="settings_push_rules_no_rules">Inga pushregler satta</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Visa dolda händelser i tidslinjen</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Tillåt att svajpa för att svara i tidslinjen</string>
     <string name="labs_show_unread_notifications_as_tab">Lägg till en dedikerad flik för olästa aviseringar på startskärmen.</string>
-
     <string name="labs_allow_extended_logging">Aktivera mångordiga loggar.</string>
     <string name="error_terms_not_accepted">Vänligen försök igen när du har godkänt användarvillkoren för din hemserver.</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="one">%1$s, %2$s och %3$d annan har läst</item>
         <item quantity="other">%1$s, %2$s och %3$d andra har läst</item>
@@ -1437,9 +1222,7 @@
     <string name="permissions_rationale_msg_keys_backup_export">Element behöver behörighet för att spara dina nycklar för totalsträckskryptering i lagringen.
 \n
 \nVänligen ge tillstånd i nästa popup för att kunna manuellt exportera dina nycklar.</string>
-
     <string name="no_ignored_users">Du ignorerar inga användare</string>
-
     <string name="login_server_other_title">Annan</string>
     <string name="login_signin_matrix_id_notice">Om du har skapat ett konto på en hemserver så kan du använda ditt Matrix-ID (t.ex. @användare:domän.com) och lösenord nedan.</string>
     <string name="signed_out_notice">Detta kan bero på flera orsaker:
@@ -1454,7 +1237,6 @@
 \nRensa den om du inte ska använda den här enheten längre, eller vill logga in på ett annat konto.</string>
     <string name="soft_logout_sso_not_same_user_error">Den nuvarande sessionen är för användaren %1$s och du försedde uppgifter för användaren %2$s. Detta stöds inte av Element.
 \nVänligen rensa först data, och logga sen in på ett annat konto.</string>
-
     <string name="settings_show_devices_list">Se alla mina sessioner</string>
     <string name="settings_developer_mode">Utvecklarläge</string>
     <string name="settings_developer_mode_summary">Utvecklarläget aktiverar dolda funktioner och kan också göra appen mindre stabil. Endast för utvecklare!</string>
@@ -1463,7 +1245,6 @@
     <string name="settings_rageshake_detection_threshold_summary">Skaka din mobil för att testa detektionsgränsen</string>
     <string name="devices_current_device">Nuvarande session</string>
     <string name="devices_other_devices">Andra sessioner</string>
-
     <string name="settings_developer_mode_fail_fast_title">Misslyckas snabbt</string>
     <string name="verification_conclusion_compromised">En av följande kan vara äventyrad:
 \n
@@ -1471,11 +1252,9 @@
 \n - Hemservern användaren du verifierar är ansluten till
 \n - Din eller den andra användarens internetanslutning
 \n - Din eller den andra användarens enhet</string>
-
     <string name="verification_verify_device">Verifiera den här sessionen</string>
     <string name="verification_scan_notice">Skanna koden med den andra användarens enhet för att säkert verifiera varandra</string>
     <string name="settings_category_timeline">Tidslinje</string>
-
     <string name="verification_code_notice">Jämför koden med den som visas på den andra användarens skärm.</string>
     <string name="encryption_information_cross_signing_state">Korssignering</string>
     <string name="encryption_information_dg_xsigning_complete">Korssignering är aktiverad
@@ -1483,35 +1262,28 @@
     <string name="encryption_information_dg_xsigning_trusted">Korssignering är aktiverad
 \nNycklar är betrodda.
 \nPrivata nycklar är inte kända</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">Korssignering är aktiverad
+    <string name="encryption_information_dg_xsigning_not_trusted">Korssignering är aktiverad.
 \nNycklar är inte betrodda</string>
     <string name="encryption_information_dg_xsigning_disabled">Korssignering är inte aktiverat</string>
-
     <string name="settings_active_sessions_list">Aktiva sessioner</string>
     <string name="settings_active_sessions_show_all">Visa alla sessioner</string>
     <string name="settings_active_sessions_manage">Hantera sessioner</string>
     <string name="settings_active_sessions_signout_device">Logga ut ur den här sessionen</string>
-
     <string name="settings_active_sessions_verified_device_desc">Den här sessionen är betrodd för säker kommunikation för att du verifierade den:</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d aktiv session</item>
         <item quantity="other">%d aktiva sessioner</item>
     </plurals>
-
     <string name="crosssigning_other_user_not_trust">Andra användare kanske inte litar på den</string>
     <string name="room_member_profile_failed_to_get_devices">Misslyckades att hämta sessioner</string>
     <string name="room_member_profile_sessions_section_title">Sessioner</string>
     <string name="verification_profile_device_verified_because">Den här sessionen är betrodd för säker kommunikationen för säker kommunikation för att %1$s (%2$s) verifierade den:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) loggade in i en ny session:</string>
     <string name="verification_profile_device_untrust_info">Tills den här användaren litar på den här sessionen så kommer meddelanden skickade till och från den att bli märkta med varningar. Alternativt så kan du manuellt verifiera den.</string>
-
-
     <string name="settings_dev_tools">Utvecklarverktyg</string>
     <string name="settings_account_data">Kontodata</string>
     <string name="verification_use_passphrase">Om du inte kan komma åt en existerande session</string>
-
     <string name="settings_key_requests">Nyckelförfrågningar</string>
-
     <string name="verify_not_me_self_verification">En av följande kan vara äventyrad:
 \n
 \n- Ditt lösenord
@@ -1520,14 +1292,10 @@
 \n- Internetuppkopplingen en av enheterna använder
 \n
 \nVi rekommenderar att du ändrar ditt lösenord och återställningsnyckel i inställningarna omedelbart.</string>
-
     <string name="bootstrap_crosssigning_progress_key_backup">Sätter upp nyckelsäkerhetskopiering</string>
-
-
     <string name="bootstrap_crosssigning_save_usb">Spara den på ett USB-minne eller en säkerhetskopieringsenhet</string>
     <string name="qr_code_scanned_self_verif_notice">Nästan färdigt! Visar den andra enheten samma sköld\?</string>
     <string name="error_failed_to_import_keys">Misslyckades att importera nycklar</string>
-
     <string name="setup_cross_signing">Aktivera korssignering</string>
     <string name="bootstrap_progress_checking_backup">Kollar säkerhetskopieringsnyckel</string>
     <string name="bootstrap_progress_checking_backup_with_info">Kollar säkerhetskopieringsnyckel (%s)</string>
@@ -1535,29 +1303,23 @@
     <string name="bootstrap_migration_use_recovery_key">använda din återställningsnyckel för säkerhetskopiering</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Om du inte känner till din lösenfras för säkerhetskopia så kan du %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Återställningsnyckel för säkerhetskopiering</string>
-
     <string name="settings_security_prevent_screenshots_title">Förhindra skärmdumpar av appen</string>
     <string name="settings_security_prevent_screenshots_summary">Att aktivera den här inställningen lägger till FLAG_SECURE till alla aktiviteter. Starta om appen för att inställningen ska få effekt.</string>
-
     <string name="use_other_session_content_description">Använd senaste Element på dina andra enheter; Element Web, Element iOS, Element för Android, eller annan Matrixklient som stöder korssignering</string>
     <string name="or_other_mx_capabale_client">eller en annan Matrixklient som städer korssignering</string>
     <string name="use_latest_app">Använd senaste Element på dina andra enheter:</string>
     <string name="command_description_discard_session">Tvingar den nuvarande utgående gruppsessionen i ett krypterat rum att kasseras</string>
     <string name="keys_backup_recovery_key_error_decrypt">Säkerhetskopian kunde inte avkrypteras med den här återställningsnyckeln: vänligen verifiera att du skrev in rätt återställningsnyckel.</string>
     <string name="settings_setup_secure_backup">Sätt upp säker säkerhetskopiering</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">Säker säkerhetskopiering</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Sätt upp</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Skriv in en hemlig fras endast du känner till, och generera en nyckel för säkerhetskopiering.</string>
-
     <string name="settings_background_fdroid_sync_mode_battery_description">Element kommer att synka i bakgrunden på ett sätt som sparar på enhetens begränsade resurser (batteri).
 \nBeroende på din enhets resurser, så kan synkroniseringen bli uppskjuten av operativsystemet.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Optimerad för realtid</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Ingen bakgrundssynk</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du kommer inte att bli aviserad om inkommande meddelanden när appen är i bakgrunden.</string>
     <string name="settings_background_sync_update_error">Misslyckades att uppdatera inställningarna.</string>
-
-
     <string name="settings_start_on_boot">Starta vid boot</string>
     <string name="settings_enable_background_sync">Aktivera bakgrundssynk</string>
     <string name="settings_set_sync_timeout">Timeout för synkbegäran</string>
@@ -1565,7 +1327,6 @@
     <string name="settings_set_workmanager_delay_summary">%s
 \nSynkroniseringen kan skjutas upp beroende på resurserna (batteri) eller status för enheten (vila).</string>
     <string name="settings_set_sync_delay">Fördröjning mellan varje synkronisering</string>
-
     <string name="settings_contact">Lokala kontakter</string>
     <string name="settings_contacts_app_permission">Kontaktbehörighet</string>
     <string name="settings_contacts_phonebook_country">Land för telefonbok</string>
@@ -1578,19 +1339,15 @@
     <string name="settings_vibrate_on_mention">Vibrera när en användare nämns</string>
     <string name="settings_secure_backup_manage">Hantera</string>
     <string name="reset_secure_backup_warning">Detta kommer att ersätta din nuvarande nyckel eller fras.</string>
-
     <string name="startup_notification_privacy_button_grant">Ge behörighet</string>
     <string name="startup_notification_privacy_button_other">Välj ett annat alternativ</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">Bakgrundsanslutning</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Ge behörighet</string>
-
     <string name="settings_analytics">Statistik</string>
     <string name="settings_opt_in_of_analytics">Skicka statistikdata</string>
     <string name="settings_opt_in_of_analytics_summary">Element samlar in anonym statistik för att låta oss förbättra appen.</string>
     <string name="settings_opt_in_of_analytics_prompt">Vänligen aktivera statistik för att hjälpa oss att förbättra Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, jag vill hjälpa till!</string>
-
     <string name="settings_data_save_mode">Databesparingsläge</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Publikt namna</string>
@@ -1599,17 +1356,12 @@
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_delete_dialog_title">Autentisering</string>
     <string name="devices_delete_submit_button_label">Skicka in</string>
-
     <string name="settings_integration_manager">Integrationshanterare</string>
-
     <string name="account_email_validation_title">Verifikation pågår</string>
     <string name="account_phone_number_already_used_error">Det här telefonnumret används redan.</string>
     <string name="passwords_do_not_match">Lösenorden matchar inte</string>
-
     <string name="settings_delete_threepid_confirmation">Är du säker på att du vill ta bort %1$s %2$s\?</string>
-
     <string name="settings_select_country">Välj ett land</string>
-
     <string name="settings_phone_number_country_label">Land</string>
     <string name="settings_phone_number_country_error">Vänligen välj ett land</string>
     <string name="settings_phone_number_label">Telefonnummer</string>
@@ -1621,112 +1373,88 @@
     <string name="settings_phone_number_code">Kod</string>
     <string name="account_phone_number_error">Ett fel inträffade vid verifiering av ditt telefonnummer.</string>
     <string name="account_additional_info">Ytterligare info: %s</string>
-
     <string name="settings_default_compression">Förvald komprimering</string>
     <string name="compression_opt_list_choose">Välj</string>
     <string name="media_source_choose">Välj</string>
     <string name="settings_play_shutter_sound">Spela slutarljud</string>
-
     <string name="media_saving_period_3_days">3 dagar</string>
     <string name="media_saving_period_1_week">1 vecka</string>
     <string name="media_saving_period_1_month">1 månad</string>
     <string name="media_saving_period_forever">För alltid</string>
-
     <string name="room_settings_room_photo">Rumsbild</string>
     <string name="room_settings_room_name">Rumsnamn</string>
     <string name="room_settings_topic">Ämne</string>
     <string name="room_settings_room_tag">Rumsetikett</string>
     <string name="room_settings_tag_pref_dialog_title">Märkt som:</string>
-
     <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
     <string name="room_settings_tag_pref_entry_low_priority">Låg prioritet</string>
     <string name="room_settings_tag_pref_entry_none">Ingen</string>
-
     <string name="room_settings_category_access_visibility_title">Behörighet och synlighet</string>
     <string name="room_settings_directory_visibility">Lista det här rummet i rumskatalogen</string>
     <string name="room_settings_room_access_rules_pref_title">Rumstillgång</string>
     <string name="room_settings_room_read_history_rules_pref_title">Synlighet för rumshistorik</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Vem kan läsa historiken\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Vem kan komma åt det här rummet\?</string>
-
     <string name="room_settings_read_history_entry_anyone">Vem som helst</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Endast medlemmar (från när det här alternativet valdes)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Endast medlemmar (sen de bjöds in)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Endast medlemmar (sen de gick med)</string>
-
     <string name="room_settings_room_access_warning">För att länka till ett rum så måste det ha en adress.</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Vem som helst som har rummets adress, förutom gäster</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Vem som helst som har rummets adress, inklusive gäster</string>
-
     <string name="room_settings_banned_users_title">Bannade användare</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d bannad användare</item>
         <item quantity="other">%d bannade användare</item>
     </plurals>
-
     <string name="room_settings_room_internal_id">Rummets interna ID</string>
     <string name="room_settings_addresses_pref_title">Adresser</string>
     <string name="room_settings_labs_end_to_end_warnings">Du behöver logga ut för att kunna aktivera krypteringen.</string>
     <string name="room_settings_addresses_no_local_addresses">Det här rummet har inga lokala adresser</string>
     <string name="room_settings_addresses_add_new_address">Ny adress (t.ex. #foo:matrix.org)</string>
-
     <string name="room_settings_add_new_group">Nytt gemenskaps-ID (t.ex. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Ogiltigt gemenskaps-ID</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' är inte ett giltigt gemenskaps-ID</string>
-
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Ogiltigt aliasformat</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' är inte ett giltigt format för ett alias</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Du kommer inte att ha någon huvudadress specificerad för det här rummet.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Huvudadressvarningar</string>
-
     <string name="room_settings_set_main_address">Sätt som huvudadress</string>
     <string name="room_settings_unset_main_address">Avsätt som huvudadress</string>
     <string name="room_settings_copy_room_id">Kopiera rums-ID</string>
     <string name="room_settings_copy_room_address">Kopiera rumsadress</string>
-
     <string name="room_settings_addresses_e2e_disabled">Kryptering är avaktiverat i det här rummet.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Aktivera kryptering
 \n(varning: kan inte avaktiveras igen!)</string>
-
     <string name="directory_title">Katalog</string>
     <string name="encryption_information_device_info">Händelseinformation</string>
     <string name="encryption_information_user_id">Användar-ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519-identitetsnyckel</string>
     <string name="encryption_information_claimed_ed25519_fingerprint_key">Gjorde anspråk på Ed25519-fingeravtrycksynyckel</string>
     <string name="encryption_information_decryption_error">Avkrypteringsfel</string>
-
     <string name="encryption_information_device_name">Publikt namn</string>
     <string name="encryption_information_name">Publikt namn</string>
     <string name="encryption_information_verification">Verifiering</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519-fingeravtryck</string>
-
     <string name="encryption_exported_successfully">Nycklar framgångsrikt importerade</string>
-
     <plurals name="encryption_import_room_keys_success">
         <item quantity="one">%1$d/%2$d nyckel importerad framgångsrikt.</item>
         <item quantity="other">%1$d/%2$d nycklar importerade framgångsrikt.</item>
     </plurals>
-
     <string name="encryption_information_not_verified">Inte verifierad</string>
     <string name="encryption_information_verified">Verifierad</string>
     <string name="encryption_information_blocked">Svartlistad</string>
-
     <string name="encryption_information_unknown_ip">okänd IP</string>
     <string name="encryption_information_none">ingen</string>
-
     <string name="encryption_information_verify">Verifiera</string>
     <string name="encryption_information_unverify">Avverifiera</string>
     <string name="encryption_information_block">Svartlista</string>
     <string name="encryption_information_unblock">Avsvartlista</string>
-
     <string name="encryption_information_verify_device_warning2">Om de inte matchar så kan kommunikationens säkerhet vara äventyrad.</string>
     <string name="encryption_information_verify_key_match">Jag verifierar att nycklarna matchar</string>
-
     <string name="directory_server_fail_to_retrieve_server">Servern kan vara otillgänglig eller överbelastad</string>
     <string name="directory_server_placeholder">Hemserver-URL</string>
     <string name="lock_screen_hint">Skriv här…</string>
-
     <string name="notification_unread_notified_messages_in_room">%1$s i %2$s</string>
     <string name="notification_unknown_new_event">Ny händelse</string>
     <string name="notification_unknown_room_name">Rum</string>
@@ -1736,21 +1464,17 @@
     <string name="notification_inline_reply_failed">** Misslyckades att skicka - vänligen öppna rummet</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="historical_placeholder">Sök efter historiska</string>
-
     <string name="widget_no_power_to_manage">Du behöver behörighet för att hantera widgets i det här rummet</string>
     <string name="widget_creation_failure">Widgetskapande har misslyckats</string>
     <string name="settings_labs_create_conference_with_jitsi">Skapa gruppsamtal med Jitsi</string>
     <string name="widget_delete_message_confirmation">Är du säker på att du vill radera den här widgeten från det här rummet\?</string>
     <plurals name="active_widgets">
-        <item quantity="one">1 aktiv widget</item>
+        <item quantity="one">%d aktiv widget</item>
         <item quantity="other">%d aktiva widgets</item>
     </plurals>
     <string name="active_widget_view_action">VISA</string>
     <string name="active_widgets_title">Aktiva widgets</string>
-
-
     <string name="room_widget_activity_title">Widgets</string>
     <string name="room_widget_permission_title">Ladda widget</string>
     <string name="room_widget_permission_added_by">Den här widgeten lades till av:</string>
@@ -1761,13 +1485,10 @@
     <string name="room_widget_reload">Ladda om widget</string>
     <string name="room_widget_open_in_browser">Öppna i webbläsaren</string>
     <string name="room_widget_revoke_access">Återkalla tillgång för mig</string>
-
     <string name="room_widget_permission_avatar_url">Din avatar-URL</string>
     <string name="room_widget_permission_user_id">Ditt användar-ID</string>
     <string name="room_widget_permission_widget_id">Widget-ID</string>
     <string name="room_widget_permission_room_id">Rums-ID</string>
-
-
     <string name="error_jitsi_not_supported_on_old_device">Tyvärr, gruppsamtal med Jitsi stöds inte på gamla enheter (enheter med Android äldre än 5.0)</string>
     <string name="room_widget_resource_permission_title">Den här widgeten vill använda följande resurser:</string>
     <string name="room_widget_resource_grant_permission">Tillåt</string>
@@ -1788,7 +1509,6 @@
     <string name="room_no_active_widgets">Inga aktiva widgets</string>
     <string name="settings_labs_enable_send_voice">Skicka röstmeddelanden</string>
     <string name="widget_integration_review_terms">För att fortsätta behöver du acceptera villkoren för den här tjänsten.</string>
-
     <string name="start_verification">Starta verifiering</string>
     <string name="start_verification_short_label">Verifiera</string>
     <string name="share_without_verifying">Dela utan att verifiera</string>
@@ -1796,10 +1516,8 @@
     <string name="key_share_request">Nyckeldelningsbegäran</string>
     <string name="ignore_request">Ignorera begäran</string>
     <string name="ignore_request_short_label">Ignorera</string>
-
     <string name="conference_call_warning_title">Varning!</string>
     <string name="conference_call_warning_message">Gruppsamtal är under utveckling och kanske inte är pålitligt.</string>
-
     <string name="command_error">Kommandofel</string>
     <string name="unrecognized_command">Okänt kommando: %s</string>
     <string name="command_description_emote">Visar handling</string>
@@ -1813,66 +1531,50 @@
     <string name="command_description_kick_user">Sparkar ut användaren med det angivna ID:t</string>
     <string name="command_description_nick">Ändrar ditt visningsnamn</string>
     <string name="command_description_clear_scalar_token">För att fixa Matrixapphantering</string>
-
     <string name="create">Skapa</string>
     <string name="create_community">Skapa gemenskap</string>
     <string name="community_name">Gemenskapsnamn</string>
     <string name="community_name_hint">Exempel</string>
     <string name="community_id">Gemenskaps-ID</string>
     <string name="community_id_hint">exempel</string>
-
     <string name="group_details_home">Hem</string>
     <string name="no_users_placeholder">Inga användare</string>
-
     <string name="joined">Gick med</string>
     <string name="invited">Bjöd in</string>
     <plurals name="group_members">
-        <item quantity="one">1 medlem</item>
+        <item quantity="one">%d medlem</item>
         <item quantity="other">%d medlemmar</item>
     </plurals>
-
     <string name="group_no_long_description">Gemenskapsadministratören har inte försett en lång beskrivning för den här gemenskapen.</string>
-
     <string name="has_been_kicked">Du har blivit utsparkad från %1$s av %2$s</string>
     <string name="has_been_banned">Du har blivit bannad från %1$s av %2$s</string>
     <string name="reason_colon">Orsak: %1$s</string>
     <string name="rejoin">Gå med igen</string>
     <string name="forget_room">Glöm rummet</string>
-
     <string name="receipt_avatar">Läsindikationsavatar</string>
     <string name="notice_avatar">Notisavatar</string>
     <string name="avatar">Avatar</string>
-
     <string name="dialog_user_consent_submit">Granska nu</string>
-
     <string name="error_empty_field_enter_user_name">Vänligen skriv in ett användarnamn.</string>
     <string name="room_tombstone_versioned_description">Det här rummet har blivit ersatt och är inte längre tillgängligt</string>
     <string name="room_tombstone_continuation_link">Samtalet fortsätter här</string>
     <string name="room_tombstone_continuation_description">Det här rummet är en fortsättning av en annan konversation</string>
     <string name="room_tombstone_predecessor_link">Tryck här för att se äldre meddelanden</string>
-
     <string name="resource_limit_exceeded_title">Resursgränsen överskriden</string>
     <string name="resource_limit_soft_default">Hemservern har överskridit en av sina resursbegränsningar så <b>vissa användare kommer inte att kunna logga in</b>.</string>
     <string name="resource_limit_hard_default">Den här hemservern har överskridit en av sina resursbegränsningar.</string>
-
     <string name="resource_limit_soft_mau"> Den här hemservern har nått sin månatliga aktiva användargräns så <b>vissa användare kommer inte att kunna logga in</b>.</string>
     <string name="resource_limit_hard_mau">Den här hemservern har nått sin månatliga aktiva användargräns.</string>
-
     <string name="resource_limit_soft_contact">Vänligen %s för att öka den här gränsen.</string>
     <string name="resource_limit_hard_contact">Vänligen %s för att fortsätta använda den här tjänsten.</string>
-
     <string name="error_lazy_loading_not_supported_by_home_server">Din hemserver stöder inte fördröjd inladdning av rumsmedlemmar än. Försök igen senare.</string>
-
     <string name="unknown_error">Tyvärr, ett fel inträffade</string>
-
     <string name="merged_events_expand">expandera</string>
     <string name="merged_events_collapse">kollapsa</string>
-
     <string name="settings_info_area_show">Visa infoarean</string>
     <string name="show_info_area_always">Alltid</string>
     <string name="show_info_area_messages_and_errors">För meddelanden och fel</string>
     <string name="show_info_area_only_errors">Endast för fel</string>
-
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
@@ -1883,7 +1585,6 @@
     <string name="passphrase_passphrase_does_not_match">Lösenfrasen matchar inte</string>
     <string name="passphrase_empty_error_message">Vänligen skriv en lösenfras</string>
     <string name="passphrase_passphrase_too_weak">Lösenfrasen är för svag</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Vänligen radera lösenfrasen om du vill att Element ska generera en återställningsnyckel.</string>
     <string name="keys_backup_setup_step2_button_title">Sätt lösenfras</string>
     <string name="keys_backup_setup_creating_backup">Skapar säkerhetskopia</string>
@@ -1893,11 +1594,9 @@
     <string name="keys_backup_setup_step3_copy_button_title">Spara återställningnyckel</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Dela</string>
     <string name="recovery_key_export_saved">Återställningsnyckeln har sparats.</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">En säkerhetskopia finns redan på din hemserver</string>
     <string name="keys_backup_setup_override_replace">Ersätt</string>
     <string name="keys_backup_setup_override_stop">Stoppa</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Vänligen gör en kopia</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Dela återställningsnyckel med…</string>
     <string name="keys_backup_setup_step3_generating_key_status">Genererar återställningsnyckel med hjälp av lösenfras, den här processen kan ta flera sekunder.</string>
@@ -1906,15 +1605,11 @@
     <string name="keys_backup_setup_backup_started_title">Säkerhetskopiering startad</string>
     <string name="keys_backup_setup_skip_title">Är du säker\?</string>
     <string name="keys_backup_setup_skip_msg">Du kan förlora åtkomst till dina meddelanden om du loggar ut ur eller förlorar den här enheten.</string>
-
     <string name="keys_backup_restore_use_recovery_key">använd din återställningsnyckel</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Kan du inte din återställningslösenfras så kan du %s.</string>
-
     <string name="keys_backup_restore_key_enter_hint">Skriv in återställningsnyckel</string>
-
     <string name="keys_backup_passphrase_error_decrypt">Säkerhetskopian kunde inte avkrypteras med den här lösenfrasen: vänligen verifiera att du skrev in rätt lösenfras.</string>
     <string name="network_error_please_check_and_retry">Nätverksfel: vänligen kolla din anslutning och försök igen.</string>
-
     <string name="keys_backup_restoring_waiting_message">Återställer säkerhetskopia:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Räknar ut återställningsnyckel…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Laddar ner nycklar…</string>
@@ -1923,26 +1618,19 @@
     <string name="keys_backup_recovery_code_empty_error_message">Vänligen skriv in en återställningsnyckel</string>
     <string name="keys_backup_restore_success_title">Säkerhetskopia återställd %s !</string>
     <string name="keys_backup_get_trust_error">Misslyckades att få betroendeinfo för säkerhetskopian (%s).</string>
-
     <string name="keys_backup_settings_deleting_backup">Raderar säkerhetskopia…</string>
     <string name="keys_backup_settings_checking_backup_state">Kollar status för säkerhetskopian</string>
     <string name="new_recovery_method_popup_was_me">Det var jag</string>
-
     <string name="keys_backup_banner_in_progress">Säkerhetskopierar dina nycklar. Detta kan ta flera minuter…</string>
-
-
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Säkerhetskopierar %d nyckel…</item>
         <item quantity="other">Säkerhetskopierar %d nycklar…</item>
     </plurals>
-
     <string name="keys_backup_info_title_signature">Signatur</string>
-
     <string name="autodiscover_well_known_autofill_dialog_title">Autokomplettera serveralternativ</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element detekterade en anpassad serverkonfiguration för din användar-ID-domän \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Använd konfig</string>
-
     <string name="sas_verify_title">Verifiera genom att jämföra en kort textsträng.</string>
     <string name="sas_security_advise">För maximal säkerhet så rekommenderar vi att du gör det här personligen eller med en annan pålitlig form av kommunikation.</string>
     <string name="sas_verify_start_button_title">Påbörja verifiering</string>
@@ -1950,18 +1638,14 @@
     <string name="sas_incoming_verification_request_dialog">Du mottog en inkommande verifieringsbegäran.</string>
     <string name="sas_view_request_action">Visa begäran</string>
     <string name="sas_waiting_for_partner">Väntar på att den andra parten ska bekräfta…</string>
-
     <string name="sas_verified">Verifierad!</string>
     <string name="sas_got_it">Jag förstår</string>
-
     <string name="sas_verifying_keys">Dyker inget upp\? Inte alla klienter stöder interaktiv verifiering än. Använd legacyverifiering.</string>
     <string name="sas_legacy_verification_button_title">Använd legacyverifiering.</string>
-
     <string name="sas_verification_request_notification_channel_title">Nyckelverifiering</string>
     <string name="sas_cancelled_dialog_title">Begäran avbruten</string>
     <string name="sas_cancelled_by_me">Verifieringen är avbruten.
 \nAnledning: %s</string>
-
     <string name="sas_incoming_request_notif_title">Verifieringsbegäran</string>
     <string name="sas_error_m_user">Användaren avbröt verifieringen</string>
     <string name="sas_error_m_timeout">Verifieringsprocessen timeade ut</string>
@@ -1970,17 +1654,13 @@
     <string name="sas_error_m_key_mismatch">Nyckelmismatch</string>
     <string name="sas_error_m_user_error">Användarmismatch</string>
     <string name="sas_error_unknown">Okänt fel</string>
-
     <string name="error_user_already_logged_in">Det verkar som att du försöker ansluta till en annan hemserver. Vill du logga ut\?</string>
-
     <string name="edit">Redigera</string>
     <string name="reply">Svara</string>
-
     <string name="global_retry">Försök igen</string>
     <string name="room_list_empty">Gå med i ett rum för att börja använda appen.</string>
     <string name="send_you_invite">Skickade en inbjudan till dig</string>
     <string name="invited_by">Inbjuden av %s</string>
-
     <string name="room_list_catchup_welcome_title">Välkommen hit!</string>
     <string name="room_list_catchup_welcome_body">Kom ikapp med olästa meddelanden här</string>
     <string name="room_list_people_empty_title">Konversationer</string>
@@ -1990,19 +1670,15 @@
     <string name="message_add_reaction">Lägg till reaktion</string>
     <string name="message_view_reaction">Visa reaktioner</string>
     <string name="reactions">Reaktioner</string>
-
     <string name="event_redacted_by_user_reason">Händelsen raderades av användaren</string>
     <string name="event_redacted_by_admin_reason">Händelsen modererades av en rumsadministratör</string>
     <string name="last_edited_info_message">Senast redigerad av %1$s vid %2$s</string>
-
-
     <string name="malformed_message">Felformaterad händelse, kan inte visa</string>
     <string name="error_no_network">Inget nätverk. Vänligen kolla din internetanslutning.</string>
     <string name="action_change">Ändra</string>
     <string name="please_wait">Vänligen vänta…</string>
     <string name="room_preview_no_preview">Det här rummet kan inte förhandsgranskas</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Förhandsgranskning av världsläsbara rum stöds inte än av Element</string>
-
     <string name="create_room_title">Nytt rum</string>
     <string name="create_room_action_create">SKAPA</string>
     <string name="create_room_name_hint">Rumsnamn</string>
@@ -2013,71 +1689,50 @@
     <string name="create_room_federation_error">Rummet har skapats, men vissa inbjudningar har inte skickats av följande anledning:
 \n
 \n%s</string>
-
     <string name="keys_backup_unable_to_get_trust_info">Ett fel inträffade vi hämtning av betroendeinfo</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Ett fel inträffade vid hämtning av nyckelsäkerhetskopia</string>
-
     <string name="navigate_to_room_when_already_in_the_room">Du tittar redan på det här rummet!</string>
-
     <string name="quick_reactions">Snabbreaktioner</string>
-
     <string name="settings_expert">Expert</string>
     <string name="settings_push_gateway_no_pushers">Inga registrerade pushgateways</string>
-
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrera token</string>
-
     <string name="send_file_step_idle">Väntar…</string>
     <string name="send_file_step_encrypting_thumbnail">Krypterar miniatyrbild…</string>
     <string name="send_file_step_sending_thumbnail">Skickar miniatyrbild (%1$s / %2$s)</string>
     <string name="edited_suffix">(redigerad)</string>
-
     <string name="no_message_edits_found">Inga redigeringar funna</string>
-
     <string name="link_copied_to_clipboard">Länk kopierad till klippbordet</string>
-
     <string name="creating_direct_room">Skapar rum…</string>
     <string name="direct_room_start_search">Börja skriva för att få resultat</string>
     <string name="joining_room">Går med i rummet…</string>
-
     <string name="message_view_edit_history">Visa redigeringshistoria</string>
-
     <string name="terms_of_service">Användarvillkor</string>
     <string name="review_terms">Granska villkor</string>
     <string name="read_at">Läst vid</string>
-
-
     <string name="settings_discovery_mail_pending">Väntar</string>
-
     <string name="settings_text_message_sent_wrong_code">Verifikationskoden är felaktig.</string>
-
     <string name="error_network_timeout">Det verkar som att servern tar för lång tid att svara. Detta kan orsakas av antingen dålig uppkoppling eller ett fel på servern. Vänligen försök igen senare.</string>
-
     <string name="send_attachment">Skicka bilaga</string>
-
     <string name="a11y_open_drawer">Öppna navigationslådan</string>
     <string name="a11y_create_menu_open">Öppna rumskapandemenyn</string>
     <string name="a11y_create_menu_close">Stäng rumskapandemenyn…</string>
     <string name="a11y_close_keys_backup_banner">Stäng nyckelsäkerhetskopieringsbannern</string>
     <string name="a11y_jump_to_bottom">Hoppa till botten</string>
-
     <string name="three_users_read">%1$s, %2$s och %3$s läste</string>
     <string name="two_users_read">%1$s och %2$s läste</string>
     <string name="one_user_read">%s läste</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">1 användare läste</item>
+        <item quantity="one">%d användare läste</item>
         <item quantity="other">%d användare läste</item>
     </plurals>
-
     <string name="error_attachment">Ett fel inträffade vid hämtning av bilagan.</string>
     <string name="error_handling_incoming_share">Kunde inte hantera delningsdata</string>
-
     <string name="uploads_files_subtitle">%1$s vid %2$s</string>
     <string name="report_content_spam">Det är skräppost</string>
     <string name="report_content_inappropriate">Det är olämpligt</string>
@@ -2086,14 +1741,11 @@
     <string name="report_content_custom_hint">Anledning till att rapportera detta innehåll</string>
     <string name="report_content_custom_submit">RAPPORTERA</string>
     <string name="block_user">IGNORERA ANVÄNDARE</string>
-
     <string name="content_reported_title">Innehåll rapporterat</string>
     <string name="content_reported_as_spam_title">Rapporterad som skräppost</string>
     <string name="content_reported_as_inappropriate_title">Rapporterad som olämplig</string>
     <string name="no_network_indicator">Det finns ingen nätverksanslutning just nu</string>
-
     <string name="message_ignore_user">Ignorera användare</string>
-
     <string name="room_list_quick_actions_settings">Inställningar</string>
     <string name="room_list_quick_actions_favorite_add">Lägg till i favoriter</string>
     <string name="room_list_quick_actions_favorite_remove">Ta bort från favoriter</string>
@@ -2104,12 +1756,10 @@
     <string name="room_join_rules_public_by_you">Du gjorde rummet publikt för alla som har länken.</string>
     <string name="room_join_rules_invite_by_you">Du ändrade rummet till endast inbjudna.</string>
     <string name="timeline_unread_messages">Olästa meddelanden</string>
-
     <string name="login_splash_title">Det är din konversation. Äg det.</string>
     <string name="login_splash_text2">Håll konversationer privata med kryptering</string>
     <string name="login_splash_text3">Utöka och anpassa din upplevelse</string>
     <string name="login_splash_submit">Kom igång</string>
-
     <string name="login_server_title">Välj en server</string>
     <string name="login_server_modular_text">Premiumservervärd för organisationer</string>
     <string name="login_continue">Fortsätt</string>
@@ -2120,55 +1770,45 @@
     <string name="login_signup">Bli medlem</string>
     <string name="login_signin">Logga in</string>
     <string name="login_signin_sso">Fortsätt med SSO</string>
-
     <string name="login_server_url_form_modular_hint">Element Matrix Services-adress</string>
     <string name="login_server_url_form_other_hint">Adress</string>
     <string name="login_server_url_form_modular_text">Premiumservervärd för organisationer</string>
     <string name="login_server_url_form_modular_notice">Skriv in adressen för den Modular Element eller server du vill använda</string>
     <string name="login_server_url_form_other_notice">Skriv in adressen för en server eller Element du vill ansluta till</string>
     <string name="login_server_url_form_common_notice">Skriv in adressen för servern du vill använda</string>
-
     <string name="login_sso_error_message">Ett fel inträffade vid laddning av sidan: %1$s (%2$d)</string>
-    <string name="login_mode_not_supported">Appen kan inte logga in på den här hemservern. Hemservern stöder följande inloggninstyp(er): %1$s.
+    <string name="login_mode_not_supported">Appen kan inte logga in på den här hemservern. Hemservern stöder följande inloggningstyp(er): %1$s.
 \n
 \nVill du logga in med en webbklient\?</string>
     <string name="login_registration_disabled">Tyvärr, den här servern accepterar inte nya konton.</string>
     <string name="login_registration_not_supported">Appen kan inte skapa ett konto på den här hemservern.
 \n
 \nVill du registrera dig med en webbklient\?</string>
-
     <string name="login_reset_password_submit">Nästa</string>
     <string name="login_reset_password_warning_title">Varning!</string>
     <string name="login_reset_password_warning_submit">Fortsätt</string>
-
     <string name="login_reset_password_mail_confirmation_title">Kolla din inkorg</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Tryck på länken för att bekräfta ditt nya lösenord. När du har följt länken det innehåller, klicka nedan.</string>
     <string name="login_reset_password_success_title">Framgång!</string>
     <string name="login_reset_password_success_notice">Ditt lösenord har återställts.</string>
     <string name="login_reset_password_success_submit">Tillbaka till inloggning</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Varning</string>
     <string name="login_reset_password_cancel_confirmation_content">Ditt lösenord har inte ändrats än.
 \n
 \nVill du avbryta återställningsprocessen\?</string>
-
     <string name="login_set_email_submit">Nästa</string>
-
     <string name="login_set_msisdn_title">Sätt telefonnummer</string>
     <string name="login_set_msisdn_notice2">Vänligen använd internationellt format.</string>
     <string name="login_set_msisdn_mandatory_hint">Telefonnummer</string>
     <string name="login_set_msisdn_optional_hint">Telefonnummer (valfritt)</string>
     <string name="login_set_msisdn_submit">Nästa</string>
-
     <string name="login_msisdn_confirm_title">Bekräfta telefonnummer</string>
     <string name="login_msisdn_confirm_notice">Vi skickade just en kod till %1$s. Skriv in den nedan för att bekräfta att det är du.</string>
     <string name="login_msisdn_confirm_hint">Skriv in kod</string>
     <string name="login_msisdn_confirm_send_again">Skicka igen</string>
     <string name="login_msisdn_confirm_submit">Nästa</string>
-
     <string name="login_msisdn_error_not_international">Internationella telefonnummer måste börja med \'+\'</string>
     <string name="login_msisdn_error_other">Telefonnumret verkar vara ogiltigt. Vänligen kolla det</string>
-
     <string name="login_signup_to">Logga in på %1$s</string>
     <string name="login_signup_username_hint">Användarnamn</string>
     <string name="login_signup_password_hint">Lösenord</string>
@@ -2178,20 +1818,17 @@
     <string name="login_signup_cancel_confirmation_content">Ditt konto är inte skapat än.
 \n
 \nVill du avbryta registreringsprocessen\?</string>
-
     <string name="login_a11y_choose_matrix_org">Välj matrix.org</string>
     <string name="login_a11y_choose_modular">Välj Element Matrix Services</string>
     <string name="login_a11y_choose_other">Välj en annan hemserver</string>
     <string name="login_a11y_captcha_container">Vänligen utför captchautmaningen</string>
     <string name="login_terms_title">Acceptera villkoren för att fortsätta</string>
-
     <string name="login_validation_code_is_not_correct">Den inskrivna koden är felaktig. Vänligen kolla den.</string>
     <string name="login_error_outdated_homeserver_title">Utdaterad hemserver</string>
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">För många förfrågningar har skickats. Du kan försöka igen om %1$d sekund…</item>
         <item quantity="other">För många förfrågningar har skickats. Du kan försöka igen om %1$d sekunder…</item>
     </plurals>
-
     <string name="login_connect_using_matrix_id_notice">Alternativt, om du redan har ett konto och du kan ditt Matrix-ID och ditt lösenord, så kan du använda den här metoden:</string>
     <string name="login_connect_using_matrix_id_submit">Logga in med ditt Matrix-ID</string>
     <string name="login_signin_matrix_id_title">Logga in med ditt Matrix-ID</string>
@@ -2199,10 +1836,8 @@
     <string name="login_signin_matrix_id_password_notice">Om du inte kan ditt lösenord, gå tillbaka för att återställa det.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Det här är inte ett giltigt användar-ID. Förväntat format: \'@användare:hemserver.org\'</string>
     <string name="seen_by">Sett av</string>
-
     <string name="signed_out_title">Du är utloggad</string>
     <string name="signed_out_submit">Logga in igen</string>
-
     <string name="soft_logout_title">Du är utloggad</string>
     <string name="soft_logout_signin_title">Logga in</string>
     <string name="soft_logout_signin_notice">Administratören för din hemserver (%1$s) har loggat ut dig ur ditt konto %2$s (%3$s).</string>
@@ -2210,15 +1845,12 @@
     <string name="soft_logout_signin_password_hint">Lösenord</string>
     <string name="soft_logout_clear_data_title">Rensa personlig information</string>
     <string name="soft_logout_clear_data_submit">Rensa all data</string>
-
     <string name="soft_logout_clear_data_dialog_title">Rensa data</string>
     <string name="soft_logout_clear_data_dialog_e2e_warning_content">Du kommer att bli av med åtkomsten till dina krypterade meddelanden om du inte loggar in igen för att återfå dina krypteringsnycklar.</string>
     <string name="soft_logout_clear_data_dialog_submit">Rensa data</string>
     <string name="permalink_malformed">Din matrix.to-länk var felformaterad</string>
     <string name="bug_report_error_too_short">Beskrivningen är för kort</string>
-
     <string name="notification_initial_sync">Inledande synk…</string>
-
     <string name="rageshake_detected">Skakning upptäckt!</string>
     <string name="settings">Inställningar</string>
     <string name="create_room_encryption_title">Aktivera kryptering</string>
@@ -2228,7 +1860,6 @@
     <string name="verify_user_sas_emoji_help_text">Verifiera den här användaren genom att bekräfta att följande unika emojier visas på hens skärm i samma ordning.</string>
     <string name="verify_user_sas_emoji_security_tip">För maximal säkerhet, använd en annan pålitlig kommunikationsform eller gör detta personligen.</string>
     <string name="verification_green_shield">Kolla efter den gröna skölden för att försäkra dig om att en användare är betrodd. Lita på alla användare i ett rum för att försäkra dig om att rummet är säkert.</string>
-
     <string name="verification_conclusion_not_secure">Inte säker</string>
     <string name="sent_a_video">Video.</string>
     <string name="sent_an_image">Bild.</string>
@@ -2240,20 +1871,14 @@
     <string name="verification_sent">Verifikation skickad</string>
     <string name="verification_request">Verifieringsbegäran</string>
     <string name="verification_verify_device_manually">Verifiera manuellt</string>
-
     <string name="you">Du</string>
-
     <string name="verification_scan_their_code">Skanna deras kod</string>
     <string name="verification_scan_emoji_title">Kan inte skanna</string>
     <string name="verification_scan_emoji_subtitle">Om ni inte träffas personligen, jämför emojier istället</string>
-
     <string name="verification_no_scan_emoji_title">Verifiera genom att jämföra emojier</string>
-
     <string name="verify_by_emoji_title">Verifiera med emojier</string>
     <string name="verify_by_emoji_description">Om du inte kan skanna koden ovan, verifiera genom att jämföra ett kort, unikt urval av emojier.</string>
-
     <string name="a13n_qr_code_description">QR-kodsbild</string>
-
     <string name="verification_verify_user">Verifiera %s</string>
     <string name="verification_verified_user">Verifierade %s</string>
     <string name="verification_request_waiting_for">Väntar på %s…</string>
@@ -2263,61 +1888,43 @@
     <string name="room_profile_section_security">Säkerhet</string>
     <string name="room_profile_section_admin">Adminhandlingar</string>
     <string name="room_profile_leaving_room">Lämnar rummet…</string>
-
     <string name="room_member_power_level_custom">Anpassad</string>
     <string name="room_member_power_level_invites">Inbjudningar</string>
     <string name="room_member_power_level_users">Användare</string>
-
     <string name="room_member_power_level_admin_in">Administratör i %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderator i %1$s</string>
     <string name="room_member_power_level_default_in">Standard i %1$s</string>
     <string name="room_member_power_level_custom_in">Anpassad (%1$d) i %2$s</string>
-
     <string name="room_member_jump_to_read_receipt">Hoppa till läskvitto</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element hanterar inte händelser av typen \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element stötte på ett fel vid rendering av innehållet i händelsen med id \'%1$s\'</string>
-
     <string name="unignore">Avignorera</string>
-
     <string name="command_description_rainbow_emote">Skickar den givna emoten i regnbågsfärg</string>
-
     <string name="call_notification_answer">Godkänn</string>
     <string name="call_notification_reject">Avslå</string>
     <string name="call_notification_hangup">Lägg på</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Aktivera kryptering\?</string>
     <string name="room_settings_enable_encryption_dialog_submit">Aktivera kryptering</string>
-
     <string name="verification_request_notice">För att vara säker, verifiera %s genom att kolla en engångskod.</string>
     <string name="verification_request_start_notice">För att vara säker, gör detta personligen eller använd en annan säker kommunikationsform.</string>
-
     <string name="verification_emoji_notice">Jämför de unika emojierna, och försäkra dig om att de visas i samma ordning.</string>
     <string name="settings_hs_admin_e2e_disabled">Din serveradministratör har inaktiverat totalsträckskryptering som förval för privata rum och direktmeddelanden.</string>
     <string name="settings_failed_to_get_crypto_device_info">Ingen kryptografisk information tillgänglig</string>
-
     <string name="crosssigning_verify_this_session">Verifiera den här inloggningen</string>
     <string name="complete_security">Fullborda säkerhet</string>
-
     <string name="verification_profile_verify">Verifiera</string>
     <string name="verification_profile_verified">Verifierad</string>
     <string name="verification_profile_warning">Varning</string>
-
     <string name="trusted">Betrodd</string>
     <string name="not_trusted">Inte betrodd</string>
-
     <string name="initialize_cross_signing">Initierar korssignering</string>
     <string name="reset_cross_signing">Återställ nycklar</string>
-
     <string name="a11y_qr_code_for_verification">QR-kod</string>
-
     <string name="qr_code_scanned_by_other_notice">Nästan färdigt! Ser %s samma sköld\?</string>
     <string name="qr_code_scanned_by_other_yes">Ja</string>
     <string name="qr_code_scanned_by_other_no">Nej</string>
-
     <string name="no_connectivity_to_the_server_indicator">Anslutningen till servern har tappats</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Flygplansläge är på</string>
-
     <plurals name="poll_info">
         <item quantity="one">%d röst</item>
         <item quantity="other">%d röster</item>
@@ -2330,62 +1937,45 @@
     <string name="command_description_poll">Skapar en enkel omröstning</string>
     <string name="verification_cannot_access_other_session">Använd en återställningslösenfras eller -nyckel</string>
     <string name="new_signin">Ny inloggning</string>
-
     <string name="enter_secret_storage_passphrase">Skriv in en lösenfras för hemlig lagring</string>
     <string name="enter_secret_storage_passphrase_warning">Varning:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Du bör endast komma åt hemlig lagring från en betrodd enhet</string>
-
     <string name="message_action_item_redact">Ta bort…</string>
     <string name="share_confirm_room">Vill du skicka den här bilagan till %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Skicka bild i originalstorlek</item>
         <item quantity="other">Skicka bilder i originalstorlek</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Bekräfta borttagning</string>
     <string name="delete_event_dialog_content">Är du säker på att du vill ta bort (radera) den här händelsen\? Observera att om du raderar ett rumsnamn eller ämnesändring så kan det upphäva ändringen.</string>
     <string name="delete_event_dialog_reason_checkbox">Inkludera en anledning</string>
     <string name="delete_event_dialog_reason_hint">Anledning för borttagning</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Händelsen raderades av användaren, anledning: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Händelsen modererades av rumsadministratören. Anledning: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Nycklarna är redan uppdaterade!</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="refresh">Ladda om</string>
-
     <string name="new_session">Ny inloggning. Var det du\?</string>
     <string name="new_session_review">Tryck för att granska och verifiera</string>
     <string name="verify_new_session_was_not_me">Det var inte jag</string>
     <string name="verify_new_session_compromized">Ditt konto kan vara äventyrat</string>
-
     <string name="verify_cancelled_notice">Verifiera dina enheter i inställningarna.</string>
     <string name="verification_cancelled">Verifikation avbruten</string>
-
     <string name="recovery_passphrase">återställningslösenfras</string>
     <string name="account_password">kontolösenord</string>
-
     <string name="set_recovery_passphrase">Sätt en %s</string>
     <string name="confirm_recovery_passphrase">Bekräfta %s</string>
-
     <string name="enter_account_password">Skriv in ditt %s för att fortsätta.</string>
-
     <string name="bootstrap_info_confirm_text">Skriv in din %s igen för att fortsätta.</string>
     <string name="bootstrap_dont_reuse_pwd">Använd inte ditt kontolösenord.</string>
-
     <string name="bootstrap_info_text_2">Skriv in en säkerhetsfras endast du känner till, vilken används för att säkra hemligheter på din server.</string>
-
     <string name="bootstrap_loading_text">Detta kan ta flera sekunder, ha tålamod.</string>
     <string name="bootstrap_loading_title">Sätter upp återställning.</string>
     <string name="your_recovery_key">Din återställningsnyckel</string>
     <string name="bootstrap_finish_title">Du är färdig!</string>
     <string name="keep_it_safe">Håll den säker</string>
     <string name="finish">Slutför</string>
-
     <string name="bootstrap_save_key_description">Använd denna %1$s som ett skyddsnät ifall du glömmer din %2$s.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Publicerar skapade identitetsnycklar</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Genererar säkra nycklar baserat på lösenfras</string>
     <string name="bootstrap_crosssigning_progress_default_key">Definierar förvald nyckel för SSSS</string>
@@ -2394,36 +1984,27 @@
     <string name="bootstrap_crosssigning_progress_save_ssk">Synkroniseras självsigneringsnyckel</string>
     <string name="bootstrap_crosssigning_print_it">Skriv ut den och spara den någonstans säkert</string>
     <string name="bootstrap_crosssigning_save_cloud">Kopiera den till din personliga molnlagring</string>
-
     <string name="auth_flow_not_supported">Du kan inte göra det där på mobilen</string>
-
     <string name="encryption_unknown_algorithm_tile_description">Krypteringen som används i det här rummet stöds inte</string>
-
     <string name="room_created_summary_item">%s skapade och konfigurerade rummet.</string>
     <string name="room_created_summary_item_by_you">Du skapade och konfigurerade rummet.</string>
-
     <string name="qr_code_scanned_verif_waiting_notice">Nästan färdigt! Väntar på bekräftelse…</string>
     <string name="qr_code_scanned_verif_waiting">Väntar på %s…</string>
-
     <string name="auth_invalid_login_param_space_in_password">Felaktigt användarnamn och/eller lösenord. Lösenordet du skrev börjar eller slutar med mellanslag, vänligen kolla det.</string>
     <string name="auth_invalid_login_deactivated_account">Kontot har inaktiverats.</string>
-
     <string name="upgrade_security">Krypteringsuppgradering tillgänglig</string>
     <string name="security_prompt_text">Verifiera dig själv och andra för att hålla dina chattar säkra</string>
-
     <string name="bootstrap_enter_recovery">Skriv in din %s för att fortsätta</string>
     <string name="enter_backup_passphrase">Skriv in %s</string>
     <string name="backup_recovery_passphrase">Återställningslösenfras</string>
     <string name="bootstrap_invalid_recovery_key">Det är inte en giltig återställningsnyckel</string>
     <string name="recovery_key_empty_error_message">Vänligen skriv in en återställningsnyckel</string>
-
     <string name="bootstrap_progress_compute_curve_key">Hämtar kurvnyckel</string>
     <string name="bootstrap_progress_generating_ssss">Generar SSSS-nyckel baserat på lösenfras</string>
     <string name="bootstrap_progress_generating_ssss_with_info">Generar SSSS-nyckel baserat på lösenfras (%s)</string>
     <string name="bootstrap_progress_generating_ssss_recovery">Generar SSSS-nyckel baserat på återställningsnyckel</string>
     <string name="bootstrap_progress_storing_in_sss">Lagrar hemlighet för nyckelsäkerhetskopiering i SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="app_desktop_web">Element Webb
 \nElement Skrivbord</string>
     <string name="app_ios_android">Element iOS
@@ -2432,23 +2013,19 @@
     <string name="use_recovery_key">Använd återställningsnyckel</string>
     <string name="enter_secret_storage_input_key">Välj din återställningsnyckel eller mata in den manuellt genom att skriva den eller klistra in från klippbordet</string>
     <string name="failed_to_access_secure_storage">Misslyckades att komma åt säker lagring</string>
-
     <string name="unencrypted">Okrypterad</string>
     <string name="encrypted_unverified">Krypterad av en overifierad enhet</string>
     <string name="verify_this_session">Verifiera den nya inloggningen på ditt konto: %1$s</string>
-
     <string name="cross_signing_verify_by_text">Verifiera manuellt med text</string>
     <string name="crosssigning_verify_session">Verifiera inloggning</string>
     <string name="cross_signing_verify_by_emoji">Verifiera interaktivt med emojier</string>
     <string name="mark_as_verified">Markera som betrodd</string>
-
     <string name="error_empty_field_choose_user_name">Vänligen välj ett användarnamn.</string>
     <string name="error_empty_field_choose_password">Vänligen välj att lösenord.</string>
     <string name="external_link_confirmation_title">Dubbelkolla den här länken</string>
     <string name="external_link_confirmation_message">Länken %1$s tar dig till en annan sida: %2$s.
 \n
 \nÄr du säker på att du vill fortsätta\?</string>
-
     <string name="add_members_to_room">Lägg till medlemmar</string>
     <string name="inviting_users_to_room">Bjuder in användare…</string>
     <string name="invitation_sent_to_one_user">Inbjudan skickad till %1$s</string>
@@ -2458,7 +2035,6 @@
     <string name="identity_server_error_bulk_sha256_not_supported">För ditt privatlivs skull stöder Element bara att skicka hashade e-postadresser och telefonnummer.</string>
     <string name="identity_server_error_binding_error">Associationen har misslyckats.</string>
     <string name="identity_server_error_no_current_binding_error">Det finns ingen nuvarande association med den här identifieraren.</string>
-
     <string name="identity_server_set_default_submit">Använd %1$s</string>
     <string name="identity_server_set_alternative_submit">Skicka in</string>
     <string name="power_level_edit_title">Sätt roll</string>
@@ -2471,44 +2047,32 @@
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Använd en säkerhetsfras</string>
     <string name="bottom_sheet_save_your_recovery_key_title">Spara din säkerhetsnyckel</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Spara din säkerhetsnyckel någonstans säkert, som en lösenordshanterare eller ett kassaskåp.</string>
-
     <string name="set_a_security_phrase_title">Sätt an säkerhetsfras</string>
     <string name="set_a_security_phrase_notice">Skriv in en säkerhetsfras endast du känner till, vilken används för att säkra hemligheter på din server.</string>
     <string name="set_a_security_phrase_hint">Säkerhetsfras</string>
     <string name="set_a_security_phrase_again_notice">Skriv in säkerhetsfrasen igen för att bekräfta den.</string>
-
     <string name="save_your_security_key_title">Spara din säkerhetsnyckel</string>
     <string name="save_your_security_key_notice">Spara din säkerhetsnyckel någonstans säkert, som en lösenordshanterare eller ett kassaskåp.</string>
-
     <string name="room_settings_name_hint">Rumsnamn</string>
     <string name="room_settings_topic_hint">Ämne</string>
     <string name="room_settings_save_success">Du ändrade rumsinställningarna framgångsrikt</string>
-
     <string name="crypto_utd">Kan inte avkryptera</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Väntar på krypteringshistorik</string>
-
     <string name="element_disclaimer_title">Riot är nu Element!</string>
     <string name="element_disclaimer_content">Vi är glada att meddela att vi har bytt namn! Din app är uppdaterad och du är inloggad på ditt konto.</string>
     <string name="element_disclaimer_negative_button">UPPFATTAT</string>
     <string name="element_disclaimer_positive_button">LÄR DIG MER</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Spara återställningsnyckel i</string>
-
     <string name="add_from_phone_book">Lägg till från min telefonbok</string>
     <string name="empty_phone_book">Din telefonbok är tom</string>
     <string name="phone_book_title">Telefonbok</string>
     <string name="loading_contact_book">Hämtar dina kontakter…</string>
     <string name="contacts_book_title">Kontaktbok</string>
-
     <string name="three_pid_revoke_invite_dialog_title">Återkalla inbjudan</string>
     <string name="three_pid_revoke_invite_dialog_content">Återkalla inbjudan av %1$s\?</string>
-
     <string name="member_banned_by">Bannad av %1$s</string>
     <string name="failed_to_unban">Misslyckades att avbanna användaren</string>
-
     <string name="alert_push_are_disabled_title">Pushnotiser är inaktiverade</string>
     <string name="alert_push_are_disabled_description">Granska dina inställningar för att aktivera pushnotiser</string>
     <plurals name="wrong_pin_message_remaining_attempts">
@@ -2519,11 +2083,11 @@
     <string name="too_many_pin_failures">För många fel, du har blivit utloggad</string>
     <string name="create_pin_title">Välj en PIN-kod för säkerhet</string>
     <string name="create_pin_confirm_title">Bekräfta PIN</string>
-    <string name="create_pin_confirm_failure">Misslyckades med att validera PIN, vänligen skriv en ny.</string>
+    <string name="create_pin_confirm_failure">Misslyckades med att validera PIN-kod, vänligen skriv en ny.</string>
     <string name="auth_pin_title">Skriv din PIN-kod</string>
     <string name="auth_pin_forgot">Glömt PIN\?</string>
-    <string name="auth_pin_reset_title">Återställ PIN</string>
-    <string name="auth_pin_new_pin_action">Ny PIN</string>
+    <string name="auth_pin_reset_title">Återställ PIN-kod</string>
+    <string name="auth_pin_new_pin_action">Ny PIN-kod</string>
     <string name="auth_pin_reset_content">För att återställa din PIN-kod behöver du logga in igen och skapa en ny.</string>
     <string name="settings_security_pin_code_title">Aktivera PIN</string>
     <string name="settings_security_pin_code_summary">Om du vill återställa din PIN-kod, tryck på \"Glömt PIN\?\" för att logga ut och återställa.</string>
@@ -2535,33 +2099,80 @@
     <string name="settings_phone_numbers">Telefonnummer</string>
     <string name="settings_remove_three_pid_confirmation_content">Ta bort %s\?</string>
     <string name="error_threepid_auth_failed">Se till att du har klickat på länken i e-brevet vi skickade till dig.</string>
-
     <string name="settings_emails_and_phone_numbers_title">E-postadresser och telefonnummer</string>
     <string name="settings_emails_and_phone_numbers_summary">Hantera e-postadresser och telefonnummer länkade till ditt Matrix-konto</string>
-
     <string name="settings_text_message_sent_hint">Kod</string>
     <string name="login_msisdn_notice">Vänligen använd internationellt format (telefonnumret måste börja med \'+\')</string>
     <string name="confirm_your_identity_quad_s">Bekräfta din identitet genom att verifiera den här inloggningen, och ge den åtkomst till dina krypterade meddelanden.</string>
     <string name="error_sso_flow_not_supported_yet">Tyvärr stöds den här handlingen inte än för konton anslutna med externt konto.</string>
-
     <string name="error_opening_banned_room">Kan inte öppna ett rum du är bannad från.</string>
     <string name="room_error_not_found">Kan inte hitta det här rummet. Se till att det existerar.</string>
     <plurals name="seconds">
         <item quantity="one">%d sekund</item>
         <item quantity="other">%d sekunder</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">Visa statushändelser angående rumsmedlemmar</string>
     <string name="settings_show_room_member_state_events_summary">Inkluderar när personer bjuds in, går med, lämnar, kickas, bannas eller byter sin avatar eller sitt namn.</string>
     <string name="sent_a_poll">Omröstning</string>
     <string name="sent_a_bot_buttons">Bottknappar</string>
     <string name="sent_a_reaction">Reagerade med: %s</string>
     <string name="sent_verification_conclusion">Verifieringsavslutning</string>
-
     <string name="universal_link_malformed">Länken var felformaterad</string>
     <string name="no_permissions_to_start_webrtc_call">Du har inte behörighet att starta ett samtal i det här rummet</string>
     <string name="delete_account_data_warning">Radera kontodata av typen %1$s\?
 \n
 \nAnvänd varsamt, det kan leda till oväntat beteende.</string>
-
-</resources>
+    <string name="secure_backup_reset_no_history">så kommer du att börja om utan historik, meddelanden, betrodda enheter eller betrodda användare</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">PIN-kod krävs varje gång du öppnar Element.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN-kod krävs efter att du inte har använt Element på 2 minuter.</string>
+    <string name="settings_security_pin_code_grace_period_title">Kräv PIN-kod efter 2 minuter</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Visa bara antal olästa meddelanden i en enkel avisering.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Visa detaljer som rumsnamn och meddelandeinnehåll.</string>
+    <string name="settings_security_pin_code_notifications_title">Visa innehåll i aviseringar</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-kod är det enda sättet att låsa upp Element.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Aktivera enhetsspecifik biometri, som fingeravtryck och ansiktsigenkänning.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Aktivera biometri</string>
+    <string name="settings_security_application_protection_screen_title">Ställ in skydd</string>
+    <string name="settings_security_application_protection_summary">Skydda åtkomst med PIN-kod och biometri.</string>
+    <string name="settings_security_application_protection_title">Skydda åtkomst</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Visa enheten du kan verifiera med nu</item>
+        <item quantity="other">Visa %d enheter du kan verifiera med nu</item>
+    </plurals>
+    <string name="secure_backup_reset_if_you_reset_all">Om du återställer allt</string>
+    <string name="bad_passphrase_key_reset_all_action">Glömt eller förlorat alla återställningsalternativ\? Återställ allt</string>
+    <string name="secure_backup_reset_all_no_other_devices">Gör bara detta om du inte har någon annan enhet att verifiera den här enheten med.</string>
+    <string name="direct_room_created_summary_item">%s gick med.</string>
+    <string name="direct_room_profile_section_more_leave">Lämna</string>
+    <string name="secure_backup_reset_all">Återställ allt</string>
+    <string name="direct_room_created_summary_item_by_you">Du gick med.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Meddelanden i det här rummet är totalsträckskrypterade.</string>
+    <string name="direct_room_profile_section_more_settings">Inställningar</string>
+    <string name="direct_room_profile_encrypted_subtitle">Meddelanden här är totalsträckskrypterade.
+\n
+\nDina meddelanden är säkrade med lås och bara du och mottagaren har nycklarna för att låsa upp dem.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Meddelanden här är inte totalsträckskrypterade.</string>
+    <string name="login_error_outdated_homeserver_warning_content">Den här hemservern kör en gammal version. Be din hemserveradministratör att uppgradera. Du kan fortsätta, men vissa funktioner kanske inte fungerar ordentligt.</string>
+    <string name="direct_room_join_rules_invite_by_you">Du ändrade detta till endast inbjudna.</string>
+    <string name="direct_room_join_rules_invite">%1$s ändrade detta till endast inbjudna.</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Visa komplett historik i krypterade rum</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s och %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s i %2$s och %3$s</string>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d inbjudan</item>
+        <item quantity="other">%d inbjudningar</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Aviseringen har klickats!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Vänligen klicka på aviseringen. Om du inte ser aviseringen, vänligen kolla systeminställningarna.</string>
+    <string name="settings_troubleshoot_test_notification_title">Aviseringsvisning</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Du kollar på aviseringen! Klicka på mig!</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Misslyckades att ta emot push. Lösningen kan vara att installera om appen.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">Appen tar emot PUSH:en</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Appen väntar på PUSH:en</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Testa push</string>
+    <string name="search_is_not_supported_in_e2e_room">Sökning i krypterade rum stöds inte än.</string>
+    <string name="search_banned_user_hint">Filtrera bannade användare</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du har inte behörighet att starta ett samtal</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Du har inte behörighet att starta ett gruppsamtal</string>
+    <string name="reset">Återställ</string>
+</resources>
\ No newline at end of file

From 7f4860482033d49262fc3e93b16539fd06897c27 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 12 Oct 2020 20:14:56 +0000
Subject: [PATCH 250/278] Translated using Weblate (German)

Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 524 +---------------------
 1 file changed, 4 insertions(+), 520 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 358609bc2e..fe624cb8c9 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1,21 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">de</string>
     <string name="resources_country_code">DE</string>
-
     <!-- titles -->
     <string name="title_activity_home">Nachrichten</string>
     <string name="title_activity_room">"Raum</string>
     <string name="title_activity_settings">Einstellungen</string>
     <string name="title_activity_member_details">Benutzerdetails</string>
     <string name="title_activity_historical">Historisch</string>
-
     <string name="call_notification_answer">Akzeptiere</string>
     <string name="call_notification_reject">Ablehnen</string>
     <string name="call_notification_hangup">Anruf beenden</string>
-
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
@@ -48,7 +45,6 @@
     <string name="send_anyway">Trotzdem senden</string>
     <string name="or">oder</string>
     <string name="invite">Einladen</string>
-
     <!-- actions -->
     <string name="action_sign_out">Abmelden</string>
     <string name="action_voice_call">Sprachanruf</string>
@@ -61,27 +57,22 @@
     <string name="action_close">Schließen</string>
     <string name="copied_to_clipboard">In Zwischenablage kopiert</string>
     <string name="disable">Deaktivieren</string>
-
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Bestätigung</string>
     <string name="dialog_title_warning">Warnung</string>
-
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Favoriten</string>
     <string name="bottom_action_people">Personen</string>
     <string name="bottom_action_rooms">Räume</string>
-
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Raumnamen filtern</string>
     <string name="home_filter_placeholder_favorites">Favoriten filtern</string>
     <string name="home_filter_placeholder_people">Personen filtern</string>
     <string name="home_filter_placeholder_rooms">Raumnamen filtern</string>
-
     <!-- Home fragment -->
     <string name="invitations_header">Einladungen</string>
     <string name="low_priority_header">Niedrige Priorität</string>
-
     <!-- People fragment -->
     <string name="direct_chats_header">Konversationen</string>
     <string name="local_address_book_header">Lokales Adressbuch</string>
@@ -89,17 +80,15 @@
     <string name="no_conversation_placeholder">Keine Konversationen</string>
     <string name="no_contact_access_placeholder">Element wurde nicht erlaubt, auf lokale Kontakte zuzugreifen</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
-
     <!-- Rooms fragment -->
     <string name="rooms_header">Räume</string>
     <string name="rooms_directory_header">Raum-Verzeichnis</string>
     <string name="no_room_placeholder">Keine Räume</string>
     <string name="no_public_room_placeholder">Keine öffentl. Räume verfügbar</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 Benutzer</item>
-        <item quantity="other">%d Benutzer/in</item>
+        <item quantity="one">%d Benutzer/in</item>
+        <item quantity="other">%d Benutzer/innen</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
     <string name="send_bug_report_include_screenshot">Screenshot übermitteln</string>
@@ -112,10 +101,8 @@
     <string name="send_bug_report_failed">Der Fehlerbericht konnte nicht übermittelt werden (%s)</string>
     <string name="send_bug_report_progress">Fortschritt (%s%%)</string>
     <string name="send_bug_report_app_crashed">Die Anwendung ist während der letzten Benutzung abgestürzt. Möchtest du das Fehler-melden-Fenster öffnen?</string>
-
     <string name="send_files_in">Sende Datei nach</string>
     <string name="read_receipt">Gelesen</string>
-
     <string name="join_room">Raum betreten</string>
     <string name="username">Benutzername</string>
     <string name="create_account">Konto erstellen</string>
@@ -124,14 +111,11 @@
     <string name="hs_url">Home-Server-URL</string>
     <string name="identity_url">Identitätsserver-URL</string>
     <string name="search">Suchen</string>
-
     <string name="start_new_chat">Neuen Chat starten</string>
     <string name="start_voice_call">Sprachanruf starten</string>
     <string name="start_video_call">Videoanruf starten</string>
-
     <string name="option_send_files">Dateien senden</string>
     <string name="option_take_photo_video">Foto oder Video aufnehmen</string>
-
     <!-- Authentication -->
     <string name="auth_login">Anmelden</string>
     <string name="auth_register">Konto erstellen</string>
@@ -178,7 +162,6 @@
     <string name="auth_reset_password_success_message">Dein Passwort wurde zurückgesetzt.
 \n
 \nDu wurdest aus allen Sitzungen abgemeldet und wirst keine Push-Benachrichtigungen mehr erhalten. Um die Push-Benachrichtigungen wieder zu aktivieren, musst du dich auf jedem Gerät erneut anmelden.</string>
-
     <!-- Login Screen -->
     <string name="login_error_must_start_http">URL muss mit \'http[s]://\' beginnen</string>
     <string name="login_error_network_error">Login unmöglich: Netzwerkfehler</string>
@@ -187,7 +170,6 @@
     <string name="login_error_unable_register">Registrierung unmöglich</string>
     <string name="login_error_unable_register_mail_ownership">Registrierung fehlgeschlagen: E-Mail-Adresse nicht verifizierbar</string>
     <string name="login_error_invalid_home_server">Bitte eine gültige URL eingeben</string>
-
     <string name="login_error_forbidden">Ungültige Zugangsdaten</string>
     <string name="login_error_unknown_token">Der verwendete Zugangstoken ist unbekannt</string>
     <string name="login_error_bad_json">Fehlerhaftes JSON</string>
@@ -195,35 +177,27 @@
     <string name="login_error_limit_exceeded">Es wurden zu viele Anfragen gesendet</string>
     <string name="login_error_user_in_use">Dieser Benutzername wird bereits verwendet</string>
     <string name="login_error_login_email_not_yet">Der Link in der E-Mail wurde noch nicht geöffnet</string>
-
     <!-- crypto warnings -->
-
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lesebestätigungsliste</string>
-
     <!-- accounts list Screen -->
-
     <!-- image size selection -->
     <string name="compression_options">Sende als</string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Groß</string>
     <string name="compression_opt_list_medium">Mittel</string>
     <string name="compression_opt_list_small">Klein</string>
-
     <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Download abbrechen?</string>
     <string name="attachment_cancel_upload">Upload abbrechen?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm:%2$ds</string>
-
     <!-- room creation dialog Screen -->
     <string name="yesterday">Gestern</string>
     <string name="today">Heute</string>
-
     <!-- room info dialog Screen -->
     <string name="room_info_room_name">Raumname</string>
     <string name="room_info_room_topic">Raum-Thema</string>
-
     <!-- call string -->
     <string name="call_connected">Anruf verbunden</string>
     <string name="call_connecting">Verbindungsaufbau…</string>
@@ -233,16 +207,13 @@
     <string name="incoming_video_call">Eingehender Video-Anruf</string>
     <string name="incoming_voice_call">Eingehender Sprachanruf</string>
     <string name="call_in_progress">Anruf aktiv…</string>
-
     <string name="call_error_user_not_responding">Die Gegenseite hat den Anruf nicht angenommen.</string>
     <string name="call_error_ice_failed">Medien-Verbindung fehlgeschlagen</string>
     <string name="call_error_camera_init_failed">Kann Kamera nicht initialisieren</string>
     <string name="call_error_answered_elsewhere">Anruf woanders entgegengenommen</string>
-
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Foto oder Video aufnehmen</string>
     <string name="media_picker_cannot_record_video">Video kann nicht aufgenommen werden</string>
-
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Information</string>
     <string name="permissions_rationale_msg_storage">Element benötigt die Berechtigung, auf deine Fotos und Videos zugreifen zu können, um Anhänge zu senden und zu speichern.\n\nBitte erlaube den Zugriff im nächsten Dialog, um Dateien von deinem Gerät zu versenden.</string>
@@ -260,25 +231,20 @@ Bitte erlaube den Zugriff im nächsten Dialog, um den Anruf durchzuführen.</str
     <string name="permissions_rationale_msg_contacts">Element kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer Email-Adresse und Telefonnummer zu finden. Wenn du der Nutzung deines Adressbuchs zu diesem Zweck zustimmst, erlaube den Zugriff im nächsten Popup-Fenster.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Element kann dein Adressbuch durchsuchen, um andere Matrix-Nutzer anhand ihrer E-Mail-Adresse und Telefonnummer zu finden. 
 \nStimmst du der Nutzung deines Adressbuchs zu diesem Zweck zu\?</string>
-
     <string name="permissions_action_not_performed_missing_permissions">Entschuldige. Die Aktion wurde aufgrund fehlender Berechtigungen nicht ausgeführt</string>
-
     <!-- medias slider string -->
     <string name="media_slider_saved">Gespeichert</string>
     <string name="media_slider_saved_message">In Downloads speichern?</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="_continue">Fortsetzen</string>
-
     <!-- Actions -->
     <string name="remove">Entfernen</string>
     <string name="join">Betreten</string>
     <string name="preview">Vorschau</string>
     <string name="reject">Ablehnen</string>
-
     <!-- Room -->
     <string name="room_jump_to_first_unread">Zur ersten ungelesenen Nachricht springen.</string>
-
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">Du wurdest von %s in diesen Raum eingeladen</string>
     <string name="room_preview_unlinked_email_warning">"Diese Einladung wurde an %s gesendet. Es ist nicht mit diesem Konto verknüpft.
@@ -286,27 +252,22 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="room_preview_try_join_an_unknown_room">Du möchtest auf %s zugreifen. Möchtest du den Raum betreten, um an der Diskussion teilzunehmen?</string>
     <string name="room_preview_try_join_an_unknown_room_default">einen Raum</string>
     <string name="room_preview_room_interactions_disabled">Dies ist eine Vorschau dieses Raums. Raum-Interaktionen wurden deaktiviert.</string>
-
     <!-- Chat creation -->
     <string name="room_creation_title">Neuer Chat</string>
     <string name="room_creation_add_member">Mitglied hinzufügen</string>
     <string name="room_title_one_member">1 Mitglied</string>
-
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Raum verlassen</string>
     <string name="room_participants_leave_prompt_msg">Bist du sicher, dass du den Raum verlassen möchtest?</string>
     <string name="room_participants_remove_prompt_msg">Bist du sicher, dass du %s aus diesem Chat entfernen möchtest?</string>
     <string name="room_participants_create">Erstellen</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Untätig</string>
-
     <string name="room_participants_header_admin_tools">ADMIN-WERKZEUGE</string>
     <string name="room_participants_header_call">ANRUFE</string>
     <string name="room_participants_header_direct_chats">DIREKT-CHATS</string>
     <string name="room_participants_header_devices">SITZUNGEN</string>
-
     <string name="room_participants_action_invite">Einladen</string>
     <string name="room_participants_action_leave">Diesen Raum verlassen</string>
     <string name="room_participants_action_remove">Aus diesem Raum entfernen</string>
@@ -321,18 +282,14 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="room_participants_action_mention">Erwähnen</string>
     <string name="room_participants_action_devices_list">Sitzungsliste anzeigen</string>
     <string name="room_participants_power_level_prompt">Du wirst diese Änderung nicht rückgängig machen können, da der/die Benutzer!n dasselbe Berechtigungslevel wie du selbst erhalten wirst. Bist du sicher\?</string>
-
     <string name="room_participants_invite_prompt_msg">"Bist du sicher, dass du %s in diesen Chat einladen willst?"</string>
-
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Mit ID einladen</u></string>
     <string name="people_search_local_contacts">LOKALE KONTAKTE (%d)</string>
     <string name="people_search_filter_text">Nur Matrix-Benutzer</string>
-
     <string name="people_search_invite_by_id_dialog_title">Benutzer per ID einladen</string>
     <string name="people_search_invite_by_id_dialog_description">Bitte gib eine oder mehrere E-Mail-Adressen oder eine Matrix-ID ein</string>
     <string name="people_search_invite_by_id_dialog_hint">E-Mail or Matrix-ID</string>
-
     <!--  Chat -->
     <string name="room_menu_search">Suchen</string>
     <string name="room_one_user_is_typing">%s schreibt…</string>
@@ -349,7 +306,6 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="room_delete_unsent_messages">Nicht gesendete Nachrichten löschen</string>
     <string name="room_message_file_not_found">Datei nicht gefunden</string>
     <string name="room_do_not_have_permission_to_post">Du bist nicht berechtigt, in diesen Raum zu schreiben</string>
-
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Vertrauen</string>
     <string name="ssl_do_not_trust">Nicht vertrauen</string>
@@ -362,7 +318,6 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="ssl_unexpected_existing_expl">Das Zertifikat unterscheidet sich von dem Zertifikat, dem dein Gerät ursprünglich vertraut hat. Dies ist SEHR UNGEWÖHNLICH. Es wird empfohlen, dass du dieses neue Zertifikat NICHT AKZEPTIERST.</string>
     <string name="ssl_expected_existing_expl">Das Zertifikat hat sich von einem ursprünglich vertrauenswürdigem Zertifikat in ein nicht vertrauenswürdiges Zertifikat geändert. Eventuell wurde das Zertifikat des Servers erneuert. Bitte erkundige dich beim Server-Administrator, welcher Fingerprint als vertrauenswürdig gilt.</string>
     <string name="ssl_only_accept">Akzeptiere das Zertifikat nur dann, wenn der Server-Administrator einen Fingerprint veröffentlicht hat, der mit dem obigen übereinstimmt.</string>
-
     <!-- Room Details -->
     <string name="room_details_title">Raum-Details</string>
     <string name="room_details_people">Personen</string>
@@ -371,7 +326,6 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
     <string name="malformed_id">Ungültige ID. Eine E-Mail-Adresse oder eine Matrix-ID (\'@localpart:domain\') ist erforderlich</string>
     <string name="room_details_people_invited_group_name">EINGELADEN</string>
     <string name="room_details_people_present_group_name">TEILNEHMER</string>
-
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Grund für das Melden dieses Inhalts</string>
     <string name="room_event_action_report_prompt_ignore_user">Möchtest du alle Nachrichten dieses Nutzers verbergen?
@@ -379,7 +333,6 @@ Du kannst dich mit einem anderen Konto anmelden oder diese E-Mail-Adresse zu die
 Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string>
     <string name="room_event_action_cancel_upload">Upload abbrechen</string>
     <string name="room_event_action_cancel_download">Download abbrechen</string>
-
     <!-- Search -->
     <string name="search_hint">Suchen</string>
     <string name="search_members_hint">Raum-Mitglieder filtern</string>
@@ -388,7 +341,6 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="tab_title_search_messages">NACHRICHTEN</string>
     <string name="tab_title_search_people">PERSONEN</string>
     <string name="tab_title_search_files">DATEIEN</string>
-
     <!-- Room recents -->
     <string name="room_recents_join">BEITRETEN</string>
     <string name="room_recents_directory">VERZEICHNIS</string>
@@ -401,18 +353,15 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="room_recents_join_room">Raum beitreten</string>
     <string name="room_recents_join_room_title">Einem Raum beitreten</string>
     <string name="room_recents_join_room_prompt">Raum-ID oder Raum-Alias eingeben</string>
-
     <!-- Directory -->
     <string name="directory_search_results_title">Verzeichnis durchsuchen</string>
     <string name="directory_searching_title">Verzeichnis wird durchsucht…</string>
-
     <!-- home room settings -->
     <string name="room_settings_favourite">Favorit</string>
     <string name="room_settings_de_prioritize">Niedrige Priorität</string>
     <string name="room_settings_direct_chat">Direkter Chat</string>
     <string name="room_settings_leave_conversation">Konversation verlassen</string>
     <string name="room_settings_forget">Vergessen</string>
-
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Nachrichten</string>
     <string name="room_sliding_menu_settings">Einstellungen</string>
@@ -421,9 +370,7 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="room_sliding_menu_third_party_notices">Nutzungshinweise von Drittanbietern</string>
     <string name="room_sliding_menu_copyright">Urheberrechtserklärung</string>
     <string name="room_sliding_menu_privacy_policy">Datenschutzerklärung</string>
-
     <!-- Vector Settings -->
-
     <string name="settings_profile_picture">Profilbild</string>
     <string name="settings_display_name">Anzeigename</string>
     <string name="settings_email_address">E-Mail-Adresse</string>
@@ -432,22 +379,18 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="settings_add_phone_number">Telefonnummer hinzufügen</string>
     <string name="settings_app_info_link_summary">Zeige App-Infos in den Systemeinstellungen.</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 diese Sitzung aktivieren</string>
     <string name="settings_turn_screen_on">Bildschirm für 3 Sekunden aktivieren</string>
-
     <string name="settings_messages_in_one_to_one">Nachrichten in direkten Chats</string>
     <string name="settings_messages_in_group_chat">Nachrichten in Gruppen-Chats</string>
     <string name="settings_invited_to_room">Wenn ich in einen Raum eingeladen werde</string>
     <string name="settings_call_invitations">Anrufe</string>
     <string name="settings_messages_sent_by_bot">Nachrichten von Bots</string>
-
     <string name="settings_background_sync">Hintergrundsynchronisierung</string>
     <string name="settings_enable_background_sync">Hintergrundsynchronisierung aktivieren</string>
     <string name="settings_set_sync_timeout">Timeout für Synchronisierungsanfragen</string>
     <string name="settings_set_sync_delay">Verzögerung zwischen jeder Synchronisierung</string>
-
     <string name="settings_version">Version</string>
     <string name="settings_olm_version">OLM Version</string>
     <string name="settings_app_term_conditions">Nutzungsbedingungen</string>
@@ -456,8 +399,6 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="settings_privacy_policy">Datenschutzerklärung</string>
     <string name="settings_clear_cache">Cache leeren</string>
     <!--string name="settings_room_privacy_label">Privacy</string-->
-
-
     <string name="settings_user_settings">Nutzereinstellungen</string>
     <string name="settings_notifications">Benachrichtigungen</string>
     <string name="settings_ignored_users">Ignorierte Benutzer</string>
@@ -483,19 +424,15 @@ Um fortzufahren, gib dein Passwort ein.</string>
     <string name="devices_delete_dialog_title">Authentifizierung</string>
     <string name="devices_delete_pswd">Passwort:</string>
     <string name="devices_delete_submit_button_label">Absenden</string>
-
     <string name="settings_logged_in">Angemeldet als</string>
     <string name="settings_home_server">Home-Server</string>
     <string name="settings_identity_server">Identitätsserver</string>
-
     <string name="account_email_validation_title">Verifizierung ausstehend</string>
     <string name="account_email_validation_message">Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Klicke anschließend auf Fortsetzen.</string>
     <string name="account_email_validation_error">Verifizieren der E-Mail-Adresse nicht möglich. Bitte prüfe deine E-Mails und klicke auf den enthaltenen Link. Anschließend klicke auf Fortsetzen.</string>
-
     <string name="account_email_already_used_error">Diese E-Mail-Adresse wird bereits verwendet.</string>
     <string name="account_email_not_found_error">Diese E-Mail-Adresse wurde nicht gefunden.</string>
     <string name="account_phone_number_already_used_error">Diese Telefonnummer wird bereits verwendet.</string>
-
     <string name="settings_change_password">Passwort ändern</string>
     <string name="settings_old_password">Aktuelles Passwort</string>
     <string name="settings_new_password">Neues Passwort</string>
@@ -505,13 +442,9 @@ Um fortzufahren, gib dein Passwort ein.</string>
     <string name="settings_unignore_user">Alle Nachrichten von %s anzeigen?
 
 Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string>
-
     <string name="settings_delete_notification_targets_confirmation">Bist du sicher, dass du dieses Benachrichtigungsziel entfernen möchtest?</string>
-
     <string name="settings_delete_threepid_confirmation">Bist du sicher, dass du %1$s %2$s entfernen möchtest?</string>
-
     <string name="settings_select_country">Wähle ein Land</string>
-
     <string name="settings_phone_number_country_label">Land</string>
     <string name="settings_phone_number_country_error">Bitte wähle ein Land</string>
     <string name="settings_phone_number_label">Mobilfunknummer</string>
@@ -522,19 +455,16 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="settings_phone_number_verification_error">Fehler beim Verifizieren der Telefonnummer</string>
     <string name="settings_phone_number_code">Code</string>
     <!-- Room Settings -->
-
     <!-- room global settings-->
     <string name="room_settings_room_photo">Raumbild</string>
     <string name="room_settings_room_name">Raumname</string>
     <string name="room_settings_topic">Thema</string>
     <string name="room_settings_room_tag">Raum-Markierung</string>
     <string name="room_settings_tag_pref_dialog_title">Markiert als:</string>
-
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
     <string name="room_settings_tag_pref_entry_low_priority">Niedrige Priorität</string>
     <string name="room_settings_tag_pref_entry_none">Keine</string>
-
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Zugriff und Sichtbarkeit</string>
     <string name="room_settings_directory_visibility">Diesen Raum im Raum-Verzeichnis anzeigen</string>
@@ -542,22 +472,18 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="room_settings_room_read_history_rules_pref_title">Lesbarkeit des Chatverlaufs</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Wer kann den Chatverlauf lesen?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Wer kann auf diesen Raum zugreifen?</string>
-
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Jeder</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Nur Mitglieder (ab dem Zeitpunkt, an dem diese Option ausgewählt wurde)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Nur Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Nur Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind)</string>
-
     <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Um einen Link zu einem Raum erstellen zu können, muss dieser eine Adresse haben.</string>
     <string name="room_settings_room_access_entry_only_invited">Nur eingeladene Personen</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Alle, die den Raum-Link kennen (ausgenommen Gäste)</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Alle, die den Raum-Link kennen (auch Gäste)</string>
-
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Verbannte Benutzer</string>
-
     <!-- advanced -->
     <string name="room_settings_category_advanced_title">Erweitert</string>
     <string name="room_settings_room_internal_id">Interne ID dieses Raumes</string>
@@ -569,34 +495,26 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="room_settings_labs_end_to_end_warnings">Du musst dich abmelden, um die Verschlüsselung aktivieren zu können.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Nur für verifizierte Sitzungen verschlüsseln</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Niemals verschlüsselte Nachrichten an unverifizierte Sitzungen in diesem Raum von dieser Sitzung senden.</string>
-
     <!-- Raum settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Dieser Raum hat keine lokalen Adressen</string>
     <string name="room_settings_addresses_add_new_address">Neue Adresse (z. B. #foo:matrix.org)</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Ungültiges Adressformat</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' entspricht nicht dem Format von Adressen</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Du wirst keine Hauptadresse mehr angegeben haben.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Hauptadressen-Warnung</string>
-
     <string name="room_settings_set_main_address">Als Hauptadresse setzen</string>
     <string name="room_settings_unset_main_address">Als Hauptadresse aufheben</string>
     <string name="room_settings_copy_room_id">Raum-ID kopieren</string>
     <string name="room_settings_copy_room_address">Raumadresse kopieren</string>
-
     <string name="room_settings_addresses_e2e_enabled">Verschlüsselung ist in diesem Raum aktiviert.</string>
     <string name="room_settings_addresses_e2e_disabled">Verschlüsselung ist in diesem Raum deaktiviert.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Verschlüsselung aktivieren \n(Warnung: Kann nicht wieder deaktiviert werden!)</string>
-
     <!-- Directory -->
     <string name="directory_title">Verzeichnis</string>
-
     <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s versuchte einen bestimmten Punkt in diesem Chatverlauf zu laden, konnte ihn aber nicht finden.</string>
-
     <!-- encryption dialog -->
     <string name="encryption_information_title">Ende-zu-Ende-Verschlüsselungs-Informationen</string>
-
     <string name="encryption_information_device_info">Ereignisinformation</string>
     <string name="encryption_information_user_id">Nutzer-ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519-Identitätsschlüssel</string>
@@ -604,7 +522,6 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="encryption_information_algorithm">Algorithmus</string>
     <string name="encryption_information_session_id">Sitzungs-ID</string>
     <string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
-
     <string name="encryption_information_sender_device_information">Informationen der Absendersitzung</string>
     <string name="encryption_information_device_name">Öffentlicher Name</string>
     <string name="encryption_information_name">Öffentlicher Name</string>
@@ -612,7 +529,6 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="encryption_information_device_key">Sitzungsschlüssel</string>
     <string name="encryption_information_verification">Verifizierungsstatus</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519-Fingerabdruck</string>
-
     <string name="encryption_export_e2e_room_keys">Ende-zu-Ende-Verschlüsselungs-Raumschlüssel exportieren</string>
     <string name="encryption_export_room_keys">Raumschlüssel exportieren</string>
     <string name="encryption_export_room_keys_summary">Schlüssel in lokale Datei exportieren</string>
@@ -622,31 +538,25 @@ Beachte: Diese Aktion wird die App neu starten und einige Zeit brauchen.</string
     <string name="encryption_export_saved_as">Die Ende-zu-Ende-Raumschlüssel wurden in \'%s\' gespeichert.
 
 Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.</string>
-
     <string name="encryption_import_e2e_room_keys">Ende-zu-Ende-Raumschlüssel importieren</string>
     <string name="encryption_import_room_keys">Raumschlüssel importieren</string>
     <string name="encryption_import_room_keys_summary">Schlüssel aus lokaler Datei importieren</string>
     <string name="encryption_import_import">Importieren</string>
     <string name="encryption_never_send_to_unverified_devices_title">Nur zu verifizierten Sitzungen verschlüsseln</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Von dieser Sitzung aus keine verschlüsselten Nachrichten an nicht-verifizierte Sitzungen senden.</string>
-
     <string name="encryption_information_not_verified">Nicht verifiziert</string>
     <string name="encryption_information_verified">Verifiziert</string>
     <string name="encryption_information_blocked">Auf der Blockierliste</string>
-
     <string name="encryption_information_unknown_device">unbekannte Sitzung</string>
     <string name="encryption_information_none">Nichts</string>
-
     <string name="encryption_information_verify">Bestätigen</string>
     <string name="encryption_information_unverify">Verifiz. widerrufen</string>
     <string name="encryption_information_block">Sperren</string>
     <string name="encryption_information_unblock">Zulassen</string>
-
     <string name="encryption_information_verify_device">Sitzung verifizieren</string>
     <string name="encryption_information_verify_device_warning">Vergleiche die folgenden Zeichen mit den Einstellungen in der Sitzung des/der anderen Nutzer!n und bestätige:</string>
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="encryption_information_verify_key_match">Ich bestätige, dass die Schlüssel übereinstimmen</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Raum enthält unbekannte Sitzungen</string>
     <string name="unknown_devices_alert_message">Dieser Raum enthält unbekannte Sitzungen, die noch nicht verifiziert wurden.
@@ -654,7 +564,6 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
 \nWir empfehlen, den Verifizierungsprozess für jedes Gerät zu durchlaufen, bevor du fortfährst. Du kannst die Nachricht aber auch ohne Verifizierung senden, wenn du das vorziehst. 
 \n
 \nUnbekannte Sitzungen:</string>
-
     <!-- directory activity  -->
     <string name="select_room_directory">Raum-Verzeichnis auswählen</string>
     <string name="directory_server_fail_to_retrieve_server">Der Server kann nicht verfügbar oder überlastet sein</string>
@@ -662,31 +571,23 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="directory_server_placeholder">Home-Server-URL</string>
     <string name="directory_server_all_rooms_on_server">Alle Räume auf dem %s-Server</string>
     <string name="directory_server_native_rooms">Alle nativen %s-Räume</string>
-
     <!-- historical -->
     <string name="historical_placeholder">Suche nach historischen</string>
-
     <string name="settings_user_interface">Nutzer-Oberfläche</string>
     <string name="settings_interface_language">Sprache</string>
     <string name="settings_select_language">Wähle Sprache</string>
-
     <string name="settings_start_on_boot">Starte beim Systemstart</string>
     <string name="settings_clear_media_cache">Medien-Cache leeren</string>
     <string name="settings_keep_media">Medien behalten</string>
-
     <string name="settings_always_show_timestamps">Für alle Nachrichten Zeitstempel anzeigen</string>
-
     <string name="media_saving_period_3_days">3 Tage</string>
     <string name="media_saving_period_1_week">1 Woche</string>
     <string name="media_saving_period_1_month">1 Monat</string>
     <string name="media_saving_period_forever">Unbegrenzt</string>
-
     <string name="offline">Offline</string>
-
     <string name="user_directory_header">Nutzer-Verzeichnis</string>
     <string name="people_search_user_directory">BENUTZER-VERZEICHNIS (%s)</string>
     <string name="settings_data_save_mode">Datensparsamer Modus</string>
-
     <string name="font_size">Schriftgröße</string>
     <string name="small">Klein</string>
     <string name="normal">Normal</string>
@@ -696,14 +597,11 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="tiny">Sehr klein</string>
     <string name="huge">Riesig</string>
     <string name="settings_theme">Design</string>
-
     <string name="settings_12_24_timestamps">Zeige Zeitstempel im 12-Stunden-Format</string>
-
     <string name="widget_no_power_to_manage">Um Widgets in diesem Raum zu verwalten, ist eine Berechtigung erforderlich</string>
     <string name="widget_creation_failure">Widget konnte nicht erstellt werden</string>
     <string name="settings_labs_create_conference_with_jitsi">Konferenzgespräche mit jitsi durchführen</string>
     <string name="widget_delete_message_confirmation">Soll das Widget wirklich aus diesem Raum gelöscht werden?</string>
-
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Widget konnte nicht erstellt werden.</string>
     <string name="widget_integration_positive_power_level">Berechtigungslevel muss eine positive ganze Zahl sein.</string>
@@ -718,10 +616,8 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="light_theme">Helles Design</string>
     <string name="dark_theme">Dunkles Design</string>
     <string name="black_them">Schwarzes Design</string>
-
     <string name="notification_sync_in_progress">Synchronisiere…</string>
     <string name="notification_listening_for_events">Auf Ereignisse lauschen</string>
-
     <string name="settings_containing_my_display_name">Nachrichten, die meinen Anzeigenamen enthalten</string>
     <string name="settings_containing_my_user_name">Nachrichten, die meinen Benutzernamen enthalten</string>
     <string name="you_added_a_new_device">Du hast die neue Sitzung \'%s\' hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
@@ -730,99 +626,72 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="call">Anruf</string>
     <string name="notification_noisy_notifications">Laute Benachrichtigungen</string>
     <string name="notification_silent_notifications">Lautlose Benachrichtigungen</string>
-
     <string name="option_take_photo">Foto aufnehmen</string>
     <string name="option_take_video">Video aufnehmen</string>
-
     <string name="settings_labs_native_camera">Systemeigene Kamera verwenden</string>
-
     <!-- share keys -->
     <string name="share_without_verifying">Ohne Verifizierung teilen</string>
     <string name="ignore_request">Anfrage ignorieren</string>
-
     <string name="settings_analytics">Anonymisierte Analysedaten</string>
     <string name="title_activity_bug_report">Fehlerbericht</string>
-
     <string name="conference_call_warning_title">Warnung!</string>
     <string name="conference_call_warning_message">Konferenzgespräche werden noch entwickelt und sind vielleicht nicht zuverlässig.</string>
-
     <!-- slash commands -->
     <string name="command_error">Befehlsfehler</string>
     <string name="unrecognized_command">Unbekanntes Kommando: %s</string>
-
     <!-- notification statuses -->
     <string name="notification_off">Aus</string>
     <string name="notification_noisy">Laut</string>
-
     <string name="encrypted_message">Verschlüsselte Nachricht</string>
-
     <string name="title_activity_group_details">Community-Details</string>
-
     <string name="loading">Lädt…</string>
-
     <string name="action_exit">Schließen</string>
     <string name="bottom_action_groups">Communities</string>
-
     <string name="home_filter_placeholder_groups">Community-Namen filtern</string>
-
     <string name="groups_invite_header">Einladen</string>
     <string name="groups_header">Communities</string>
     <string name="no_group_placeholder">Keine Gruppen</string>
-
     <string name="start_new_chat_prompt_msg">Sicher, dass du einen neuen Chat mit %s starten möchtest\?</string>
     <string name="start_voice_call_prompt_msg">Sicher, dass du einen Sprachanruf starten möchtest\?</string>
     <string name="start_video_call_prompt_msg">Sicher, dass du einen Videoanruf starten möchtest\?</string>
-
     <string name="groups_list">Gruppenliste</string>
-
     <string name="room_participants_ban_prompt_msg">Ein Bann führt zu einem Ausschluss eines Nutzers von diesem Raum und verhindert einen erneuten Beitritt.</string>
-
     <string name="room_settings_all_messages_noisy">Alle Nachrichten (laut)</string>
     <string name="room_settings_all_messages">Alle Nachrichten</string>
     <string name="room_settings_mention_only">Nur Erwähnungen</string>
     <string name="room_settings_mute">Stumm</string>
     <string name="settings_inline_url_preview">URL-Vorschau im Chat</string>
     <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen eines Nutzers</string>
-
     <string name="room_settings_room_notifications_title">Benachrichtigungen</string>
     <string name="room_settings_no_flair">Dieser Raum zeigt für keine Community Avatare an</string>
     <string name="room_settings_add_new_group">Neue Community-ID (z.B. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Ungültige Community-ID</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ist keine valide Community-ID</string>
-
-
     <string name="create">Erstellen</string>
     <string name="create_community">Community erstellen</string>
     <string name="community_name">Community-Name</string>
     <string name="community_name_hint">Beispiel</string>
     <string name="community_id">Community-ID</string>
     <string name="community_id_hint">Beispiel</string>
-
     <!-- group details -->
     <string name="group_details_home">Startseite</string>
     <string name="group_details_people">Personen</string>
     <string name="group_details_rooms">Räume</string>
     <string name="no_users_placeholder">Keine Benutzer</string>
-
     <string name="rooms">Räume</string>
     <string name="joined">Beigetreten</string>
     <string name="invited">Eingeladen</string>
     <string name="filter_group_members">Filter Gruppen-Mitglieder</string>
     <string name="filter_group_rooms">Filter Gruppen-Räume</string>
-
     <string name="group_no_long_description">Der Community-Administrator hat keine lange Beschreibung für diese Community zur Verfügung gestellt.</string>
-
     <string name="has_been_kicked">Du wurdest von %2$s aus %1$s gekickt</string>
     <string name="has_been_banned">Du wurdest von %2$s aus %1$s verbannt</string>
     <string name="reason_colon">Grund: %1$s</string>
     <string name="rejoin">Erneut beitreten</string>
     <string name="forget_room">Raum vergessen</string>
     <string name="room_settings_add_homescreen_shortcut">Startbildschirm-Verknüpfung hinzufügen</string>
-
     <string name="settings_flair">Community Avatare</string>
-
     <string name="send_bug_report_rage_shake">Schütteln, um einen Fehler zu melden</string>
-
     <string name="actions">Aktionen</string>
     <string name="list_members">Mitglieder auflisten</string>
     <string name="room_sync_in_progress">Synchronisiere…</string>
@@ -838,7 +707,6 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
         <item quantity="one">1 neue Nachricht</item>
         <item quantity="other">%d neue Nachrichten</item>
     </plurals>
-
     <plurals name="directory_search_rooms">
         <item quantity="one">1 Raum</item>
         <item quantity="other">%d Räume</item>
@@ -863,17 +731,13 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
         <item quantity="one">1 aktives Widget</item>
         <item quantity="other">%d aktive Widgets</item>
     </plurals>
-
     <!-- Widget Integration Manager -->
     <string name="avatar">Profilbild</string>
-
     <plurals name="membership_changes">
         <item quantity="one">1 Mitgliederänderung</item>
         <item quantity="other">%d Mitgliederänderungen</item>
     </plurals>
-
     <string name="notification_unread_notified_messages_in_room">%1$s in %2$s</string>
-
     <string name="open_chat_header">Öffne Header</string>
     <string name="receipt_avatar">Profilbild für Lesebestätigungen</string>
     <string name="notice_avatar">Profilbild für Bemerkungen</string>
@@ -886,32 +750,25 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="settings_notification_privacy_secure_message_content">• Der Nachrichteninhalt der Benachrichtigung wird <b>sicher vom Matrix-Home-Server abgerufen</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Benachrichtigungen enthalten <b>Metadaten und Nachrichteninhalte</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Benachrichtigungen werden <b>den Nachrichteninhalt nicht anzeigen</b></string>
-
     <string name="startup_notification_privacy_title">Benachrichtungs-Datenschutz</string>
     <string name="startup_notification_privacy_message">Element kann im Hintergrund laufen um deine Benachrichtigungen sicher und privat zu verwalten. Dies kann den Energieverbrauch beeinflussen.</string>
     <string name="startup_notification_privacy_button_grant">Berechtigung gewähren</string>
     <string name="startup_notification_privacy_button_other">Wähle eine andere Option</string>
-
     <string name="title_activity_choose_sticker">Sende einen Sticker</string>
-
     <string name="option_send_sticker">Sende Sticker</string>
     <string name="no_sticker_application_dialog_content">Du hast aktuell keine Stickerpakete aktiviert.
 \n
 \nMöchtest du welche hinzufügen\?</string>
-
     <string name="settings_deactivate_account_section">Account deaktivieren</string>
     <string name="settings_deactivate_my_account">Deaktiviere meinen Account</string>
-
     <string name="settings_opt_in_of_analytics">Sende Analysedaten</string>
     <string name="settings_opt_in_of_analytics_summary">Element sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
     <string name="settings_opt_in_of_analytics_prompt">Bitte aktive Analysedaten um uns zu helfen Element zu verbessern.</string>
     <string name="settings_opt_in_of_analytics_ok">Ja, ich möchte helfen!</string>
-
     <string name="widget_integration_missing_parameter">Ein benötigter Parameter fehlt.</string>
     <string name="widget_integration_invalid_parameter">Ein Parameter ist nicht valide.</string>
     <string name="dialog_user_consent_content">Um %1$s weiter zu verwenden, musst die Geschäftsbedingungen begutachten und ihnen zustimmen.</string>
     <string name="dialog_user_consent_submit">Jetzt prüfen</string>
-
     <string name="deactivate_account_title">Account deaktiveren</string>
     <string name="deactivate_account_content">Dies wir dein Konto permanent unbenutzbar machen. Du wirst dich nicht anmelden können und keiner wird denselben Nutzernamen erneut registrieren können. Dies wird dein Konto aus allen Räumen austreten lassen, an denen es teilnimmt und es wird deine Kontoangaben vom Identitätsserver löschen. <b>Diese Aktion ist unumkehrbar</b>. 
 \n 
@@ -921,37 +778,25 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="deactivate_account_delete_checkbox">Bitte alle Nachrichten, die ich gesendet habe, löschen, wenn mein Account deaktiviert wird (Warnung: Unterhaltungen werden für zukünftige Nutzer unvollständig erscheinen)</string>
     <string name="deactivate_account_prompt_password">Um fortzufahren, bitte Passwort eingeben:</string>
     <string name="deactivate_account_submit">Account deaktivieren</string>
-
     <string name="dialog_title_third_party_licences">Drittanbieter-Lizenzen</string>
-
     <string name="download">Download</string>
     <string name="speak">Sprechen</string>
     <string name="clear">Leeren</string>
     <string name="e2e_re_request_encryption_key">Verschlüsselungsschlüssel von deinen anderen Sitzungen erneut anfragen.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Schlüsselanfrage gesendet.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Anfrage gesendet</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Bitte öffne Element auf einem anderen Gerät, das die Nachricht entschlüsseln kann, damit es die Schlüssel an diese Sitzung senden kann.</string>
-
     <string name="lock_screen_hint">Hier tippen…</string>
-
     <string name="option_send_voice">Sprachnachricht senden</string>
-
     <string name="go_on_with">fortfahren mit…</string>
     <string name="error_no_external_application_found">Es wurde keine externe Anwendung gefunden, um diese Aktion auszuführen.</string>
-
     <string name="settings_labs_enable_send_voice">Sende Sprachnachrichten</string>
-
     <string name="error_empty_field_your_password">Bitte gib dein Passwort ein.</string>
-
     <string name="send_bug_report_description_in_english">Schreibe bitte auf Englisch, wenn möglich.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Sende verschlüsselte Antwort…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Sende unverschlüsselte Antwort…</string>
     <string name="settings_preview_media_before_sending">Zeige Medien vor dem Senden</string>
-
     <string name="settings_without_flair">Du bist aktuell kein Mitglied einer Community.</string>
-
     <string name="settings_labs_keyboard_options_to_send_message">Benutze die Enter-Taste der Tastatur zum Senden</string>
     <string name="command_description_emote">Zeigt Aktionen</string>
     <string name="command_description_ban_user">Bannt Benutzer mit angegebener ID</string>
@@ -966,12 +811,10 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="command_description_nick">Ändert deinen Anzeigenamen</string>
     <string name="command_description_markdown">(De-)Aktiviert Markdown</string>
     <string name="command_description_clear_scalar_token">Um das Matrix-App-Management zu reparieren</string>
-
     <string name="room_tombstone_versioned_description">Dieser Raum wurde ersetzt und ist nicht länger aktiv</string>
     <string name="room_tombstone_continuation_link">Die Konversation wird hier fortgesetzt</string>
     <string name="room_tombstone_continuation_description">Dieser Raum ist die Fortsetzung einer anderen Konversation</string>
     <string name="room_tombstone_predecessor_link">Klicke hier um die älteren Nachrichten zu sehen</string>
-
     <string name="missing_permissions_error">Nicht berechtigt, diese Aktion durchzuführen.</string>
     <plurals name="format_time_s">
         <item quantity="one">1s</item>
@@ -989,14 +832,11 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
         <item quantity="one">1T</item>
         <item quantity="other">%dT</item>
     </plurals>
-
     <string name="room_participants_now">Jetzt %1$s</string>
     <string name="room_participants_ago">%1$s seit %2$s</string>
-
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s und %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <plurals name="room_details_selected">
         <item quantity="one">1 ausgewählt</item>
         <item quantity="other">%d ausgewählt</item>
@@ -1005,58 +845,43 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
         <item quantity="one">1 Mitglied</item>
         <item quantity="other">%d Mitglieder</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="one">1 Raum</item>
         <item quantity="other">%d Räume</item>
     </plurals>
     <string name="system_alerts_header">Systembenachrichtigungen</string>
-
     <string name="resource_limit_exceeded_title">Ressourcen-Limit</string>
     <string name="resource_limit_contact_action">Kontaktiere Administrator</string>
-
     <string name="resource_limit_contact_admin">kontaktiere deinen Service-Administrator</string>
-
     <string name="resource_limit_soft_default">Dieser Home-Server hat einen seiner Ressourcen-Limits erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
     <string name="resource_limit_hard_default">Dieser Home-Server hat einen seiner Ressourcen-Limits überschritten.</string>
-
     <string name="resource_limit_soft_mau"> Dieser Home-Server hat sein Limit an monatlich aktiven Nutzern erreicht, sodass <b>einige Nutzer sich nicht anmelden können</b>.</string>
     <string name="resource_limit_hard_mau">Dieser Home-Server hat sein Limit an monatlich aktiven Nutzern erreicht.</string>
-
     <string name="resource_limit_soft_contact">Bitte %s um dieses Limit anheben zu lassen.</string>
     <string name="resource_limit_hard_contact">Bitte %s um diesen Dienst weiter zu nutzen.</string>
-
     <string name="dialog_title_error">Fehler</string>
-
     <string name="settings_lazy_loading_title">Raummitglieder bei Bedarf nachladen</string>
     <string name="settings_lazy_loading_description">Verbessere Performanz, indem Raum-Mitglieder erst beim ersten Ansehen geladen werden.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Dein Home-Server unterstützt noch nicht das Nachladen von Raummitgliedern. Versuche es später.</string>
-
     <string name="unknown_error">Entschuldige, ein Fehler trat auf</string>
-
     <string name="room_sliding_menu_version_x">Version %s</string>
     <string name="status_theme">Status.im-Design</string>
-
     <string name="encryption_export_notice">Bitte eine Passphrase erstellen um exportierte Schlüssel zu verschlüsseln. Du musst dieselbe Passphrase eingeben um die Schlüssel importieren zu können.</string>
     <string name="passphrase_create_passphrase">Erzeuge Passphrase</string>
     <string name="passphrase_passphrase_does_not_match">Passphrasen stimmen nicht überein</string>
     <string name="merged_events_expand">aufklappen</string>
     <string name="merged_events_collapse">Zusammenklappen</string>
-
     <string name="settings_info_area_show">Zeige Infobereich</string>
     <string name="show_info_area_always">Immer</string>
     <string name="show_info_area_messages_and_errors">Für Nachrichten und Fehler</string>
     <string name="show_info_area_only_errors">Nur für Fehler</string>
-
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
-
     <string name="call_anyway">Trotzdem anrufen</string>
     <string name="room_participants_action_kick">Entfernen</string>
     <string name="reason_hint">Grund</string>
-
     <string name="settings_inline_url_preview_summary">Linkvorschau im Chat aktivieren, falls dein Home-Server diese Funktion unterstützt.</string>
     <string name="settings_send_typing_notifs">Sende Schreibbenachrichtigungen</string>
     <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
@@ -1068,11 +893,9 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="settings_password">Passwort</string>
     <string name="settings_labs_native_camera_summary">Starte die System-Kamera anstelle der angepassten Kamera.</string>
     <string name="settings_labs_enable_send_voice_summary">Diese Option erfordert eine externe Anwendung um Sprachnachrichten aufzuzeichnen.</string>
-
     <string name="command_problem_with_parameters">Das Kommando \"%s\" braucht mehr Parameter oder einige Parameter sind inkorrekt.</string>
     <string name="markdown_has_been_enabled">Markdown wurde aktiviert.</string>
     <string name="markdown_has_been_disabled">Markdown wurde deaktiviert.</string>
-
     <string name="settings_show_join_leave_messages">Zeige Betreten- und Verlassen-Ereignisse</string>
     <string name="settings_show_avatar_display_name_changes_messages">Zeige Konto-Ereignisse</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Enthält Änderungen des Profilbilds und des Anzeigenamens.</string>
@@ -1080,62 +903,49 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.
     <string name="settings_call_ringtone_use_app_ringtone">Nutze den Standard-Klingelton von Element für eingehende Anrufe</string>
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
-
     <string name="accept">Akzeptieren</string>
-
     <string name="auth_accept_policies">Bitte prüfe und akzeptiere die Richtlinien dieses Home-Servers:</string>
-
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tests ausführen</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Läuft… (%1$d von %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Versuche vorgeschlagene Lösung(en).</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Bitte sende einen Fehlerbericht, damit dies untersucht werden kann.</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">Systemeinstellungen.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Benachrichtigungen sind in den Systemeinstellungen aktiviert.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notifications sind in den Systemeinstellungen deaktiviert.
 Bitte überprüfe die Systemeinstellungen.</string>
     <string name="open_settings">Öffne Einstellungen</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Kontoeinstellungen.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Benachrichtigungen sind für dein Konto eingeschaltet.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Notifications sind für dein Konto deaktiviert.
 Bitte überprüfe die Kontoeinstellungen.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Aktiviere</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Sitzungseinstellungen.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Benachrichtigungen sind für diese Sitzung aktiviert.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Benachrichtigungen sind für diese Sitzung nicht aktiviert. 
 \nBitte überprüfe die Einstellungen für Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Aktiviere</string>
-
     <string name="settings_troubleshoot_test_play_services_failed">Element benutzt Google Play Dienste um Push-Nachrichten zu übermitteln, doch scheinen sie nicht korrekt konfiguriert zu sein:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Repariere Play-Dienste</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Firebase-Token</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM-Token erfolgreich abgefragt:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Abfragen des FCM-Tokens fehlgeschlagen:
 \n%1$s</string>
-
     <string name="settings_troubleshoot_test_token_registration_success">FCM-Token erfolgreich beim Home-Sserver registriert.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">FCM-Token konnte nicht beim Home-Server registriert werden: %1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Benachrichtigungsdienst</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Benachrichtigungsdienst läuft.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Benachrichtigungsdienst läuft nicht.
 Versuche die Anwendung neuzustarten.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Starte Dienst</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">Automatischer Neustart des Benachrichtigungsdienstes</string>
     <string name="settings_troubleshoot_test_service_restart_success">Dienst wurde automatisch gestoppt und erneut gestartet.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Dienst konnte nicht neugestartet werden</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Starte beim Hochfahren</string>
     <string name="settings_troubleshoot_test_service_boot_success">Dienst wird starten, wenn das Gerät neu gestartet wird.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">Dieser Dienst wird nicht starten, wenn das Gerät neu gestartet wird. Du wirst keine Benachrichtigungen bekommen bis Element einmal geöffnet wurde.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktiviere das Starten beim Hochfahren</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Überprüfe Hintergrund-Einschränkungen</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Hintergrund-Einschränkungen sind für Element deaktiviert. Dieser Test sollte über mobile Daten ausgeführt werden (kein WLAN).
 %1$s</string>
@@ -1143,7 +953,6 @@ Versuche die Anwendung neuzustarten.</string>
 \nDie App wird aggressiv eingeschränkt, während sie im Hintergrund arbeiten möchte. Dies könnte Benachrichtigungen beeinflussen.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Einschränkungen deaktivieren</string>
-
     <string name="settings_troubleshoot_test_battery_title">Batterieoptimierung</string>
     <string name="settings_troubleshoot_test_battery_success">Element wird nicht von Batterieoptimierungen beeinflusst.</string>
     <string name="settings_notification_troubleshoot">Fehler bei Benachrichtigungen finden</string>
@@ -1154,50 +963,36 @@ Versuche die Anwendung neuzustarten.</string>
     <string name="settings_troubleshoot_test_token_registration_title">Token-Registrierung</string>
     <string name="settings_troubleshoot_test_battery_failed">Wenn ein Benutzer ein abgestecktes Gerät mit ausgeschaltetem Bildschirm eine Weile nicht bewegt, wechselt es in den Doze-Modus. Dies hindert Apps daran, auf das Netzwerk zuzugreifen und verzögert die Ausführung von Aufgaben, Synchronisierungen und Standard-Alarmen.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoriere Optimierungen</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">Hintergrundverbindung</string>
     <string name="startup_notification_fdroid_battery_optim_message">"Element muss eine  Hintergrundverbindung (nur geringe Belastung) aufrechterhalten, um verlässliche Benachrichtigungen zu erhalten.
 \nAuf dem nächsten Bildschirm wirst Du gefragt, ob Du Element erlauben möchtest im Hintergrund zu laufen. Bitte akzeptieren."</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Berechtigung gewähren</string>
-
     <string name="account_email_error">Beim Verifizieren deiner E-Mail-Adresse trat ein Fehler auf.</string>
-
     <string name="account_phone_number_error">Beim Verifizieren deiner Telefonnummer trat ein Fehler auf.</string>
     <string name="account_additional_info">Weitere Information: %s</string>
-
     <string name="no_valid_google_play_services_apk">Keine validen Google-Play-Dienste gefunden. Benachrichtigungen könnten nicht richtig funktionieren.</string>
-
     <string name="video_call_in_progress">Videogespräch aktiv…</string>
-
     <string name="title_activity_keys_backup_setup">Schlüssel-Sicherung</string>
     <string name="title_activity_keys_backup_restore">Schlüssel-Sicherung verwenden</string>
     <string name="keys_backup_is_not_finished_please_wait">Schlüsselsicherung ist nicht abgeschlossen. Bitte warten…</string>
-
     <string name="skip">Überspringen</string>
     <string name="done">Fertig</string>
-
     <string name="settings_notification_advanced">Erweiterte Benachrichtigungseinstellungen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Angepasste Einstellungen.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Beachte, dass einige Nachrichtentypen leise sind (erzeugen eine Benachrichtigung aber keinen Ton).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Einige Benachrichtigungen sind in deinen erweiterten Einstellungen deaktiviert.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Konnte angepasste Regeln nicht laden. Bitte erneut versuchen.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Einstellungen überprüfen</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Konto hinzufügen</string>
-
     <string name="settings_noisy_notifications_preferences">Laute Benachrichtigungen einstellen</string>
     <string name="settings_call_notifications_preferences">Anrufbenachrichtigung einstellen</string>
     <string name="settings_silent_notifications_preferences">Lautlose Benachrichtigungen einstellen</string>
     <string name="settings_system_preferences_summary">Wähle LED-Farbe, Vibration, Ton…</string>
-
-
     <string name="notification_silent">Stumm</string>
     <string name="passphrase_empty_error_message">Bitte eine Passphrase eingeben</string>
     <string name="passphrase_passphrase_too_weak">Passphrase ist zu schwach</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Bitte lösche die Passphrase, wenn Element einen Wiederherstellungs-Schlüssel erzeugen soll.</string>
     <string name="keys_backup_no_session_error">Keine Matrix-Sitzung verfügbar</string>
-
     <string name="keys_backup_setup_step1_title">Verliere nie wieder verschlüsselte Nachrichten</string>
     <string name="keys_backup_setup_step2_button_title">Setze Passphrase</string>
     <string name="keys_backup_setup_step3_button_title">Erledigt</string>
@@ -1210,21 +1005,15 @@ Versuche die Anwendung neuzustarten.</string>
     <string name="keys_backup_setup_backup_started_title">Sicherung gestartet</string>
     <string name="keys_backup_setup_skip_title">Bist du sicher\?</string>
     <string name="keys_backup_restore_key_enter_hint">Wiederherstellungsschlüssel eingeben</string>
-
     <string name="keys_backup_restore_setup_recovery_key">Nachrichtenwiederherstellung</string>
-
     <string name="keys_backup_restoring_waiting_message">Stelle Backup wieder her:</string>
     <string name="keys_backup_unlock_button">Historie entschlüsseln</string>
     <string name="keys_backup_settings_restore_backup_button">Von Sicherung wiederherstellen</string>
     <string name="keys_backup_settings_delete_backup_button">Sicherung löschen</string>
-
     <string name="keys_backup_settings_deleting_backup">Lösche Sicherung…</string>
     <string name="keys_backup_settings_delete_backup_error">Konnte Sicherung nicht löschen (%s)</string>
-
     <string name="keys_backup_settings_delete_confirm_title">Lösche Sicherung</string>
-
     <string name="settings_notification_by_event">Präferenz der Benachrichtigungen nach Ereignis</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 Dieser Fehler ist außerhalb von Element passiert. Google sagt, dass dieses Gerät zu viele Apps registriert hat um FCM zu nutzen. Der Fehler taucht nur auf, wenn sehr viele Apps installiert sind. Er sollte also den Durchschnittsnutzer nicht betreffen.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -1233,33 +1022,25 @@ Dieser Fehler ist außerhalb von Element passiert. Google sagt, dass dieses Ger
 Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
     <string name="settings_cryptography_manage_keys">Verwaltung der Krypto-Schlüssel</string>
     <string name="encryption_settings_manage_message_recovery_summary">Schlüssel-Sicherung verwalten</string>
-
     <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der/die Empfänger!nnen haben die Schlüssel um diese Nachrichten zu lesen. 
 \n
 \nSichere deine Schlüssel, um sie nicht zu verlieren.</string>
     <string name="recovery_key_export_saved_as_warning">Der Wiederherstellungsschlüssel wurde nach \'%s\' gespeichert. 
 \n
 \nWarnung: Diese Datei wird gelöscht, wenn die Anwendung deinstalliert wird.</string>
-
     <string name="keys_backup_setup_step3_generating_key_status">Wiederherstellungsschlüssel aus Passphrase generieren. Dies kann mehrere Sekunden brauchen.</string>
     <string name="keys_backup_setup_backup_started_message">Deine Verschlüsselungsschlüssel werden nun im Hintergrund auf deinem Home-Server gesichert. Die initiale Sicherung kann mehrere Minuten dauern.</string>
-
-
     <string name="keys_backup_setup_skip_msg">Du verlierst möglicherweise den Zugang zu deinen Nachrichten, wenn du dich abmeldest oder das Gerät verlierst.</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">Rufe Backup-Version ab…</string>
     <string name="keys_backup_restore_with_passphrase">Nutze deine Wiederherstellungspassphrase, um deinen verschlüsselten Chatverlauf lesen zu können</string>
     <string name="keys_backup_restore_use_recovery_key">nutze deinen Wiederherstellungsschlüssel</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Wenn du deine Wiederherstellungspassphrase nicht weist, kannst du %s.</string>
-
     <string name="keys_backup_restore_with_recovery_key">Nutze deinen Wiederherstellungsschlüssel, um deinen verschlüsselten Chatverlauf lesen zu können</string>
     <string name="keys_backup_restore_with_key_helper">Hast du deinen Wiederherstellungsschlüssel verloren\? Du kannst einen neuen in den Einstellungen einrichten.</string>
     <string name="keys_backup_passphrase_error_decrypt">Sicherung konnte mit dieser Passphrase nicht entschlüsselt werden. Bitte stelle sicher, dass du die korrekte Wiederherstellungspassphrase eingegeben hast.</string>
     <string name="network_error_please_check_and_retry">Netzwerkfehler: Bitte überprüfe die Verbindung und versuche es erneut.</string>
-
     <string name="keys_backup_recovery_code_empty_error_message">Gib deinen Wiederherstellungsschlüssel ein</string>
     <string name="keys_backup_recovery_code_error_decrypt">Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden. Bitte stelle sicher, dass du den korrekten Wiederherstellungsschlüssel eingegeben hast.</string>
-
     <string name="keys_backup_restore_success_title">Sicherung wiederhergestellt %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Backup mit %d Schlüssel wiederhergestellt.</item>
@@ -1269,16 +1050,11 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
         <item quantity="one">%d neuer Schlüssel wurde dieser Sitzung hinzugefügt.</item>
         <item quantity="other">%d neue Schlüssel wurden dieser Sitzung hinzugefügt.</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">Konnte letzte Version der Wiederherstellungsschlüssel nicht laden (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Sitzungsverschlüsselung ist nicht aktiviert</string>
-
-
     <string name="keys_backup_settings_status_ok">Die Schlüsselsicherung wurde für diese Sitzung korrekt eingerichtet.</string>
     <string name="keys_backup_settings_status_ko">Die Schlüsselsicherung ist in dieser Sitzung nicht aktiv.</string>
     <string name="keys_backup_settings_status_not_setup">Deine Schlüssel werden von dieser Sitzung nicht gesichert.</string>
-
-
     <string name="keys_backup_settings_signature_from_unknown_device">Sicherung hat eine Signatur von einer unbekannten Sitzung mit der ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Sicherung hat eine valide Sicherung von dieser Sitzung.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Die Sicherung hat eine gültige Signatur von der verifizierten Sitzung %s.</string>
@@ -1286,10 +1062,8 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Die Sicherung hat eine ungültige Signatur von der verifizierten Sitzung %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Die Sicherung hat eine ungültige Signatur von der nicht verifizierten Sitzung %s</string>
     <string name="keys_backup_get_trust_error">Abfrage der Vertrauensinformationen für die Sicherung fehlgeschlagen (%s).</string>
-
     <string name="keys_backup_settings_untrusted_backup">Um die Schlüsselsicherung für diese Sitzung zu verwenden, stelle sie jetzt mit deiner Passphrase oder deinem Wiederherstellungsschlüssel wieder her.</string>
     <string name="keys_backup_settings_delete_confirm_message">Deine gesicherten Verschlüsselungsschlüssel vom Server löschen\? Du wirst deinen Wiederherstellungsschlüssel nicht mehr nutzen können, um deinen verschlüsselten Chatverlauf zu lesen.</string>
-
     <string name="sign_out_bottom_sheet_warning_no_backup">Beim Ausloggen gehen deine verschlüsselten Nachrichten verloren</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Schlüssel-Sicherung wird durchgeführt. Wenn du dich jetzt ausloggst, gehen deine verschlüsselten Nachrichten verloren.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Schlüssel-Sicherung sollte bei allen Sitzungen aktiviert sein, um den Verlust verschlüsselter Nachrichten zu verhindern.</string>
@@ -1299,20 +1073,15 @@ Dieser Fehler ist außerhalb von Element passiert. Es gibt kein Google-Konto auf
     <string name="are_you_sure">Sicher\?</string>
     <string name="backup">Sicherung</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Alle verschlüsselten Nachrichten gehen verloren, wenn Du dich ausloggst ohne eine Sicherung der Schlüssel gemacht zu haben.</string>
-
     <string name="stay">Bleiben</string>
     <string name="abort">Abbrechen</string>
-
     <string name="action_sign_out_confirmation_simple">Sicher, dass du dich ausloggen möchtest\?</string>
-
     <string name="encryption_message_recovery">Wiederherstellung verschlüsselter Nachrichten</string>
     <string name="error_empty_field_enter_user_name">Bitte gib einen Benutzernamen ein.</string>
     <string name="settings_data_save_mode_summary">Der datensparsame Modus sorgt dafür, dass die Präsenz- und Tipp-Benachrichtigungen ausgefiltert werden.</string>
-
     <string name="keys_backup_setup">Richte Schlüsselsicherung ein</string>
     <string name="keys_backup_setup_step1_advanced">(Erweitert)</string>
     <string name="keys_backup_setup_step1_manual_export">Schlüssel manuell exportieren</string>
-
     <string name="keys_backup_setup_step2_text_title">Schütze deine Sicherung mit einer Passphrase.</string>
     <string name="keys_backup_setup_step2_text_description">Eine verschlüsselte Kopie deiner Schlüssel wird auf deinem Home-Server gespeichert. Schütze deine Sicherung mit einer Passphrase. Für maximale Sicherheit sollte diese *nicht* dein Konto-Passwort sein.</string>
     <string name="keys_backup_setup_creating_backup">Erstelle Sicherung</string>
@@ -1332,46 +1101,36 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="new_recovery_method_popup_was_me">Ich war es</string>
     <string name="keys_backup_banner_setup_line1">Verliere nie mehr verschlüsselte Nachrichten</string>
     <string name="keys_backup_banner_setup_line2">Richte die Schlüsselsicherung ein</string>
-
     <string name="keys_backup_banner_recover_line1">Verliere nie wieder verschlüsselte Nachrichten</string>
     <string name="keys_backup_banner_recover_line2">Benutze Schlüsselsicherung</string>
-
     <string name="keys_backup_banner_update_line1">Neue sichere Schlüssel für Nachrichten</string>
     <string name="keys_backup_banner_update_line2">Verwalte Schlüsselsicherung</string>
-
     <string name="keys_backup_banner_in_progress">Sichere Schlüssel…</string>
-
     <string name="keys_backup_info_keys_all_backup_up">Alle Schlüssel sind gesichert</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Sichere %d Schlüssel…</item>
         <item quantity="other">Sichere %d Schlüssel…</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">Version</string>
     <string name="keys_backup_info_title_algorithm">Algorithmus</string>
     <string name="keys_backup_info_title_signature">Signatur</string>
-
     <string name="keys_backup_restoring_computing_key_waiting_message">Berechne Wiederherstellungsschlüssel…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Lade Schlüssel herunter…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Importiere Schlüssel…</string>
     <string name="ignore">Ignorieren</string>
-
     <string name="auth_login_sso">Mit Single-Sign-On anmelden</string>
     <string name="login_error_unknown_host">Diese URL ist nicht erreichbar, bitte prüfen</string>
     <string name="login_error_ssl_handshake">Dein Gerät nutzt eine veraltetes TLS-Sicherheitsprotokoll, das anfällig für Angriffe ist. Zu deiner Sicherheit wirst du nicht in der Lage sein, dich zu verbinden</string>
     <string name="settings_send_message_with_enter">Schicke Nachricht mit Eingabetaste</string>
     <string name="settings_send_message_with_enter_summary">Eingabetaste der Bildschirmtastatur schickt die Nachricht ab, statt einen Zeilenumbruch zu erzeugen</string>
-
     <string name="settings_change_password_submit">Passwort aktualisieren</string>
     <string name="settings_fail_to_update_password_invalid_current_password">Das Passwort ist ungültig</string>
     <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
-
     <string name="autodiscover_invalid_response">Ungültige Antwort beim Entdecken des Home-Servers</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveroptionen vervollständigen</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element hat eine benutzerdefinierte Serverkonfiguration für die Domäne deines Benutzernamens gefunden \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Nutze Konfiguration</string>
-
     <string name="notification_sync_init">Initialisiere Dienst</string>
     <string name="settings_media">Medien</string>
     <string name="settings_default_compression">Standard-Komprimierung</string>
@@ -1379,7 +1138,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_default_media_source">Standard-Medienquelle</string>
     <string name="media_source_choose">Wählen</string>
     <string name="settings_play_shutter_sound">Auslöseton abspielen</string>
-
     <string name="action_mark_room_read">Als gelesen markieren</string>
     <string name="settings_notification_privacy_no_background_sync">Die App braucht sich <b>nicht</b> im Hintergrund mit dem Home-Server verbinden, dies sollte die Akkunutzung reduzieren</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -1390,18 +1148,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
         <item quantity="one">%d Nachricht</item>
         <item quantity="other">%d Nachrichten</item>
     </plurals>
-
     <string name="notification_unknown_new_event">Neues Ereignis</string>
     <string name="notification_unknown_room_name">Raum</string>
     <string name="notification_new_messages">Neue Nachrichten</string>
     <string name="notification_new_invitation">Neue Einladung</string>
     <string name="notification_sender_me">Ich</string>
     <string name="notification_inline_reply_failed">** Fehler beim Senden - bitte Raum öffnen</string>
-
     <string name="error_jitsi_not_supported_on_old_device">Entschuldigung, Konferenzanrufe mit Jitsi werden auf älteren Geräten (mit älteren Android-Versionen als 5.0) nicht unterstützt</string>
-
     <string name="title_activity_verify_device">Sitzung verifizieren</string>
-
     <string name="encryption_information_unknown_ip">Unbekannte IP-Adresse</string>
     <string name="you_added_a_new_device_with_info">Eine neue Sitzung fordert Verschlüsselungsschlüssel an. 
 \nSitzungsname: %1$s 
@@ -1411,86 +1165,67 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \nSitzungsname: %1$s 
 \nZuletzt gesehen: %2$s 
 \nWenn du nicht eine andere Sitzung angemeldet hast, ignoriere diese Anfrage.</string>
-
     <string name="start_verification_short_label">Verifizieren</string>
     <string name="share_without_verifying_short_label">Teilen</string>
     <string name="ignore_request_short_label">Ignorieren</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Auf deinem Home-Server existiert bereits eine Sicherung</string>
     <string name="keys_backup_setup_override_replace">Ersetzen</string>
     <string name="keys_backup_setup_override_stop">Stopp</string>
-
     <string name="keys_backup_settings_checking_backup_state">Überprüfe Sicherungsstatus</string>
     <string name="invalid_or_expired_credentials">Du wurdest abgemeldet, da deine Anmeldedaten falsch oder abgelaufen sind.</string>
-
     <string name="sas_verify_title">Verifizieren durch Vergleichen eines kurzen Textes.</string>
     <string name="sas_verify_start_button_title">Starte Verifizierung</string>
     <string name="sas_incoming_request_title">Eingehende Verifizierungsanfrage</string>
     <string name="sas_incoming_verification_request_dialog">Du hast eine eingehende Verifizierungsanfrage erhalten.</string>
     <string name="sas_view_request_action">Anfrage ansehen</string>
     <string name="sas_waiting_for_partner">Warte auf Bestätigung des/r anderen Nutzer*in…</string>
-
     <string name="sas_verified">Verifiziert!</string>
     <string name="sas_verified_successful">Du hast diese Sitzung erfolgreich verifiziert.</string>
     <string name="sas_verified_successful_description">Sichere Nachrichten mit diesem Benutzer sind Ende-zu-Ende verschlüsselt und können nicht von Dritten mitgelesen werden.</string>
     <string name="sas_got_it">Verstanden</string>
-
     <string name="sas_verification_request_notification_channel_title">Schlüssel-Verifizierung</string>
     <string name="sas_cancelled_dialog_title">Anfrage abgebrochen</string>
     <string name="sas_cancelled_by_me">Die Verifizierung wird abgebrochen.
 \nGrund: %s</string>
-
     <string name="sas_verification_request_notification_channel">Interaktive Sitzungs-Verifizierung</string>
     <string name="sas_incoming_request_notif_title">Verifizierungsanfrage</string>
     <string name="sas_incoming_request_notif_content">%s möchte deine Sitzung verifizieren</string>
-
     <string name="sas_error_m_user">Der Benutzer hat die Verifizierung abgebrochen</string>
     <string name="sas_error_m_timeout">Der Verifizierungsprozess ist abgelaufen</string>
     <string name="sas_error_m_unexpected_message">Die Sitzung hat eine unerwartete Nachricht erhalten</string>
     <string name="sas_error_m_invalid_message">Eine ungültige Nachricht wurde empfangen</string>
     <string name="sas_error_unknown">Unbekannter Fehler</string>
-
-
     <string name="edit">Bearbeiten</string>
     <string name="reply">Antworten</string>
-
     <string name="global_retry">Wiederholen</string>
     <string name="room_list_empty">Trete einem Raum bei um die App zu benutzen.</string>
     <string name="send_you_invite">Hat dir eine Einladung gesendet</string>
     <string name="invited_by">Eingeladen von %s</string>
-
     <string name="room_list_catchup_empty_title">Du bist auf dem neuesten Stand!</string>
     <string name="room_list_catchup_empty_body">Du hast keine weiteren, ungelesenen Nachrichten</string>
     <string name="room_list_catchup_welcome_title">Willkommen zu Hause!</string>
     <string name="room_list_people_empty_title">Unterhaltungen</string>
     <string name="room_list_rooms_empty_title">Räume</string>
     <string name="room_list_rooms_empty_body">Deine Räume werden hier angezeigt</string>
-
     <string name="title_activity_emoji_reaction_picker">Reaktionen</string>
     <string name="reactions_agree">Zustimmen</string>
     <string name="reactions_like">Mag ich</string>
     <string name="message_add_reaction">Reaktion hinzufügen</string>
     <string name="message_view_reaction">Reaktionen ansehen</string>
     <string name="reactions">Reaktionen</string>
-
     <string name="event_redacted_by_user_reason">Ereignis von Benutzer gelöscht</string>
     <string name="event_redacted_by_admin_reason">Ereignis moderiert durch Raum-Administrator</string>
     <string name="last_edited_info_message">Zuletzt bearbeitet von %1$s am %2$s</string>
-
-
     <string name="create_new_room">Neuen Raum erstellen</string>
     <string name="error_no_network">Kein Netzwerk. Bitte überprüfe deine Internetverbindung.</string>
     <string name="action_change">Ändern</string>
     <string name="change_room_directory_network">Netzwerk wechseln</string>
     <string name="please_wait">Bitte warten…</string>
     <string name="group_all_communities">Alle Communities</string>
-
     <string name="room_preview_no_preview">Für diesen Raum kann keine Vorschau angezeigt werden</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Die Vorschau von öffentlichen Räumen wird von Element noch nicht unterstützt</string>
-
     <string name="fab_menu_create_room">Räume</string>
     <string name="fab_menu_create_chat">Direktnachrichten</string>
-
     <string name="create_room_title">Neuer Raum</string>
     <string name="create_room_action_create">ERSTELLEN</string>
     <string name="create_room_name_hint">Raumname</string>
@@ -1498,22 +1233,17 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="create_room_public_description">Jeder wird diesem Raum beitreten können</string>
     <string name="create_room_directory_title">Raumverzeichnis</string>
     <string name="create_room_directory_description">Veröffentliche diesen Raum ins Raumverzeichnis</string>
-
     <string name="settings_integration_manager">Integrationsmanager</string>
-
     <string name="integration_manager_not_configured">Kein Integrationsmanager konfiguriert.</string>
     <string name="key_share_request">Schlüsselaustausch anfragen</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Es sieht so aus, als hättest du bereits ein Setup-Schlüssel-Backup von einer anderen Sitzung. Möchtest du es durch das, was du gerade erstellt hast, ersetzen\?</string>
     <string name="sas_security_advise">Für maximale Sicherheit empfehlen wir, dies persönlich zu tun, oder ein anderes vertrautes Kommunikationsmedium zu nutzen.</string>
     <string name="sas_incoming_request_description">Überprüfe diese Sitzung, um sie als vertrauenswürdig zu markieren. Sitzungen von anderen Nutzer*innen zu vertrauen gibt dir zusätzliche Sicherheit bei der Verwendung von Ende-zu-Ende verschlüsselten Nachrichten.</string>
     <string name="sas_incoming_request_description_2">Durch Verifizieren dieser Sitzung wird sie bei dir und deinem Gegenüber als vertrauenswürdig markiert.</string>
-
     <string name="sas_emoji_description">Verifiziere diese Sitzung, indem du bestätigst, dass das folgende Emoji auf dem Bildschirm deines Gegenübers angezeigt wird</string>
     <string name="sas_decimal_description">Verifiziere diese Sitzung, indem du bestätigst, dass die folgenden Zahlen auf dem Bildschirm deines Gegenübers angezeigt werden</string>
-
     <string name="sas_verifying_keys">Es ist nichts aufgetaucht\? Noch nicht alle Clients unterstützen die interaktive Verifikation. Nutze die alte Verifikation.<button>Nutze alte Verifikation</button>.</string>
     <string name="sas_legacy_verification_button_title">Verwende die alte Verifizierungsmethode.</string>
-
     <string name="sas_error_m_unknown_transaction">Die Sitzung kennt diese Transaktion nicht</string>
     <string name="sas_error_m_mismatched_commitment">Die Hash-Verpflichtung stimmte nicht überein</string>
     <string name="sas_error_m_mismatched_sas">Die SAS stimmte nicht überein</string>
@@ -1524,13 +1254,10 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="malformed_message">Fehlerhaftes Ereignis, kann nicht angezeigt werden</string>
     <string name="keys_backup_unable_to_get_trust_info">Beim Abrufen der Vertrauensinformationen ist ein Fehler aufgetreten</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Beim Abrufen der Schlüsselsicherungsdaten ist ein Fehler aufgetreten</string>
-
     <string name="settings_sdk_version">Matrix SDK Version</string>
     <string name="settings_other_third_party_notices">Sonstige Hinweise Dritter</string>
     <string name="navigate_to_room_when_already_in_the_room">Du siehst diesen Raum bereits!</string>
-
     <string name="quick_reactions">Schnelle Reaktionen</string>
-
     <string name="settings_general_title">Allgemein</string>
     <string name="settings_preferences">Einstellungen</string>
     <string name="settings_security_and_privacy">Sicherheit &amp; Privatsphäre</string>
@@ -1538,79 +1265,55 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_push_rules">Push-Regeln</string>
     <string name="settings_push_rules_no_rules">Keine Push-Regeln definiert</string>
     <string name="settings_push_gateway_no_pushers">Keine registrierten Push-Gateways</string>
-
     <string name="preference_voice_and_video">Sprache &amp; Video</string>
     <string name="preference_root_help_about">Hilfe &amp; Über</string>
-
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Token registrieren</string>
-
     <string name="send_suggestion">Mache einen Vorschlag</string>
     <string name="send_suggestion_content">Bitte schreibe unten deine Anmerkungen.</string>
     <string name="send_suggestion_report_placeholder">Beschreibe hier deine Anmerkung</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Versteckte Ereignisse in der Zeitleiste anzeigen</string>
-
     <string name="bottom_action_people_x">Direkte Nachrichten</string>
-
     <string name="send_file_step_idle">Warten…</string>
     <string name="send_file_step_encrypting_thumbnail">Miniaturbild wird verschlüsselt…</string>
     <string name="send_file_step_encrypting_file">Datei wird verschlüsselt…</string>
     <string name="edited_suffix">(bearbeitet)</string>
-
     <string name="message_edits">Nachrichtenbearbeitung</string>
     <string name="no_message_edits_found">Keine Änderungen gefunden</string>
-
     <string name="room_filtering_filter_hint">Gespräche filtern…</string>
     <string name="room_filtering_footer_create_new_direct_message">Sende eine neue Direktnachricht</string>
     <string name="room_filtering_footer_open_room_directory">Das Raumverzeichnis anzeigen</string>
-
     <string name="link_copied_to_clipboard">Link in die Zwischenablage kopiert</string>
-
     <string name="add_by_matrix_id">Mit Matrix-ID hinzufügen</string>
     <string name="creating_direct_room">Raum erstellen…</string>
     <string name="message_view_edit_history">Bearbeitungsverlauf anzeigen</string>
-
     <string name="sas_cancelled_by_other">Die andere Partei hat die Überprüfung abgebrochen.
 \n%s</string>
     <string name="sas_error_m_unknown_method">Die Sitzung kann sich nicht auf eine Schlüsselvereinbarung, eine Hash-, eine MAC- oder eine SAS-Methode einigen</string>
-
     <string name="import_e2e_keys_from_file">E2E-Schlüssel aus der Datei \"%1$s\" importieren.</string>
-
     <string name="send_suggestion_sent">Vielen Dank, der Vorschlag wurde erfolgreich gesendet</string>
     <string name="send_suggestion_failed">Der Vorschlag konnte nicht gesendet werden (%s)</string>
-
     <string name="send_file_step_sending_thumbnail">Miniaturbild wird gesendet (%1$s / %2$s)</string>
     <string name="send_file_step_sending_file">Datei wird gesendet (%1$s / %2$s)</string>
-
     <string name="downloading_file">Datei %1$s wird heruntergeladen …</string>
     <string name="downloaded_file">Die Datei %1$s wurde heruntergeladen!</string>
-
-
     <string name="room_filtering_footer_title">Kannst du nicht finden, wonach du suchst\?</string>
     <string name="room_filtering_footer_create_new_room">Erstelle einen neuen Raum</string>
     <string name="room_directory_search_hint">Name oder ID (#beispiel:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Aktiviere Wischen, um in der Zeitleiste zu antworten</string>
-
     <string name="direct_room_no_known_users">Kein Ergebnis gefunden. Verwende \'Mit Matrix-ID hinzufügen\', um auf dem Server zu suchen.</string>
     <string name="direct_room_start_search">Beginne mit der Eingabe, um Ergebnisse zu erhalten</string>
     <string name="direct_room_filter_hint">Filtern nach Benutzername oder ID…</string>
-
     <string name="joining_room">Raum betreten…</string>
-
     <string name="decline">Ablehnen</string>
-
     <string name="push_gateway_item_app_id">App-ID:</string>
     <string name="review">Überprüfung</string>
     <string name="none">Keine</string>
     <string name="revoke">Widerrufen</string>
     <string name="disconnect">Trennen</string>
     <string name="people_no_identity_server">Kein Integrationsserver konfiguriert.</string>
-
     <string name="call_failed_no_ice_title">Anruf aufgrund eines falsch konfigurierten Servers fehlgeschlagen</string>
     <string name="call_failed_no_ice_use_alt">Versuche es mit %s</string>
     <string name="call_failed_dont_ask_again">Nicht erneut fragen</string>
-
     <string name="auth_add_email_message_2">Richte eine E-Mail für die Kontowiederherstellung ein. Optional, kannst du später einrichten, dass Personen dich über diese Adresse finden.</string>
     <string name="auth_add_phone_message_2">Richte eine Telefonnummer ein. Später kannst du einrichten, dass Personen dich über diese finden.</string>
     <string name="auth_add_email_phone_message_2">Lege eine E-Mail-Adresse für die Kontowiederherstellung fest. Später kann optional eine E-Mail-Adresse oder eine Telefonnummer dazu verwendet werden, um von anderen Personen gefunden zu werden.</string>
@@ -1620,19 +1323,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_background_fdroid_sync_mode_real_time">Optimiert für die Echtzeit</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Keine Hintergrundsynchronisation</string>
     <string name="settings_background_sync_update_error">Fehler beim Aktualisieren der Einstellungen.</string>
-
-
     <string name="settings_set_workmanager_delay">Bevorzugtes Synchronisationsintervall</string>
     <string name="settings_discovery_category">Auffindbarkeit</string>
     <string name="encryption_information_device_name_with_warning">Öffentlicher Name (sichtbar für Personen, mit denen du kommunizierst)</string>
     <string name="device_name_warning">Der öffentliche Name der Sitzung ist für Personen sichtbar, mit denen du kommunizierst</string>
     <string name="widget_integration_review_terms">Um fortzufahren, musst du die Nutzungsbedingungen akzeptieren.</string>
-
     <string name="identity_server_not_defined">Du verwendest keinen Identitätsserver</string>
     <string name="identity_server_not_defined_for_password_reset">Es ist kein Identitätsserver konfiguriert. Du musst dein Kennwort zurücksetzen.</string>
-
     <string name="error_user_already_logged_in">Du versuchst anscheinend, eine Verbindung zu einem anderen Home-Server herzustellen. Möchtest du dich abmelden\?</string>
-
     <string name="push_gateway_item_push_key">Push-Key:</string>
     <string name="push_gateway_item_app_display_name">App-Anzeigename:</string>
     <string name="push_gateway_item_url">Url:</string>
@@ -1640,10 +1338,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="review_terms">Nutzungsbedingungen überprüfen</string>
     <string name="terms_description_for_identity_server">Für andere auffindbar sein</string>
     <string name="terms_description_for_integration_manager">Verwende Bots, Bridges, Widgets und Sticker-Pakete</string>
-
     <string name="read_at">Gelesen von</string>
-
-
     <string name="identity_server">Identitätsserver</string>
     <string name="disconnect_identity_server">Verbindung zum Identitätsserver trennen</string>
     <string name="add_identity_server">Identitätsserver konfigurieren</string>
@@ -1651,11 +1346,9 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_discovery_emails_title">Auffindbare E-Mail-Adressen</string>
     <string name="settings_discovery_no_mails">Erkennungsoptionen werden angezeigt, sobald du eine E-Mail hinzugefügt hast.</string>
     <string name="settings_discovery_mail_pending">ausstehend</string>
-
     <string name="settings_discovery_enter_identity_server">Gib einen neuen Identitätsserver ein</string>
     <string name="settings_discovery_bad_identity_server">Konnte keine Verbindung zum Home-Server herstellen</string>
     <string name="resources_script">Latn</string>
-
     <string name="call_failed_no_ice_description">Bitte frage den/die Administrator/in deines Home-Servers (%1$s) nach der Einrichtung eines TURN-Servers, damit Anrufe zuverlässig funktionieren. 
 \n 
 \nAlternativ kann ein öffentlicher Server auf %2$s genutzt werden. Dies wird jedoch weniger zuverlässig sein und deine IP-Adresse wird gegenüber diesem Server preisgegeben. Du kannst den Server auch in den Einstellungen anpassen.</string>
@@ -1666,8 +1359,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_add_3pid_confirm_password_title">Passwort bestätigen</string>
     <string name="settings_add_3pid_flow_not_supported">Du kannst dies nicht auf einem mobilen Element tun</string>
     <string name="settings_add_3pid_authentication_needed">Authentifizierung benötigt</string>
-
-
     <string name="settings_background_fdroid_sync_mode">Hintergrund-Synchronisierungsmodus</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element wird sich im Hintergrund auf eine Art synchronisieren die Ressourcen des Geräts (Akku) schont. 
 \nAbhängig vom Ressourcen-Status deines Geräts kann dein System die Synchronisierung verschieben.</string>
@@ -1692,22 +1383,17 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_widget_permission_theme">Dein Design</string>
     <string name="room_widget_permission_widget_id">Widget-ID</string>
     <string name="room_widget_permission_room_id">Raum-ID</string>
-
-
     <string name="room_widget_resource_permission_title">Dieses Widget möchte folgende Ressourcen benutzen:</string>
     <string name="room_widget_resource_grant_permission">Erlauben</string>
     <string name="room_widget_resource_decline_permission">Alle blockieren</string>
     <string name="room_widget_webview_access_camera">Kamera benutzen</string>
     <string name="room_widget_webview_access_microphone">Mikrofon benutzen</string>
     <string name="room_widget_webview_read_protected_media">Lese DRM-geschützte Medien</string>
-
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du wirst nicht über eingehende Nachrichten benachrichtigt, wenn die App im Hintergrund ist.</string>
     <string name="settings_discovery_manage">Verwalte deine Erkennungseinstellungen.</string>
     <string name="room_widget_revoke_access">Zugriff für mich zurückziehen</string>
-
     <string name="push_gateway_item_device_name">Sitzungsname:</string>
     <string name="push_gateway_item_format">Format:</string>
-
     <string name="settings_discovery_identity_server_info">Du nutzt aktuell %1$s um vorhandene Kontakte zu finden und um von dir bekannten Kontakten gefunden zu werden.</string>
     <string name="settings_discovery_identity_server_info_none">Du benutzt aktuell keinen Identitätsserver. Um zu entdecken und um von dir bekannten Kontakten entdeckt zu werden, richte unten einen ein.</string>
     <string name="settings_discovery_msisdn_title">Auffindbare Telefonnummern</string>
@@ -1715,21 +1401,15 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_discovery_no_terms_title">Identitätsserver hat keine Nutzungsbedingungen</string>
     <string name="settings_discovery_no_terms">Der Identitätsserver den du ausgewählt hast, hat keine Nutzungsbedingungen. Fahre nur fort, wenn du dem/r Besitzer!n des Dienstes vertraust</string>
     <string name="settings_text_message_sent">Eine Textnachricht wurde an %s gesendet. Bitte gib den Verifizierungscode ein, den sie enthält.</string>
-
     <string name="labs_allow_extended_logging">Aktiviere ausführliche Logs.</string>
     <string name="labs_allow_extended_logging_summary">Ausführliche Logs werden der Entwicklung der App dadurch helfen, dass mehr Informationen übertragen werden, wenn du einen Fehlerbericht sendest. Auch wenn dies aktiviert ist, werden keine Nachrichteninhalte oder andere privaten Daten aufgezeichnet.</string>
-
-
     <string name="error_terms_not_accepted">Bitte erneut versuchen, nachdem du die Nutzungsbedingungen deines Home-Servers akzeptiert hast.</string>
-
     <string name="room_widget_permission_webview_shared_info_title">Bei Benutzung könnten Cookies gesetzt werden und es könnten Daten mit %s geteilt werden:</string>
     <string name="room_widget_permission_shared_info_title">Bei Benutzung könnten Daten mit %s geteilt werden:</string>
     <string name="settings_discovery_no_msisdn">Optionen zum Finden werden erscheinen, sobald du eine Telefonnummer hinzugefügt hast.</string>
     <string name="settings_discovery_confirm_mail">Wir haben dir eine Bestätigungsmail an %s gesendet. Prüfe dein Postfach und klicke auf den Bestätigungslink</string>
     <string name="error_network_timeout">Es sieht aus, als würde der Server zu viel Zeit benötigen, um zu antworten. Der Grund kann eine schlechte Verbindung oder ein Fehler mit dem Server sein. Bitte versuche es später erneut.</string>
-
     <string name="send_attachment">Anhang senden</string>
-
     <string name="a11y_open_drawer">Navigationsmenü öffnen</string>
     <string name="a11y_create_menu_open">Raumerstellungsmenü öffnen</string>
     <string name="a11y_create_menu_close">Schließe das Raumerstellungsmenü…</string>
@@ -1739,7 +1419,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="a11y_show_password">Passwort anzeigen</string>
     <string name="a11y_hide_password">Passwort verstecken</string>
     <string name="a11y_jump_to_bottom">Zum Ende springen</string>
-
     <string name="three_users_read">gelesen von %1$s, %2$s und %3$s</string>
     <string name="two_users_read">gelesen von %1$s und %2$s</string>
     <string name="one_user_read">gelesen von %s</string>
@@ -1747,9 +1426,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
         <item quantity="one">gelesen von einem Nutzer</item>
         <item quantity="other">gelesen von %d Nutzern</item>
     </plurals>
-
     <string name="error_file_too_big">Die Datei \'%1$s\' (%2$s) ist zu groß, um sie hochzuladen. Das Limit ist %3$s.</string>
-
     <string name="error_attachment">Beim Abrufen des Anhangs ist ein Fehler aufgetreten.</string>
     <string name="attachment_type_file">Datei</string>
     <string name="attachment_type_contact">Kontakt</string>
@@ -1764,7 +1441,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="report_content_custom_hint">Meldegrund</string>
     <string name="report_content_custom_submit">MELDEN</string>
     <string name="block_user">NUTZER IGNORIEREN</string>
-
     <string name="content_reported_title">Inhalt gemeldet</string>
     <string name="content_reported_content">Dieser Inhalt wurde gemeldet.
 \n
@@ -1777,15 +1453,11 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="content_reported_as_inappropriate_content">Dieser Inhalt wurde als unangebracht gemeldet
 \n
 \nWenn du keine weiteren Inhalte dieses Nutzers mehr sehen möchtest, kannst du ihn blockieren, um seine Nachrichten auszublenden</string>
-
     <string name="permissions_rationale_msg_keys_backup_export">Element benötigt Berechtigungen, um deine E2E Schlüssel zu speichern.
 \n
 \nBitte erlaube den Zugriff im nächsten Pop-Up sodass du deine Schlüssel manuell exportieren kannst.</string>
-
     <string name="no_network_indicator">Aktuell besteht keine Netzwerkverbindung</string>
-
     <string name="message_ignore_user">Nutzer ignorieren</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">Alle Nachrichten (laut)</string>
     <string name="room_list_quick_actions_notifications_all">Alle Nachrichten</string>
     <string name="room_list_quick_actions_notifications_mentions">Nur Erwähnungen</string>
@@ -1795,17 +1467,12 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="notice_member_no_changes">%1$s hat keine Änderungen gemacht</string>
     <string name="command_description_spoiler">Sendet die Nachricht als Spoiler</string>
     <string name="no_ignored_users">Du ignorierst keine Nutzer</string>
-
     <string name="help_long_click_on_room_for_more_options">Halte auf einem Raum um mehr Optionen anzuzeigen</string>
-
-
     <string name="room_join_rules_public">%1$s hat den Raum für jeden, der den Link hat, öffentlich gemacht.</string>
     <string name="timeline_unread_messages">Ungelesene Nachrichten</string>
-
     <string name="login_splash_text1">Privat oder in Gruppen mit Leuten chatten</string>
     <string name="login_splash_text2">Halte Gespräche mittels Verschlüsselung privat</string>
     <string name="login_splash_submit">Beginne</string>
-
     <string name="login_server_title">Wähle einen Server</string>
     <string name="login_server_text">Genau wie bei E-Mails haben Accounts ein Zuhause, auch wenn du mit jedem kommunizieren kannst</string>
     <string name="login_server_matrix_org_text">Folge Millionen anderen kostenlos auf dem größten öffentlichen Server</string>
@@ -1813,14 +1480,11 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_server_modular_learn_more">Mehr erfahren</string>
     <string name="login_server_other_title">Andere</string>
     <string name="login_server_other_text">Benutzerdefinierte &amp; erweiterte Einstellungen</string>
-
     <string name="login_continue">Fortfahren</string>
     <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitätsserver würde bedeuten, dass du weder von anderen Nutzern gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine Email Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
     <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.</string>
-
     <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
-
     <string name="login_splash_text3">Erweitere &amp; individualisiere dein Benutzererlebnis</string>
     <string name="login_connect_to">Verbinde mit %1$s</string>
     <string name="login_connect_to_modular">Mit Element Matrix Services verbinden</string>
@@ -1829,7 +1493,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_signup">Registrieren</string>
     <string name="login_signin">Anmelden</string>
     <string name="login_signin_sso">Mit einmaligem Anmelden fortfahren</string>
-
     <string name="login_server_url_form_modular_hint">Element Matrix Services Adresse</string>
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_sso_error_message">Ein Fehler beim Laden der Seite %1$s (%2$d) ist aufgetreten</string>
@@ -1837,32 +1500,24 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_registration_not_supported">Die Anwendung kann kein neues Benutzerkonto auf diesem Server erstellen.
 \n
 \nMöchtest du dich über eine Web-Anwendung anmelden\?</string>
-
     <string name="login_login_with_email_error">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft.</string>
-
     <string name="login_reset_password_on">Passwort auf %1$s zurücksetzen</string>
     <string name="login_reset_password_email_hint">E-Mail</string>
     <string name="login_reset_password_password_hint">Neues Passwort</string>
-
     <string name="login_reset_password_warning_title">Achtung!</string>
     <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Verschlüsselungsschlüssel zurücksetzen. Dein verschlüsselter Chatverlauf wird dadurch unlesbar. Richte eine Schlüsselsicherung ein oder exportiere deine Raumschlüssel von einer anderen Sitzung bevor du dein Passwort zurücksetzt.</string>
     <string name="login_reset_password_warning_submit">Fortfahren</string>
-
     <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft</string>
-
     <string name="login_reset_password_mail_confirmation_title">Prüfe deinen Posteingang</string>
     <string name="login_reset_password_mail_confirmation_notice">Eine Bestätigungsemail wurde an %1$s versendet.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Klicke auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.</string>
     <string name="login_reset_password_mail_confirmation_submit">Ich habe meine E-Mail-Adresse bestätigt</string>
-
     <string name="login_reset_password_success_title">Erfolgreich!</string>
     <string name="login_reset_password_success_notice">Dein Passwort wurde zurückgesetzt.</string>
     <string name="login_reset_password_success_submit">Zurück zur Anmeldung</string>
-
     <string name="login_reset_password_cancel_confirmation_content">Dein Passwort wurde noch nicht geändert.
 \n
 \nMöchtest du die Passwortänderung stoppen\?</string>
-
     <string name="login_set_email_title">E-Mail-Adresse angeben</string>
     <string name="login_set_email_mandatory_hint">E-Mail</string>
     <string name="login_set_email_optional_hint">E-Mail (optional)</string>
@@ -1878,24 +1533,20 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_signup_cancel_confirmation_content">Dein Benutzerkonto ist noch nicht erstellt.
 \n
 \nMöchtest du die Registrierung stoppen\?</string>
-
     <string name="login_a11y_choose_matrix_org">matrix.org auswählen</string>
     <string name="login_a11y_choose_modular">modular auswählen</string>
     <string name="login_a11y_choose_other">Benutzerdefinierten Server auswählen</string>
     <string name="login_terms_title">Bedingungen akzeptieren um fortzufahren</string>
-
     <string name="login_wait_for_email_title">Bitte überprüfe deine E-Mails</string>
     <string name="login_wait_for_email_notice">Wir haben dir eine E-Mail an %1$s gesendet.
 \nBitte öffne den darin enthaltenen Link, um mit der Benutzerkontoerstellung fortzufahren.</string>
     <string name="login_validation_code_is_not_correct">Der eingegebene Code ist nicht korrekt. Bitte überprüfe deine Eingabe.</string>
     <string name="reaction_search_type_hint">Beginne zu Tippen um eine Reaktion zu finden.</string>
-
     <string name="room_join_rules_invite">%1$s hat den Raum auf \"nur-einladen\" gestellt.</string>
     <string name="login_splash_title">Es ist deine Konversation. Mache sie dir zu eigen.</string>
     <string name="login_server_url_form_modular_text">Premium-Hosting für Organisationen</string>
     <string name="login_server_url_form_modular_notice">Gib die Adresse des Modular Element oder Servers ein, den du verwenden möchtest</string>
     <string name="login_server_url_form_other_notice">Gibt die Adresse eines Servers oder eines Element ein, zu dem du dich verbinden möchtest</string>
-
     <string name="login_mode_not_supported">Die Anwendung kann sich nicht bei diesem Home-Server anmelden. Der Home-Server unterstützt die folgenden Anmeldetypen: %1$s. 
 \n 
 \nMöchtest du dich mit einem Webclient anmelden\?</string>
@@ -1905,17 +1556,13 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_reset_password_cancel_confirmation_title">Warnung</string>
     <string name="login_set_email_notice">Lege eine E-Mail-Adresse fest, um dein Konto wiederherzustellen. Später kannst du optional zulassen, dass Personen dich anhand dieser E-Mail-Adresse entdecken.</string>
     <string name="login_set_email_submit">Weiter</string>
-
     <string name="login_set_msisdn_title">Lege Telefonnummer fest</string>
     <string name="login_set_msisdn_notice">Lege eine Telefonnummer fest, damit Personen dich anhand dieser entdecken können.</string>
     <string name="login_set_msisdn_notice2">Bitte verwende das internationale Format.</string>
     <string name="login_set_msisdn_submit">Weiter</string>
-
     <string name="login_msisdn_confirm_submit">Weiter</string>
-
     <string name="login_msisdn_error_not_international">Internationale Telefonnummern müssen mit \'+\' beginnen</string>
     <string name="login_msisdn_error_other">Die Telefonnummer scheint ungültig zu sein. Bitte prüfen</string>
-
     <string name="login_signup_to">Anmelden bei %1$s</string>
     <string name="login_signup_username_hint">Benutzername</string>
     <string name="login_signup_submit">Weiter</string>
@@ -1923,14 +1570,11 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_a11y_captcha_container">Bitte löse das Captcha</string>
     <string name="login_error_outdated_homeserver_title">Veralteter Home-Server</string>
     <string name="login_error_outdated_homeserver_content">Auf diesem Home-Server läuft eine zu alte Version, um eine Verbindung herzustellen. Bitten deine Home-Server-Administration um ein Upgrade.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunde…</item>
         <item quantity="other">Es wurden zu viele Anfragen gesendet. Versuche es erneut in %1$d Sekunden…</item>
     </plurals>
-
     <string name="seen_by">Gesehen von</string>
-
     <string name="signed_out_title">Du bist abgemeldet</string>
     <string name="signed_out_notice">Dies kann verschiedene Gründe haben:
 \n
@@ -1940,7 +1584,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \n
 \n• Die Administration deines Servers hat deinen Zugriff aus Sicherheitsgründen ungültig gemacht.</string>
     <string name="signed_out_submit">Melde dich erneut an</string>
-
     <string name="soft_logout_title">Du bist abgemeldet</string>
     <string name="soft_logout_signin_title">Anmelden</string>
     <string name="soft_logout_signin_notice">Deine Home-Server-Administration (%1$s) hat dich von deinem Konto %2$s (%3$s) abgemeldet.</string>
@@ -1952,7 +1595,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \n 
 \nDeaktiviere diese Option, wenn dieses Gerät nicht mehr verwendet wird oder sich bei einem anderen Konto angemeldet werden soll.</string>
     <string name="soft_logout_clear_data_submit">Alle Daten löschen</string>
-
     <string name="soft_logout_clear_data_dialog_title">Daten löschen</string>
     <string name="soft_logout_clear_data_dialog_content">Alle aktuell auf diesem Gerät gespeicherten Daten löschen\?
 \nMelde dich erneut an, um auf deine Kontodaten und Nachrichten zuzugreifen.</string>
@@ -1960,12 +1602,9 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="soft_logout_clear_data_dialog_submit">Daten löschen</string>
     <string name="soft_logout_sso_not_same_user_error">Die aktuelle Sitzung gehört dem/der Benutzer!n%1$s. Die angegebenen Anmeldeinformationen sind von Benutzer!n %2$s. Dies wird nicht von Element unterstützt.
 \nBitte zuerst die Daten löschen und dann erneut anmelden.</string>
-
     <string name="permalink_malformed">matrix.to-Link fehlerhaft</string>
     <string name="bug_report_error_too_short">Die Beschreibung ist zu kurz</string>
-
     <string name="notification_initial_sync">Initiale Synchronisierung…</string>
-
     <string name="settings_show_devices_list">Alle meine Sitzungen anzeigen</string>
     <string name="settings_advanced_settings">Erweiterte Einstellungen</string>
     <string name="settings_developer_mode">Entwicklungsmodus</string>
@@ -1977,26 +1616,19 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings">Einstellungen</string>
     <string name="devices_current_device">Aktuelle Sitzung</string>
     <string name="devices_other_devices">Andere Sitzungen</string>
-
     <string name="autocomplete_limited_results">Zeigt nur die ersten Ergebnisse, gib mehr Buchstaben ein…</string>
-
     <string name="settings_developer_mode_fail_fast_title">Ausfallsicher</string>
     <string name="settings_developer_mode_fail_fast_summary">Element kann häufiger abstürzen, wenn ein unerwarteter Fehler auftritt</string>
-
     <string name="command_description_shrug">Stellt einer Klartextnachricht ¯\\_(ツ)_/¯ voran</string>
-
     <string name="create_room_encryption_title">Aktiviere Verschlüsselung</string>
     <string name="create_room_encryption_description">Nach der Aktivierung kann die Verschlüsselung nicht deaktiviert werden.</string>
-
     <string name="login_error_threepid_denied">Deine E-Mail-Domain ist nicht berechtigt, sich auf diesem Server zu registrieren</string>
-
     <string name="verification_conclusion_warning">Nicht vertrauenswürdige Anmeldung</string>
     <string name="verification_sas_match">Sie stimmen überein</string>
     <string name="verification_sas_do_not_match">Sie stimmen nicht überein</string>
     <string name="verify_user_sas_emoji_help_text">Verifiziere diese/n Benutzer!n, indem du bestätigst, dass diese einzigartigen Emoji in derselben Reihenfolge auf dem Bildschirm deines Gegenübers angezeigt werden.</string>
     <string name="verify_user_sas_emoji_security_tip">Für ultimative Sicherheit verwende ein anderes vertrauenswürdiges Kommunikationsmittel oder mache es persönlich.</string>
     <string name="verification_green_shield">Suche nach dem grünen Schild, um sicherzustellen, dass ein/e Benutzer!n vertrauenswürdig ist. Vertraue allen Benutzer!nnen in einem Raum, um sicherzustellen, dass der Raum sicher ist.</string>
-
     <string name="verification_conclusion_not_secure">Nicht sicher</string>
     <string name="verification_conclusion_compromised">Eine der folgenden Möglichkeiten kann beeinträchtigt sein: 
 \n 
@@ -2004,12 +1636,10 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \n - Der Home-Server mit dem dein Gegenüber verbunden ist 
 \n - Deine oder die Internetverbindung des Gegenüber 
 \n - Dein Gerät oder das Gerät des Gegenüber</string>
-
     <string name="sent_a_video">Video.</string>
     <string name="sent_an_image">Bild.</string>
     <string name="sent_an_audio_file">Audio</string>
     <string name="sent_a_file">Datei</string>
-
     <string name="verification_request_waiting">Warten…</string>
     <string name="verification_request_other_cancelled">%s brach ab</string>
     <string name="verification_request_you_cancelled">Du hast abgebrochen</string>
@@ -2017,25 +1647,17 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="verification_request_you_accepted">Du hast akzeptiert</string>
     <string name="verification_sent">Verifizierung gesendet</string>
     <string name="verification_request">Verifizierung angefragt</string>
-
-
     <string name="verification_verify_device">Verifiziere diese Sitzung</string>
     <string name="verification_verify_device_manually">Manuelle Verifizierung</string>
-
     <string name="you">Ich</string>
-
     <string name="verification_scan_notice">Scanne den Code mit dem Gerät des Gegenüber für eine gegenseitige Überprüfung</string>
     <string name="verification_scan_their_code">Scanne ihren/seinen Code</string>
     <string name="verification_scan_emoji_title">Kann nicht scannen</string>
     <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht Emoji stattdessen</string>
-
     <string name="verification_no_scan_emoji_title">Verifizieren via Emoji-Vergleich</string>
-
     <string name="verify_by_emoji_title">Mit Emoji verifizieren</string>
     <string name="verify_by_emoji_description">Wenn du den obigen Code nicht scannen kannst, verifiziert, indem ihr eine kurze, eindeutige Auswahl an Emoji vergleicht.</string>
-
     <string name="a13n_qr_code_description">QR-Code-Bild</string>
-
     <string name="verification_verify_user">%s verifizieren</string>
     <string name="verification_verified_user">%s verifiziert</string>
     <string name="verification_request_waiting_for">Warte auf %s…</string>
@@ -2058,52 +1680,37 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_profile_section_more_uploads">Uploads</string>
     <string name="room_profile_section_more_leave">Raum verlassen</string>
     <string name="room_profile_leaving_room">Verlasse den Raum…</string>
-
     <string name="room_member_power_level_admins">Administratoren</string>
     <string name="room_member_power_level_moderators">Moderierende</string>
     <string name="room_member_power_level_custom">benutzerdefiniert</string>
     <string name="room_member_power_level_invites">Eingeladen</string>
     <string name="room_member_power_level_users">Nutzer!n</string>
-
     <string name="room_member_power_level_admin_in">Admin in %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderation in %1$s</string>
     <string name="room_member_jump_to_read_receipt">Springen &amp; als gelesen markieren</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element kann keine Ereignisse vom Typ \'%1$s\'</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element beherrscht keine Nachrichten vom Typ \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element ist beim verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
-
     <string name="unignore">Nicht ignorieren</string>
-
     <string name="verify_cannot_cross_sign">Diese Sitzung kann diese Verifizierung nicht mit deinen anderen Sitzungen teilen.
 \nDie Überprüfung wird lokal gespeichert und in einer zukünftigen Version der App freigegeben.</string>
-
     <string name="room_list_sharing_header_recent_rooms">Neueste Räume</string>
     <string name="room_list_sharing_header_other_rooms">Andere Räume</string>
-
     <string name="command_description_rainbow">Sendet die angegebene Nachricht in Regenbogenfarben</string>
     <string name="command_description_rainbow_emote">Sendet das angegebene Emote in Regenbogenfarben</string>
-
     <string name="settings_category_timeline">Zeitleiste</string>
-
     <string name="settings_category_composer">Nachrichteneditor</string>
-
     <string name="room_settings_enable_encryption">Aktivieren Ende-zu-Ende-Verschlüsselung</string>
     <string name="room_settings_enable_encryption_warning">Einmal aktiviert kann die Verschlüsselung nicht rückgängig gemacht werden.</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Verschlüsselung aktivieren\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Nach der Aktivierung kann die Verschlüsselung für einen Raum nicht deaktiviert werden. In einem verschlüsselten Raum gesendete Nachrichten können vom Server nicht gesehen werden, nur von den Teilnehmenden des Raums. Durch die Verschlüsselung funktionieren viele Bots und Bridges möglicherweise nicht ordnungsgemäß.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Verschlüsselung aktivieren</string>
-
     <string name="verification_request_notice">Um sicher zu gehen, verifiziere %s, indem ein einmaligen Code überprüft wird.</string>
     <string name="verification_request_start_notice">Um sicher zu sein, tut dies persönlich oder verwendet einen anderen Kommunikationsweg.</string>
-
     <string name="verification_emoji_notice">Vergleiche die einzigartigen Emoji und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.</string>
     <string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenübers.</string>
     <string name="verification_conclusion_ok_notice">Nachrichten mit diesem Gegenüber sind Ende-zu-Ende verschlüsselt und können nicht von Dritten gelesen werden.</string>
     <string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer!nnen sehen sie als vertrauenswürdig an.</string>
-
-
     <string name="encryption_information_cross_signing_state">Cross-Signing</string>
     <string name="encryption_information_dg_xsigning_complete">Cross-Signing ist aktiviert
 \nPrivate Schlüssel auf dem Gerät.</string>
@@ -2113,55 +1720,38 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="encryption_information_dg_xsigning_not_trusted">Cross-Signing ist aktiviert
 \nSchlüssel sind nicht vertrauenswürdig</string>
     <string name="encryption_information_dg_xsigning_disabled">Cross-Signing ist nicht aktiviert</string>
-
-
     <string name="settings_active_sessions_list">Aktive Sitzungen</string>
     <string name="settings_active_sessions_show_all">Zeige alle Sitzungen</string>
     <string name="settings_active_sessions_manage">Sitzungen verwalten</string>
     <string name="settings_active_sessions_signout_device">Diese Sitzung abmelden</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Keine kryptografischen Informationen verfügbar</string>
-
     <string name="settings_active_sessions_verified_device_desc">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, da du sie überprüft hast:</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifiziere diese Sitzung, um sie als vertrauenswürdig zu markieren, und gewähren ihr Zugriff auf verschlüsselte Nachrichten. Wenn du dich nicht bei dieser Sitzung angemeldet hast, ist dein Konto möglicherweise gefährdet:</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">Eine aktive Sitzung</item>
         <item quantity="other">%d aktive Sitzungen</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Verifiziere diese Sitzung</string>
     <string name="crosssigning_other_user_not_trust">Andere Benutzer!nnen vertrauen ihr möglicherweise nicht</string>
     <string name="complete_security">Vollständige Sicherheit</string>
-
     <string name="verification_open_other_to_verify">Nutze eine vorhandene Sitzung um diese Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren.</string>
-
-
     <string name="verification_profile_verify">Verifizieren</string>
     <string name="verification_profile_verified">Verifiziert</string>
     <string name="verification_profile_warning">Warnung</string>
-
     <string name="room_member_profile_failed_to_get_devices">Sitzungen konnten nicht abgerufen werden</string>
     <string name="room_member_profile_sessions_section_title">Sitzungen</string>
     <string name="trusted">Vertraut</string>
     <string name="not_trusted">Nicht vertraut</string>
-
     <string name="verification_profile_device_verified_because">Diese Sitzung ist für sichere Nachrichtenübertragung vertrauenswürdig, weil %1$s (%2$s) sie verifiziert hat:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) hat sich in einer neuen Sitzung angemeldet:</string>
     <string name="verification_profile_device_untrust_info">Bis diese/r Benutzer!n dieser Sitzung vertraut, werden an und von ihr/ihm gesendete Nachrichten mit Warnungen gekennzeichnet. Alternativ kannst du dies manuell überprüfen.</string>
-
-
     <string name="initialize_cross_signing">Initialisiere Cross-Signing</string>
     <string name="reset_cross_signing">Schlüssel zurücksetzen</string>
-
     <string name="a11y_qr_code_for_verification">QR-Code</string>
-
     <string name="qr_code_scanned_by_other_notice">Fast geschaft! Zeigt %s dasselbe Schild an\?</string>
     <string name="qr_code_scanned_by_other_yes">Ja</string>
     <string name="qr_code_scanned_by_other_no">Nein</string>
-
     <string name="no_connectivity_to_the_server_indicator">Verbindung zum Server wurde unterbrochen</string>
-
     <string name="settings_dev_tools">Entwicklungswerkzeuge</string>
     <string name="settings_account_data">Kontodaten</string>
     <plurals name="poll_info">
@@ -2176,52 +1766,38 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="command_description_poll">Erstellt eine einfache Umfrage</string>
     <string name="verification_cannot_access_other_session">Nutze eine Wiederherstellungsmethode</string>
     <string name="verification_use_passphrase">Wenn du auf keine existierende Sitzung zugreifen kannst</string>
-
     <string name="new_signin">Neue Anmeldung</string>
-
     <string name="enter_secret_storage_invalid">Kann keine Geheimnisse im Speicher finden</string>
     <string name="enter_secret_storage_passphrase">Gib die geheime Speicherpassphrase ein</string>
     <string name="enter_secret_storage_passphrase_warning">Warnung:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Du solltest nur von einem vertrauenswürdigen Gerät auf den geheimen Speicher zugreifen</string>
-
     <string name="message_action_item_redact">Entfernen…</string>
     <string name="share_confirm_room">Möchtest du diesen Anhang an %1$s senden\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Sende Bild in Originalgröße</item>
         <item quantity="other">Sende Bilder in Originalgröße</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Entfernen bestätigen</string>
     <string name="delete_event_dialog_content">Möchtest du dieses Ereignis wirklich entfernen (löschen)\? Beachte, dass beim Löschen eines Raumnamens oder einer Themenänderung die Änderung rückgängig gemacht werden kann.</string>
     <string name="delete_event_dialog_reason_checkbox">Grund hinzufügen</string>
     <string name="delete_event_dialog_reason_hint">Grund für das Editieren</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Ereignis gelöscht von Benutzer!n, Grund: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Ereignis vom Raumadministration moderiert, Grund: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Schlüssel sind bereits aktuell!</string>
-
     <string name="spoiler">Spoiler</string>
     <string name="room_member_power_level_custom_in">Benutzerdefiniert (%1$d) in %2$s</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="settings_key_requests">Schlüsselanforderungen</string>
-
     <string name="e2e_use_keybackup">Schalte den verschlüsselten Nachrichtenverlauf frei</string>
-
     <string name="refresh">Neu laden</string>
-
     <string name="new_session">Neue Anmeldung. Warst du das\?</string>
     <string name="new_session_review">Tippe für eine Überprüfung &amp; Verifikation</string>
     <string name="verify_new_session_notice">Benutze diese Sitzung um deine neue zu verfizieren, damit sie auf verschlüsselte Nachrichten zugreifen kann.</string>
     <string name="verify_new_session_was_not_me">Das war ich nicht</string>
     <string name="verify_new_session_compromized">Dein Account ist möglicherweise komprimittiert</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">Wenn du abbrichst, wirst du auf diesem Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen</string>
     <string name="verify_cancel_self_verification_from_trusted">Wenn du abbrichst, wirst du auf deinem neuen Gerät keine verschlüsselten Nachrichten lesen können, und andere Benutzer werden ihm nicht vertrauen</string>
     <string name="verify_cancel_other">Du wirst %1$s (%2$s) nicht verifizieren, wenn du jetzt abbrichst. Beginne in deren Nutzerprofil erneut.</string>
-
     <string name="verify_not_me_self_verification">Eines der folgenden könnte kom­pro­mit­tie­rt sein:
 \n
 \n- Dein Passwort
@@ -2230,29 +1806,20 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 \n- Die Internetverbindung, die von den Geräten genutzt wird
 \n
 \nWir empfehlen dir dein Passwort &amp; Wiederherstellungsschlüssel in den Einstellungen sofort zu ändern.</string>
-
     <string name="verify_cancelled_notice">Verifiziere deine Geräte in den Einstellungen.</string>
     <string name="verification_cancelled">Verifizierung abgebrochen</string>
-
     <string name="generate_message_key">Generiere einen Nachrichtenschlüssel</string>
-
     <string name="confirm_recovery_passphrase">Bestätige %s</string>
-
     <string name="enter_account_password">Gibe dein %s ein um fortzufahren.</string>
-
     <string name="bootstrap_info_confirm_text">Gib deine %s für eine Bestätigung erneut ein.</string>
     <string name="bootstrap_dont_reuse_pwd">Benutze dein Accountpasswort nicht mehrfach.</string>
-
-
     <string name="bootstrap_loading_text">Dies könnte einige Sekunden dauern, gedulde dich bitte.</string>
     <string name="bootstrap_loading_title">Wiederherstellung einrichten.</string>
     <string name="your_recovery_key">Dein Wiederherstellungsschlüssel</string>
     <string name="bootstrap_finish_title">Geschafft!</string>
     <string name="keep_it_safe">Bewahre ihn sicher auf</string>
     <string name="finish">Abschließen</string>
-
     <string name="bootstrap_save_key_description">Benutze diesen %1$s als Sicherheit für den Fall, dass du deine %2$s vergisst.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Veröffentliche erstellte Identitätsschlüssel</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Generiere sicheren Schlüssel von der Passphrase</string>
     <string name="bootstrap_crosssigning_progress_default_key">Definiere SSSS Standardschlüssel</string>
@@ -2260,65 +1827,46 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="bootstrap_crosssigning_progress_save_usk">Synchronisiere Benutzerschlüssel</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Synchronisiere selbstsignierenden Schlüssel</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Richte Schlüsselbackup ein</string>
-
-
     <string name="bootstrap_cross_signing_success">Deine %2$s &amp; %1$s sind nun eingerichtet.
 \n
 \nBewahre sie sicher auf! Du wirst sie benötigen, um verschlüsselte Nachrichten und sichere Informationen freizuschalten, wenn du alle deine aktive Sitzungen verlierst.</string>
-
     <string name="bootstrap_crosssigning_save_usb">Speichere ihn auf einem USB-Stick oder auf einem Sicherungslaufwerk</string>
     <string name="error_failed_to_import_keys">Import der Schlüssel fehlgeschlagen</string>
-
     <string name="settings_notification_configuration">Benachrichtigungskonfiguration</string>
     <string name="settings_messages_at_room">Nachrichten, die @raum enthalten</string>
     <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Nachrichten in Gruppenchats</string>
     <string name="settings_notification_advanced_summary">Setze die Benachrichtigungspräferenz abhängig vom Ereignistyp</string>
-
     <string name="command_description_plain">Sendet eine Nachricht als einfachen Text, ohne sie als Markdown zu interpretieren</string>
-
     <string name="auth_invalid_login_param_space_in_password">Inkorrekter Benutzername und/oder Passwort. Das eingegebene Passwort beginnt oder endet mit Leerzeichen, bitte kontrolliere es.</string>
-
     <string name="message_key">Nachrichtenschlüssel</string>
     <string name="account_password">Kontopasswort</string>
-
     <string name="recovery_passphrase">Wiederherstellungs-Passphrase</string>
     <string name="bootstrap_crosssigning_print_it">Druck es aus und speichere es an einem sicheren Ort</string>
     <string name="bootstrap_crosssigning_save_cloud">Kopier es in deinen persönlichen Cloud-Speicher</string>
-
     <string name="encryption_not_enabled">Verschlüsselung ist nicht aktiviert</string>
     <string name="auth_flow_not_supported">Dies kann nicht von einem mobilen Gerät erfolgen</string>
-
     <string name="settings_when_rooms_are_upgraded">Wenn Räume verbessert werden</string>
     <string name="encryption_enabled">Verschlüsselung aktiviert</string>
     <string name="encryption_enabled_tile_description">Nachrichten in diesem Raum sind Ende-zu-Ende verschlüsselt. Erfahre mehr &amp; verifiziere Benutzer in deren Profil.</string>
     <string name="encryption_unknown_algorithm_tile_description">Die Verschlüsselung in diesem Raum wird nicht unterstützt</string>
-
     <string name="qr_code_scanned_verif_waiting">Warte auf %s…</string>
-
     <string name="set_recovery_passphrase">%s setzen</string>
     <string name="settings_troubleshoot_title">Fehlerbehebung</string>
     <string name="room_created_summary_item">%s hat den Raum erstellt und konfiguriert.</string>
-
     <string name="qr_code_scanned_self_verif_notice">Fast geschafft! Zeigt das andere Gerät das gleiche Schild an\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Fast geschafft! Warte auf Bestätigung…</string>
     <string name="settings_messages_in_e2e_one_to_one">Verschlüsselte Nachrichten in 1:1 Chats</string>
     <string name="room_message_placeholder">Nachricht…</string>
-
     <string name="security_prompt_text">Verifiziere dich &amp; andere, um eure Chats zu schützen</string>
-
     <string name="bootstrap_enter_recovery">Gib zum Fortfahren deinen %s ein</string>
     <string name="use_file">Datei benutzen</string>
-
     <string name="bootstrap_invalid_recovery_key">Dies ist kein gültiger Wiederherstellungsschlüssel</string>
     <string name="recovery_key_empty_error_message">Bitte gib deinen Wiederherstellungsschlüssel ein</string>
-
     <string name="bootstrap_info_text">Verschlüsselte Nachrichten und Verifizierungen mit einer %s absichern und entsperren.</string>
     <string name="bootstrap_skip_text">Das setzen eines Wiederherstellungspassworts ermöglicht das sichern &amp; entsperren von verschlüsselten Nachrichten und Verifizierungen.
 \n
 \nWenn du kein Nachrichtenpasswort setzen willst, erzeuge stattdessen einen Nachrichtenschlüssel.</string>
     <string name="bootstrap_skip_text_no_gen_key">Das setzen eines Wiederherstellungspassworts ermöglicht das sichern &amp; entsperren von verschlüsselten Nachrichten und Verifizierungen.</string>
-
-
     <string name="upgrade_security">Verschlüsselungsupgrade verfügbar</string>
     <string name="enter_backup_passphrase">%s eingeben</string>
     <string name="backup_recovery_passphrase">Wiederherstellungspasswort</string>
@@ -2330,19 +1878,15 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="bootstrap_progress_generating_ssss_recovery">Generiere SSSS Schlüssel aus dem Wiederherstellungsschlüssel</string>
     <string name="bootstrap_progress_storing_in_sss">Speichere Schlüsselbackup Schlüssel in SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_enter_backup_password">Gib dein Passwort für das Schlüsselbackup ein, um fortzufahren.</string>
     <string name="bootstrap_migration_use_recovery_key">nutze deinen Schlüsselbackup Wiederherstellungsschlüssel</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Wenn du dein Schlüsselbackup Passwort nicht weißt, kannst du %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Schlüsselbackup Wiederherstellungsschlüssel</string>
-
     <string name="settings_security_prevent_screenshots_title">Verhindere Screenshots innerhalb der Anwendung</string>
     <string name="settings_security_prevent_screenshots_summary">Das Aktivieren dieser Einstellung setzt das FLAG_SECURE in allen Aktivitäten. Starte die Anwendung neu, damit die Änderung wirksam wird.</string>
-
     <string name="media_file_added_to_gallery">Datei wurde der Galerie hinzugefügt</string>
     <string name="error_adding_media_file_to_gallery">Datei konnte nicht zur Galerie hinzugefügt werden</string>
     <string name="change_password_summary">Neues Benutzerpasswort festlegen…</string>
-
     <string name="use_other_session_content_description">Nutze die neueste Version von Element auf deinen anderen Geräten, Element Web, Element Desktop, Element iOS, Element für Android oder einen anderen cross-signing fähigen Matrix client</string>
     <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
@@ -2357,30 +1901,25 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="enter_secret_storage_input_key">Wähle deinen Wiederherstellungsschüssel, gib ihn ein oder füge ihn aus der Zwischenablage ein</string>
     <string name="keys_backup_recovery_key_error_decrypt">Sicherung konnte mit diesem Wiederherstellungsschlüssel nicht entschlüsselt werden. Bitte stelle sicher, dass du den korrekten Wiederherstellungsschlüssel eingegeben hast.</string>
     <string name="failed_to_access_secure_storage">Konnte nicht auf gesicherten Speicher zugreifen</string>
-
     <string name="unencrypted">Unverschlüsselt</string>
     <string name="encrypted_unverified">Verschlüsselt von einem unbekannten Gerät</string>
     <string name="review_logins">Überprüfe, wo du angemeldet bist</string>
     <string name="verify_other_sessions">Verifiziere alle deine Sitzungen, um sicherzustellen, dass dein Konto &amp; deine Nachrichten sicher sind</string>
     <string name="verify_this_session">Bestätige neue Anmeldung zu deinem Konto: %1$s</string>
-
     <string name="cross_signing_verify_by_text">Verifiziere manuell mit einem Text</string>
     <string name="crosssigning_verify_session">Verifiziere Anmeldung</string>
     <string name="cross_signing_verify_by_emoji">Verifiziere interaktiv mit Emojis</string>
     <string name="confirm_your_identity">Bestätige deine Identität, indem du diesen Login von einer deiner anderen Sitzungen verifizierst, um Zugriff auf deine verschlüsselten Nachrichten zu erhalten.</string>
     <string name="mark_as_verified">Als vertraut markieren</string>
-
     <string name="error_empty_field_choose_user_name">Bitte wähle einen Benutzernamen.</string>
     <string name="error_empty_field_choose_password">Bitte wähle ein Passwort.</string>
     <string name="external_link_confirmation_title">Überprüfe diesen Link genau</string>
     <string name="external_link_confirmation_message">Dieser Link %1$s bringt dich zu einer anderen Seite: %2$s.
 \n
 \nWillst du wirklich fortfahren\?</string>
-
     <string name="create_room_dm_failure">Konnte Direktnachricht nicht erzeugen. Prüfe die Nutzer, die du einladen willst und versuche es erneut.</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="add_members_to_room">Nutzer!n hinzufügen</string>
     <string name="invite_users_to_room_action_invite">EINLADEN</string>
     <string name="inviting_users_to_room">Benutzer werden eingeladen…</string>
@@ -2392,20 +1931,15 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
         <item quantity="other">Einladungen gesendet an %1$s und %2$d weitere Benutzer</item>
     </plurals>
     <string name="invite_users_to_room_failure">Wir konnten den Benutzer nicht einladen. Bitte überprüfe den Benutzernamen, welchen du einladen möchtest und versuche es erneut.</string>
-
     <string name="pause_video">Pause</string>
     <string name="action_copy">Kopieren</string>
     <string name="bottom_action_notification">Benachrichtigungen</string>
     <string name="call_failed_no_connection">Element-Anruf fehlgeschlagen</string>
     <string name="play_video">Abspielen</string>
     <string name="dismiss">Ablehnen</string>
-
-
     <string name="dialog_title_success">Erfolg</string>
-
     <string name="call_failed_no_connection_description">Echtzeitverbindung konnte nicht hergestellt werden.
 \nBitte den/die Administrator/in deines Home-Servers, einen TURN-Server so zu konfigurieren, dass Anrufe zuverlässig funktionieren.</string>
-
     <string name="call_select_sound_device">Wähle Audiogerät aus</string>
     <string name="sound_device_phone">Telefonie</string>
     <string name="sound_device_speaker">Lautsprecher</string>
@@ -2416,18 +1950,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="call_camera_back">Hintere Kamera</string>
     <string name="call_format_turn_hd_off">Deaktiviere HD-Qualität</string>
     <string name="call_format_turn_hd_on">Aktiviere HD-Qualität</string>
-
     <string name="login_error_ssl_peer_unverified">SSL-Fehler: Die Identität des Gegenüber ist noch nicht verifiziert.</string>
     <string name="login_error_ssl_other">SSL Fehler.</string>
     <string name="active_call_with_duration">Aktiver Anruf (%s)</string>
     <string name="return_to_call">Zum Anruf zurückkehren</string>
-
     <string name="room_participants_action_cancel_invite">Einladung zurückziehen</string>
     <string name="room_participants_power_level_demote_warning_title">Möchtest du dich zurückstufen\?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Du kannst die Zurückstufung nicht rückgängig machen und du wirst die Rechte nur mit einem anderen berechtigten Benutzer im Raum zurückerlangen können.</string>
     <string name="room_participants_power_level_demote">Zurückstufen</string>
-
-
     <string name="room_participants_action_ignore_title">Benutzer ignorieren</string>
     <string name="room_participants_action_ignore_prompt_msg">Durch das Ignorieren werden für dich alle Nachrichten des Nutzers ausgeblendet.
 \nDu kannst die Aktion jederzeit in den allgemeinen Einstellungen rückgängig machen.</string>
@@ -2443,7 +1973,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="room_participants_ban_reason">Grund für den Bann</string>
     <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
     <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem Benutzer erlauben dem Raum wieder beizutreten.</string>
-
     <string name="settings_secure_backup_section_title">Sicheres Backup</string>
     <string name="settings_secure_backup_manage">Verwalten</string>
     <string name="settings_secure_backup_setup">Backup einrichten</string>
@@ -2452,49 +1981,36 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_secure_backup_section_info">Absicherung um den Zugriffsverlust auf verschlüsselte Nachrichten &amp; Daten zu verhindern, indem die Schlüssel für die Entschlüsselung auf dem Server gesichert werden.</string>
     <string name="reset_secure_backup_title">Generiere einen neuen Sicherheitsschlüssel oder setze eine neue Sicherheitspassphrase für dein existierendes Backup.</string>
     <string name="reset_secure_backup_warning">Dieses wird deinen aktuellen Schlüssel oder deine aktuelle Phrase ersetzen.</string>
-
     <string name="disabled_integration_dialog_title">Integrationen sind deaktiviert</string>
     <string name="disabled_integration_dialog_content">Aktiviere \'Erlaube Integrationen\' in den Einstellungen um dies zu machen.</string>
-
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d gebannter Benutzer</item>
         <item quantity="other">%d gebannte Benutzer</item>
     </plurals>
-
     <string name="encryption_exported_successfully">Schlüssel erfolgreich exportiert</string>
-
     <string name="active_widget_view_action">ANSICHT</string>
     <string name="active_widgets_title">Aktive Widgets</string>
-
-
     <string name="recovery_key_export_saved">Der Sicherheitsschlüssel ist gespeichert worden.</string>
-
     <string name="secure_backup_banner_setup_line1">Backup</string>
     <string name="secure_backup_banner_setup_line2">Absicherung gegen den Zugriffsverlust auf verschlüsselte Nachrichten &amp; Daten</string>
-
     <string name="secure_backup_setup">Richte Backup ein</string>
-
     <string name="event_redacted">Nachricht gelöscht</string>
     <string name="settings_show_redacted">Zeige gelöschte Nachrichten</string>
     <string name="settings_show_redacted_summary">Zeige einen Platzhalter für gelöschte Nachrichten</string>
     <string name="labs_show_unread_notifications_as_tab">Dedizierten Tab für ungelesene Nachrichten zur Hauptansicht hinzufügen</string>
-
     <string name="settings_discovery_confirm_mail_not_clicked">Wir haben dir eine Bestätigungsmail an %s gesendet. Bitte prüfe deine E-Mails und klicke auf den Bestätigungslink</string>
     <string name="settings_text_message_sent_wrong_code">Der Verifizierungscode ist nicht korrekt.</string>
-
     <string name="uploads_media_title">MEDIEN</string>
     <string name="uploads_media_no_result">Es gibt in diesem Raum keine Medien</string>
     <string name="uploads_files_title">DATEIEN</string>
     <string name="uploads_files_subtitle">%1$s um %2$s</string>
     <string name="uploads_files_no_result">Es gibt in diesem Raum keine Dateien</string>
-
     <string name="room_list_quick_actions_favorite_add">Füge zu Favoriten hinzu</string>
     <string name="room_list_quick_actions_favorite_remove">Entferne von Favoriten</string>
     <string name="notice_member_no_changes_by_you">Du hast keine Änderungen gemacht</string>
     <string name="room_join_rules_public_by_you">Du hast den Raum für alle, die den Link kennen, zugänglich gemacht.</string>
     <string name="room_join_rules_invite_by_you">Du hast den Raumbeitritt auf Einladungen beschränkt.</string>
     <string name="login_server_url_form_common_notice">Gib die Adresse des Servers ein, den du benutzen möchtest</string>
-
     <string name="login_connect_using_matrix_id_notice">Wenn du deine Matrixkennung und dein Passwort weißt, kannst du alternativ diese Methode nutzen:</string>
     <string name="login_connect_using_matrix_id_submit">Einloggen mit Matrix-ID</string>
     <string name="login_signin_matrix_id_title">Einloggen mit Matrix-ID</string>
@@ -2503,30 +2019,22 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="login_signin_matrix_id_password_notice">Wenn du dein Passwort nicht weißt, gehe zurück um es zurücksetzen zu lassen.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: \'@benutzer:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Es konnte kein gültiger Home-Server gefunden werden. Bitte prüfe deine Kennung</string>
-
     <string name="send_a_sticker">Sticker</string>
-
     <string name="room_profile_section_admin">Administrative Aktionen</string>
     <string name="room_member_power_level_default_in">Standard in %1$s</string>
     <string name="settings_hs_admin_e2e_disabled">Dein Serveradministrator hat in privaten Räumen &amp; Direktnachrichten Ende-zu-Ende Verschlüsselung standardmäßig deaktiviert.</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Flugzeugmodus ist aktiv</string>
-
     <string name="bootstrap_info_text_2">Gib eine Sicherheitsphrase ein, die nur du kennst. Diese wird benutzt um deine Daten auf dem Server geheim zu halten.</string>
-
     <string name="bootstrap_cancel_text">Wenn du jetzt abbrichst und den Zugriff zu deinen Sitzungen verlierst, kannst du verschlüsselte Nachrichten &amp; Daten verlieren.
 \n
 \nDu kannst auch ein Backup einrichten &amp; deine Schlüssel in den Einstellungen verwalten.</string>
-
     <string name="room_created_summary_item_by_you">Du hast den Raum erstellt und konfiguriert.</string>
-
     <string name="auth_invalid_login_deactivated_account">Dieser Account ist deaktiviert worden.</string>
-
     <string name="setup_cross_signing">Aktiviere Cross Signing</string>
     <string name="error_saving_media_file">Konnte Mediendatei nicht speichern</string>
     <string name="choose_locale_current_locale_title">Aktuelle Sprache</string>
     <string name="choose_locale_other_locales_title">Andere verfügbare Sprachen</string>
     <string name="choose_locale_loading_locales">Lade verfügbare Sprachen…</string>
-
     <string name="open_terms_of">Öffne AGBs von %s</string>
     <string name="disconnect_identity_server_dialog_content">Trenne Verbingung zu Identitätsserver %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Dieser Identitätsserver ist veraltet. Element unterstützt nur API V2.</string>
@@ -2536,7 +2044,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="identity_server_error_bulk_sha256_not_supported">Deiner Privatssphäre wegen unterstützt Element nur das Senden gehashter Emailaddressen und Telefonnummern.</string>
     <string name="identity_server_error_binding_error">Die Assoziierung ist fehlgeschlagen.</string>
     <string name="identity_server_error_no_current_binding_error">Für diese Kennung gibt es aktuell keine Assoziierung.</string>
-
     <string name="identity_server_set_default_notice">Dein Homeserver (%1$s) schlägt %2$s als Identitätsserver vor</string>
     <string name="identity_server_set_default_submit">Benutze %1$s</string>
     <string name="identity_server_set_alternative_notice">Alternativ kannst du die URL eines beliebigen anderen Identitätsservers angeben</string>
@@ -2549,31 +2056,24 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="a11y_unmute_microphone">Aktiviere Mikrophon</string>
     <string name="a11y_stop_camera">Stoppe Kamera</string>
     <string name="a11y_start_camera">Starte Kamera</string>
-
     <string name="settings_setup_secure_backup">Richte Backup ein</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">Backup</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">Absicherung um den Zugriffsverlust auf verschlüsselte Nachrichten &amp; Daten zu verhindern, indem die Schlüssel für die Entschlüsselung auf dem Server gesichert werden.</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Benutze einen Sicherheitsschlüssel</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generiere einen Sicherheitsschlüssel, welcher z.B. in einem Passwortmanager oder in einem Tresor sicher aufbewahrt werden sollte.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Benutze Sicherheitsphrase</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Gib eine geheime Phrase ein, die nur du kennst und generiere einen Schlüssel als Backup.</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">Speichere deinen Sicherheitsschlüssel</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Bewahre deinen Sicherheitsschlüssel irgendwo sicher auf, wie z.B. in einem Passwortmanager oder in einem Tresor.</string>
-
     <string name="set_a_security_phrase_title">Setze Sicherheitsphrase</string>
     <string name="set_a_security_phrase_notice">Gib eine Sicherheitsphrase ein, welche nur du kennst und deine Daten auf dem Server geheim halten soll.</string>
     <string name="set_a_security_phrase_hint">Sicherheitsphrase</string>
     <string name="set_a_security_phrase_again_notice">Gib deine Sicherheitsphrase zur Bestätigung erneut ein.</string>
-
     <string name="save_your_security_key_title">Speichere deinen Sicherheitsschlüssel</string>
     <string name="save_your_security_key_notice">Bewahre deinen Sicherheitsschlüssel irgendwo sicher auf, wie z.B. in einem Passwortmanager oder in einem Tresor.</string>
-
     <string name="room_settings_name_hint">Raumname</string>
     <string name="room_settings_topic_hint">Thema</string>
     <string name="room_settings_save_success">Du hast die Raumeinstellungen erfolgreich geändert</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">Du kannst auf diese Nachricht nicht zugreifen</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Warte auf diese Nachricht. Das könnte eine Weile dauern</string>
     <string name="crypto_utd">Kann nicht entschlüsselt werden</string>
@@ -2582,17 +2082,12 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="crypto_error_withheld_unverified">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender deiner Sitzung nicht vertraut</string>
     <string name="crypto_error_withheld_generic">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender absichtlich die Schlüssel nicht gesendet hat</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Warte auf Verschlüsselungshistorie</string>
-
     <string name="element_disclaimer_title">Riot heißt nun Element!</string>
     <string name="element_disclaimer_content">Wir sind begeistert unsere Namensänderung mitteilen zu können! Deine App ist auf dem neusten Stand und du bist mit deinem Account angemeldet.</string>
     <string name="element_disclaimer_negative_button">VERSTANDEN</string>
     <string name="element_disclaimer_positive_button">MEHR ERFAHREN</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Speichere Wiederherstellungsschlüssel in</string>
-
     <string name="add_from_phone_book">Füge über Kontaktliste hinzu</string>
     <string name="empty_phone_book">Deine Kontaktliste ist leer</string>
     <string name="phone_book_title">Kontaktliste</string>
@@ -2600,13 +2095,10 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="loading_contact_book">Ermittle deine Kontakte…</string>
     <string name="empty_contact_book">Deine Kontaktliste ist leer</string>
     <string name="contacts_book_title">Kontaktliste</string>
-
     <string name="three_pid_revoke_invite_dialog_title">Einladung zurücknehmen</string>
     <string name="three_pid_revoke_invite_dialog_content">Einladung zu %1$s zurücknehmen\?</string>
-
     <string name="member_banned_by">Gebannt von %1$s</string>
     <string name="failed_to_unban">Aufheben des Banns fehlgeschlagen</string>
-
     <string name="alert_push_are_disabled_title">Push-Benachrichtigungen sind deaktiviert</string>
     <string name="alert_push_are_disabled_description">Gehe zu deinen Einstellungen um Push-Benachrichtigungen zu aktivieren</string>
     <string name="create_pin_title">Nutze eine PIN für mehr Sicherheit</string>
@@ -2636,13 +2128,11 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
         <item quantity="one">%1$d/%2$d Schlüssel erfolgreich importiert.</item>
         <item quantity="other">%1$d/%2$d Schlüssel erfolgreich importiert.</item>
     </plurals>
-
     <string name="room_manage_integrations">Verwalte Integrationen</string>
     <string name="room_no_active_widgets">Keine aktiven Widgets</string>
     <string name="create_room_federation_error">Der Raum wurde erstellt, aber manche Einladungen wurden aus folgendem Grund nicht versendet:
 \n
 \n%s</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="one">Von %1$s, %2$s und %3$d anderem gelesen</item>
         <item quantity="other">Von %1$s, %2$s und %3$d anderen gelesen</item>
@@ -2660,22 +2150,18 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_phone_numbers">Telefonnummern</string>
     <string name="settings_remove_three_pid_confirmation_content">%s entfernen\?</string>
     <string name="error_threepid_auth_failed">Stelle sicher, dass du auf den Link in der E-Mail geklickt hast, die wir dir gesendet haben.</string>
-
     <string name="settings_emails_and_phone_numbers_title">E-Mail-Adressen und Telefonnummern</string>
     <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mails und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
-
     <string name="settings_text_message_sent_hint">Code</string>
     <string name="login_msisdn_notice">Verwende das internationale Format (Telefonnummer muss mit \'+\' beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
     <string name="error_sso_flow_not_supported_yet">Leider ist dieser Vorgang für Konten, die über Single Sign-On verbunden sind, noch nicht möglich.</string>
-
     <string name="error_opening_banned_room">Raum, indem du gebannt wurdest, kann nicht geöffnet werden.</string>
     <string name="room_error_not_found">Raum kann nicht gefunden werden. Stelle sicher, dass er existiert.</string>
     <plurals name="seconds">
         <item quantity="one">%d Sekunde</item>
         <item quantity="other">%d Sekunden</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">Zeige Status-Ereignisse der Raum-Mitglieder</string>
     <string name="settings_show_room_member_state_events_summary">Bezieht Einladungs-/Beitritts-/Verlassen-/Entfernen-/Verbannen-Ereignisse und Avatar-/Anzeigenamen-Wechsel mit ein.</string>
     <string name="sent_a_poll">Umfrage</string>
@@ -2684,9 +2170,7 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="universal_link_malformed">Der Link war fehlerhaft</string>
     <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
     <string name="sent_verification_conclusion">Ergebnis der Überprüfung</string>
-
     <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
 \n
 \nVorsicht! Es kann zu unerwartetem Verhalten führen.</string>
-
-</resources>
+</resources>
\ No newline at end of file

From c1ea4bc1a73301f932cfdc742498be9ec9765722 Mon Sep 17 00:00:00 2001
From: ginnyTheCat <constantin@wartenburger.de>
Date: Wed, 14 Oct 2020 09:03:22 +0000
Subject: [PATCH 251/278] Translated using Weblate (German)

Currently translated at 96.5% (1852 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
---
 vector/src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index fe624cb8c9..1615b5f9d4 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2173,4 +2173,5 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
 \n
 \nVorsicht! Es kann zu unerwartetem Verhalten führen.</string>
+    <string name="reset">Zurücksetzen</string>
 </resources>
\ No newline at end of file

From 284babfeaaace6fd39e6f69d12d176c724292df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 14 Oct 2020 21:01:25 +0000
Subject: [PATCH 252/278] Translated using Weblate (Estonian)

Currently translated at 66.6% (2 of 3 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
---
 fastlane/metadata/android/et/short_description.txt | 1 +
 fastlane/metadata/android/et/title.txt             | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/et/short_description.txt
 create mode 100644 fastlane/metadata/android/et/title.txt

diff --git a/fastlane/metadata/android/et/short_description.txt b/fastlane/metadata/android/et/short_description.txt
new file mode 100644
index 0000000000..4075c1f7cf
--- /dev/null
+++ b/fastlane/metadata/android/et/short_description.txt
@@ -0,0 +1 @@
+Turvalised ning hajutatud vestlused ja VoIP-kõned. Sinu suhtlus on üliturvaline.
diff --git a/fastlane/metadata/android/et/title.txt b/fastlane/metadata/android/et/title.txt
new file mode 100644
index 0000000000..f74f9ff18f
--- /dev/null
+++ b/fastlane/metadata/android/et/title.txt
@@ -0,0 +1 @@
+Element (varem Riot.im)

From e7a86793831613036ff0ebf6aed624a34f19ba84 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 15 Oct 2020 08:18:39 +0000
Subject: [PATCH 253/278] Translated using Weblate (Italian)

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
---
 .../src/main/res/values-it/strings.xml        | 66 +++++++------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
index cf081752a2..7aa2169b1f 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s ha inviato un\'immagine.</string>
-
     <string name="notice_room_invite_no_invitee">Invito di %s</string>
     <string name="notice_room_invite">%1$s ha invitato %2$s</string>
     <string name="notice_room_invite_you">%1$s ti ha invitato</string>
@@ -30,55 +29,40 @@
     <string name="notice_room_visibility_world_readable">chiunque.</string>
     <string name="notice_room_visibility_unknown">sconosciuto (%s).</string>
     <string name="notice_end_to_end">%1$s ha attivato la crittografia end-to-end (%2$s)</string>
-
     <string name="notice_requested_voip_conference">%1$s ha richiesto una conferenza VoIP</string>
     <string name="notice_voip_started">Conferenza VoIP iniziata</string>
     <string name="notice_voip_finished">Conferenza VoIP terminata</string>
-
     <string name="notice_avatar_changed_too">(anche l\'avatar è cambiato)</string>
     <string name="notice_room_name_removed">%1$s ha rimosso il nome della stanza</string>
     <string name="notice_room_topic_removed">%1$s ha rimosso l\'argomento della stanza</string>
     <string name="notice_profile_change_redacted">%1$s ha aggiornato il profilo %2$s</string>
     <string name="notice_room_third_party_invite">%1$s ha mandato un invito a %2$s per unirsi alla stanza</string>
     <string name="notice_room_third_party_registered_invite">%1$s ha accettato l\'invito per %2$s</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Impossibile decriptare: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Il dispositivo del mittente non ci ha inviato le chiavi per questo messaggio.</string>
-
     <string name="could_not_redact">Impossibile revisionare</string>
     <string name="unable_to_send_message">Impossibile inviare il messaggio</string>
-
     <string name="message_failed_to_upload">Invio dell\'immagine fallito</string>
-
     <string name="network_error">Errore di rete</string>
     <string name="matrix_error">Errore di Matrix</string>
-
     <string name="room_error_join_failed_empty_room">Al momento non è possibile rientrare in una stanza vuota.</string>
-
     <string name="encrypted_message">Messaggio criptato</string>
-
     <string name="medium_email">Indirizzo email</string>
     <string name="medium_phone_number">Numero di telefono</string>
-
     <string name="summary_user_sent_sticker">%1$s ha inviato un adesivo.</string>
-
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Invito da %s</string>
     <string name="room_displayname_room_invite">Invito nella stanza</string>
     <string name="room_displayname_two_members">%1$s e %2$s</string>
     <string name="room_displayname_empty_room">Stanza vuota</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s e 1 altro</item>
         <item quantity="other">%1$s e %2$d altri</item>
     </plurals>
-
-
     <string name="notice_event_redacted">Messaggio rimosso</string>
     <string name="notice_event_redacted_by">Messaggio rimosso da %1$s</string>
     <string name="notice_event_redacted_with_reason">Messaggio rimosso [motivo: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Messaggio rimosso da %1$s [motivo: %2$s]</string>
-
     <string name="initial_sync_start_importing_account">Sync iniziale:
 \nImportazione account…</string>
     <string name="initial_sync_start_importing_account_crypto">Sync iniziale:
@@ -95,12 +79,9 @@
 \nImportazione comunità</string>
     <string name="initial_sync_start_importing_account_data">Sync iniziale:
 \nImportazione dati account</string>
-
     <string name="notice_room_update">%s ha aggiornato questa stanza.</string>
-
     <string name="event_status_sending_message">Invio messaggio in corso …</string>
     <string name="clear_timeline_send_queue">Cancella la coda di invio</string>
-
     <string name="notice_room_third_party_revoked_invite">%1$s ha revocato l\'invito a %2$s di unirsi alla stanza</string>
     <string name="notice_room_invite_no_invitee_with_reason">Invito di %1$s. Motivo: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s ha invitato %2$s. Motivo: %3$s</string>
@@ -115,34 +96,25 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s ha revocato l\'invito a %2$s di unirsi alla stanza. Motivo: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s ha accettato l\'invito per %2$s. Motivo: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s ha rifiutato l\'invito di %2$s. Motivo: %3$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s ha aggiunto %2$s come indirizzo per questa stanza.</item>
         <item quantity="other">%1$s ha aggiunto %2$s come indirizzi per questa stanza.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s ha rimosso %2$s come indirizzo per questa stanza.</item>
         <item quantity="other">%1$s ha rimosso %3$s come indirizzi per questa stanza.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s ha aggiunto %2$s e rimosso %3$s come indirizzi per questa stanza.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s ha impostato l\'indirizzo principale per questa stanza a %2$s.</string>
     <string name="notice_room_canonical_alias_unset">%1$s ha rimosso l\'indirizzo principale per questa stanza.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s ha permesso l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza per gli ospiti.</string>
-
     <string name="notice_end_to_end_ok">%1$s ha attivato la cifratura end-to-end.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ha attivato la cifratura end-to-end (algoritmo %2$s non riconosciuto).</string>
-
     <string name="key_verification_request_fallback_message">%s sta chiedendo di verificare la tua chiave, ma il tuo client non supporta la verifica in-chat. Dovrai usare il metodo di verifica obsoleto per verificare le chiavi.</string>
-
     <string name="notice_room_created">%1$s ha creato la stanza</string>
     <string name="summary_you_sent_image">Hai inviato un\'immagine.</string>
     <string name="summary_you_sent_sticker">Hai inviato un adesivo.</string>
-
     <string name="notice_room_invite_no_invitee_by_you">Il tuo invito</string>
     <string name="notice_room_created_by_you">Hai creato la stanza</string>
     <string name="notice_room_invite_by_you">Hai invitato %1$s</string>
@@ -170,7 +142,6 @@
     <string name="notice_made_future_room_visibility_by_you">Hai reso visibile la futura cronologia della stanza a %1$s</string>
     <string name="notice_end_to_end_by_you">Hai attivato la crittografia end-to-end (%1$s)</string>
     <string name="notice_room_update_by_you">Hai aggiornato questa stanza.</string>
-
     <string name="notice_requested_voip_conference_by_you">Hai richiesto una conferenza VoIP</string>
     <string name="notice_room_name_removed_by_you">Hai rimosso il nome della stanza</string>
     <string name="notice_room_topic_removed_by_you">Hai rimosso l\'argomento della stanza</string>
@@ -180,24 +151,20 @@
     <string name="notice_room_third_party_invite_by_you">Hai mandato un invito a %1$s a unirsi alla stanza</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s a unirsi alla stanza</string>
     <string name="notice_room_third_party_registered_invite_by_you">Hai accettato l\'invito per %1$s</string>
-
     <string name="notice_widget_added">%1$s ha aggiunto il widget %2$s</string>
     <string name="notice_widget_added_by_you">Hai aggiunto il widget %1$s</string>
     <string name="notice_widget_removed">%1$s ha rimosso il widget %2$s</string>
     <string name="notice_widget_removed_by_you">Hai rimosso il widget %1$s</string>
     <string name="notice_widget_modified">%1$s ha modificato il widget %2$s</string>
     <string name="notice_widget_modified_by_you">Hai modificato il widget %1$s</string>
-
     <string name="power_level_admin">Amministratore</string>
     <string name="power_level_moderator">Moderatore</string>
     <string name="power_level_default">Predefinito</string>
     <string name="power_level_custom">Personalizzato (%1$d)</string>
     <string name="power_level_custom_no_value">Personalizzato</string>
-
     <string name="notice_power_level_changed_by_you">Hai cambiato il livello di potere di %1$s.</string>
     <string name="notice_power_level_changed">%1$s ha cambiato il livello di potere di %2$s.</string>
     <string name="notice_power_level_diff">%1$s da %2$s a %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Il tuo invito. Motivo: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Hai invitato %1$s. Motivo: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">Sei entrato nella stanza. Motivo: %1$s</string>
@@ -210,26 +177,41 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Hai revocato l\'invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hai accettato l\'invito per %1$s. Motivo: %2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %2$s. Motivo: %2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
         <item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Hai rimosso %1$s come indirizzo per questa stanza.</item>
         <item quantity="other">Hai rimosso %2$s come indirizzi per questa stanza.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">Hai aggiunto %1$s e rimosso %2$s come indirizzi per questa stanza.</string>
-
     <string name="notice_room_canonical_alias_set_by_you">Hai impostato l\'indirizzo principale per questa stanza a %1$s.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Hai rimosso l\'indirizzo principale per questa stanza.</string>
-
     <string name="notice_room_guest_access_can_join_by_you">Hai permesso l\'accesso alla stanza per gli ospiti.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza per gli ospiti.</string>
-
     <string name="notice_end_to_end_ok_by_you">Hai attivato la crittografia end-to-end.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Hai attivato la crittografia end-to-end (algoritmo %1$s sconosciuto).</string>
-
-</resources>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Hai impedito l\'accesso alla stanza agli ospiti.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s ha impedito l\'accesso alla stanza agli ospiti.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Hai permesso l\'accesso agli ospiti.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s ha permesso l\'accesso agli ospiti.</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Sei entrato. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Sei uscito. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s è uscito. Motivo: %2$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s è entrato. Motivo: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Hai revocato l\'invito per %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s ha revocato l\'invito per %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Hai invitato %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s ha invitato %2$s</string>
+    <string name="notice_direct_room_update_by_you">Hai aggiornato la stanza.</string>
+    <string name="notice_direct_room_update">%s ha aggiornato la stanza.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Hai reso visibili i messaggi futuri a %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s ha reso visibili i messaggi futuri a %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Sei uscito dalla stanza</string>
+    <string name="notice_direct_room_leave">%1$s è uscito dalla stanza</string>
+    <string name="notice_direct_room_join_by_you">Sei entrato</string>
+    <string name="notice_direct_room_join">%1$s è entrato</string>
+    <string name="notice_direct_room_created_by_you">Hai creato la discussione</string>
+    <string name="notice_direct_room_created">%1$s ha creato la discussione</string>
+</resources>
\ No newline at end of file

From c1f08e8f225693c969282987b1f3f3b505245b79 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Tue, 13 Oct 2020 22:50:29 +0000
Subject: [PATCH 254/278] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/pt_BR/
---
 .../src/main/res/values-pt-rBR/strings.xml    | 64 +++++++------------
 1 file changed, 24 insertions(+), 40 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
index 52b935c097..4e62a21c0e 100644
--- a/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-pt-rBR/strings.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s enviou uma foto.</string>
-
     <string name="notice_room_invite_no_invitee">convite de %s</string>
     <string name="notice_room_invite">%1$s convidou %2$s</string>
     <string name="notice_room_invite_you">%1$s convidou você</string>
@@ -31,64 +29,45 @@
     <string name="notice_room_visibility_world_readable">qualquer pessoa.</string>
     <string name="notice_room_visibility_unknown">desconhecido (%s).</string>
     <string name="notice_end_to_end">%1$s ativou a criptografia de ponta a ponta (%2$s)</string>
-
     <string name="notice_requested_voip_conference">%1$s deseja iniciar uma chamada em grupo</string>
     <string name="notice_voip_started">Chamada em grupo iniciada</string>
     <string name="notice_voip_finished">Chamada em grupo encerrada</string>
-
     <string name="notice_avatar_changed_too">(a foto de perfil também foi alterada)</string>
     <string name="notice_room_name_removed">%1$s removeu o nome da sala</string>
     <string name="notice_room_topic_removed">%1$s removeu a descrição da sala</string>
     <string name="notice_profile_change_redacted">%1$s atualizou o perfil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s enviou um convite para %2$s entrar na sala</string>
     <string name="notice_room_third_party_registered_invite">%1$s aceitou o convite para %2$s</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Não foi possível descriptografar: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">O aparelho do remetente não nos enviou as chaves para esta mensagem.</string>
-
     <!-- Room Screen -->
     <string name="could_not_redact">Não foi possível redigir</string>
     <string name="unable_to_send_message">Não foi possível enviar a mensagem</string>
-
     <string name="message_failed_to_upload">O envio da imagem falhou</string>
-
     <!-- general errors -->
     <string name="network_error">Erro de conexão à internet</string>
     <string name="matrix_error">Erro no servidor Matrix</string>
-
     <!-- Home Screen -->
-
     <!-- Last seen time -->
-
     <!-- call events -->
-
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Atualmente, não é possível entrar novamente em uma sala vazia.</string>
-
     <string name="encrypted_message">Mensagem criptografada</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">Endereço de e-mail</string>
     <string name="medium_phone_number">Número de telefone</string>
-
-
     <string name="summary_user_sent_sticker">%1$s enviou uma figurinha.</string>
-
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Convite de %s</string>
     <string name="room_displayname_room_invite">Convite para sala</string>
     <string name="room_displayname_two_members">%1$s e %2$s</string>
     <string name="room_displayname_empty_room">Sala vazia</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s e 1 outro</item>
         <item quantity="other">%1$s e %2$d outros</item>
     </plurals>
-
-
     <string name="summary_you_sent_image">Você enviou uma foto.</string>
     <string name="summary_you_sent_sticker">Você enviou uma figurinha.</string>
-
     <string name="notice_room_invite_no_invitee_by_you">Seu convite</string>
     <string name="notice_room_created">%1$s criou a sala</string>
     <string name="notice_room_created_by_you">Você criou a sala</string>
@@ -118,7 +97,6 @@
     <string name="notice_end_to_end_by_you">Você ativou a criptografia de ponta a ponta (%1$s)</string>
     <string name="notice_room_update">%s atualizou esta sala.</string>
     <string name="notice_room_update_by_you">Você atualizou esta sala.</string>
-
     <string name="notice_requested_voip_conference_by_you">Você solicitou uma chamada em grupo</string>
     <string name="notice_room_name_removed_by_you">Você removeu o nome da sala</string>
     <string name="notice_room_topic_removed_by_you">Você removeu a descrição da sala</string>
@@ -133,24 +111,20 @@
     <string name="notice_room_third_party_revoked_invite">%1$s cancelou o convite a %2$s para entrar na sala</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Você cancelou o convite a %1$s para entrar na sala</string>
     <string name="notice_room_third_party_registered_invite_by_you">Você aceitou o convite para %1$s</string>
-
     <string name="notice_widget_added">%1$s adicionou o widget %2$s</string>
     <string name="notice_widget_added_by_you">Você adicionou o widget %1$s</string>
     <string name="notice_widget_removed">%1$s removeu o widget %2$s</string>
     <string name="notice_widget_removed_by_you">Você removeu o widget %1$s</string>
     <string name="notice_widget_modified">%1$s editou o widget %2$s</string>
     <string name="notice_widget_modified_by_you">Você editou o widget %1$s</string>
-
     <string name="power_level_admin">Administrador</string>
     <string name="power_level_moderator">Moderador</string>
     <string name="power_level_default">Padrão</string>
     <string name="power_level_custom">Personalizado (%1$d)</string>
     <string name="power_level_custom_no_value">Personalizado</string>
-
     <string name="notice_power_level_changed_by_you">Você alterou o nível de permissão de %1$s.</string>
     <string name="notice_power_level_changed">%1$s alterou o nível de permissão de %2$s.</string>
     <string name="notice_power_level_diff">%1$s de %2$s para %3$s</string>
-
     <string name="initial_sync_start_importing_account">Primeira sincronização:
 \nImportando a conta…</string>
     <string name="initial_sync_start_importing_account_crypto">Primeira sincronização:
@@ -167,10 +141,8 @@
 \nImportando as comunidades</string>
     <string name="initial_sync_start_importing_account_data">Primeira sincronização:
 \nImportando os dados da conta</string>
-
     <string name="event_status_sending_message">Enviando mensagem…</string>
     <string name="clear_timeline_send_queue">Limpar a fila de envio</string>
-
     <string name="notice_room_invite_no_invitee_with_reason">Convite de %1$s. Motivo: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">O seu convite. Motivo: %1$s</string>
     <string name="notice_room_invite_with_reason">%1$s convidou %2$s. Motivo: %3$s</string>
@@ -196,45 +168,57 @@
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Você aceitou o convite para %1$s. Motivo: %2$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s desfez o convite de %2$s. Motivo: %3$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Você desfez o convite de %1$s. Motivo: %2$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s adicionou %2$s como um endereço desta sala.</item>
         <item quantity="other">%1$s adicionou %2$s como endereços desta sala.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Você adicionou %1$s como um endereço desta sala.</item>
         <item quantity="other">Você adicionou %1$s como endereços desta sala.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s removeu %2$s como um endereço desta sala.</item>
         <item quantity="other">%1$s removeu %3$s como endereços desta sala.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Você removeu %1$s como um endereço desta sala.</item>
         <item quantity="other">Você removeu %2$s como endereços desta sala.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s adicionou %2$s e removeu %3$s como endereços desta sala.</string>
     <string name="notice_room_aliases_added_and_removed_by_you">Você adicionou %1$s e removeu %2$s como endereços desta sala.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s definiu o endereço principal desta sala como %2$s.</string>
     <string name="notice_room_canonical_alias_set_by_you">Você definiu o endereço principal desta sala como %1$s.</string>
     <string name="notice_room_canonical_alias_unset">%1$s removeu o endereço principal desta sala.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Você removeu o endereço principal desta sala.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s permitiu que convidados entrem na sala.</string>
     <string name="notice_room_guest_access_can_join_by_you">Você permitiu que convidados entrem na sala.</string>
     <string name="notice_room_guest_access_forbidden">%1$s impediu que convidados entrassem na sala.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Você impediu que convidados entrassem na sala.</string>
-
     <string name="notice_end_to_end_ok">%1$s ativou a criptografia de ponta a ponta.</string>
     <string name="notice_end_to_end_ok_by_you">Você ativou a criptografia de ponta a ponta.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s ativou a criptografia de ponta a ponta (algoritmo não reconhecido %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Você ativou a criptografia de ponta a ponta (algoritmo não reconhecido %1$s).</string>
-
     <string name="key_verification_request_fallback_message">%s deseja confirmar a sua chave, mas o seu aplicativo não suporta a confirmação da chave da conversa. Você precisará usar a confirmação tradicional de chaves para confirmar chaves.</string>
-
-</resources>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Você impediu que desconhecidos entrem na sala.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s impediu que desconhecidos entrem na sala.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Você permitiu que desconhecidos entrem aqui.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s permitiu que desconhecidos entrem aqui.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Você saiu. Motivo: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s saiu. Motivo: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Você entrou. Motivo: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s entrou. Motivo: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Você cancelou o convite para %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s cancelou o convite para %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Você convidou %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s convidou %2$s</string>
+    <string name="notice_direct_room_update_by_you">Você atualizou esta sala.</string>
+    <string name="notice_direct_room_update">%s atualizou esta sala.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Você definiu que as mensagens enviadas a partir do presente momento estarão disponíveis para %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s definiu que as mensagens enviadas a partir do presente momento estarão disponíveis para %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Você saiu da sala</string>
+    <string name="notice_direct_room_leave">%1$s saiu da sala</string>
+    <string name="notice_direct_room_join_by_you">Você entrou</string>
+    <string name="notice_direct_room_join">%1$s entrou</string>
+    <string name="notice_direct_room_created_by_you">Você criou a sala</string>
+    <string name="notice_direct_room_created">%1$s criou a sala</string>
+</resources>
\ No newline at end of file

From 98086f1b6bdfb8e8e72d0a565a4f7b9d4d883681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 13 Oct 2020 04:52:47 +0000
Subject: [PATCH 255/278] Translated using Weblate (Estonian)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
---
 vector/src/main/res/values-et/strings.xml | 553 ++++------------------
 1 file changed, 84 insertions(+), 469 deletions(-)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 4a7f5ddbed..24acbc8dbc 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -1,20 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="resources_language">et</string>
     <string name="resources_country_code">EE</string>
     <string name="resources_script">Latn</string>
-
     <string name="light_theme">Hele teema</string>
     <string name="dark_theme">Tume teema</string>
     <string name="black_them">Must teema</string>
     <string name="status_theme">Status.im teema</string>
-
     <string name="notification_sync_init">Käivitan teenuse</string>
     <string name="notification_sync_in_progress">Sünkroniseerin…</string>
     <string name="notification_listening_for_events">Kuulan, kas leidub sündmusi</string>
     <string name="notification_noisy_notifications">Lärmakad teavitused</string>
     <string name="notification_silent_notifications">Vaiksed teavitused</string>
-
     <string name="title_activity_home">Sõnumid</string>
     <string name="title_activity_room">Jututuba</string>
     <string name="title_activity_settings">Seadistused</string>
@@ -26,10 +23,8 @@
     <string name="title_activity_keys_backup_setup">Võtmete varundus</string>
     <string name="title_activity_keys_backup_restore">Kasuta võtmete varundust</string>
     <string name="title_activity_verify_device">Verifitseeri sessioon</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Võtmete varundus pole veel valmis, oota natuke…</string>
     <string name="encrypted_message">Krüptitud sõnum</string>
-
     <string name="sign_out_bottom_sheet_warning_no_backup">Kui sa logid nüüd välja, siis sa kaotad ligipääsu kõikidele krüptitud sõnumitele</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Parasjagu varundan võtmeid. Kui sa logid nüüd välja, siis sa kaotad ligipääsu kõikidele oma krüptitud sõnumitele.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Turvaline võtmete varundus peaks olema aktiivne kõikides sinu sessioonides, sest see hoiab ära krüptitud sõnumitele ligipääsu kadumise.</string>
@@ -39,11 +34,8 @@
     <string name="are_you_sure">Kas sa oled kindel\?</string>
     <string name="backup">Varunda</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Kui sa enne väljalogimist ei varunda oma võtmeid, siis sa kaotad ligipääsu oma krüptitud sõnumitele.</string>
-
     <string name="dialog_title_third_party_licences">Kolmandate osapoolte litsentsid</string>
-
     <string name="loading">Laeme…</string>
-
     <string name="ok">Sobib</string>
     <string name="cancel">Tühista</string>
     <string name="save">Salvesta</string>
@@ -92,7 +84,6 @@
     <string name="ignore">Eira</string>
     <string name="review">Vaata üle</string>
     <string name="decline">Keeldu</string>
-
     <string name="action_exit">Välju</string>
     <string name="actions">Tegevused</string>
     <string name="action_sign_out">Logi välja</string>
@@ -108,27 +99,22 @@
     <string name="action_close">Sulge</string>
     <string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
     <string name="disable">Lülita välja</string>
-
     <string name="dialog_title_confirmation">Kinnitus</string>
     <string name="dialog_title_warning">Hoiatus</string>
     <string name="dialog_title_error">Viga</string>
-
     <string name="bottom_action_home">Kodu</string>
     <string name="bottom_action_favourites">Lemmikud</string>
     <string name="bottom_action_people">Inimesed</string>
     <string name="bottom_action_rooms">Jututoad</string>
     <string name="bottom_action_groups">Kogukonnad</string>
-
     <string name="home_filter_placeholder_home">Filtreeri jututubasid</string>
     <string name="home_filter_placeholder_favorites">Filtreeri lemmikuid</string>
     <string name="home_filter_placeholder_people">Filtreeri inimesi</string>
     <string name="home_filter_placeholder_rooms">Filtreeri jututubasid</string>
     <string name="home_filter_placeholder_groups">Filtreeri kogukondasid</string>
-
     <string name="invitations_header">Kutsed</string>
     <string name="low_priority_header">Vähetähtis</string>
     <string name="system_alerts_header">Süsteemi hoiatused</string>
-
     <string name="direct_chats_header">Vestlused</string>
     <string name="local_address_book_header">Kohalik aadressiraamat</string>
     <string name="user_directory_header">Kasutajate kataloog</string>
@@ -137,20 +123,17 @@
     <string name="no_contact_access_placeholder">Sa pole Element\'ile andnud ligipääsu kohalikele kontaktidele</string>
     <string name="no_result_placeholder">Tulemusi ei ole</string>
     <string name="people_no_identity_server">Isikutuvastusserver ei ole seadistatud.</string>
-
     <string name="rooms_header">Jututoad</string>
     <string name="rooms_directory_header">Jututubade loend</string>
     <string name="no_room_placeholder">Jututube ei leidu</string>
     <string name="no_public_room_placeholder">Avalikke jututube ei leidu</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 kasutaja</item>
+        <item quantity="one">%d kasutaja</item>
         <item quantity="other">%d kasutajat</item>
     </plurals>
-
     <string name="groups_invite_header">Kutse</string>
     <string name="groups_header">Kogukonnad</string>
     <string name="no_group_placeholder">Gruppe ei leidu</string>
-
     <string name="send_bug_report_include_logs">Saada logikirjed</string>
     <string name="send_bug_report_include_crash_logs">Saada kokkujooksmise logikirjed</string>
     <string name="send_bug_report_include_screenshot">Saada ekraanipilt</string>
@@ -162,14 +145,11 @@
     <string name="send_bug_report_alert_message">Ma märkan, et pahameelega raputad oma telefoni. Kas sa tahaksid saata veateate\?</string>
     <string name="send_bug_report_app_crashed">See rakendus jooksis viimati kokku. Kas sa tahaksid saata selle kohta veateate\?</string>
     <string name="send_bug_report_rage_shake">Veateate saatmiseks raputa väga kõvasti</string>
-
     <string name="send_bug_report_sent">Veateate saatmine õnnestus</string>
     <string name="send_bug_report_failed">Veateate saatmine ei õnnestunud (%s)</string>
     <string name="send_bug_report_progress">Saatmise kulg (%s%%)</string>
-
     <string name="send_files_in">Saada</string>
     <string name="read_receipt">Loetud</string>
-
     <string name="join_room">Liitu jututoaga</string>
     <string name="username">Kasutajanimi</string>
     <string name="create_account">Loo konto</string>
@@ -178,13 +158,10 @@
     <string name="hs_url">Koduserveri aadress</string>
     <string name="identity_url">Isikutuvastusserveri aadress</string>
     <string name="search">Otsi</string>
-
     <string name="start_new_chat">Alusta uut vestlust</string>
     <string name="start_voice_call">Algata häälkõne</string>
     <string name="start_video_call">Algata videokõne</string>
-
     <string name="option_send_voice">Edasta häält</string>
-
     <string name="start_new_chat_prompt_msg">Kas oled kindel, et soovid alustada vestlust kasutajaga %s\?</string>
     <string name="start_voice_call_prompt_msg">Kas oled kindel, et soovid algatada häälkõnet\?</string>
     <string name="start_video_call_prompt_msg">Kas oled kindel, et soovid algatada videokõnet\?</string>
@@ -194,20 +171,16 @@
 \nAlternatiivina võid sa kasutada avalikku TURN serverit %2$s, kuid see ei pruugi olla sama töökindel ning sa jagad oma IP-aadressi selle serveriga. TURN-serveri kasutamist võid sa määrata ka seadistustes.</string>
     <string name="call_failed_no_ice_use_alt">Proovi kasutada serverit %s</string>
     <string name="call_failed_dont_ask_again">Ära küsi minult uuesti</string>
-
     <string name="option_send_files">Saada faile</string>
     <string name="option_send_sticker">Saada kleepse</string>
     <string name="option_take_photo_video">Tee foto või video</string>
     <string name="option_take_photo">Tee foto</string>
     <string name="option_take_video">Tee video</string>
-
     <string name="no_sticker_application_dialog_content">Sul ei ole hetkel ühtegi kleepsupakki kasutusel.
 \n
 \nKas lisame nüüd mõne\?</string>
-
     <string name="go_on_with">kasuta rakendust…</string>
     <string name="error_no_external_application_found">Vabandust, aga selle tegevuse jaoks ei leidu ühtegi välist rakendust.</string>
-
     <string name="auth_login">Logi sisse</string>
     <string name="auth_register">Loo konto</string>
     <string name="auth_submit">Saada</string>
@@ -260,7 +233,6 @@
 \n
 \nSa oled välja logitud kõikidest oma seni kasutusel olnud sessioonidest ega saa enam teateid ega sõnumeid. Nende uuesti lugemiseks palun logi igas seadmes tagasi Matrix\'i võrku.</string>
     <string name="auth_accept_policies">Palun loe läbi ja nõustu koduserveri kasutusjuhendiga:</string>
-
     <string name="login_error_must_start_http">Serveri aadressi alguses peab olema kas https:// või http://</string>
     <string name="login_error_network_error">Sisselogimine ei õnnestu: võrguühenduse viga</string>
     <string name="login_error_unable_login">Ei õnnestu sisse logida</string>
@@ -272,7 +244,6 @@
     <string name="login_error_no_homeserver_found">See ei ole toimiv Matrix\'i serveri aadress</string>
     <string name="login_error_homeserver_not_found">Sellel aadressil ei leidu koduserverit, palun kontrolli aadressi õigsust</string>
     <string name="login_error_ssl_handshake">Sinu seade kasutab aegunud versiooni TLS-protokollist ning seal leiduvate turvanõrkuste tõttu ja sinu turvalisuse tagamiseks ühendust serveriga ei algatata</string>
-
     <string name="login_error_forbidden">Vigane kasutajanimi või salasõna</string>
     <string name="login_error_bad_json">Vigane JSON</string>
     <string name="login_error_not_json">Ei sisaldanud korrektset JSON\'it</string>
@@ -281,16 +252,12 @@
     <string name="play_video">Esita</string>
     <string name="pause_video">Peata</string>
     <string name="dismiss">Loobu</string>
-
-
     <string name="action_copy">Kopeeri</string>
     <string name="dialog_title_success">Õnnestus</string>
-
     <string name="bottom_action_notification">Teavitused</string>
     <string name="call_failed_no_connection">Kõne ebaõnnestus</string>
     <string name="call_failed_no_connection_description">Reaalajas ühenduse loomine ei õnnestunud.
 \nPalu oma koduserveri %@ haldajat, et ta seadistaks kõnede kindlamaks toimimiseks TURN serveri.</string>
-
     <string name="call_select_sound_device">Vali heliseade</string>
     <string name="sound_device_phone">Telefon</string>
     <string name="sound_device_speaker">Kõlar</string>
@@ -301,51 +268,38 @@
     <string name="call_camera_back">Tagakaamera</string>
     <string name="call_format_turn_hd_off">Lülita kõrglahutusega video välja</string>
     <string name="call_format_turn_hd_on">Lülita kõrglahutusega video sisse</string>
-
     <string name="auth_login_sso">Logi sisse ühekordse sisselogimise abil</string>
     <string name="login_error_ssl_other">SSL-ühenduse viga.</string>
     <string name="login_error_unknown_token">Sisestatud tunnusluba ei ole õige</string>
     <string name="login_error_login_email_not_yet">E-posti teel saadetud linki pole veel klõpsitud</string>
-
     <string name="e2e_re_request_encryption_key">Küsi oma muudest sessioonidest krüptimisvõtmed uuesti.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Võtmete jagamise päring on saadetud.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Päring on saadetud</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Palun käivita Element mõnes muus seadmes, mis suudab neid sõnumeid dekrüptoda ja seega saata krüptovõtmeid siia sessiooni.</string>
-
     <string name="read_receipts_list">Lugemisteatiste loend</string>
-
     <string name="groups_list">Gruppide loend</string>
-
     <plurals name="membership_changes">
-        <item quantity="one">1 liikmelisuse muutus</item>
+        <item quantity="one">%d liikmelisuse muutus</item>
         <item quantity="other">%d liikmelisuse muutust</item>
     </plurals>
-
     <string name="compression_options">Saada pilt</string>
     <string name="compression_opt_list_original">Algses suuruses</string>
     <string name="compression_opt_list_large">Suurena</string>
     <string name="compression_opt_list_medium">Keskmisena</string>
     <string name="compression_opt_list_small">Väikesena</string>
-
     <string name="attachment_cancel_download">Kas katkestame allalaadimise\?</string>
     <string name="attachment_cancel_upload">Kas katkestame üleslaadimise\?</string>
     <string name="attachment_remaining_time_seconds">%d sekundit</string>
     <string name="attachment_remaining_time_minutes">%1$d min %2$d sek</string>
-
     <string name="yesterday">Eile</string>
     <string name="today">Täna</string>
-
     <string name="room_info_room_name">Jututoa nimi</string>
     <string name="room_info_room_topic">Jututoa teema</string>
-
     <string name="settings_call_category">Kõned</string>
     <string name="settings_call_ringtone_use_app_ringtone">Kasuta saabuvate kõnede jaoks Element\'i vaikimisi helinat</string>
     <string name="settings_call_ringtone_use_default_stun">Kasuta kõnehõlbustusserverit</string>
     <string name="settings_call_ringtone_title">Saabuva kõne helin</string>
     <string name="settings_call_ringtone_dialog_title">Vali helin kõnede jaoks:</string>
-
     <string name="call">Kõne</string>
     <string name="call_connected">Vastuvõetud kõne</string>
     <string name="call_connecting">Kõne ühendus on loomisel…</string>
@@ -358,14 +312,11 @@
     <string name="video_call_in_progress">Videokõne on pooleli…</string>
     <string name="active_call_with_duration">Käsilolev kõne (%s)</string>
     <string name="return_to_call">Pöördu tagasi kõne juurde</string>
-
     <string name="call_error_user_not_responding">Teine osapool ei võtnud kõnet vastu.</string>
     <string name="call_error_camera_init_failed">Kaamerat ei õnnestu kasutusele võtta</string>
     <string name="call_error_answered_elsewhere">kõnele vastati muust seadmest</string>
-
     <string name="media_picker_both_capture_title">Tee foto või video</string>
     <string name="media_picker_cannot_record_video">Video salvestamine ei õnnestu</string>
-
     <string name="permissions_rationale_popup_title">Lisateave õiguste kohta</string>
     <string name="permissions_rationale_msg_storage">Element vajab õigusi sinu foto- ja videokataloogide lugemiseks ning manuste salvestamiseks.
 \n
@@ -382,21 +333,17 @@
 \n
 \nKõnede tegemiseks palun anna järgmisel lehel vajalikud õigused.</string>
     <string name="permissions_action_not_performed_missing_permissions">Vabandust. Kuna vastavaid õigusi ei olnud, siis toimingut ei saanud teha</string>
-
     <string name="media_slider_saved">Salvestatud</string>
     <string name="media_slider_saved_message">Kas salvestame allalaetud failide kausta\?</string>
     <string name="yes">JAH</string>
     <string name="no">EI</string>
     <string name="_continue">Jätka</string>
-
     <string name="remove">Eemalda</string>
     <string name="join">Liitu</string>
     <string name="preview">Eelvaade</string>
     <string name="reject">Hülga</string>
-
     <string name="room_sync_in_progress">Sünkroniseerin…</string>
     <string name="room_jump_to_first_unread">Mine esimese lugemata sõnumi juurde.</string>
-
     <string name="room_preview_invitation_format">Sa oled kutsutud siia jututuppa %s poolt</string>
     <string name="room_preview_unlinked_email_warning">Kutse saadeti %s e-posti aadressile, aga see ei ole seotud antud kasutajakontoga.
 \nSa kas peaksid logima sisse teise kontoga või lisama selle e-posti aadressi oma kasutajakontole.</string>
@@ -409,23 +356,20 @@
     <string name="ssl_unexpected_existing_expl">Võrreldes selle sertifikaadiga, mida sinu nutiseade seni usaldas, on praegune sertifikaat muutunud. See on VÄGA EBATAVALINE. Me soovitame, et ÄRA NÕUSTU selle uue sertifikaadiga.</string>
     <string name="ssl_expected_existing_expl">Senise usaldusväärse sertifikaadi asemel kasutab server nüüd mitteusaldusväärset sertifikaati. See võib tähendada et haldaja on seda serveris muutnud. Et võrrelda viimase kehtiva sertifikaadi sõrmejälge, palun võta haldajaga ühendust.</string>
     <string name="ssl_only_accept">NÕUSTU sertifikaadiga vaid siis, kui serveri haldaja antud sõrmejälg klapib sellega, mida sa hetkel siin näed.</string>
-
     <string name="room_details_title">Jututoa üksikasjad</string>
     <string name="room_details_people">Inimesed</string>
     <string name="room_details_files">Failid</string>
     <string name="room_details_settings">Seadistused</string>
     <plurals name="room_details_selected">
-        <item quantity="one">1 valitud</item>
+        <item quantity="one">%d valitud</item>
         <item quantity="other">%d valitud</item>
     </plurals>
     <string name="malformed_id">Vigane kasutajatunnus. Peaksid kasutama kas e-posti aadressi või õiget Matrix\'i kasutajatunnust vormingus \'@toreinimene:domeen.ee\'</string>
     <string name="room_details_people_invited_group_name">KUTSUTUD</string>
     <string name="room_details_people_present_group_name">LIITUNUD</string>
-
     <string name="room_event_action_report_prompt_reason">Sellest sisust teatamise põhjus</string>
     <string name="room_event_action_cancel_upload">Katkesta üleslaadimine</string>
     <string name="room_event_action_cancel_download">Katkesta allalaadimine</string>
-
     <string name="search_hint">Otsi</string>
     <string name="search_members_hint">Filtreeri jututoa liikmeid</string>
     <string name="search_no_results">Tulemusi pole</string>
@@ -433,7 +377,6 @@
     <string name="tab_title_search_messages">SÕNUMID</string>
     <string name="tab_title_search_people">INIMESED</string>
     <string name="tab_title_search_files">FAILID</string>
-
     <string name="room_recents_join">LIITU</string>
     <string name="room_recents_favourites">LEMMIKUD</string>
     <string name="room_recents_conversations">JUTUTOAD</string>
@@ -444,7 +387,6 @@
     <string name="room_recents_join_room">Liitu jututoaga</string>
     <string name="room_recents_join_room_title">Liitu jututoaga</string>
     <string name="room_recents_join_room_prompt">Sisesta jututoa tunnus, nimi või alias</string>
-
     <string name="directory_search_results_title">Sirvi kataloogi</string>
     <string name="room_settings_direct_chat">Otsevestlus</string>
     <string name="active_widget_view_action">VAATA</string>
@@ -457,23 +399,17 @@
     <string name="send_suggestion_report_placeholder">Kirjelda oma ettepanekut siin</string>
     <string name="send_suggestion_sent">Tänud, ettepaneku saatmine õnnestus</string>
     <string name="send_suggestion_failed">Ettepaneku saatmine ei õnnestunud (%s)</string>
-
     <string name="room_filtering_filter_hint">Sõelu vestlustest…</string>
     <string name="room_filtering_footer_title">Kas sa ei leia seda, mida otsisid\?</string>
     <string name="room_filtering_footer_create_new_room">Loo uus jututuba</string>
     <string name="room_filtering_footer_create_new_direct_message">Saada uus otsesõnum</string>
     <string name="room_filtering_footer_open_room_directory">Vaata jututubade loendit</string>
-
     <string name="direct_room_filter_hint">Sõelu kasutajanime või kasutajatunnuse alusel…</string>
-
     <string name="message_view_edit_history">Näita muudatuste ajalugu</string>
-
     <string name="a11y_create_direct_message">Algata uus otsevestlus</string>
     <string name="a11y_create_room">Loo uus jututuba</string>
     <string name="bug_report_error_too_short">Kirjeldus on liiga lühike</string>
-
     <string name="notification_initial_sync">Teen andmete esmast sünkroonimist…</string>
-
     <string name="settings_show_devices_list">Näita kõiki minu sessioone</string>
     <string name="settings_advanced_settings">Lisaseadistused</string>
     <string name="alert_push_are_disabled_description">Tõuketeavituste kasutuselevõtuks vaata üle seadistused</string>
@@ -490,34 +426,26 @@
     <string name="auth_pin_confirm_to_disable_title">PIN-koodi kasutuselt eemaldamiseks korda PIN-koodi</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Kasuta krüptimist vaid verifitseeritud sessioonides</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse selles jututoas.</string>
-
     <string name="room_settings_addresses_no_local_addresses">Sellel jututoal puuduvad kohalikud aadressid</string>
     <string name="room_settings_addresses_add_new_address">Uus aadress (näiteks #seltskond:matrix.org)</string>
-
     <string name="room_settings_no_flair">Sellele jututoale ei ole jagatud ühtegi kogukonna rinnasilti</string>
     <string name="room_settings_add_new_group">Uus kogukonna tunnus (näiteks +meieseltsing:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Vigane kogukonna tunnus</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ei ole korrektne kogukonna tunnus</string>
-
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Vigane aliase vorming</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' ei ole lubatud aliase vorming</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Sel jututoal ei saa olema põhiaadressi.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Põhiaadressi hoiatus</string>
-
     <string name="room_settings_set_main_address">Määra põhiaadressiks</string>
     <string name="room_settings_unset_main_address">Eemalda põhiaadressiks määramine</string>
     <string name="room_settings_copy_room_id">Kopeeri jututoa tunnus</string>
     <string name="room_settings_copy_room_address">Kopeeri jututoa aadress</string>
-
     <string name="room_settings_addresses_e2e_enabled">Krüptimine on selles jututoas kasutusel.</string>
     <string name="room_settings_addresses_e2e_disabled">Krüptimine ei ole selles jututoas kasutusel.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Võta krüptimine kasutusele 
 \n(hoiatus: seda ei saa hiljem enam välja lülitada!)</string>
-
     <string name="directory_title">Kaust</string>
     <string name="settings_theme">Teema</string>
-
     <string name="font_size">Fontide suurus</string>
     <string name="tiny">Pisike</string>
     <string name="small">Väike</string>
@@ -526,18 +454,15 @@
     <string name="larger">Suurem</string>
     <string name="largest">Veel suurem</string>
     <string name="huge">Hiidsuur</string>
-
     <string name="widget_no_power_to_manage">Sul on vaja õigusi, et selles jututoas hallata vidinaid</string>
     <string name="widget_creation_failure">Vidina loomine ei õnnestunud</string>
     <string name="settings_labs_create_conference_with_jitsi">Algata rühmakõnesid jitsi vahendusel</string>
     <string name="widget_delete_message_confirmation">Kas oled kindel, et soovid siit jututoast selle vidina kustutada\?</string>
     <plurals name="active_widgets">
-        <item quantity="one">Kasutusel on üks vidin</item>
+        <item quantity="one">Kasutusel on %d vidin</item>
         <item quantity="other">Kasutusel on %d vidinat</item>
     </plurals>
     <string name="active_widgets_title">Kasutusel vidinad</string>
-
-
     <string name="room_widget_activity_title">Vidin</string>
     <string name="room_widget_permission_title">Lae vidin</string>
     <string name="room_widget_permission_added_by">Selle vidina lisaja:</string>
@@ -548,23 +473,18 @@
     <string name="room_widget_reload">Lae vidin uuesti</string>
     <string name="room_widget_open_in_browser">Ava veebibrauseris</string>
     <string name="room_widget_revoke_access">Eemalda minu ligipääsuõigused</string>
-
     <string name="room_widget_permission_display_name">Sinu kuvatav nimi</string>
     <string name="room_widget_permission_avatar_url">Sinu avatari aadress</string>
     <string name="room_widget_permission_user_id">Sinu kasutajatunnus</string>
     <string name="room_widget_permission_theme">Sinu teema</string>
     <string name="room_widget_permission_widget_id">Vidina tunnus</string>
     <string name="room_widget_permission_room_id">Jututoa tunnus</string>
-
-
     <string name="has_been_banned">%2$s seadis sulle ligipääsukeelu %1$s jututuppa</string>
     <string name="reason_colon">Põhjus: %1$s</string>
     <string name="rejoin">Liitu uuesti</string>
     <string name="forget_room">Unusta jututuba ära</string>
-
     <string name="keys_backup_setup_step1_advanced">(Lisaseadistused)</string>
     <string name="keys_backup_setup_step1_manual_export">Ekspordi võtmed käsitsi</string>
-
     <string name="keys_backup_setup_step2_text_title">Krüpti oma varukoopia paroolifraasiga.</string>
     <string name="keys_backup_setup_step2_text_description">Me salvestame krüptitud varukoopia sinu krüptovõtmetest meie serveris. Tagamaks, et keegi ei saa seda kasutada, krüpti varukoopia paroolifraasiga.
 \n
@@ -587,60 +507,47 @@
     <string name="keys_backup_recovery_code_empty_error_message">Palun sisesta taastevõti</string>
     <string name="sas_emoji_description">Verifitseeri see sessioon tehes kindlaks et järgnev emoji kuvatakse partneri ekraanil</string>
     <string name="sas_decimal_description">Verifitseeri see sessioon tehes kindlaks, et järgnevad numbrid kuvatakse partneri ekraanil</string>
-
     <string name="sas_incoming_verification_request_dialog">Sa võtsid vastu saabuva verifitseerimispalve.</string>
     <string name="sas_waiting_for_partner">Ootan teise osapoole kinnitust…</string>
-
     <string name="sas_verified">Verifitseeritud!</string>
     <string name="sas_verified_successful">Sa oled edukalt verifitseerinud selle sessiooni.</string>
     <string name="sas_verified_successful_description">Turvalised sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.</string>
     <string name="sas_got_it">Selge lugu</string>
-
     <string name="sas_verifying_keys">Mitte midagi huvitavat ei paista\? Kõik kliendid ei toeta veel interaktiivset verifitseerimist. Selle asemel kasuta vana kooli verifitseerimist.</string>
     <string name="sas_legacy_verification_button_title">Kasuta vana kooli verifitseerimist.</string>
-
     <string name="sas_verification_request_notification_channel_title">Krüptovõtmete verifitseerimine</string>
     <string name="sas_cancelled_dialog_title">Päring on tühistatud</string>
     <string name="sas_cancelled_by_other">Teine osapool tühistas verifitseerimise.
 \n%s</string>
     <string name="sas_cancelled_by_me">Verifitseerimine on tühistatud.
 \nPõhjus %s</string>
-
     <string name="sas_verification_request_notification_channel">Vastastikune sessioonide verifitseerimine</string>
     <string name="sas_incoming_request_notif_title">Verifitseerimispäring</string>
     <string name="sas_incoming_request_notif_content">%s soovib verifitseerida sinu sessiooni</string>
-
     <string name="sas_error_m_user">Kasutaja tühistas verifitseerimise</string>
     <string name="sas_error_m_timeout">Verifitseerimisprotsess aegus</string>
     <string name="room_list_rooms_empty_body">Sinu jututoad kuvatakse siin</string>
-
     <string name="title_activity_emoji_reaction_picker">Reageerimised</string>
     <string name="reactions_agree">Nõus</string>
     <string name="reactions_like">Meeldib</string>
     <string name="message_add_reaction">Lisa reaktsioon</string>
     <string name="reactions">Reageerimised</string>
-
     <string name="event_redacted">Sõnum on kustutatud</string>
     <string name="settings_show_redacted">Näita kustutatud sõnumeid</string>
     <string name="settings_show_redacted_summary">Näita kustutatud sõnumite asemel kohatäidet</string>
     <string name="event_redacted_by_user_reason">Kasutaja kustutas sündmuse</string>
     <string name="event_redacted_by_admin_reason">Jututoa haldur on sündmust modereerinud</string>
     <string name="last_edited_info_message">Viimati muudetud %1$s poolt, muutmise aeg %2$s</string>
-
-
     <string name="malformed_message">Vigaselt vormindatud sündmus ja kuvamine pole seetõttu võimalik</string>
     <string name="error_no_network">Võrguühendus puudub. Palun kontrolli oma internetiühendust.</string>
     <string name="action_change">Muuda</string>
     <string name="change_room_directory_network">Vaheta võrku</string>
     <string name="please_wait">Palun oota…</string>
     <string name="group_all_communities">Kõik kogukonnad</string>
-
     <string name="room_preview_no_preview">Sellel jututoal puudub eelvaade</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Element ei toeta veel kõigile nähtavate jututubade eelvaadet</string>
-
     <string name="fab_menu_create_room">Jututoad</string>
     <string name="fab_menu_create_chat">Isiklikud sõnumid</string>
-
     <string name="create_room_title">Uus jututuba</string>
     <string name="create_room_action_create">LOO</string>
     <string name="create_room_name_hint">Jututoa nimi</string>
@@ -648,14 +555,11 @@
     <string name="create_room_public_description">Kõik võivad selle jututoaga liituda</string>
     <string name="create_room_directory_title">Jututubade loend</string>
     <string name="create_room_directory_description">Avalda see jututuba jututubade loendis</string>
-
     <string name="send_attachment">Saada manus</string>
-
     <string name="uploads_media_no_result">Selles jututoas pole meediafaile</string>
     <string name="uploads_files_title">FAILID</string>
     <string name="uploads_files_subtitle">Lisaja %1$s, lisamise aeg %2$s</string>
     <string name="uploads_files_no_result">Selles jututoas pole faile</string>
-
     <string name="report_content_spam">Tegemist on spämmiga</string>
     <string name="report_content_inappropriate">See on ebasobilik</string>
     <string name="report_content_custom">Kohandatud põhjus…</string>
@@ -665,15 +569,12 @@
     <string name="login_reset_password_success_notice">Sinu salasõna on muudetud.</string>
     <string name="login_reset_password_success_notice_2">Sa oled kõikidest sessioonidest välja logitud ning enam ei saa tõuketeavitusi. Nende taaskuvamiseks logi sisse kõikides oma seadmetes.</string>
     <string name="login_reset_password_success_submit">Tagasi sisselogimise lehele</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Hoiatus</string>
     <string name="verification_request_start_notice">"Turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate suhtluskanalit, mida mõlemad usaldate."</string>
-
     <string name="verification_emoji_notice">Võrdle unikaalset emoji\'de kombinatsiooni ja vaata, et nad oleksid samas järjekorras.</string>
     <string name="verification_code_notice">Võrdle koodi sellega, mida kuvatakse teise kasutaja ekraanil.</string>
     <string name="verification_conclusion_ok_notice">Sõnumid selle kasutajaga on läbivalt krüptitud ning kolmandad osapooled ei saa neid lugeda.</string>
     <string name="verification_conclusion_ok_self_notice">Sinu uus sessioon on nüüd verifitseeritud. Selles sessioonis saad lugeda oma krüptitud sõnumeid ja teiste kasutajate jaoks on ta usaldusväärne.</string>
-
     <string name="encryption_information_cross_signing_state">Risttunnustamine</string>
     <string name="encryption_information_dg_xsigning_complete">Risttunnustamine on kasutusel
 \nPrivaatvõtmed asuvad seadmes.</string>
@@ -683,20 +584,17 @@
     <string name="encryption_information_dg_xsigning_not_trusted">Risttunnustamine on kasutusel
 \nVõtmed ei ole usaldusväärsed</string>
     <string name="encryption_information_dg_xsigning_disabled">Risttunnustamine ei ole kasutusel</string>
-
     <string name="settings_hs_admin_e2e_disabled">Sinu serveri haldur on lülitanud läbiva krüptimise omavahelistes jututubades ja otsesõnumites välja.</string>
     <string name="settings_active_sessions_list">Aktiivsed sessioonid</string>
     <string name="settings_active_sessions_show_all">Näita kõiki sessioone</string>
     <string name="settings_active_sessions_manage">Halda sessioone</string>
     <string name="settings_active_sessions_signout_device">Logi sellest sessioonist välja</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Teave krüptograafia kohta puudub</string>
-
     <string name="settings_active_sessions_verified_device_desc">Kuna sina oled selle sessiooni verifitseerinud, siis see sessioon on krüptitud sõnumite saatmiseks usaldusväärne:</string>
     <string name="identity_server_error_outdated_identity_server">See isikutuvastusserver kasutab vana API\'t. Element toetab aga vaid API versiooni 2.</string>
     <string name="identity_server_error_outdated_home_server">See tegevus ei ole võimalik. Koduserveri versioon on liiga vana.</string>
     <plurals name="directory_search_rooms">
-        <item quantity="one">1 jututuba</item>
+        <item quantity="one">%d jututuba</item>
         <item quantity="other">%d jututuba</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
@@ -704,7 +602,6 @@
         <item quantity="other">Otsingusõnaga %2$s leidsin %1$s jututuba</item>
     </plurals>
     <string name="directory_searching_title">Otsin kataaloogist…</string>
-
     <string name="room_settings_all_messages_noisy">Kõik sõnumid (lärmakas)</string>
     <string name="room_settings_all_messages">Kõik sõnumid</string>
     <string name="room_settings_mention_only">Ainult mainimised</string>
@@ -713,8 +610,7 @@
     <string name="room_settings_de_prioritize">Vähetähtis</string>
     <string name="room_settings_leave_conversation">Lahku vestlusest</string>
     <string name="room_settings_forget">Unusta</string>
-    <string name="room_settings_add_homescreen_shortcut">Lisa otsetee avalehele</string>
-
+    <string name="room_settings_add_homescreen_shortcut">Lisa avalehele</string>
     <string name="room_sliding_menu_messages">Sõnumid</string>
     <string name="room_sliding_menu_settings">Seadistused</string>
     <string name="room_sliding_menu_version">Versioon</string>
@@ -723,7 +619,6 @@
     <string name="room_sliding_menu_third_party_notices">Kolmandate osapoolte litsentsid</string>
     <string name="room_sliding_menu_copyright">Autoriõigused</string>
     <string name="room_sliding_menu_privacy_policy">Privaatsuspoliitika</string>
-
     <string name="settings_profile_picture">Profiilipilt</string>
     <string name="settings_display_name">Kuvatav nimi</string>
     <string name="settings_email_address">E-posti aadress</string>
@@ -735,11 +630,8 @@
     <string name="settings_add_3pid_confirm_password_title">Kinnitage oma salasõna</string>
     <string name="settings_add_3pid_flow_not_supported">Seda tegevust ei saa teha Element\'i nutirakendusest</string>
     <string name="settings_add_3pid_authentication_needed">Autentimine on nõutav</string>
-
-
     <string name="settings_notification_advanced">Teavituste lisaseadistused</string>
     <string name="settings_notification_by_event">Teavituse olulisus sündmuse alusel</string>
-
     <string name="settings_notification_privacy">Teavituste privaatsus</string>
     <string name="settings_troubleshoot_test_system_settings_title">Süsteemiseadistused.</string>
     <string name="settings_troubleshoot_test_account_settings_title">Kasutajakonto seadistused.</string>
@@ -747,13 +639,11 @@
     <string name="settings_troubleshoot_test_account_settings_failed">Sinu kontol ei ole teavitusi kasutusel.
 \nSeda saad muuta konto seadistuses.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Võta kasutusele</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Sessiooni seadistused.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Selles sessioonis on teavitused kasutusel.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Selles sessioonis ei ole teavitusi kasutusel.
 \nSeda saad muuta Element\'i seadistuses.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Võta kasutusele</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">Kohandatud seadistused.</string>
     <string name="settings_12_24_timestamps">Näita ajatempleid 12-tunnises vormingus</string>
     <string name="settings_show_read_receipts">Näita lugemisteatiseid</string>
@@ -766,32 +656,26 @@
     <string name="settings_phone_number_code">Kood</string>
     <string name="account_phone_number_error">Sinu telefoninumbri kontrollimisel tekkis viga.</string>
     <string name="account_additional_info">Lisateave: %s</string>
-
     <string name="settings_media">Meedia</string>
     <string name="settings_default_compression">Vaikimisi pakkimine</string>
     <string name="compression_opt_list_choose">Vali</string>
     <string name="settings_default_media_source">Vaikimisi meediaallikas</string>
     <string name="media_source_choose">Vali</string>
     <string name="settings_play_shutter_sound">Tee katiku klõpsu</string>
-
     <string name="settings_flair">Kogukonna rinnasilt</string>
     <string name="settings_without_flair">Sa ei ole hetkel ainsamagi kogukonna liige.</string>
-
     <string name="media_saving_period_3_days">3 päeva</string>
     <string name="media_saving_period_1_week">1 nädal</string>
     <string name="media_saving_period_1_month">1 kuu</string>
     <string name="media_saving_period_forever">Igavesti</string>
-
     <string name="room_settings_room_photo">Jututoa foto</string>
     <string name="room_settings_room_name">Jututoa nimi</string>
     <string name="room_settings_topic">Jututoa teema</string>
     <string name="room_settings_room_tag">Jututoa silt</string>
     <string name="room_settings_tag_pref_dialog_title">Sildistatud kui:</string>
-
     <string name="room_settings_tag_pref_entry_favourite">Lemmik</string>
     <string name="room_settings_tag_pref_entry_low_priority">Vähetähtis</string>
     <string name="room_settings_tag_pref_entry_none">Ei midagi</string>
-
     <string name="room_settings_category_access_visibility_title">Ligipääs ja nähtavus</string>
     <string name="room_settings_directory_visibility">Näita seda jututuba jututubade kataloogis</string>
     <string name="room_settings_room_notifications_title">Teavitused</string>
@@ -799,23 +683,19 @@
     <string name="room_settings_room_read_history_rules_pref_title">Jututoa ajaloo loetavus</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Kes võivad lugeda ajalugu\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Kes pääsevad ligi siia jututuppa\?</string>
-
     <string name="room_settings_read_history_entry_anyone">Kõik kasutajad</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Ainult liikmetele (alates selle seadistuse kasutuselevõtmisest)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Ainult liikmetele (alates nende kutsumise ajast)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Ainult liikmetele (alates liitumisest)</string>
-
     <string name="room_settings_room_access_warning">Sellele jututoale viitamiseks peab tal olema aadress.</string>
     <string name="room_settings_room_access_entry_only_invited">Vaid kutsutud kasutajad</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Kõik, kes teavad jututoa viidet, välja arvatud külalised</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Kõik, kes teavad jututoa viidet, kaasa arvatud külalised</string>
-
     <string name="room_settings_banned_users_title">Suhtluskeelu saanud kasutajad</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d suhtluskeelu saanud kasutaja</item>
         <item quantity="other">%d suhtluskeelu saanud kasutajat</item>
     </plurals>
-
     <string name="room_settings_category_advanced_title">Lisaseadistused</string>
     <string name="room_settings_room_internal_id">Selle jututoa sisemine tunnus</string>
     <string name="room_settings_addresses_pref_title">Aadressid</string>
@@ -825,9 +705,7 @@
     <string name="room_settings_labs_end_to_end_is_active">Läbiv krüptimine on kasutusel</string>
     <string name="room_settings_labs_end_to_end_warnings">Läbiva krüptimise kasutuselevõtuks pead korraks välja logima.</string>
     <string name="failed_to_load_timeline_position">%s üritas laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida.</string>
-
     <string name="encryption_information_title">Läbiva krüptimise teave</string>
-
     <string name="encryption_information_device_info">Sündmuse teave</string>
     <string name="encryption_information_user_id">Kasutajatunnus</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519 identiteedi võti</string>
@@ -835,7 +713,6 @@
     <string name="encryption_information_algorithm">Algoritm</string>
     <string name="encryption_information_session_id">Sessiooni tunnus</string>
     <string name="encryption_information_decryption_error">Dekrüptimise viga</string>
-
     <string name="encryption_information_sender_device_information">Saatja sessiooni teave</string>
     <string name="encryption_information_device_name">Avalik nimi</string>
     <string name="encryption_information_device_name_with_warning">Avalik nimi (nähtav neile, kellega sa suhtled)</string>
@@ -845,18 +722,15 @@
     <string name="encryption_information_device_key">Sessiooni võti</string>
     <string name="encryption_information_verification">Verifitseerimine</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 sõrmejälg</string>
-
     <string name="encryption_export_e2e_room_keys">Ekspordi jututubade läbiva krüptimise võtmed</string>
     <string name="encryption_export_room_keys">Ekspordi jututoa võtmed</string>
     <string name="encryption_export_room_keys_summary">Ekspordi võtmed kohalikku faili</string>
     <string name="encryption_export_export">Ekspordi</string>
     <string name="room_join_rules_invite_by_you">Sina määrasid, et jututuppa pääseb vaid kutsega.</string>
     <string name="timeline_unread_messages">Lugemata sõnumid</string>
-
     <string name="login_splash_text2">Krüptimise abil hoiad vestlused privaatsena</string>
     <string name="login_splash_text3">Laienda ja kohanda oma kasutuskogemust</string>
     <string name="login_splash_submit">Alusta</string>
-
     <string name="login_server_title">Vali server</string>
     <string name="login_server_text">Nii nagu e-posti puhul, siis kasutajakonto asub ühes serveris, kuid saab suhelda kasutajatega üle ilma</string>
     <string name="login_server_matrix_org_text">Liitu tasuta miljonite teistega suurimas tasuta Matrix\'i serveris</string>
@@ -864,7 +738,6 @@
     <string name="login_server_modular_learn_more">Lisateave</string>
     <string name="login_server_other_title">Muud serverid</string>
     <string name="login_server_other_text">Kohandatud seadistused</string>
-
     <string name="login_continue">Jätka</string>
     <string name="login_connect_to">Ühenda koduserveriga %1$s</string>
     <string name="login_connect_to_modular">Ühenda teenusepakkujaga Element Matrix Services</string>
@@ -873,14 +746,12 @@
     <string name="login_signup">Registreeru</string>
     <string name="login_signin">Logi sisse</string>
     <string name="login_signin_sso">Jätka kasutades SSO\'d ehk ühekordset autentimist</string>
-
     <string name="login_server_url_form_modular_hint">Element Matrix Services teenuse aadress</string>
     <string name="login_server_url_form_other_hint">Aadress</string>
     <string name="login_server_url_form_modular_text">Tasuline Matrix\'i majutusteenus organisatsioonidele</string>
     <string name="login_server_url_form_modular_notice">Sisesta Modular Element teenuse või muu serveri aadress, mida sa soovid kasutada</string>
     <string name="login_server_url_form_other_notice">Sisesta serveri või Element\'i aadress, mida sa soovid kasutada</string>
     <string name="login_server_url_form_common_notice">Sisesta serveri aadress, mida sa soovid kasutada</string>
-
     <string name="login_sso_error_message">Lehe laadimisel tekkis viga %1$s (%2$d)</string>
     <string name="login_mode_not_supported">See rakendus ei saa sisse logida antud koduserverisse. See koduserver toetab järgmisi sisselogimise tüüp(e): %1$s.
 \n
@@ -889,21 +760,16 @@
     <string name="login_registration_not_supported">See rakendus ei saa antud koduserveris uut kasutajakontot.
 \n
 \nKas sa soovid registreerida kasutades veebibrauseri põhist klienti\?</string>
-
     <string name="login_login_with_email_error">See e-posti aadress ei ole seotud ühegi kasutajakontoga.</string>
-
     <string name="login_reset_password_on">Loo uus salasõna koduserveris %1$s</string>
     <string name="login_reset_password_notice">Kontrollimaks, et just sina sina ise sisestasid uue salasõna, siis saadame sulle kinnituskirja.</string>
     <string name="login_reset_password_submit">Järgmine</string>
     <string name="login_reset_password_email_hint">E-posti aadress</string>
     <string name="login_reset_password_password_hint">Uus salasõna</string>
-
     <string name="login_reset_password_warning_title">Hoiatus!</string>
     <string name="login_reset_password_warning_content">Salasõna muutmine tühistab kõik läbiva krüptimise võtmed sinu kõikides sessioonides ning seega muutub kogu sinu vestluste ajalugu loetamatuks. Palun kindlasti kas sea üles võtmete varundamine või ekspordi mõnest muust sessioonist jututubade võtmed enne senise salasõna tühistamist.</string>
     <string name="login_reset_password_warning_submit">Jätka</string>
-
     <string name="login_reset_password_error_not_found">See e-posti aadress ei ole seotud ühegi kasutajakontoga</string>
-
     <string name="login_reset_password_mail_confirmation_title">Vaata oma saabuvate e-kirjade postkasti</string>
     <string name="login_reset_password_mail_confirmation_notice">Verifitseerimise jaoks saatsime e-kirja aadressile %1$s.</string>
     <string name="soft_logout_signin_submit">Logi sisse</string>
@@ -913,7 +779,6 @@
 \n
 \nEemalda nad, kui oled lõpetanud selle seadme kasutamise või soovid sisse logida muu kasutajakontoga.</string>
     <string name="soft_logout_clear_data_submit">Eemalda kõik andmed</string>
-
     <string name="soft_logout_clear_data_dialog_title">Eemalda andmed</string>
     <string name="soft_logout_clear_data_dialog_content">Kas sa oled kindel, et soovid kustutada kõik andmed, mis on hetkel siin seadmes salvestatud\?
 \nOma sõnumite ja kontoandmete nägemiseks logi uuesti sisse.</string>
@@ -928,47 +793,42 @@
     <string name="room_creation_title">Uus vestlus</string>
     <string name="room_creation_add_member">Lisa osaleja</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">1 aktiivne osaleja</item>
+        <item quantity="one">%d aktiivne osaleja</item>
         <item quantity="other">%d aktiivset osalejat</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="one">1 osaleja</item>
+        <item quantity="one">%d osaleja</item>
         <item quantity="other">%d osalejat</item>
     </plurals>
     <string name="room_title_one_member">1 osaleja</string>
-
     <plurals name="format_time_s">
-        <item quantity="one">1 sekund</item>
+        <item quantity="one">%d sekund</item>
         <item quantity="other">%d sekundit</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">1 minut</item>
+        <item quantity="one">%d minut</item>
         <item quantity="other">%d minutit</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">1 tund</item>
+        <item quantity="one">%d tund</item>
         <item quantity="other">%d tundi</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">1 päev</item>
+        <item quantity="one">%d päev</item>
         <item quantity="other">%d päeva</item>
     </plurals>
-
     <string name="room_participants_leave_prompt_title">Lahku jututoast</string>
     <string name="room_participants_leave_prompt_msg">Kas oled kindel, et soovid lahkuda jututoast\?</string>
     <string name="room_participants_remove_prompt_msg">Kas sa oled kindel, et soovid eemaldada %s sellest vestlusest\?</string>
     <string name="room_participants_create">Loo</string>
-
     <string name="room_participants_online">Võrgus</string>
     <string name="room_participants_offline">Võrgust väljas</string>
     <string name="room_participants_idle">Jõude</string>
     <string name="room_participants_now">Nüüd %1$s</string>
     <string name="room_participants_ago">Oli %1$s %2$s tagasi</string>
-
     <string name="room_participants_header_admin_tools">HALDUSTARVIKUD</string>
     <string name="room_participants_header_call">KÕNED</string>
     <string name="room_participants_header_devices">SESSIOONID</string>
-
     <string name="room_participants_action_invite">Kutsu</string>
     <string name="room_participants_action_cancel_invite">Tühista kutse</string>
     <string name="room_participants_action_leave">Lahku sellest jututoast</string>
@@ -986,14 +846,11 @@
 \n
 \nHoiatus: rakenduse eemaldamisel ka see fail ilmselt kustutatakse.</string>
     <string name="recovery_key_export_saved">Taastevõti on salvestatud.</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Varukoopia on juba olemas sinu koduserveris</string>
     <string name="keys_backup_setup_override_replace">Asenda</string>
     <string name="keys_backup_setup_override_stop">Peata</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Palun tee koopia</string>
     <string name="settings_discovery_mail_pending">Ootel</string>
-
     <string name="settings_discovery_enter_identity_server">Sisesta uue isikutuvastusserveri aadress</string>
     <string name="settings_discovery_bad_identity_server">Ei saanud ühendust isikutuvastusserveriga</string>
     <string name="settings_discovery_please_enter_server">Palun sisesta isikutuvastusserveri aadress</string>
@@ -1001,67 +858,48 @@
     <string name="settings_discovery_no_terms">Sinu valitud isikutuvastusserveril pole kasutustingimusi. Jätka vaid siis, kui sa usaldad serveri omanikku ja haldajat</string>
     <string name="settings_text_message_sent">Saatsime tekstisõnumi numbrile %s. Palun sisesta seal kuvatud kontrollkood.</string>
     <string name="settings_text_message_sent_wrong_code">Kontrollkood ei ole õige.</string>
-
     <string name="room_list_sharing_header_other_rooms">Muud jututoad</string>
-
     <string name="command_description_rainbow">Saadab selle sõnumi vikerkaarevärvilisena</string>
     <string name="command_description_rainbow_emote">Saadab antud emote vikerkaarevärvides</string>
-
     <string name="settings_category_timeline">Ajajoon</string>
-
     <string name="settings_category_composer">Sõnumite kirjutamine</string>
-
     <string name="room_settings_enable_encryption">Võta läbiv krüptimine kasutusele</string>
     <string name="room_settings_enable_encryption_warning">"Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada."</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Kas võtame krüptimise kasutusele\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Kui kord juba kasutusele võetud, siis krüptimist enam hiljem ära lõpetada ei saa. Krüptitud sõnumeid ei saa lugeda ei vaheapealses veebiliikluses ega serveris ja vaid jututoa liikmed saavad neid lugeda. Krüptimise kasutusele võtmine võib takistada nii robotite kui sõnumisildade tööd.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Võta jututoas krüptimine kasutusele</string>
-
     <string name="verification_request_notice">Lisaturvalisus mõttes verifitseeri %s võrreldes selleks üheks korraks loodud koodi mõlemas seadmes.</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifitseeri see sessioon selleks, et teda võiks lugeda usaldusväärseks ja saaks ligipääsu krüptitud sõnumitele. Kui sina pole sellesse sessiooni sisse loginud, siis sinu kasutajakonto võib olla sattunud võõraste kontrolli alla:</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d aktiivne sessioon</item>
         <item quantity="other">%d aktiivset sessiooni</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Verifitseeri see sisselogimissessioon</string>
     <string name="crosssigning_other_user_not_trust">Teised kasutajad ei pruugi seda usaldada</string>
     <string name="complete_security">Vormista turvaseadistused lõpuni</string>
-
     <string name="verification_open_other_to_verify">Kasuta olemasolevat sessiooni selle sessiooni verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele.</string>
-
-
     <string name="verification_profile_verify">Verifitseeri</string>
     <string name="verification_profile_verified">Verifitseeritud</string>
     <string name="verification_profile_warning">Hoiatus</string>
-
     <string name="room_member_profile_failed_to_get_devices">Sessionide loendi laadimine ei õnnestunud</string>
     <string name="room_member_profile_sessions_section_title">Sessioonid</string>
     <string name="trusted">Usaldusväärne</string>
     <string name="not_trusted">Ei ole usaldusväärne</string>
-
     <string name="verification_profile_device_verified_because">Kuna %1$s (%2$s) on selle sessiooni verifitseerinud, siis see sessioon on krüptitud sõnumite saatmiseks usaldusväärne:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) logis sisse uues sessioonis:</string>
     <string name="room_participants_power_level_prompt">Sa ei saa seda muudatust hiljem tagasi pöörata, sest annad teisele kasutajale samad õigused, mis sinul on.
 \nKas sa oled ikka kindel\?</string>
-
     <string name="room_participants_power_level_demote_warning_title">Kas vähendad enda õigusi\?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Kuna sa vähendad enda õigusi, siis sul ei pruugi hiljem olla võimalik seda muutust tagasi pöörata. Kui sa juhtumisi oled viimane haldusõigustega kasutaja jututoas, siis hiljem on võimatu samu õigusi tagasi saada.</string>
     <string name="room_participants_power_level_demote">Vähenda enda õigusi</string>
-
-
     <string name="room_participants_action_ignore_title">Eira kasutajat</string>
     <string name="room_participants_action_ignore_prompt_msg">Selle kasutaja eiramine eemaldab teie jagatud jututoast tema sõnumid.
 \n
 \nÜldistest seadistustest saad seda alati muuta.</string>
     <string name="room_participants_action_ignore">Eira selle kasutaja sõnumeid</string>
-
     <string name="room_participants_action_unignore_title">Lõpeta selle kasutaja eiramine</string>
     <string name="room_participants_action_unignore_prompt_msg">Selle kasutaja eiramise lõpetamine teeb tema sõnumid uuesti nähtavaks.</string>
     <string name="room_participants_action_unignore">Lõpeta eiramine</string>
-
     <string name="room_participants_action_cancel_invite_title">Tühista kutse</string>
     <string name="room_participants_action_cancel_invite_prompt_msg">Kas oled kindel et sa soovid tühistada kutse sellele kasutajale\?</string>
     <string name="room_participants_kick_title">Müksa kasutaja välja</string>
@@ -1074,23 +912,18 @@
     <string name="room_participants_unban_title">Taasta selle kasutaja ligipääs</string>
     <string name="room_participants_ban_prompt_msg">Sellele kasutajale suhtluskeelu seadmine tõstab ta jututoast välja ning ei võimalda uuesti liitumist.</string>
     <string name="room_participants_unban_prompt_msg">Suhtluskeelu eemaldamine võimaldab jututoaga uuesti liituda.</string>
-
     <string name="reason_hint">Põhjus</string>
-
     <string name="room_participants_invite_prompt_msg">Kas sa oled kindel, et soovid kutsuda %s vestlusele\?</string>
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s ja %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="people_search_invite_by_id"><u>Kutsu tunnuse alusel</u></string>
     <string name="people_search_local_contacts">KONTAKTID SIIN SEADMES (%d)</string>
     <string name="people_search_user_directory">KASUTAJATE LOEND (%s)</string>
     <string name="people_search_filter_text">Vaid Matrix\'i kasutajad</string>
-
     <string name="people_search_invite_by_id_dialog_title">Kutsu kasutajat tunnuse alusel</string>
     <string name="people_search_invite_by_id_dialog_description">Palun sisesta üks või enam e-posti aadressi või Matrix\'i kasutajatunnust</string>
     <string name="people_search_invite_by_id_dialog_hint">E-posti aadress või Matrix\'i kasutajatunnus</string>
-
     <string name="room_menu_search">Otsi</string>
     <string name="room_one_user_is_typing">%s kirjutab…</string>
     <string name="room_two_users_are_typing">%1$s &amp; %2$s kirjutavad…</string>
@@ -1109,10 +942,9 @@
     <string name="room_message_file_not_found">Faili ei leidunud</string>
     <string name="room_do_not_have_permission_to_post">Sul ei ole õigusi siia jututuppa kirjutamiseks</string>
     <plurals name="room_new_messages_notification">
-        <item quantity="one">1 uus sõnum</item>
+        <item quantity="one">%d uus sõnum</item>
         <item quantity="other">%d uut sõnumit</item>
     </plurals>
-
     <string name="ssl_trust">Usalda</string>
     <string name="ssl_do_not_trust">Ära usalda</string>
     <string name="ssl_logout_account">Logi välja</string>
@@ -1127,23 +959,19 @@
     <string name="settings_troubleshoot_diagnostic_success_status">Esmasel vaatlusel vigu ei leidu. Kui sa jätkuvalt ei saa teavitusi, siis palun saada edaspidise uurimise jaoks meile veateade.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Üks või enam testi andis tulemuseks vea, palun proovi pakutud lahendusi.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Üks või enam testi andis tulemuseks vea, palun saada edaspidise uurimise jaoks meile veateade.</string>
-
     <string name="settings_troubleshoot_test_system_settings_success">Süsteemi seadistustes on teavitused kasutusel.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Süsteemi seadistustes ei ole teavitusi kasutusel.
 \nPalun vaata need üle.</string>
     <string name="open_settings">Ava seadistused</string>
-
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Pane tähele, et mõned teavitused on seadistatud vaiksetena (teavitus kuvatakse ilma helilise märguandeta).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Mõned teavitused on sinu kohandatud seadistustes kinni keeratud.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Kohandatud reeglite laadimine ei õnnestunud. Palun proovi uuesti.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Palun kontrolli seadistusi</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Goolge Play teenuste kontrollimine</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK on kättesaadav ja uuendatud.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element kasutab Google Play teenuseid tõuketeavituste edastamiseks, kui see ei tundu olema korrektselt seadistatud:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Paranda Google Play teenused</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Firebase tunnusluba</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM tunnusloa laadimine õnnestus:
 \n%1$s</string>
@@ -1156,42 +984,35 @@
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nSee viga on väljaspool Element\'i kontrolli. Telefoni ei ole seadistatud Google\'i kontot. Palun ava seadistustes kontohaldur ning lisa üks Google\'i konto.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lisa Google\'i konto</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">Tunnusloa registreerimine</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM tunnusloa registreerimine koduserveris õnnestus.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">FCM tunnusloa registreerimine koduserveris ei õnnestunud:
 \n%1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Teavituste teenus</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Teavituste teenus töötab.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Teavituste teenus ei tööta.
 \nProovi, kas Element\'i uuesti käivitamine aitab.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Käivita teenus</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">Teavituste teenuse automaatne taaskäivitamine</string>
     <string name="settings_troubleshoot_test_service_restart_success">Teenus suleti ja käivitati automaatselt uuesti.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Teenuse uuesti käivitamine ei õnnestunud</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Käivita teenus seadme käivitamisel</string>
     <string name="settings_troubleshoot_test_service_boot_success">Teenus käivitatakse nutiseadme käivitamisel.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">Seda teenust ei käivitatata nutiseadme käivitamisel. Sa ei saa teavitusi enne, kui Element on vähemalt korra avatud.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Käivita teenus nutiseadme käivitamisel</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Kontrolli taustapiiranguid</string>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="one">1 jututuba</item>
+        <item quantity="one">%d jututuba</item>
         <item quantity="other">%d jututuba</item>
     </plurals>
-
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: 1 sõnum</item>
+        <item quantity="one">%1$s: %d sõnum</item>
         <item quantity="other">%1$s: %2$d sõnumit</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d teavitus</item>
         <item quantity="other">%d teavitust</item>
     </plurals>
-
     <string name="notification_unread_notified_messages_in_room">%1$s -&gt; %2$s</string>
     <string name="notification_unknown_new_event">Uus sündmus</string>
     <string name="notification_unknown_room_name">Jututuba</string>
@@ -1201,9 +1022,7 @@
     <string name="notification_inline_reply_failed">** Saatmine ei õnenstunud - palun ava jututoa vaade</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="historical_placeholder">Otsi ajaloost</string>
-
     <string name="error_jitsi_not_supported_on_old_device">Vabandust, aga rühmakõned Jitsi vahendusel ei ole vanades seadmetes toetatud (Androidi versioon alla 5.0)</string>
     <string name="room_widget_resource_permission_title">See vidin soovib kasutada järgmisi andmeid:</string>
     <string name="room_widget_resource_grant_permission">Luba</string>
@@ -1211,7 +1030,6 @@
     <string name="room_widget_webview_access_camera">Luba kaamera kasutamine</string>
     <string name="room_widget_webview_access_microphone">Luba mikrofoni kasutamine</string>
     <string name="room_widget_webview_read_protected_media">Luba DRM\'iga kaitstud meedia avamine</string>
-
     <string name="widget_integration_unable_to_create">Vidina loomine ei õnnestunud.</string>
     <string name="widget_integration_failed_to_send_request">Päringu saatmine ei õnnestunud.</string>
     <string name="widget_integration_positive_power_level">Õiguste tase peab olema positiivne täisarv.</string>
@@ -1232,7 +1050,6 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element saab kontrollida teie aadressiraamatut, et leida teisi Matrixi kasutajaid nende e-posti aadresside ja telefoninumbrite põhjal.
 \n
 \nKas sa oled nõus oma aadressiraamatut sel eesmärgil jagama\?</string>
-
     <string name="room_event_action_report_prompt_ignore_user">Kas sa soovid peita selle kasutaja kõik sõnumid\?
 \n
 \nPane tähele, et antud toiming taaskäivitab rakenduse ja see võib võtta veidi aega.</string>
@@ -1242,12 +1059,10 @@
 \nTöö, mida rakendus proovib teha, on agressiivselt piiratud, kui see on taustal ja see võib mõjutada teavituste kättesaamist.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Keela piirangud</string>
-
     <string name="settings_troubleshoot_test_battery_title">Aku optimeerimine</string>
     <string name="settings_troubleshoot_test_battery_success">Aku optimeerimine ei mõjuta Elementi.</string>
     <string name="settings_troubleshoot_test_battery_failed">Kui kasutaja jätab seadme mõneks ajaks vooluvõrgust välja ja ühele kohale paigale ning ekraan on välja lülitatud, lülitub seade Doze režiimi. See takistab rakendustel juurdepääsu võrgule ja lükkab edasi nende töö, sünkroonimise ja tavalised teated.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Eira optimeerimist</string>
-
     <string name="settings_notification_privacy_normal">Tavaline</string>
     <string name="settings_notification_privacy_reduced">Vähendatud privaatsus</string>
     <string name="settings_notification_privacy_need_permission">See rakendus vajab taustal toimimiseks õigusi</string>
@@ -1257,7 +1072,6 @@
     <string name="settings_notification_privacy_secure_message_content">• teavitusega märgitud sõnumi sisu <b>laetakse turvaliselt ja otse sinu Matrix\'i koduserverist</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• teavitused sisaldavad nii <b>metainfot kui sõnumi sisu</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• teavitused <b>ei näita sõnumi sisu</b></string>
-
     <string name="settings_notification_ringtone">Teavituste heli</string>
     <string name="settings_enable_all_notif">Võta teavitused sellel kontol kasutusele</string>
     <string name="settings_enable_this_device">Võta teavitused selles sessioonis kasutusele</string>
@@ -1266,8 +1080,6 @@
     <string name="settings_call_notifications_preferences">Seadista kõneteavitused</string>
     <string name="settings_silent_notifications_preferences">Seadista vaiksed teavitused</string>
     <string name="settings_system_preferences_summary">Vali LED-tule värv, värin ning heli…</string>
-
-
     <string name="settings_containing_my_display_name">Sõnumid, mis sisaldavad minu kuvatavat nime</string>
     <string name="settings_containing_my_user_name">Sõnumid, mis sisaldavad minu kasutajatunnust</string>
     <string name="settings_messages_in_one_to_one">Kahepoolsete vestluste sõnumid</string>
@@ -1275,7 +1087,6 @@
     <string name="settings_invited_to_room">Kui mind kutsutakse jututuppa</string>
     <string name="settings_call_invitations">Saabuvad kõned</string>
     <string name="settings_messages_sent_by_bot">Robotite saadetud sõnumid</string>
-
     <string name="settings_background_sync">Andmete sünkroniseerimine taustal</string>
     <string name="settings_background_fdroid_sync_mode">Andmete taustal sünkroniseerimise režiim</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimeeritud akukestust silmas pidades</string>
@@ -1287,8 +1098,6 @@
     <string name="settings_background_fdroid_sync_mode_disabled">Taustasünkroonimine puudub</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Kui rakendus töötab taustal, siis sa ei saa saabunud sõnumite kohta teavitusi.</string>
     <string name="settings_background_sync_update_error">Seadistuste uuendamine ei õnnestunud.</string>
-
-
     <string name="settings_start_on_boot">Käivita teenus seadme käivitamisel</string>
     <string name="settings_enable_background_sync">Kasuta taustasünkroonimist</string>
     <string name="settings_set_sync_timeout">Sünkroniseerimispäring aegus</string>
@@ -1296,7 +1105,6 @@
     <string name="settings_set_workmanager_delay_summary">%s
 \nSünkroniseerimine võib jääda vahele, kui aku täituvus on madal või seade energiasäästurežiimil.</string>
     <string name="settings_set_sync_delay">Viivitus sünkroonimiste vahel</string>
-
     <string name="settings_version">Versioon</string>
     <string name="settings_olm_version">olm-teegi versioon</string>
     <string name="settings_app_term_conditions">Kasutustingimused</string>
@@ -1306,7 +1114,6 @@
     <string name="settings_keep_media">Säilita meedia</string>
     <string name="settings_clear_cache">Tühjenda puhver</string>
     <string name="settings_clear_media_cache">Tühjenda meedia puhver</string>
-
     <string name="settings_user_settings">Kasutaja seadistused</string>
     <string name="settings_notifications">Teavitused</string>
     <string name="settings_ignored_users">Eiratud kasutajad</string>
@@ -1341,7 +1148,6 @@
     <string name="settings_preview_media_before_sending">Enne meedia saatmist näita eelvaadet</string>
     <string name="settings_send_message_with_enter">Saada sõnum reavahetusklahvi vajutamisel</string>
     <string name="settings_send_message_with_enter_summary">Tarkvaralise klaviatuuri reavahetusklahvi vajutus saadab sõnumi ning ei tee reavahetust</string>
-
     <string name="settings_secure_backup_section_title">Turvaline varundus</string>
     <string name="settings_secure_backup_manage">Halda</string>
     <string name="settings_secure_backup_setup">Võta kasutusele turvaline varundus</string>
@@ -1350,7 +1156,6 @@
     <string name="settings_secure_backup_section_info">Tagamaks, et sa ei kaota ligipääsu krüptitud sõnumitele ja andmetele, varunda krüptimisvõtmed oma serveris.</string>
     <string name="reset_secure_backup_title">Loo uus turvavõti või seadista olemaoleva varukoopia jaoks uus turvafraas.</string>
     <string name="reset_secure_backup_warning">Sellega asendad olemasoleva turvavõtme või turvafraasi.</string>
-
     <string name="settings_deactivate_account_section">Deaktiveeri kasutajakonto</string>
     <string name="settings_deactivate_my_account">Eemalda minu konto kasutusest</string>
     <string name="settings_discovery_category">Leia kasutajaid</string>
@@ -1359,21 +1164,17 @@
     <string name="startup_notification_privacy_message">Element võib taustal töötamise ajal hallata sinu teavitusi turvaliselt ja privaatselt. Aga see võib mõjutada akukasutust.</string>
     <string name="startup_notification_privacy_button_grant">Anna õigused</string>
     <string name="startup_notification_privacy_button_other">Tee muu valik</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">Taustaühendus</string>
     <string name="startup_notification_fdroid_battery_optim_message">Selleks et teavitused toimiksid korralikult peab Element kasutama vähese kõrvalmõjuga taustaühendust.
 \nKui järgmisel lehel sinult küsitakse kas lubada, et Element töötab kogu aeg taustal, siis palun nõustu.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Anna õigused</string>
-
     <string name="settings_analytics">Analüütika</string>
     <string name="settings_opt_in_of_analytics">Saada arendajatele analüütikat</string>
     <string name="settings_opt_in_of_analytics_summary">Võimaldamaks meil rakendust parandada kogub Element anonüümset teavet rakenduse kasutuse kohta.</string>
     <string name="settings_opt_in_of_analytics_prompt">Selleks, et saaksime Element\'i paremaks teha, palun luba analüütika.</string>
     <string name="settings_opt_in_of_analytics_ok">Jah, ma soovin aidata!</string>
-
     <string name="settings_data_save_mode">Võrguliikluse mahu säästmise režiim</string>
     <string name="settings_data_save_mode_summary">Võrguliikluse andmemahu säästmiseks kasutatakse filtrit, mille puhul kasutajate olekuid ei uuendata ja sõnumite kirjutamise teavitusi ei laeta.</string>
-
     <string name="devices_details_dialog_title">Sessiooniteave</string>
     <string name="devices_details_id_title">Seadme tunnus</string>
     <string name="devices_details_name_title">Avalik nimi</string>
@@ -1385,20 +1186,16 @@
     <string name="devices_delete_dialog_title">Autentimine</string>
     <string name="devices_delete_pswd">Salasõna:</string>
     <string name="devices_delete_submit_button_label">Saada</string>
-
     <string name="settings_logged_in">Sisselogitud kui</string>
     <string name="settings_home_server">Koduserver</string>
     <string name="settings_identity_server">Isikutuvastusserver</string>
     <string name="settings_integration_allow">Luba lõimingud</string>
     <string name="settings_integration_manager">Lõiminguhaldur</string>
-
     <string name="disabled_integration_dialog_title">Lõimingud ei ole kasutusel</string>
     <string name="disabled_integration_dialog_content">Selle tegevuse kasutuselevõetuks lülita seadetes sisse „Luba lõiminguid“ valik.</string>
-
     <string name="settings_user_interface">Kasutajaliides</string>
     <string name="settings_interface_language">Keel</string>
     <string name="settings_select_language">Vali keel</string>
-
     <string name="account_email_validation_title">Verifikatsioon on ootel</string>
     <string name="account_email_validation_message">Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu.</string>
     <string name="account_email_validation_error">E-posti aadressi õigsust pole veel õnnestunud kontrollida. Palun vaata oma e-kirju ning klõpsi meie saadetud kirjas leiduvat linki. Kui see on tehtud, siis vajuta Jätka-nuppu.</string>
@@ -1406,7 +1203,6 @@
     <string name="account_email_not_found_error">Seda e-posti aadressi ei leidunud.</string>
     <string name="account_phone_number_already_used_error">See telefoninumber on juba kasutusel.</string>
     <string name="account_email_error">Sinu e-posti aadressi kontrollimisel tekkis viga.</string>
-
     <string name="settings_password">Salasõna</string>
     <string name="settings_change_password">Muuda salasõna</string>
     <string name="settings_old_password">Praegune salasõna</string>
@@ -1420,13 +1216,9 @@
 \n
 \nPane tähele, et antud toiming taaskäivitab rakenduse ja see võib võtta veidi aega.</string>
     <string name="passwords_do_not_match">Salasõnad ei klapi omavahel</string>
-
     <string name="settings_delete_notification_targets_confirmation">Kas sa oled kindel et soovid eemaldada antud teavituse liigi\?</string>
-
     <string name="settings_delete_threepid_confirmation">Kas sa oled kindel, et soovid eemaldada %1$s %2$s\?</string>
-
     <string name="settings_select_country">Vali riik</string>
-
     <string name="settings_phone_number_country_label">Riik</string>
     <string name="settings_phone_number_country_error">Palun vali riik</string>
     <string name="encryption_export_notice">Eksporditavate võtmete krüptimiseks palun sisesta paroolifraas. Võtmete importimisel pead kasutama sama paroolifraasi.</string>
@@ -1434,62 +1226,51 @@
 \n
 \nHoiatus: rakenduse eemaldamisel ka see fail ilmselt kustutatakse.</string>
     <string name="encryption_exported_successfully">Võtmete eksportimine õnnestus</string>
-
     <string name="encryption_message_recovery">Krüptitud sõnumite taastamine</string>
     <string name="encryption_settings_manage_message_recovery_summary">Halda võtmete varundust</string>
-
     <string name="encryption_import_e2e_room_keys">Impordi E2E läbiva krüptimise võtmed jututubade jaoks</string>
     <string name="encryption_import_room_keys">Impordi jututoa krüptovõtmed</string>
     <string name="encryption_import_room_keys_summary">Impordi võtmed kohalikust failist</string>
     <string name="encryption_import_import">Impordi</string>
     <string name="encryption_never_send_to_unverified_devices_title">Kasuta krüptimist vaid verifitseeritud sessioonides</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse.</string>
-
     <string name="encryption_information_not_verified">Ei ole verifitseeritud</string>
     <string name="encryption_information_verified">Verifitseeritud</string>
     <string name="encryption_information_blocked">Mustas nimekirjas</string>
-
     <string name="encryption_information_unknown_device">tundmatu sessioon</string>
     <string name="encryption_information_unknown_ip">tundmatu ip-aadress</string>
     <string name="encryption_information_none">ei midagi</string>
-
     <string name="encryption_information_verify">Verifitseeri</string>
     <string name="encryption_information_unverify">Eemalda verifitseerimine</string>
     <string name="encryption_information_block">Lisa musta nimekirja</string>
     <string name="encryption_information_unblock">Eemalda mustast nimekirjast</string>
-
     <string name="encryption_information_verify_device">Verifitseeri sessioon</string>
     <string name="encryption_information_verify_device_warning">Kinnita seda võrreldes järgnevaid andmeid oma teise sessiooni kasutajaseadetes:</string>
     <string name="encryption_information_verify_device_warning2">Kui nad omavahel ei klapi, siis teie suhtluse turvalisus võib olla ohus.</string>
     <string name="encryption_information_verify_key_match">Kinnitan, et võtmed klapivad omavahel</string>
-
     <string name="unknown_devices_alert_title">Jututoas leidub tundmatuid sessioone</string>
     <string name="unknown_devices_alert_message">Siin jututoas leidub tundmatuid ja verifitseerimata sessioone.
 \nSee tähendab, et pole mitte mingit kindlust selles osas, et teised kasutajad on ka tegelikult need, keda nad väidavad end olevat.
 \nKui sa tõesti soovid, siis sa võid saata sõnumi ka verifitseerimata kasutajatele, kuid meie soovitame, et sa esmalt läbid verifitseerimise kõikide nende sessioonidega.
 \n
 \nTundmatud sessioonid:</string>
-
     <string name="select_room_directory">Vali jututubade loend</string>
     <string name="directory_server_fail_to_retrieve_server">Server kas pole kättesaadav või on ülekoormatud</string>
     <string name="directory_server_type_homeserver">Sisesta koduserveri nimi, mille avalike jututubade loendit soovid näha</string>
     <string name="directory_server_placeholder">Koduserveri aadress</string>
     <string name="directory_server_all_rooms_on_server">Kõik jututoad %s serveris</string>
     <string name="directory_server_native_rooms">Kõik %s jututoad</string>
-
     <string name="lock_screen_hint">Kirjuta siia…</string>
-
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">1 lugemata teavitatud sõnum</item>
+        <item quantity="one">%d lugemata teavitatud sõnum</item>
         <item quantity="other">%d lugemata teavitatud sõnumit</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">1 lugemata teavitatud sõnum</item>
+        <item quantity="one">%d lugemata teavitatud sõnum</item>
         <item quantity="other">%s lugemata teavitatud sõnumit</item>
     </plurals>
     <string name="settings_labs_enable_send_voice_summary">Selle valiku kasutamine eeldab kolmanda osapoole rakendust sõnumite salvestamiseks.</string>
     <string name="widget_integration_review_terms">Jätkamaks pead nõustuma kasutustingimustega.</string>
-
     <string name="you_added_a_new_device">Sa oled lisanud uue sessiooni \'%s\', mis soovib saada krüptimisvõtmeid.</string>
     <string name="you_added_a_new_device_with_info">Uus sessioon soovib krüptovõtmeid.
 \nSessiooni nimi: %1$s 
@@ -1500,7 +1281,6 @@
 \nSessiooni nimi: %1$s 
 \nViimati nähtud: %2$s
 \nKui sa pole mõnes muus seadmes sisse loginud, siis ära pane seda teadet tähele.</string>
-
     <string name="start_verification">Alusta verifitseerimist</string>
     <string name="start_verification_short_label">Verifitseeri</string>
     <string name="share_without_verifying">Jaga ilma verifitseerimata</string>
@@ -1508,10 +1288,8 @@
     <string name="key_share_request">Krüptovõtmete jagamise päring</string>
     <string name="ignore_request">Eira päringut</string>
     <string name="ignore_request_short_label">Eira</string>
-
     <string name="conference_call_warning_title">Hoiatus!</string>
     <string name="conference_call_warning_message">Rühmakõnede funktsionaalsus on veel arendamisel ja ei pruugi hetkel olla töökindel.</string>
-
     <string name="command_error">Käsu viga</string>
     <string name="unrecognized_command">Tundmatu käsk: %s</string>
     <string name="command_problem_with_parameters">Käsk „%s“ eeldab rohkem parameetreid või mõni neist on vigane.</string>
@@ -1528,51 +1306,41 @@
     <string name="command_description_nick">Muudab sinu kuvatavat nime</string>
     <string name="command_description_markdown">Lülita markdown-vormingu kasutamine sisse või välja</string>
     <string name="command_description_clear_scalar_token">Paranda Matrix\'i rakenduse haldust</string>
-
     <string name="markdown_has_been_enabled">Markdown-vormindus on kasutusel.</string>
     <string name="markdown_has_been_disabled">Markdown-vormindus ei ole kasutusel.</string>
-
     <string name="notification_off">Välja lülitatud</string>
     <string name="notification_silent">Vaikne</string>
     <string name="notification_noisy">Jutukas</string>
-
     <string name="create">Loo</string>
     <string name="create_community">Loo kogukond</string>
     <string name="community_name">Kogukonna nimi</string>
     <string name="community_name_hint">Näiteks</string>
     <string name="community_id">Kogukonna tunnus</string>
     <string name="community_id_hint">näiteks</string>
-
     <string name="group_details_home">Avaleht</string>
     <string name="group_details_people">Inimesed</string>
     <string name="group_details_rooms">Jututoad</string>
     <string name="no_users_placeholder">Kasutajaid ei ole</string>
-
     <string name="rooms">Jututoad</string>
     <string name="joined">Liikmed</string>
     <string name="invited">Kutsutud</string>
     <string name="filter_group_members">Filtreeri kogukonna liikmeid</string>
     <string name="filter_group_rooms">Filtreeri kogukonna jututubasid</string>
-
     <plurals name="group_members">
-        <item quantity="one">1 liige</item>
+        <item quantity="one">%d liige</item>
         <item quantity="other">%d liiget</item>
     </plurals>
-
     <plurals name="group_rooms">
-        <item quantity="one">1 jututuba</item>
+        <item quantity="one">%d jututuba</item>
         <item quantity="other">%d jututuba</item>
     </plurals>
     <string name="group_no_long_description">Kogukonna haldur ei ole kogukonna pikka kirjeldust koostanud.</string>
-
     <string name="has_been_kicked">%2$s müksas sind välja %1$s jututoast</string>
     <string name="receipt_avatar">Lugemisteatise tunnuspilt</string>
     <string name="notice_avatar">Teavituse tunnuspilt</string>
     <string name="avatar">Tunnuspilt</string>
-
     <string name="dialog_user_consent_content">Selleks et jätkata koduserveri %1$s kasutamist sa pead üle vaatama ja nõustuma meie kasutustingimustega.</string>
     <string name="dialog_user_consent_submit">Vaata üle</string>
-
     <string name="deactivate_account_title">Deaktiveeri konto</string>
     <string name="deactivate_account_content">See muudab sinu konto jäädavalt mittekasutatavaks. Sina ei saa enam sisse logida ja keegi teine ei saa seda kasutajatunnust uuesti pruukida. Samuti logitakse sind välja kõikidest jututubadest, kus sa osaled ning eemaldatakse kõik sinu andmed sinu isikutuvastusserverist. <b>Seda tegevust ei saa tagasi pöörata.</b>
 \n
@@ -1581,58 +1349,44 @@
 \nMatrix\'i sõnumite nähtavus on sarnane e-posti kirjadega. Sõnumite unustamine tegelikult tähendab seda, et sinu varemsaadetud sõnumeid ei jagata uute või veel registreerumata kasutajatega, kuid registeerunud kasutajad, kes juba on need sõnumid saanud, võivad neid ka jätkuvalt lugeda.</string>
     <string name="deactivate_account_prompt_password">Jätkamiseks palun sisesta oma salasõna:</string>
     <string name="deactivate_account_submit">Deaktiveeri konto</string>
-
     <string name="error_empty_field_enter_user_name">Palun sisesta kasutajanimi.</string>
     <string name="error_empty_field_your_password">Palun sisesta oma salasõna.</string>
     <string name="room_tombstone_versioned_description">See jututuba on asendatud teise jututoaga ning ei ole enam kasutusel</string>
     <string name="room_tombstone_continuation_link">Vestlus jätkub siin</string>
     <string name="room_tombstone_continuation_description">See jututuba on järg varasemale vestlusele</string>
     <string name="room_tombstone_predecessor_link">Vanemate sõnumite nägemiseks klõpsi siin</string>
-
     <string name="resource_limit_exceeded_title">Ressursipiir on ületatud</string>
     <string name="resource_limit_contact_action">Võta ühendust teenuse haldajaga</string>
-
     <string name="resource_limit_contact_admin">palun võta ühendust oma teenuse haldajaga</string>
-
     <string name="resource_limit_soft_default">See koduserver ületanud ühe oma ressursipiirangutest, seega <b>mõned kasutajad ei saa sisse logida</b>.</string>
     <string name="resource_limit_hard_default">See koduserver ületanud ühe oma ressursipiirangutest.</string>
-
     <string name="resource_limit_soft_mau"> See koduserver on saavutanud igakuise aktiivsete kasutajate piiri, seega <b>mõned kasutajad ei saa sisse logida</b>.</string>
     <string name="resource_limit_hard_mau">See koduserver on saavutanud igakuise aktiivsete kasutajate piiri.</string>
-
     <string name="resource_limit_soft_contact">Selle piiri suurendamiseks palun %s.</string>
     <string name="resource_limit_hard_contact">Jätkamaks selle teenuse kasutamist palun %s.</string>
-
     <string name="settings_lazy_loading_title">Lae jututoa kasutajad aeglaselt</string>
     <string name="settings_lazy_loading_description">Paranda jõudlust ja lae jututoa liikmed alles selle esimese vaatamise ajal.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Sinu koduserver ei võimalda jututoa kasutajate aeglast laadimist. Proovi hiljem uuesti.</string>
-
     <string name="unknown_error">Vabandust, aga tekkis viga</string>
-
     <string name="merged_events_expand">laienda</string>
     <string name="merged_events_collapse">ahenda</string>
-
     <string name="settings_info_area_show">Näita teabevälja</string>
     <string name="show_info_area_always">Alati</string>
     <string name="show_info_area_messages_and_errors">Sõnumite ja vigade puhul</string>
     <string name="show_info_area_only_errors">Ainult vigade puhul</string>
-
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Ühtegi Google Play teenuste rakendusefaili ei leidunud. Teavitused ei pruugi korralikult toimida.</string>
-
     <string name="passphrase_create_passphrase">Loo paroolifraas</string>
     <string name="passphrase_confirm_passphrase">Sisesta paroolifraas veel üks kord</string>
     <string name="passphrase_enter_passphrase">Sisesta paroolifraas</string>
     <string name="passphrase_passphrase_does_not_match">Paroolifraasid ei klappi mitte</string>
     <string name="passphrase_empty_error_message">Palun sisesta paroolifraas</string>
     <string name="passphrase_passphrase_too_weak">Paroolifraas on liiga nõrk</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">"Kui sa soovid, et Element looks taastevõtme, siis  palun kustuta paroolifraas."</string>
     <string name="keys_backup_no_session_error">Matrix\'i sessioone ei leidu</string>
-
     <string name="keys_backup_setup_step1_title">Ära kunagi kaota krüptitud sõnumeid</string>
     <string name="keys_backup_setup_step1_description">Sõnumid krüptitud jututubades kasutavad läbivat krüptimist. Ainult sinul ja saaja(te)l on võtmed selliste sõnumite lugemiseks.
 \n
@@ -1645,31 +1399,23 @@
     <string name="unexpected_error">Ootamatu viga</string>
     <string name="keys_backup_setup_backup_started_title">Alustasin varukoopia tegemist</string>
     <string name="keys_backup_setup_backup_started_message">Teen taustal sinu krüptovõtmetest varukoopia sinu koduserverisse. Esimese varukoopia tegemine võib võtta paar minutit.</string>
-
-
     <string name="keys_backup_setup_skip_title">Kas sa oled kindel\?</string>
     <string name="keys_backup_setup_skip_msg">Kui sa logid välja või kaotad seadme, siis sa ei saa enam lugeda oma krüptitud sõnumeid.</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">Laen varukoopia versiooni…</string>
     <string name="keys_backup_restore_with_passphrase">Selleks, et krüptitud sõnumite ajalugu lukust lahti võtta, kasuta oma taastamiseks mõeldud paroolifraasi</string>
     <string name="keys_backup_restore_use_recovery_key">kasuta oma taastevõtit</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Kas sa ei tea oma taastamiseks mõeldud paroolifraasi\? Siis sa võid %s.</string>
-
     <string name="keys_backup_restore_with_recovery_key">Selleks, et krüptitud sõnumite ajalugu lukust lahti võtta, kasuta oma taastevõtit</string>
     <string name="keys_backup_restore_key_enter_hint">Sisesta taastevõti</string>
-
     <string name="keys_backup_restore_setup_recovery_key">Sõnumite taastamine</string>
-
     <string name="keys_backup_restore_with_key_helper">Kas sa kaotasid oma taastevõtme\? Sa võid seadistustes määrata uue.</string>
     <string name="keys_backup_passphrase_error_decrypt">Selle paroolifraasiga ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastamiseks mõeldud paroolifraasi.</string>
     <string name="network_error_please_check_and_retry">Võrguühenduse viga: palun kontrolli, kas võrguühendus on olemas ja proovi uuesti.</string>
-
     <string name="keys_backup_restoring_waiting_message">Taastan võtmed varundusest:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Arvutan taastevõtit…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Laen alla krüptovõtmeid…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Impordin krüptovõtmeid…</string>
     <string name="keys_backup_recovery_code_error_decrypt">Selle taastevõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.</string>
-
     <string name="keys_backup_restore_success_title">Varukoopiast taastatud %s!</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Taastasin varukoopiast ühe võtmega.</item>
@@ -1679,18 +1425,13 @@
         <item quantity="one">Üks uus võti on lisatud siia sessiooni.</item>
         <item quantity="other">%d uut võtit on lisatud siia sessiooni.</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">Ei õnnestunud laadida taastevõtmete versiooni (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Sessioonis pole krüptograafia kasutusel</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">Taasta varundusest</string>
     <string name="keys_backup_settings_delete_backup_button">Kustuta varukoopia</string>
-
     <string name="keys_backup_settings_status_ok">Võtmete varundus on selles sesioonis korrektselt üles seatud.</string>
     <string name="keys_backup_settings_status_ko">Krüptovõtmete varundamine ei ole selles sessioonis kasutusel.</string>
     <string name="keys_backup_settings_status_not_setup">Sinu selle sessiooni krüptovõtmeid ei varundata.</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">Varukoopial on allkiri tundmatult sessioonilt tunnusega %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Varukoopial on selle sessiooni kehtiv allkiri.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Varukoopial on kehtiv allkiri verifitseeritud sessioonilt tunnusega %s.</string>
@@ -1698,63 +1439,47 @@
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Varukoopial on vigane allkiri verifitseeritud sessioonilt tunnusega %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Varukoopial on vigane allkiri verifitseerimata sessioonilt tunnusega %s</string>
     <string name="keys_backup_get_trust_error">Ei õnnestunud laadida teavet varukoopia usaldamiseks (%s).</string>
-
     <string name="keys_backup_settings_untrusted_backup">Selleks, et saaksid selles sessioonis kasutada krüptovõtmete varundamist, pead esmalt võtmed taastama oma paroolifraasi või taastevõtme abil.</string>
     <string name="keys_backup_settings_deleting_backup">Kustutan varukoopia…</string>
     <string name="keys_backup_settings_delete_backup_error">Varukoopia kustutamine ei õnnestunud (%s)</string>
-
     <string name="keys_backup_settings_checking_backup_state">Kontrollin varukoopia olekut</string>
     <string name="keys_backup_settings_delete_confirm_title">Kustuta varukoopia</string>
     <string name="keys_backup_settings_delete_confirm_message">Kas kustutame krüptovõtmete varukoopia serverist\? Sellisel juhul sa ei saa kasutada ka taastevõtit krüptitud sõnumite ajaloo loetavaks muutmseks.</string>
-
     <string name="new_recovery_method_popup_title">Uus võtmete varukoopia</string>
     <string name="new_recovery_method_popup_description">Tuvastasin uue krüptovõtmete varukoopia.
 \n
 \nKui sa ei ole ise uusi taastamise meetodeid lisanud, siis võib olla tegemist ründega sinu konto vastu. Palun vaheta koheselt oma kasutajakonto salasõna ning määra seadistustes uus taastemeetod.</string>
     <string name="new_recovery_method_popup_was_me">See olin mina</string>
-
     <string name="keys_backup_banner_setup_line1">Ära kunagi kaota krüptitud sõnumeid</string>
     <string name="keys_backup_banner_setup_line2">Võta kasutusele krüptovõtmete varundamine</string>
-
     <string name="secure_backup_banner_setup_line1">Turvaline varundus</string>
     <string name="secure_backup_banner_setup_line2">Hoia ära, et kaotad ligipääsu krüptitud sõnumitele ja andmetele</string>
-
     <string name="keys_backup_banner_recover_line1">Ära kunagi kaota krüptitud sõnumeid</string>
     <string name="keys_backup_banner_recover_line2">Kasuta varundatud võtmeid</string>
-
     <string name="keys_backup_banner_update_line1">Uued sõnumite krüptovõtmed</string>
     <string name="keys_backup_banner_update_line2">Halda võtmete varunduses</string>
-
     <string name="keys_backup_banner_in_progress">Varundan sinu krüptovõtmeid. Selleks võib kuluda mitu minutit…</string>
-
-
     <string name="secure_backup_setup">Võta kasutusele turvaline varundus</string>
-
     <string name="keys_backup_info_keys_all_backup_up">Kõik krüptovõtmed on varundatud</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Varundan üht krüptovõtit…</item>
         <item quantity="other">Varundan %d krüptovõtit…</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">Versioon</string>
     <string name="keys_backup_info_title_algorithm">Algoritm</string>
     <string name="keys_backup_info_title_signature">Allkiri</string>
-
     <string name="autodiscover_invalid_response">Vigane vastus koduserveri tuvastamise päringule</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Serveriseadistuste automaatne sõnalõpetus</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element tuvastas kohandatud serveriseadistused sinu kasutajanime domeenis „%1$s“:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Kasuta seadistusi</string>
-
     <string name="invalid_or_expired_credentials">Oled kehtetu või aegunud kasutajanime või salasõna tõttu välja logitud.</string>
-
     <string name="sas_verify_title">Verifitseeri lühikese sõne võrdlemise teel.</string>
     <string name="sas_security_advise">"Parima turvalisuse mõttes on oluline, et teed seda nii, et kas olete  üheskoos või kasutate muud suhtluskanalit, mida mõlemad usaldate."</string>
     <string name="sas_verify_start_button_title">Alusta verifitseerimist</string>
     <string name="sas_incoming_request_title">Saabuv verifitseerimispalve</string>
     <string name="sas_incoming_request_description">Selle sessiooni usaldamiseks peaksid ta verifitseerima. Kui sa pruugid läbivalt krüptitud sõnumeid, siis partnerite sessioonide verifitseerimine tagab sulle täiendava meelerahu.</string>
     <string name="sas_incoming_request_description_2">Selle sessiooni verifitseerimisel loetakse ta usaldusväärseks ning samuti märgitakse sinu sessioon tema jaoks usaldusväärseks.</string>
-
     <string name="sas_error_m_unknown_transaction">See sessioon ei tea midagi antud toimingust</string>
     <string name="sas_error_m_unknown_method">Sessioon ei suuda kokku leppida võtmete, räsi, MAC\'i või SAS\'i meetodi osas</string>
     <string name="sas_error_m_mismatched_commitment">Räsid ei klapi</string>
@@ -1764,20 +1489,15 @@
     <string name="sas_error_m_key_mismatch">Krüptovõtmed ei klapi</string>
     <string name="sas_error_m_user_error">Kasutajad ei klapi</string>
     <string name="sas_error_unknown">Teadmata viga</string>
-
     <string name="identity_server_not_defined">Sa ei kasuta ühtegi isikutuvastusserverit</string>
     <string name="identity_server_not_defined_for_password_reset">Ühtegi isikutuvastusserverit pole seadistatud, aga salasõna muutmiseks on see oluline.</string>
-
     <string name="error_user_already_logged_in">Tundub, et sa üritad luua ühendust teise koduserveriga. Kas sa soovid välja logida\?</string>
-
     <string name="edit">Muuda</string>
     <string name="reply">Vasta</string>
-
     <string name="global_retry">Proovi uuesti</string>
     <string name="room_list_empty">Selleks, et asuda rakendust kasutama, liitu mõne jututoaga.</string>
     <string name="send_you_invite">Saatis sulle kutse</string>
     <string name="invited_by">%s kutsus</string>
-
     <string name="room_list_catchup_empty_title">Ei tea… kõik vist on nüüd tehtud!</string>
     <string name="room_list_catchup_empty_body">Sul ei ole rohkem lugemata sõnumeid</string>
     <string name="room_list_catchup_welcome_title">Tere tulemast koju!</string>
@@ -1787,15 +1507,11 @@
     <string name="room_list_rooms_empty_title">Jututoad</string>
     <string name="keys_backup_unable_to_get_trust_info">Usaldamiseks vajaliku teabe laadimisel tekkis viga</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Krüptovõtmete varukoopia andmete laadimisel tekkis viga</string>
-
     <string name="import_e2e_keys_from_file">Impordi läbiva krüptimise võtmed failist „%1$s“.</string>
-
     <string name="settings_sdk_version">Matrix\'i SDK versioon</string>
     <string name="settings_other_third_party_notices">Muud kolmandate osapoolte litsentsid</string>
     <string name="navigate_to_room_when_already_in_the_room">Sa juba vaatad seda jututuba!</string>
-
     <string name="quick_reactions">Reageeri lennult</string>
-
     <string name="settings_general_title">Üldist</string>
     <string name="settings_preferences">Eelistused</string>
     <string name="settings_security_and_privacy">Turvalisus ja privaatsus</string>
@@ -1803,57 +1519,40 @@
     <string name="settings_push_rules">Tõuketeavituste reeglid</string>
     <string name="settings_push_rules_no_rules">Tõuketeavituste reegleid pole kirjeldatud</string>
     <string name="settings_push_gateway_no_pushers">Tõuketeavituste võrguväravaid pole registreeritud</string>
-
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_url">URL:</string>
     <string name="push_gateway_item_format">Vorming:</string>
-
     <string name="preference_voice_and_video">Heli ja video</string>
     <string name="preference_root_help_about">Abiteave ning info meie kohta</string>
-
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registreeri tunnusluba</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">Näita peidetud sündmusi ajajoonel</string>
-
     <string name="bottom_action_people_x">Isiklikud sõnumid</string>
-
     <string name="send_file_step_idle">Ootan…</string>
     <string name="send_file_step_encrypting_thumbnail">Krüptin pisipilti…</string>
     <string name="send_file_step_sending_thumbnail">Saadan pisipilti (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Krüptin faili…</string>
     <string name="send_file_step_sending_file">Saadan faili (%1$s / %2$s)</string>
-
     <string name="downloading_file">Laen alla faili %1$s…</string>
     <string name="downloaded_file">%1$s on alla laetud!</string>
-
     <string name="edited_suffix">(muudetud)</string>
-
     <string name="message_edits">Sõnumite muutmised</string>
     <string name="no_message_edits_found">Muutmisi ei leidunud</string>
-
     <string name="room_directory_search_hint">Nimi või kasutajatunnus (#example:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Luba vastamine ajajoonel viipamisega</string>
     <string name="link_copied_to_clipboard">Link on kopeeritud lõikelauale</string>
-
     <string name="add_by_matrix_id">Lisa Matrix\'i tunnuse alusel</string>
     <string name="creating_direct_room">Loon jututuba…</string>
     <string name="direct_room_no_known_users">Tulemusi ei leidunud. Otsinguks serverist kasuta „Lisa Matrix\'i tunnuse alusel“.</string>
     <string name="direct_room_start_search">Otsingutulemuste jaoks kirjuta midagi</string>
     <string name="joining_room">Liitun jututoaga …</string>
-
     <string name="terms_of_service">Kasutustingimused</string>
     <string name="review_terms">Vaata kasutustingimused üle</string>
     <string name="terms_description_for_identity_server">Ole teiste poolt leitav</string>
     <string name="terms_description_for_integration_manager">Kasuta roboteid, võrgusildu, vidinaid või kleepsupakke</string>
-
     <string name="read_at">Loe aadressil</string>
-
-
     <string name="identity_server">Isikutuvastusserver</string>
     <string name="disconnect_identity_server">Katkesta ühendus isikutuvastusserveriga</string>
     <string name="add_identity_server">Seadista isikutuvastusserverit</string>
@@ -1866,50 +1565,39 @@
     <string name="settings_discovery_disconnect_identity_server_info">Isikutuvastusserveri kasutamise lõpetamine tähendab, et sa ei ole leitav teiste kasutajate poolt ega sulle ei saa telefoninumbri või e-posti aadressi alusel kutset saata. Küll aga saab kutset saata Matrix\'i kasutajatunnuse alusel.</string>
     <string name="settings_discovery_msisdn_title">Leitavad telefoninumbrid</string>
     <string name="labs_show_unread_notifications_as_tab">Lisa avaekraanile eraldi sakk lugemata teavituste jaoks.</string>
-
     <string name="settings_discovery_confirm_mail">Saatsime kinnituskirja e-posti aadressile %s. Palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
     <string name="settings_discovery_confirm_mail_not_clicked">Saatsime kinnituskirja e-posti aadressile %s. Esmalt palun vaata oma kirju ja klõpsi selles kirjas leiduvat linki</string>
     <string name="settings_agree_to_terms">Selleks, et sind võiks leida e-posti aadressi või telefoninumbri alusel, nõustu isikutuvastusserveri (%s) kasutustingimustega.</string>
-
     <string name="labs_allow_extended_logging">Lülita sisse detailsete logide salvestamine.</string>
     <string name="no_ignored_users">Sa parasjagu ei eira ühtegi kasutajat</string>
-
     <string name="help_long_click_on_room_for_more_options">Lisavalikute nägemiseks vajuta jututoa nimel kaua</string>
-
-
     <string name="room_join_rules_public">%1$s muutis selle jututoa avalikuks kõigile, kes teavad tema aadressi.</string>
     <string name="room_join_rules_public_by_you">Sina muutsid selle jututoa avalikuks kõigile, kes teavad tema aadressi.</string>
     <string name="room_join_rules_invite">%1$s määras, et jututuppa pääseb vaid kutsega.</string>
     <string name="login_splash_text1">Vestle kahekaupa või rühmiti</string>
     <string name="login_reset_password_mail_confirmation_submit">Ma olen verifitseerinud oma e-posti aadressi</string>
-
     <string name="login_reset_password_success_title">Õnnestus!</string>
     <string name="login_reset_password_cancel_confirmation_content">Sinu salasõna ei ole veel muutunud.
 \n
 \nKas katkestame muutmise\?</string>
-
     <string name="login_set_email_title">Määra e-posti aadress</string>
     <string name="login_set_email_notice">Seadista e-posti aadress, mis võimaldaks sul vajadusel taastada ligipääsu oma kontole. Lisaks võid kasutada e-posti aadressi või telefoninumbrit, et need inimesed, kes sind tunnevad, saaks sind leida.</string>
     <string name="login_set_email_mandatory_hint">E-posti aadress</string>
     <string name="login_set_email_optional_hint">E-posti aadress (kui soovid)</string>
     <string name="login_set_email_submit">Järgmine</string>
-
     <string name="login_set_msisdn_title">Lisa telefoninumber</string>
     <string name="login_set_msisdn_notice">Salvesta oma telefoninumber selleks, et teised kasutajad saaks sind leida.</string>
     <string name="login_set_msisdn_notice2">Palun kasuta rahvusvahelist numbrivormingut.</string>
     <string name="login_set_msisdn_mandatory_hint">Telefoninumber</string>
     <string name="login_set_msisdn_optional_hint">Telefoninumber (kui soovid)</string>
     <string name="login_set_msisdn_submit">Järgmine</string>
-
     <string name="login_msisdn_confirm_title">Kinnita telefoninumbri lisamine</string>
     <string name="login_msisdn_confirm_notice">Me just saatsime tuvastuskoodi telefoninumbrile %1$s. Kinnitamaks, et see on sinu number, palun sisesta ta alljärgnevalt.</string>
     <string name="login_msisdn_confirm_hint">Sisesta tuvastuskood</string>
     <string name="login_msisdn_confirm_send_again">Saada uuesti</string>
     <string name="login_msisdn_confirm_submit">Järgmine</string>
-
     <string name="login_msisdn_error_not_international">Rahvusvahelise telefoninumbri alguses peaks olema „+“</string>
     <string name="login_msisdn_error_other">Telefoninumber ei tundu olema õige. Palun kontrolli seda veel üks kord</string>
-
     <string name="login_signup_to">Logi sisse koduserverisse %1$s</string>
     <string name="login_signin_username_hint">Kasutajanimi või e-posti aadress</string>
     <string name="login_signup_username_hint">Kasutajanimi</string>
@@ -1920,28 +1608,23 @@
     <string name="login_signup_cancel_confirmation_content">Sinu kasutajakonto pole veel loodud.
 \n
 \nKas katkestame konto registreerimise\?</string>
-
     <string name="login_a11y_choose_matrix_org">Vali matrix.org</string>
     <string name="login_a11y_choose_modular">Vali teenusepakkujaks Element Matrix Services</string>
     <string name="login_a11y_choose_other">Vali mõni muu koduserver</string>
     <string name="login_a11y_captcha_container">Palun tee läbi robotilõksu katse</string>
     <string name="login_terms_title">Jätkamiseks nõustu kasutustingimustega</string>
-
     <string name="login_wait_for_email_title">Palun kontrolli oma e-kirju</string>
     <string name="login_wait_for_email_notice">Saatsime e-kirja %1$s aadressile.
 \nKonto loomisega jätkamiseks palun klõpsi selles kirjas leiduvat linki.</string>
     <string name="login_validation_code_is_not_correct">Sisestatud kood ei ole õige. Palun kontrolli seda.</string>
     <string name="login_error_outdated_homeserver_title">Iganenud koduserver</string>
     <string name="login_error_outdated_homeserver_content">Selle koduserveri versioon on ühenduse loomiseks liiga vana. Palu oma koduserveri haldajal seda uuendada.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Liiga palju samaaegseid päringuid. Proovi uuesti ühe sekundi pärast…</item>
         <item quantity="other">Liiga palju samaaegseid päringuid. Proovi uuesti %1$d sekundi pärast…</item>
     </plurals>
-
     <string name="login_signin_matrix_id_error_invalid_matrix_id">See ei ole õige kasutajatunnus. Õige vorming on: \'@torekasutaja:koduserver.ee\'</string>
     <string name="autodiscover_well_known_error">Ei leia toimivat koduserverit. Palun vaata, et kasutajatunnus oleks õige</string>
-
     <string name="soft_logout_signin_title">Logi sisse</string>
     <string name="soft_logout_signin_notice">"Sinu koduserveri (%1$s) haldur on sind sinu kontolt  %2$s (%3$s) välja loginud."</string>
     <string name="soft_logout_signin_e2e_warning_notice">Selleks, et laadida vaid siin seadmes kasutatud krüptovõtmeid, palun logi sisse. Sa vajad neid võtmeid selleks, et lugeda kõiki oma krüptitud sõnumeid kõikides oma seadmetes.</string>
@@ -1957,29 +1640,21 @@
     <string name="settings">Seadistused</string>
     <string name="devices_current_device">Praegune sessioon</string>
     <string name="devices_other_devices">Muud sessioonid</string>
-
     <string name="autocomplete_limited_results">Kuvan vaid esimesi tulemusi, kirjuta natuke pikemalt…</string>
-
     <string name="settings_developer_mode_fail_fast_title">Kiire lõppmäng</string>
     <string name="settings_developer_mode_fail_fast_summary">Teadmata vigade puhul võib Element sagedamini kokku joosta</string>
-
     <string name="command_description_shrug">Lisa ¯\\_(ツ)_/¯ smaili vormindamata teksti algusesse</string>
-
     <string name="create_room_encryption_title">Võta jututoas krüptimine kasutusele</string>
     <string name="create_room_encryption_description">"Kui krüptimine on  juba kasutusele võetud, siis ei saa seda enam eemaldada."</string>
-
     <string name="login_error_threepid_denied">Sinu e-posti domeeni ei saa kasutada selles serveris registreerimisel</string>
-
     <string name="verification_conclusion_warning">Sisselogimine ei ole usaldusväärne</string>
     <string name="verification_sas_match">Nad klapivad</string>
     <string name="verification_sas_do_not_match">Nad ei klapi</string>
     <string name="verify_user_sas_emoji_help_text">Verifitseeri see sessioon tehes kindlaks et järgnev emoji kuvatakse samas järjekorras partneri ekraanil.</string>
     <string name="verify_user_sas_emoji_security_tip">Parima turvalisuse nimel palun kasuta mõnda muud usaldusväärset suhtlusvahendit või kohtu silmast silma.</string>
     <string name="verification_green_shield">Roheline kilp näitab, et kasutaja on usaldusväärne. Tagamaks, et kogu jututuba on usaldusväärne, siis peaks kõikidel selle liikmetel olema roheline kilp.</string>
-
     <string name="verification_conclusion_not_secure">Ei ole turvaline</string>
     <string name="send_a_sticker">Kleeps</string>
-
     <string name="verification_request_waiting">Ootan…</string>
     <string name="verification_request_other_cancelled">%s tühistas</string>
     <string name="verification_request_you_cancelled">Sa tühistasid</string>
@@ -1989,54 +1664,42 @@
     <string name="verification_request">Verifitseerimispäring</string>
     <string name="verification_verify_device">Verifitseeri see sessioon</string>
     <string name="verification_verify_device_manually">Verifitseeri käsitsi</string>
-
     <string name="you">Sina</string>
-
     <string name="verification_scan_notice">Selleks, et üksteist turvaliselt verifitseerida, skaneeri see QR-koodi teise kasutaja seadmest</string>
     <string name="verification_scan_their_code">Skaneeri teise osapoole QR-koodi</string>
     <string name="verification_scan_emoji_title">Kas sa ei saa skaneerida</string>
     <string name="verification_scan_emoji_subtitle">Kui te pole üheskoos, siis võrrelge selle asemel pilte</string>
-
     <string name="verification_no_scan_emoji_title">Verifitseeri võrreldes emoji\'sid</string>
-
     <string name="verify_by_emoji_title">Verifitseeri emoji\'de abil</string>
     <string name="verify_by_emoji_description">Kui sa ei saa skaneerida eespool kuvatud koodi, siis verifitseeri unikaalsete emoji\'de kombinatsiooni võrdlemise teel.</string>
-
     <string name="a13n_qr_code_description">QR-kood</string>
-
     <string name="verification_verify_user">Verifitseeri %s</string>
     <string name="verification_verified_user">%s on verifitseeritud</string>
     <string name="verification_request_waiting_for">Ootan vastust kasutajalt %s…</string>
     <string name="verify_new_session_notice">Kasuta seda sessiooni uute sessioonide verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele.</string>
     <string name="verify_new_session_was_not_me">See ei olnud mina</string>
     <string name="verify_new_session_compromized">Sinu kasutajakonto võib olla sattunud valedesse kätesse</string>
-
     <string name="use_recovery_key">Kasuta taastevõtit</string>
     <string name="enter_secret_storage_input_key">Vali oma taastevõti, sisesta ta käsitsi või aseta lõikelaualt</string>
     <string name="keys_backup_recovery_key_error_decrypt">Selle taastevõtmega ei õnnestunud varundust dekrüptida: palun kontrolli, kas sa kasutad õiget taastevõtit.</string>
     <string name="failed_to_access_secure_storage">Turvahoidla kasutamine ei õnnestu</string>
-
     <string name="unencrypted">Krüptimata</string>
     <string name="encrypted_unverified">Krüptitud verifitseerimata seadme poolt</string>
     <string name="review_logins">Vaata üle, kust sa oled Matrix\'i võrku loginud</string>
     <string name="verify_other_sessions">Selleks et sinu konto ja sõnumid oleks turvatud, verifitseeri kõik oma sessioonid</string>
     <string name="verify_this_session">Verifitseeri uus kasutajasessioon, mis pruugib sinu kontot: %1$s</string>
-
     <string name="cross_signing_verify_by_text">"Verifitseeri  käsitsi etteantud teksti abil"</string>
     <string name="crosssigning_verify_session">Verifitseeri sisselogimissessioon</string>
     <string name="cross_signing_verify_by_emoji">Verifitseeri interaktiivselt Emoji abil</string>
     <string name="confirm_your_identity">Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni mõnest oma muust sessioonist. Sellega tagad ka ligipääsu krüptitud sõnumitele.</string>
     <string name="mark_as_verified">Märgi usaldusväärseks</string>
-
     <string name="error_empty_field_choose_user_name">Palun vali kasutajanimi.</string>
     <string name="error_empty_field_choose_password">Palun vali salasõna.</string>
     <string name="external_link_confirmation_title">Kontrolli seda linki veel üks kord</string>
     <string name="external_link_confirmation_message">See %1$s link viib sind teise veebisaiti: %2$s.
 \n
 \nKas sa kindlasti soovid jätkata\?</string>
-
     <string name="create_room_dm_failure">Otsevestluse loomine ei õnnestunud. Palun kontrolli, et kasutajanimed oleks õiged ja proovi uuesti.</string>
-
     <string name="add_members_to_room">Lisa liikmeid</string>
     <string name="invite_users_to_room_action_invite">KUTSU</string>
     <string name="inviting_users_to_room">Kutsun kasutajaid…</string>
@@ -2048,11 +1711,9 @@
         <item quantity="other">Kutsed saadetud kasutajatele %1$s ja veel %2$d\'le kasutajale</item>
     </plurals>
     <string name="invite_users_to_room_failure">Meil ei õnnestunud neile kasutajatele kutset saata. Palun kontrolli, keda soovid kutsuda ning proovi uuesti.</string>
-
     <string name="choose_locale_current_locale_title">Hetkel kasutatav keel</string>
     <string name="choose_locale_other_locales_title">Muud saadaval olevad keeled</string>
     <string name="choose_locale_loading_locales">Laen saadaval olevaid keeli…</string>
-
     <string name="open_terms_of">Ava %s kasutustingimused</string>
     <string name="disconnect_identity_server_dialog_content">Kas katkestame ühenduse isikutuvastusserveriga %s\?</string>
     <string name="identity_server_error_no_identity_server_configured">Palun esmalt seadista isikutuvastusserver.</string>
@@ -2060,7 +1721,6 @@
     <string name="identity_server_error_bulk_sha256_not_supported">Sinu privaatsuse nimel saadab Element e-posti aadressid ja telefoninumbrid serverisse vaid räsituna.</string>
     <string name="identity_server_error_binding_error">Seoste loomine ei õnnestunud.</string>
     <string name="identity_server_error_no_current_binding_error">Selle tunnusega ei ole hetkel ühtegi seost.</string>
-
     <string name="identity_server_set_default_notice">Sinu koduserver (%1$s) soovitab kasutada sinu isikutuvastusserverina %2$s teenust</string>
     <string name="identity_server_set_default_submit">Kasuta %1$s teenust</string>
     <string name="identity_server_set_alternative_notice">Alternatiivina või sa sisestada ükspuha missuguse isikutuvastusserveri aadressi</string>
@@ -2073,9 +1733,7 @@
     <string name="a11y_unmute_microphone">Eemalda mikrofoni summutamine</string>
     <string name="a11y_stop_camera">Lõpeta kaamera kasutamine</string>
     <string name="a11y_start_camera">Võta kaamera kasutusele</string>
-
     <string name="settings_setup_secure_backup">Võta kasutusele turvaline varundus</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">Turvaline varundus</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">Tagamaks, et sa ei kaota ligipääsu krüptitud sõnumitele ja andmetele, varunda krüptimisvõtmed oma serveris.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Võta kasutusele</string>
@@ -2083,22 +1741,17 @@
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Loome turvavõtme, mida sa peaksid hoidma turvalises kohas, nagu näiteks arvutis salasõnade halduris või vana kooli seifis.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Kasuta turvafraasi</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Sisesta turvafraas, mida vaid sina tead ning loo võti varukoopia jaoks.</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">Salvesta oma turvavõti</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Salvesta turvavõti turvalisesse kohta, nagu näiteks arvutis salasõnade haldur või vana kooli seif.</string>
-
     <string name="set_a_security_phrase_title">Määra turvafraas</string>
     <string name="set_a_security_phrase_notice">Andmete kaitsmiseks sinu koduserveris sisesta turvafraas, mida vaid sina tead.</string>
     <string name="set_a_security_phrase_hint">Turvafraas</string>
     <string name="set_a_security_phrase_again_notice">Kinnituseks sisesta turvafraas uuesti.</string>
-
     <string name="save_your_security_key_title">Salvesta oma turvavõti</string>
     <string name="save_your_security_key_notice">Salvesta oma turvavõti turvalisesse kohta, nagu näiteks arvutis salasõnade haldur või vana kooli seif.</string>
-
     <string name="room_settings_name_hint">Jututoa nimi</string>
     <string name="room_settings_topic_hint">Jututoa teema</string>
     <string name="room_settings_save_success">Jututoa seadistuste muutmine õnnestus</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">Sa ei saa seda sõnumit lugeda</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Ootan kuni sõnumite dekrüptimine lõppeb ja selleks võib kuluda aega</string>
     <string name="crypto_utd">Dekrüptimine ei ole võimalik</string>
@@ -2107,17 +1760,12 @@
     <string name="crypto_error_withheld_unverified">Sa ei saa seda sõnumit lugeda, kuna saatja ei usalda sinu sessiooni</string>
     <string name="crypto_error_withheld_generic">Sa ei saa seda sõnumit lugeda, kuna saatja teadlikult ei saatnud vajalikke võtmeid</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Ootan krüptimise ajalugu</string>
-
     <string name="element_disclaimer_title">Riot\'i uus nimi on Element!</string>
     <string name="element_disclaimer_content">Meil on hea meel teatada, et oleme muutnud nime! Sinu rakendus on uuendatud ning sa oled oma kontole sisse logitud.</string>
     <string name="element_disclaimer_negative_button">Selge lugu</string>
     <string name="element_disclaimer_positive_button">Vaata lisateavet</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Salvesta taastevõti järgnevalt</string>
-
     <string name="add_from_phone_book">Lisa telefoniraamatust</string>
     <string name="empty_phone_book">Sinu telefoniraamat on tühi</string>
     <string name="phone_book_title">Telefoniraamat</string>
@@ -2125,31 +1773,23 @@
     <string name="loading_contact_book">Laen sinu kontaktide loendit…</string>
     <string name="empty_contact_book">Sinu kontaktide loend on tühi</string>
     <string name="contacts_book_title">Sinu kontaktide loend</string>
-
     <string name="three_pid_revoke_invite_dialog_title">Tühista kutse</string>
     <string name="three_pid_revoke_invite_dialog_content">Kas tühistame kasutaja %1$s kutse\?</string>
-
     <string name="member_banned_by">Suhtluskeeld on seatud kasutaja %1$s poolt</string>
     <string name="failed_to_unban">Kasutaja ligipääsu taastamine ei õnnestunud</string>
-
     <string name="alert_push_are_disabled_title">Tõuketeavitused on välja lülitatud</string>
     <string name="enter_account_password">Jätkamaks sisesta oma %s.</string>
-
     <string name="bootstrap_info_text">%s abil krüpti ja loe oma sõnumeid ning taga usaldusseosed.</string>
     <string name="bootstrap_info_confirm_text">Kinnituseks sisesta %s uuesti.</string>
     <string name="bootstrap_dont_reuse_pwd">Palun ära kasuta selleks oma tavalist konto salasõna.</string>
-
     <string name="bootstrap_info_text_2">Andmete kaitsmiseks sinu koduserveris sisesta turvafraas, mida vaid sina tead.</string>
-
     <string name="bootstrap_loading_text">Selleks võib kuluda mitu sekundit.</string>
     <string name="bootstrap_loading_title">Alustame taastamist.</string>
     <string name="your_recovery_key">Sinu taastevõti</string>
     <string name="bootstrap_finish_title">Valmis!</string>
     <string name="keep_it_safe">Hoia seda turvaliselt</string>
     <string name="finish">Lõpeta</string>
-
     <string name="bootstrap_save_key_description">Kasuta seda %1$s turvavõrguna olukorras, kus unustad oma %2$s.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Avaldan justloodud Identiteedivõtmed</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Loon paroolifraasi põhjal turvavõtme</string>
     <string name="bootstrap_crosssigning_progress_default_key">Määratlen vaikimisi kasutatava SSSS-võtme</string>
@@ -2157,14 +1797,10 @@
     <string name="bootstrap_crosssigning_progress_save_usk">Sünkroniseerin kasutaja võtit</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Sünkroniseerin allkirjavõtit</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Teeme võtmetest varukoopia</string>
-
-
     <string name="bootstrap_crosssigning_print_it">Trüki ta välja ja hoia turvalises kohas</string>
     <string name="bootstrap_crosssigning_save_usb">Salvesta ta mälupulgale või varunduskettale</string>
     <string name="bootstrap_crosssigning_save_cloud">Kopeeri ta isiklikku andmehoidlasse mis asub pilves</string>
-
     <string name="auth_flow_not_supported">Seda tegevust ei saa teha nutiseadmest</string>
-
     <string name="bootstrap_skip_text">Paroolifraasi kasutusele võtmine võimaldab sul krüptida ja lugeda oma sõnumeid ning tagada usaldusseoseid.
 \n
 \nKui sa ei soovi selleks kasutada sõnumite salasõna, siis võid genereerida ka sõnumivõtme.</string>
@@ -2172,21 +1808,16 @@
     <string name="bootstrap_cancel_text">Kui sa tühistad nüüd, siis sa võid peale viimasest seadmest välja logimist kaotada ligipääsu oma krüptitud sõnumitele ja andmetele.
 \n
 \nAga sa võid seadistustes võtta kasutusele turvalise varunduse ning hallata oma krüptovõtmeid.</string>
-
     <string name="encryption_enabled">Krüptimine on kasutusel</string>
     <string name="encryption_enabled_tile_description">Sõnumid selles jututoas on läbivalt krüptitud. Uuri lisaks ja verifitseeri kasutajad nende kasutajaprofiilides.</string>
     <string name="encryption_not_enabled">Krüptimine ei ole kasutusel</string>
     <string name="encryption_unknown_algorithm_tile_description">Selles jututoas kasutatud krüptimine ei ole toetatud</string>
-
     <string name="room_created_summary_item">%s lõi ja seadistas jututoa.</string>
     <string name="room_created_summary_item_by_you">Sina lõid ja seadistasid jututoa.</string>
-
     <string name="qr_code_scanned_self_verif_notice">Peaaegu valmis! Kas teises seadmes kuvatakse sama kilpi\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Peaaegu valmis! Ootan kinnitust…</string>
     <string name="qr_code_scanned_verif_waiting">Ootan vastust kasutajalt %s…</string>
-
     <string name="error_failed_to_import_keys">Võtmete importimine ei õnnestunud</string>
-
     <string name="settings_notification_configuration">Teavituste seadistused</string>
     <string name="settings_messages_at_room">Sõnumid, mis sisaldavad sõna @room</string>
     <string name="settings_messages_in_e2e_one_to_one">Kahepoolsete vestluste krüptitud sõnumid</string>
@@ -2194,9 +1825,7 @@
     <string name="settings_when_rooms_are_upgraded">Kui jututubasid uuendatakse</string>
     <string name="settings_troubleshoot_title">Leia lahendus vigadele</string>
     <string name="settings_notification_advanced_summary">Seadista teavituse olulisus sündmuse alusel</string>
-
     <string name="command_description_plain">Saadab sõnumi vormindamata tekstina ega tõlgenda seda markdown-vormindusena</string>
-
     <string name="no_permissions_to_start_conf_call">Sul ei ole õigusi siin jututoas rühmakõne algatamiseks</string>
     <string name="conference_call_in_progress">Rühmakõne on hetkel käimas!</string>
     <string name="video_meeting">Alusta videokoosolekut</string>
@@ -2210,21 +1839,15 @@
         <item quantity="one">%1$d/%2$d võtme importimine õnnestus.</item>
         <item quantity="other">%1$d/%2$d võtme importimine õnnestus.</item>
     </plurals>
-
     <string name="room_manage_integrations">Halda lõiminguid</string>
     <string name="room_no_active_widgets">Aktiivseid vidinaid ei leidu</string>
     <string name="create_room_federation_error">Jututuba on loodud, kuid mõned kutsed on saatmata järgmistel põhjustel:
 \n
 \n%s</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">Sa parasjagu jagad oma e-posti aadressi ja telefoninumbrit isikutuvastusserveriga %1$s. Selleks, et lõpetada see jagamine, pead uuesti looma ühenduse isikutuvastusserveriga %2$s.</string>
     <string name="labs_allow_extended_logging_summary">Detailne logimine võimaldab arendajatel saada rohkem teadet kui sa peale nutiseadme tõsist raputamist saadad veateate. Kui ka detailne logimine on kasutusel, siis rakendus ei logi sõnumite sisu ega isiklikke andmeid.</string>
-
-
     <string name="error_terms_not_accepted">Kui sa oled nõustunud koduserveri kasutustingimustega, siis palun proovi uuesti.</string>
-
     <string name="error_network_timeout">Tundub, et server ei suuda päringule mõistliku ajaga vastata ning see võib olla seotud kas vigase ühendusega või serveri veaga. Palun proovi mõne aja pärast uuesti.</string>
-
     <string name="a11y_open_drawer">Ava navigatsioonivalik</string>
     <string name="a11y_create_menu_open">Ava menüüvalik jututoa loomiseks</string>
     <string name="a11y_create_menu_close">Sulge menüüvalik jututoa loomiseks…</string>
@@ -2232,7 +1855,6 @@
     <string name="a11y_show_password">Näita salasõna</string>
     <string name="a11y_hide_password">Peida salasõna</string>
     <string name="a11y_jump_to_bottom">Mine lõppu</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="one">%1$s, %2$s ja %3$d muu loevad</item>
         <item quantity="other">%1$s, %2$s ja %3$d muud loevad</item>
@@ -2241,12 +1863,10 @@
     <string name="two_users_read">%1$s ja %2$s lugesid</string>
     <string name="one_user_read">%s luges</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">1 kasutaja luges</item>
+        <item quantity="one">%d kasutaja luges</item>
         <item quantity="other">%d kasutajat lugesid</item>
     </plurals>
-
     <string name="error_file_too_big">See fail „%1$s“ (%2$s) on üleslaadimiseks liiga suur. Failisuuruse ülempiir on %3$s.</string>
-
     <string name="error_attachment">Manuse laadimisel tekkis viga.</string>
     <string name="attachment_type_file">Fail</string>
     <string name="attachment_type_contact">Kontakt</string>
@@ -2255,31 +1875,25 @@
     <string name="attachment_type_gallery">Meediagalerii</string>
     <string name="attachment_type_sticker">Kleeps</string>
     <string name="error_handling_incoming_share">Jagatud andmete töötlemine ei õnnestunud</string>
-
     <string name="uploads_media_title">MEEDIA</string>
     <string name="block_user">EIRA KASUTAJAT</string>
-
     <string name="content_reported_title">Teatasin sisust</string>
-    <string name="content_reported_content">Selle sisu kohta on nüüd teade saadetud.
-\n
-\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutaja blokeerida</string>
+    <string name="content_reported_content">Selle sisu kohta on nüüd teade saadetud. 
+\n 
+\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutajat eirata.</string>
     <string name="content_reported_as_spam_title">See on rämpssõnum</string>
-    <string name="content_reported_as_spam_content">Haldaja sai nüüd teate, et see sisu on rämpssõnum.
-\n
-\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutaja blokeerida</string>
+    <string name="content_reported_as_spam_content">Haldaja sai nüüd teate, et see sisu on rämpssõnum. 
+\n 
+\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutajat eirata.</string>
     <string name="content_reported_as_inappropriate_title">See sõnum ei ole sobilik</string>
-    <string name="content_reported_as_inappropriate_content">Haldaja sai nüüd teate, et see sisu ei ole sobilik.
-\n
-\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutaja blokeerida</string>
-
+    <string name="content_reported_as_inappropriate_content">Haldaja sai nüüd teate, et see sisu ei ole sobilik. 
+\n 
+\nKui sa ei soovi enam näha selle kasutaja sisu, siis sa võid tema sõnumite peitmiseks kasutajat eirata.</string>
     <string name="permissions_rationale_msg_keys_backup_export">Läbiva krüptograafia jaoks vajalike võtmete salvestamiseks kohalikule andmekandjale vaajab Element sinu luba.
 \n
 \nSelleks et saaksid võtmed käsitsi eksportida, siis palun anna selleks järgmises vaates luba.</string>
-
     <string name="no_network_indicator">Hetkel puudub võrguühendus</string>
-
     <string name="message_ignore_user">Eira kasutajat</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">Kõik sõnumid (lärmakas)</string>
     <string name="room_list_quick_actions_notifications_all">Kõik sõnumid</string>
     <string name="room_list_quick_actions_notifications_mentions">Ainult mainimised</string>
@@ -2293,7 +1907,6 @@
     <string name="command_description_spoiler">Saadab selle sõnumi rõõmurikkujana</string>
     <string name="spoiler">Rõõmurikkuja</string>
     <string name="reaction_search_type_hint">Reageerimiste leidmiseks sisesta otsingusõnad.</string>
-
     <string name="login_splash_title">See on sinu vestlus, mida sa ka tegelikult kontrollid.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Salasõna kinnitamiseks klõpsi kirjas olnud linki. Kui oled avanud selles kirjas leidunud lingi, siis palun vajuta järgnevat nuppu.</string>
     <string name="login_connect_using_matrix_id_notice">Kui sul juba on kasutajakonto ning sa tead oma Matrix\'i kasutajatunnust ja salasõna, siis alternatiivina sa võid kasutada seda meetodit:</string>
@@ -2303,7 +1916,6 @@
     <string name="login_signin_matrix_id_hint">Matrix\'i kasutajatunnus</string>
     <string name="login_signin_matrix_id_password_notice">Kui sa ei tea oma salasṍna, siis mine tagasi ja loo uus salasõna.</string>
     <string name="seen_by">Nähtud kasutaja poolt</string>
-
     <string name="signed_out_title">Sa oled loginud välja</string>
     <string name="signed_out_notice">See võib juhtuda eri põhjustel:
 \n
@@ -2313,18 +1925,15 @@
 \n
 \n• Sinu koduserveri haldaja on turvakaalutlustel keelanud sinu ligipääsu.</string>
     <string name="signed_out_submit">Logi uuesti sisse</string>
-
     <string name="soft_logout_title">Sa oled loginud välja</string>
     <string name="soft_logout_sso_not_same_user_error">Praegune sessioon kuulub kasutajale %1$s, kuid sina üritad siseneda kasutaajaga %2$s. Sellist võimalust Element hetkel ei toeta.
 \nPalun eemalda kõik andmed ning siis logi sisse muu kontoga.</string>
-
     <string name="verification_conclusion_compromised">Mõni järgnevatest võib olla sattunud valedesse kätesse:
 \n 
 \n - Sinu koduserver
 \n - Selle osapoole koduserver, keda sa üritad verifitseerida
 \n - Sinu või teise osapoole internetiühendus
 \n - Sinu või teise osapoole seade</string>
-
     <string name="sent_a_video">Video.</string>
     <string name="sent_an_image">Pilt.</string>
     <string name="sent_an_audio_file">Helifail</string>
@@ -2346,49 +1955,35 @@
     <string name="room_profile_section_more_uploads">Üleslaetud failid</string>
     <string name="room_profile_section_more_leave">Lahku jututoast</string>
     <string name="room_profile_leaving_room">Lahkun jututoast…</string>
-
     <string name="room_member_power_level_admins">Haldajad</string>
     <string name="room_member_power_level_moderators">Moderaatorid</string>
     <string name="room_member_power_level_custom">Kohandatud õigused</string>
     <string name="room_member_power_level_invites">Kutsed</string>
     <string name="room_member_power_level_users">Kasutajad</string>
-
     <string name="room_member_power_level_admin_in">Peakasutaja jututoas %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderaator jututoas %1$s</string>
     <string name="room_member_power_level_default_in">Vaikimisi õigused jututoas %1$s</string>
     <string name="room_member_power_level_custom_in">Kohandatud õigused (%1$d) jututoas %2$s</string>
-
     <string name="room_member_jump_to_read_receipt">Hüppa lugemisteatise juurde</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element ei oska käsitleda %1$s-tüüpi sündmusi</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element ei oska käsitleda %1$s-tüüpi sünumeid</string>
     <string name="rendering_event_error_exception">Tekkis viga, kui Element üritas töödelda sõnumi %1$s sisu</string>
-
     <string name="call_notification_answer">Võta vastu</string>
     <string name="call_notification_reject">Keeldu</string>
     <string name="call_notification_hangup">Lõpeta kõne</string>
-
     <string name="unignore">Lõpeta eiramine</string>
-
     <string name="verify_cannot_cross_sign">See sessioon ei oska jagada verifitseerimisteavet sinu teiste sessioonidega.
 \nSeni salvestatakse verifitseerimisteave kohalikus seadmes ja jagatakse rakenduse tulevases versioonis.</string>
-
     <string name="room_list_sharing_header_recent_rooms">Hiljutised jututoad</string>
     <string name="verification_profile_device_untrust_info">Kuni antud kasutaja seda sessiooni ei usalda, on ta märgitud hoiatussildiga. Alternatiivina on sul võimalus verifiseerimist ka käsitsi teha.</string>
-
-
     <string name="initialize_cross_signing">Käivita risttunnustamine</string>
     <string name="reset_cross_signing">Lähtesta krüptovõtmed</string>
-
     <string name="a11y_qr_code_for_verification">QR-kood</string>
-
     <string name="qr_code_scanned_by_other_notice">Peaaegu valmis! Kas %s kuvab sama kilpi\?</string>
     <string name="qr_code_scanned_by_other_yes">Jah</string>
     <string name="qr_code_scanned_by_other_no">Ei</string>
-
     <string name="no_connectivity_to_the_server_indicator">Ühendus sinu serveriga on katkenud</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">Lennurežiim on kasutusel</string>
-
     <string name="settings_dev_tools">Arendaja töövahendid</string>
     <string name="settings_account_data">Kasutajakonto andmed</string>
     <plurals name="poll_info">
@@ -2403,45 +1998,33 @@
     <string name="command_description_poll">Loob lihtsa hääletuse</string>
     <string name="verification_cannot_access_other_session">Kasuta taastamiseks mõeldud paroolifraasi või võtit</string>
     <string name="verification_use_passphrase">Kui sa ei pääse ligi olemasolevale sessioonile</string>
-
     <string name="new_signin">Uus sisselogimine</string>
-
     <string name="enter_secret_storage_invalid">Ei leia turvahoidlast vajalikke andmeid</string>
     <string name="enter_secret_storage_passphrase">Sisesta turvahoidla paroolifraas</string>
     <string name="enter_secret_storage_passphrase_warning">Hoiatus:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Sa peaksid turvahoidlat kasutama vaid usaldusväärsest seadmest</string>
-
     <string name="message_action_item_redact">Eemalda…</string>
     <string name="share_confirm_room">Kas sa soovid seda manust saata kasutajale %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Saada pilt algupärases suuruses</item>
         <item quantity="other">Saada pildid algupärases suuruses</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Kinnita eemaldamine</string>
     <string name="delete_event_dialog_content">Kas sa oled kindel et soovid eemaldada (kustutada) seda sündmust\? Pane tähele, et see muutus võib tagasi pöörduda, kui muudad hiljem jututoa nime või teema nime.</string>
     <string name="delete_event_dialog_reason_checkbox">Lisa põhjus</string>
     <string name="delete_event_dialog_reason_hint">Kustutamise põhjus</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Kasutaja kustutas sündmuse, põhjusena %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Jututoa haldur on sündmust modereerinud, põhjusena %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Krüptovõtmed on juba uuendatud!</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="settings_key_requests">Päringud võtmete laadimiseks</string>
-
     <string name="e2e_use_keybackup">Võta krüptitud sõnumite ajalugu lukust lahti</string>
-
     <string name="refresh">Värskenda</string>
-
     <string name="new_session">Uus sisselogimine. Kas see olid sina\?</string>
     <string name="new_session_review">Kontrollimiseks ja verifitseerimiseks klõpsi</string>
     <string name="verify_cancel_self_verification_from_untrusted">Kui sa katkestad, siis sa ei saa selles seadmes lugeda krüptitud sõnumeid ning muud kasutajad ei usalda seda</string>
     <string name="verify_cancel_self_verification_from_trusted">Kui sa katkestad, siis sa ei saa oma uues seadmes lugeda krüptitud sõnumeid ning muud kasutajad ei usalda seda</string>
     <string name="verify_cancel_other">Kui sa nüüd katkestad, siis sa ei verifitseeri seadet %1$s (%2$s). Alusta uuesti sealsest profiilist.</string>
-
     <string name="verify_not_me_self_verification">Mõni järgnevatest võib olla sattunud valedesse kätesse:
 \n 
 \n - Sinu salasõna
@@ -2450,40 +2033,29 @@
 \n - Sinu või teise osapoole internetiühendus
 \n
 \nPalun vaheta seadistuste lehelt koheselt oma kasutajakonto salasõna ja taastevõti.</string>
-
     <string name="verify_cancelled_notice">Seadistuste lehelt verifitseeri oma seade.</string>
     <string name="verification_cancelled">Verifitseerimine on tühistatud</string>
-
     <string name="recovery_passphrase">Taastamiseks mõeldud paroolifraas</string>
     <string name="message_key">Sõnumite krüptovõti</string>
     <string name="account_password">Kasutajakonto salasõna</string>
-
     <string name="set_recovery_passphrase">Seadista %s</string>
     <string name="generate_message_key">Loo sõnumite krüptovõti</string>
-
     <string name="confirm_recovery_passphrase">Kinnita %s</string>
-
     <string name="bootstrap_cross_signing_success">Sinu %2$s ja %1$s on seadistatud.
 \n
 \nHoia neid turvaliselt! Kui sa oled oma rakendustes kõik sessioonid sulgenud, siis sa vajad neid ligipääsu taastamiseks oma krüptitud sõnumitele ja turvalistele andmetele.</string>
-
     <string name="auth_invalid_login_param_space_in_password">Vigane salasõna ja/või kasutajanimi. Palun vaata, kas mitte sisestatud salasõna ei alga või lõppe tühikutega.</string>
     <string name="auth_invalid_login_deactivated_account">See kasutajakonto on deaktiveeritud.</string>
-
     <string name="room_message_placeholder">Sõnum…</string>
-
     <string name="upgrade_security">Krüptimise uuendus on saadaval</string>
     <string name="setup_cross_signing">Võta risttunnustamine kasutusele</string>
     <string name="security_prompt_text">Selleks et sinu vestlused oleks turvatud, verifitseeri end ja teisi</string>
-
     <string name="bootstrap_enter_recovery">Jätkamaks sisesta oma %s</string>
     <string name="use_file">Kasuta faili</string>
-
     <string name="enter_backup_passphrase">Sisesta %s</string>
     <string name="backup_recovery_passphrase">Taastamiseks mõeldud paroolifraas</string>
     <string name="bootstrap_invalid_recovery_key">See ei ole sobilik taastevõti</string>
     <string name="recovery_key_empty_error_message">Palun sisesta taastevõti</string>
-
     <string name="bootstrap_progress_checking_backup">Kontrollin varukoopia võtmeid</string>
     <string name="bootstrap_progress_checking_backup_with_info">Kontrollin varukoopia võtit (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Arvutan elliptilise joone võtit</string>
@@ -2492,20 +2064,16 @@
     <string name="bootstrap_progress_generating_ssss_recovery">Loon taastevõtme alusel SSSS\'i</string>
     <string name="bootstrap_progress_storing_in_sss">Salvestan võtmete varunduse andmed SSSS\'is</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_enter_backup_password">Jätkamiseks sisesta oma võtmete varunduse paroolifraas.</string>
     <string name="bootstrap_migration_use_recovery_key">või kasuta oma võtmete varukoopia taastevõtit</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Kui sa ei tea oma võtmete varunduse paroolifraasi, siis sa võid %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Võtmete varukoopia taastevõti</string>
-
     <string name="settings_security_prevent_screenshots_title">Ära luba sel rakendusel teha ekraanitõmmiseid</string>
     <string name="settings_security_prevent_screenshots_summary">Selle seadistusega määratakse FLAG_SECURE märge kõikidele tegevustele. Muutuse jõustamiseks vajab rakendus uuesti käivitamist.</string>
-
     <string name="media_file_added_to_gallery">Lisasime meediafaili galeriisse</string>
     <string name="error_adding_media_file_to_gallery">Meediafaili galeriisse lisamine ei õnnestunud</string>
     <string name="error_saving_media_file">Meediafaili salvestamine ei õnnestunud</string>
     <string name="change_password_summary">Määra kontole uus salasõna…</string>
-
     <string name="use_other_session_content_description">Kasuta kõige uuemat Element\'i versioon mõnes muus seadmes, nagu näiteks Element Web, Element Desktop, Element iOS, Element Android. Samuti sobib mõni muu Matrix\'i klient, mis oskab risttunnustamist</string>
     <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
@@ -2529,10 +2097,8 @@
     <string name="settings_phone_numbers">Telefoninumbrid</string>
     <string name="settings_remove_three_pid_confirmation_content">Kas eemaldan %s\?</string>
     <string name="error_threepid_auth_failed">Palun vaata üle, et kindlasti oleksid klõpsinud linki, mille me sulle e-kirjaga saatsime.</string>
-
     <string name="settings_emails_and_phone_numbers_title">E-posti aadressid ja telefoninumbrid</string>
     <string name="settings_emails_and_phone_numbers_summary">Halda on Matrix\'i kontoga seotud e-posti aadresse ja telefoninumbreid</string>
-
     <string name="settings_text_message_sent_hint">Kood</string>
     <string name="login_msisdn_notice">Palun kasuta rahvusvahelist vormingut (telefoninumbri alguses peaks olema „+“)</string>
     <string name="verification_request_alert_description">Lisaturvalisus mõttes verifitseeri %s võrreldes selleks üheks korraks loodud koodi teie mõlemas seadmes.
@@ -2540,25 +2106,74 @@
 \nParima turvalisuse nimel kohtuge silmast silma.</string>
     <string name="confirm_your_identity_quad_s">Kinnita oma isikusamasust verifitseerides seda sisselogimissessiooni. Sellega tagad ligipääsu krüptitud sõnumitele.</string>
     <string name="error_sso_flow_not_supported_yet">Vabandust, selline tegevus pole veel võimalik kasutajakontode puhul, kus kasutatakse ühekordset sisselogimist.</string>
-
     <string name="error_opening_banned_room">Ei ole võimalik avada sellise jututoa vaadet, kus sulle on seatud suhtluskeeld.</string>
     <string name="room_error_not_found">Ei leia sellist jututuba. Palun kontrolli, et ta ikka olemas on.</string>
     <plurals name="seconds">
         <item quantity="one">%d sekund</item>
         <item quantity="other">%d sekundit</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">Näita jututoa liikmete olekusündmusi</string>
     <string name="settings_show_room_member_state_events_summary">Sealhulgas kutsumisi, liitumisi, lahkumisi, müksamisi, keelamisi ning tunnuspildi ja kuvatava nime muutusi.</string>
     <string name="sent_a_poll">Küsitlus</string>
     <string name="sent_a_bot_buttons">Robotinupud</string>
     <string name="sent_a_reaction">Reageeris: %s</string>
     <string name="sent_verification_conclusion">Verifitseerimise tulemus</string>
-
     <string name="universal_link_malformed">Link oli vigane</string>
     <string name="no_permissions_to_start_webrtc_call">Sul ei ole õigusi siin jututoas helistamiseks</string>
     <string name="delete_account_data_warning">Kas kustutame %1$s tüüpi kasutajakonto andmed\?
 \n
 \nKuna nii mõndagi ootamatut võib juhtuda, siis kasuta seda võimalust mõningase ettevaatusega.</string>
-
-</resources>
+    <string name="settings_security_pin_code_grace_period_summary_off">PIN-kood on nõutav alati, kui sa Element\'i avad.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN-kood on nõutav, kui sa kahe minuti jooksul pole Element\'i kasutanud.</string>
+    <string name="settings_security_pin_code_grace_period_title">Kahe minuti möödumisel küsi uuesti PIN-koodi</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Näita vaid napi teavitusena lugemata sõnumite arvu.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Näita täpsemat teavet nagu jututoa nimi ja sõnumi sisu.</string>
+    <string name="settings_security_pin_code_notifications_title">Näita teavitustes sisu</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-kood on ainus võimalus, kuidas sa saad Element\'i lukust lahti.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Kasuta selles seadmes leiduvaid biomeetrilise tuvastuse võimalusi nagu sõrmejälgede lugejat või näotuvastust.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Kasuta biomeetrilist tuvastust</string>
+    <string name="settings_security_application_protection_screen_title">Seadista</string>
+    <string name="settings_security_application_protection_summary">Turva ligipääsu kasutades PIN-koodi või biomeetrilist tuvastust.</string>
+    <string name="settings_security_application_protection_title">Turva oma ligipääsu</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Näita seda seadet, millega saaksid praegu verifitseerimist alustada</item>
+        <item quantity="other">Näita %d seadet, millega saaksid praegu verifitseerimist alustada</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">Siis alustad nii, et kadunud on ajalugu, sõnumid ning usaldatud seadmed ja kasutajad</string>
+    <string name="secure_backup_reset_if_you_reset_all">Kui sa alustad kõigega algusest</string>
+    <string name="secure_backup_reset_all_no_other_devices">Jätka vaid siis, kui sul pole ühtegi muud seadet, millega seda seadet saaks verifitseerida.</string>
+    <string name="secure_backup_reset_all">Alusta kõigega algusest</string>
+    <string name="bad_passphrase_key_reset_all_action">Kas sa unustasid või kaotasid kõik võimalused taastada ligipääsu oma kontole\? Lähtesta kõik seadistused</string>
+    <string name="direct_room_created_summary_item_by_you">Sina liitusid.</string>
+    <string name="direct_room_created_summary_item">%s liitus.</string>
+    <string name="direct_room_encryption_enabled_tile_description">See jututuba on läbivalt krüptitud.</string>
+    <string name="direct_room_profile_section_more_leave">Lahku</string>
+    <string name="direct_room_profile_section_more_settings">Seadistused</string>
+    <string name="direct_room_profile_encrypted_subtitle">Sõnumid siin jututoas kasutavad läbivat krüptimist. 
+\n 
+\nSinu sõnumid on turvatud ning ainult sinul ja saaja(te)l on unikaalsed võtmed selliste sõnumite lugemiseks.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">See jututuba ei ole läbivalt krüptitud.</string>
+    <string name="login_error_outdated_homeserver_warning_content">"Selle koduserveri versioon on üsna vana. Palu oma koduserveri haldajat, et ta teeks vajalikud uuendused. Kui sa jätkad, siis mõni funktsionaalsus ei  pruugi toimida nii, nagu vaja."</string>
+    <string name="direct_room_join_rules_invite_by_you">Sina määrasid, et siia jututuppa pääseb vaid kutsega.</string>
+    <string name="direct_room_join_rules_invite">%1$s määras, et siia jututuppa pääseb vaid kutsega.</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Näita krüptitud jututubades tervet ajalugu</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s ja %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s %2$s jututoas ja %3$s</string>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d kutse</item>
+        <item quantity="other">%d kutset</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Sa oled klõpsinud teavitust!</string>
+    <string name="settings_troubleshoot_test_notification_notice">"Palun klõpsi teavitust. Kui sa teavitust ei näe, palun  kontrolli oma seadme seadistusi."</string>
+    <string name="settings_troubleshoot_test_notification_title">Teavituse kuvamine</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Sa praegu vaatad teavitust! Klõpsi mind!</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Tõuketeavituse vastuvõtmine ei õnnestunud. Üks lahendus oleks kui paigaldad rakenduse uuesti.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">Rakendus võtab vastu tõuketeavitust</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Rakendus ootab tõuketeavitust</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Tõuketeavituse test</string>
+    <string name="search_is_not_supported_in_e2e_room">Otsing krüptitud jututubades ei ole veel toetatud.</string>
+    <string name="search_banned_user_hint">Otsi suhtluskeelu saanud kasutajaid</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Sul ei ole õigusi siin jututoas helistamiseks</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Sul ei ole piisavalt õigusi, et selles jututoas alustada konverentsikõnet</string>
+    <string name="reset">Taasta algolek</string>
+</resources>
\ No newline at end of file

From a086b2001b84223ac2f61cf36e4d4d950e51762b Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Thu, 15 Oct 2020 05:15:37 +0000
Subject: [PATCH 256/278] Translated using Weblate (Russian)

Currently translated at 99.4% (1907 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
---
 vector/src/main/res/values-ru/strings.xml | 626 +++-------------------
 1 file changed, 83 insertions(+), 543 deletions(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index c88a1162fa..e8912c0640 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1,21 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">ru</string>
     <string name="resources_country_code">RU</string>
-
     <!-- titles -->
     <string name="title_activity_home">Сообщения</string>
     <string name="title_activity_room">Комната</string>
     <string name="title_activity_settings">Настройки</string>
     <string name="title_activity_member_details">Информация о собеседнике</string>
     <string name="title_activity_historical">Исторические</string>
-
     <string name="call_notification_answer">Принять</string>
     <string name="call_notification_reject">Отклонить</string>
     <string name="call_notification_hangup">Завершить звонок</string>
-
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Отмена</string>
@@ -48,7 +45,6 @@
     <string name="send_anyway">Все равно отправить</string>
     <string name="or">или</string>
     <string name="invite">Приглашение</string>
-
     <!-- actions -->
     <string name="action_sign_out">Выйти из учётной записи</string>
     <string name="action_voice_call">Голосовой вызов</string>
@@ -61,27 +57,22 @@
     <string name="action_close">Закрыть</string>
     <string name="copied_to_clipboard">Скопировано в буфер</string>
     <string name="disable">Отключить</string>
-
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Подтверждение</string>
     <string name="dialog_title_warning">Предупреждение</string>
-
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Начало</string>
     <string name="bottom_action_favourites">Избранные</string>
     <string name="bottom_action_people">Люди</string>
     <string name="bottom_action_rooms">Комнаты</string>
-
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Фильтр названия комнаты</string>
     <string name="home_filter_placeholder_favorites">Фильтр избраного</string>
     <string name="home_filter_placeholder_people">Фильтр людей</string>
     <string name="home_filter_placeholder_rooms">Фильтр названия комнаты</string>
-
     <!-- Home fragment -->
     <string name="invitations_header">Приглашения</string>
     <string name="low_priority_header">Маловажные</string>
-
     <!-- People fragment -->
     <string name="direct_chats_header">Беседы</string>
     <string name="local_address_book_header">Локальные контакты</string>
@@ -89,7 +80,6 @@
     <string name="no_conversation_placeholder">Нет диалогов</string>
     <string name="no_contact_access_placeholder">Вы не дали доступ Element к внутренним контактам</string>
     <string name="no_result_placeholder">Нет результатов</string>
-
     <!-- Rooms fragment -->
     <string name="rooms_header">Комнаты</string>
     <string name="rooms_directory_header">Список комнат</string>
@@ -99,9 +89,8 @@
         <item quantity="one">%d пользователь</item>
         <item quantity="few">%d пользователя</item>
         <item quantity="many">%d пользователей</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <string name="send_bug_report_include_logs">Отправить логи</string>
     <string name="send_bug_report_include_crash_logs">Отправить журналы ошибок</string>
     <string name="send_bug_report_include_screenshot">Отправить скриншот</string>
@@ -114,10 +103,8 @@
     <string name="send_bug_report_failed">Сбой отправки отчета об ошибке (%s)</string>
     <string name="send_bug_report_progress">Прогресс (%s%%)</string>
     <string name="send_bug_report_app_crashed">В прошлый раз приложение некорректно завершило работу. Хотите отправить отчет о сбое?</string>
-
     <string name="send_files_in">Отправить в</string>
     <string name="read_receipt">Прочитан</string>
-
     <string name="join_room">Войти в Комнату</string>
     <string name="username">Имя пользователя</string>
     <string name="create_account">Создать аккаунт</string>
@@ -126,14 +113,11 @@
     <string name="hs_url">URL сервера</string>
     <string name="identity_url">URL сервера авторизации</string>
     <string name="search">Поиск</string>
-
     <string name="start_new_chat">Начать новый чат</string>
     <string name="start_voice_call">Начать голосовой вызов</string>
     <string name="start_video_call">Начать видеовызов</string>
-
     <string name="option_send_files">Отправить файлы</string>
     <string name="option_take_photo_video">Камера</string>
-
     <!-- Authentication -->
     <string name="auth_login">Вход</string>
     <string name="auth_register">Создать аккаунт</string>
@@ -180,7 +164,6 @@
     <string name="auth_reset_password_email_validation_message">На адрес %s было отправлено письмо. После перехода по ссылке в письме, нажмите ниже.</string>
     <string name="auth_reset_password_error_unauthorized">Не удалось проверить email: убедитесь, что вы перешли по присланной ссылке</string>
     <string name="auth_reset_password_success_message">Ваш пароль сброшен. Осуществлен выход на всех сессиях - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
-
     <!-- Login Screen -->
     <string name="login_error_must_start_http">URL должен начинаться с http[s]://</string>
     <string name="login_error_network_error">Сбой входа: сетевая ошибка</string>
@@ -189,7 +172,6 @@
     <string name="login_error_unable_register">Сбой регистрации</string>
     <string name="login_error_unable_register_mail_ownership">Сбой регистрации: ошибка проверки email</string>
     <string name="login_error_invalid_home_server">Пожалуйста, введите корректный URL</string>
-
     <string name="login_error_forbidden">Неверное имя пользователя или пароль</string>
     <string name="login_error_unknown_token">Указанный токен доступа не распознан</string>
     <string name="login_error_bad_json">Поврежденный JSON</string>
@@ -197,35 +179,27 @@
     <string name="login_error_limit_exceeded">Отправлено слишком много запросов</string>
     <string name="login_error_user_in_use">Логин уже используется</string>
     <string name="login_error_login_email_not_yet">Вы не перешли по высланной в email ссылке</string>
-
     <!-- crypto warnings -->
-
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Чтение списка вступивших</string>
-
     <!-- accounts list Screen -->
-
     <!-- image size selection -->
     <string name="compression_options">Откравить как </string>
     <string name="compression_opt_list_original">Оригинал</string>
     <string name="compression_opt_list_large">Крупный</string>
     <string name="compression_opt_list_medium">Средний</string>
     <string name="compression_opt_list_small">Мелкий</string>
-
     <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Отменить загрузку?</string>
     <string name="attachment_cancel_upload">Отменить загрузку?</string>
     <string name="attachment_remaining_time_seconds">%d с</string>
     <string name="attachment_remaining_time_minutes">%1$dм %2$dс</string>
-
     <!-- room creation dialog Screen -->
     <string name="yesterday">Вчера</string>
     <string name="today">Сегодня</string>
-
     <!-- room info dialog Screen -->
     <string name="room_info_room_name">Название Комнаты</string>
     <string name="room_info_room_topic">Тема комнаты</string>
-
     <!-- call string -->
     <string name="call_connected">Вызов соединён</string>
     <string name="call_connecting">Устанавливается соединение…</string>
@@ -235,16 +209,13 @@
     <string name="incoming_video_call">Входящий видеовызов</string>
     <string name="incoming_voice_call">Входящий голосовой вызов</string>
     <string name="call_in_progress">Идёт разговор…</string>
-
     <string name="call_error_user_not_responding">Вызываемый абонент не отвечает.</string>
     <string name="call_error_ice_failed">Медиавызов не удался</string>
     <string name="call_error_camera_init_failed">Невозможно инициализировать камеру</string>
     <string name="call_error_answered_elsewhere">Звонок принят на другом устройстве</string>
-
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Снять фото или видео"</string>
     <string name="media_picker_cannot_record_video">Не удалось записать видео"</string>
-
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Element Информация</string>
     <string name="permissions_rationale_msg_storage">Element нуждается в разрешении на доступ к вашей фото-и видеотеке для отправки и сохранения вложений.
@@ -261,25 +232,20 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element может проверить Вашу адресную книгу, чтобы найти других пользователей сети по email или телефонному номеру.
 \n
 \nСогласны ли вы поделиться своей адресной книгой для этой цели\?</string>
-
     <string name="permissions_action_not_performed_missing_permissions">Извините. Действие не выполнено из-за недостаточных разрешений</string>
-
     <!-- medias slider string -->
     <string name="media_slider_saved">Сохранено</string>
     <string name="media_slider_saved_message">Сохранить в загрузки?</string>
     <string name="yes">ДА</string>
     <string name="no">НЕТ</string>
     <string name="_continue">Продолжить</string>
-
     <!-- Actions -->
     <string name="remove">Удалить</string>
     <string name="join">Присоединиться</string>
     <string name="preview">Просмотр</string>
     <string name="reject">Отклонить</string>
-
     <!-- Room -->
     <string name="room_jump_to_first_unread">Перейти к первому непрочитанному сообщению.</string>
-
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s пригласил вас присоединиться к этой комнате</string>
     <string name="room_preview_unlinked_email_warning">Приглашение пришло на адрес %s, который не связан с этим аккаунтом.
@@ -287,27 +253,22 @@
     <string name="room_preview_try_join_an_unknown_room">Вы пытаетесь получить доступ к %s. Хотите присоединиться к обсуждению?</string>
     <string name="room_preview_try_join_an_unknown_room_default">комната</string>
     <string name="room_preview_room_interactions_disabled">Это пред. просмотр комнаты. Вы в режиме только чтения.</string>
-
     <!-- Chat creation -->
     <string name="room_creation_title">Новый чат</string>
     <string name="room_creation_add_member">Добавить участника</string>
     <string name="room_title_one_member">1 пользователь</string>
-
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Покинуть комнату</string>
     <string name="room_participants_leave_prompt_msg">Вы уверены, что хотите выйти из комнаты\?</string>
     <string name="room_participants_remove_prompt_msg">Вы уверены, что хотите исключить %s из чата?</string>
     <string name="room_participants_create">Создать</string>
-
     <string name="room_participants_online">В сети</string>
     <string name="room_participants_offline">Недоступен</string>
     <string name="room_participants_idle">Покой</string>
-
     <string name="room_participants_header_admin_tools">АДМИНИСТРИРОВАНИЕ</string>
     <string name="room_participants_header_call">ВЫЗОВ</string>
     <string name="room_participants_header_direct_chats">ПРЯМЫЕ ЧАТЫ</string>
     <string name="room_participants_header_devices">СЕССИИ</string>
-
     <string name="room_participants_action_invite">Пригласить</string>
     <string name="room_participants_action_leave">Покинуть этот чат</string>
     <string name="room_participants_action_remove">Исключить из этого чата</string>
@@ -322,18 +283,14 @@
     <string name="room_participants_action_mention">Упомянуть</string>
     <string name="room_participants_action_devices_list">Отобразить список сессий</string>
     <string name="room_participants_power_level_prompt">Вы не сможете отменить это действие, поскольку пользователь получит такой же уровень доступа, как и у вас. Вы уверены?</string>
-
     <string name="room_participants_invite_prompt_msg">"Вы уверены что хотите пригласить %s в этот чат?"</string>
-
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Пригласить по ID</u></string>
     <string name="people_search_local_contacts">Локальные Контакты (%d)</string>
     <string name="people_search_filter_text">Только зарегистрированные</string>
-
     <string name="people_search_invite_by_id_dialog_title">Пригласить пользователя по ID</string>
     <string name="people_search_invite_by_id_dialog_description">Пожалуйста, введите один или несколько адресов email или Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">Email или Matrix ID</string>
-
     <!--  Chat -->
     <string name="room_menu_search">Поиск</string>
     <string name="room_one_user_is_typing">%s печатает…</string>
@@ -350,7 +307,6 @@
     <string name="room_delete_unsent_messages">Удалить неотправленные сообщения</string>
     <string name="room_message_file_not_found">Файл не найден</string>
     <string name="room_do_not_have_permission_to_post">У вас нет прав писать сообщения в этом чате</string>
-
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Доверять</string>
     <string name="ssl_do_not_trust">Не доверять</string>
@@ -363,7 +319,6 @@
     <string name="ssl_unexpected_existing_expl">Сертификат сервера изменился и ваш телефон теперь ему не доверяет. Это ОЧЕНЬ ПОДОЗРИТЕЛЬНО. Рекомендуется, НЕ ДОВЕРЯТЬ этому новому сертификату.</string>
     <string name="ssl_expected_existing_expl">Сертификат изменился с ранее доверенного на недействительный. Возможно, сервер обновил свой сертификат. Свяжитесь с администратором сервера для получения ожидаемого отпечатка сертификата.</string>
     <string name="ssl_only_accept">Примите сертификат только если администратор сервера опубликовал отпечаток сертификата, который соответствует указанному выше.</string>
-
     <!-- Room Details -->
     <string name="room_details_title">Подробности комнаты</string>
     <string name="room_details_people">Люди</string>
@@ -372,7 +327,6 @@
     <string name="malformed_id">Некорректный ID. Используйте email или Matrix ID вида \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">ПРИГЛАШЕНЫ</string>
     <string name="room_details_people_present_group_name">ПРИСОЕДИНИЛИСЬ</string>
-
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Причина отчета о контенте</string>
     <string name="room_event_action_report_prompt_ignore_user">Вы хотите скрыть все сообщения этого пользователя?
@@ -380,7 +334,6 @@
 Учтите, что это действие перезапустит приложение и может занять некоторое время.</string>
     <string name="room_event_action_cancel_upload">Отменить загрузку</string>
     <string name="room_event_action_cancel_download">Отменить загрузку</string>
-
     <!-- Search -->
     <string name="search_hint">Поиск</string>
     <string name="search_members_hint">Фильтр списка пользователей</string>
@@ -389,7 +342,6 @@
     <string name="tab_title_search_messages">СООБЩЕНИЯ</string>
     <string name="tab_title_search_people">ЛЮДИ</string>
     <string name="tab_title_search_files">ФАЙЛЫ</string>
-
     <!-- Room recents -->
     <string name="room_recents_join">ПРИСОЕДИНИЛИСЬ</string>
     <string name="room_recents_directory">КАТАЛОГ</string>
@@ -402,18 +354,15 @@
     <string name="room_recents_join_room">Войти в комнату</string>
     <string name="room_recents_join_room_title">Войти в комнату</string>
     <string name="room_recents_join_room_prompt">Введите ID комнаты или псевдоним</string>
-
     <!-- Directory -->
     <string name="directory_search_results_title">Просмотр каталога</string>
     <string name="directory_searching_title">Поиск в каталоге…</string>
-
     <!-- home room settings -->
     <string name="room_settings_favourite">Избранное</string>
     <string name="room_settings_de_prioritize">Уменьшить приоритет</string>
     <string name="room_settings_direct_chat">Прямой чат</string>
     <string name="room_settings_leave_conversation">Покинуть обсуждение</string>
     <string name="room_settings_forget">Забыть</string>
-
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Сообщения</string>
     <string name="room_sliding_menu_settings">Настройки</string>
@@ -422,9 +371,7 @@
     <string name="room_sliding_menu_third_party_notices">Прочие уведомления</string>
     <string name="room_sliding_menu_copyright">Авторские права</string>
     <string name="room_sliding_menu_privacy_policy">Политика конфиденциальности</string>
-
     <!-- Vector Settings -->
-
     <string name="settings_profile_picture">Аватар</string>
     <string name="settings_display_name">Отображаемое имя</string>
     <string name="settings_email_address">Email</string>
@@ -433,22 +380,18 @@
     <string name="settings_add_phone_number">Добавить телефон</string>
     <string name="settings_app_info_link_summary">Системные настройки приложения.</string>
     <string name="settings_app_info_link_title">Сведения о приложении</string>
-
     <string name="settings_enable_all_notif">Включить уведомления для этой учетной записи</string>
     <string name="settings_enable_this_device">Включить уведомления для этой сессии</string>
     <string name="settings_turn_screen_on">Включить экран на 3 секунды</string>
-
     <string name="settings_messages_in_one_to_one">В персональных чатах</string>
     <string name="settings_messages_in_group_chat">В групповых чатах</string>
     <string name="settings_invited_to_room">Когда меня приглашают в комнату</string>
     <string name="settings_call_invitations">Вызовы</string>
     <string name="settings_messages_sent_by_bot">Сообщения от бота</string>
-
     <string name="settings_background_sync">Синхронизация</string>
     <string name="settings_enable_background_sync">Включить фоновую синхронизацию</string>
     <string name="settings_set_sync_timeout">Таймаут синхронизации</string>
     <string name="settings_set_sync_delay">Задержка между каждой синхронизацией</string>
-
     <string name="settings_version">Версия</string>
     <string name="settings_olm_version">Версия OLM</string>
     <string name="settings_app_term_conditions">Правила и условия</string>
@@ -457,8 +400,6 @@
     <string name="settings_privacy_policy">Политика конфиденциальности</string>
     <string name="settings_clear_cache">Очистить весь кэш</string>
     <!--string name="settings_room_privacy_label">Privacy</string-->
-
-
     <string name="settings_user_settings">Параметры пользователя</string>
     <string name="settings_notifications">Уведомления</string>
     <string name="settings_ignored_users">Игнорируемые</string>
@@ -484,19 +425,15 @@
     <string name="devices_delete_dialog_title">Аутентификация</string>
     <string name="devices_delete_pswd">Пароль:</string>
     <string name="devices_delete_submit_button_label">Отправить</string>
-
     <string name="settings_logged_in">Авторизован как</string>
     <string name="settings_home_server">Сервер</string>
     <string name="settings_identity_server">Сервер идентификации</string>
-
     <string name="account_email_validation_title">Ожидается подтверждение</string>
     <string name="account_email_validation_message">Проверьте электронную почту и перейдите по высланной ссылке. Затем нажмите продолжить.</string>
     <string name="account_email_validation_error">Не удалось подтвердить адрес электронной почты. Проверьте электронную почту и нажмите на содержащуюся ссылку. После этого нажмите продолжить.</string>
-
     <string name="account_email_already_used_error">Этот адрес электронной почты уже занят.</string>
     <string name="account_email_not_found_error">Такой адрес электронной почты не найден.</string>
     <string name="account_phone_number_already_used_error">Этот номер телефона уже используется.</string>
-
     <string name="settings_change_password">Смена пароля</string>
     <string name="settings_old_password">Текущий пароль</string>
     <string name="settings_new_password">Новый пароль</string>
@@ -506,13 +443,9 @@
     <string name="settings_unignore_user">Отображать сообщения пользователя %s?
 
 Учтите, что это действие перезапустит приложение и может занять некоторое время.</string>
-
     <string name="settings_delete_notification_targets_confirmation">Вы уверены, что хотите удалить устройство для получения уведомлений?</string>
-
     <string name="settings_delete_threepid_confirmation">Вы уверены, что хотите удалить %1$s %2$s?</string>
-
     <string name="settings_select_country">Выберите страну</string>
-
     <string name="settings_phone_number_country_label">Страна</string>
     <string name="settings_phone_number_country_error">Пожалуйста выберите страну</string>
     <string name="settings_phone_number_label">Телефон</string>
@@ -522,21 +455,17 @@
     <string name="settings_phone_number_verification_error_empty_code">Введите код активации</string>
     <string name="settings_phone_number_verification_error">Ошибка проверки телефона</string>
     <string name="settings_phone_number_code">Код</string>
-
     <!-- Room Settings -->
-
     <!-- room global settings-->
     <string name="room_settings_room_photo">Аватар комнаты</string>
     <string name="room_settings_room_name">Название комнаты</string>
     <string name="room_settings_topic">Тема</string>
     <string name="room_settings_room_tag">Метки комнаты</string>
     <string name="room_settings_tag_pref_dialog_title">Отмечено как:</string>
-
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Избранное</string>
     <string name="room_settings_tag_pref_entry_low_priority">Маловажные</string>
     <string name="room_settings_tag_pref_entry_none">Нет</string>
-
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Доступность и видимость</string>
     <string name="room_settings_directory_visibility">Отображать комнату в каталоге</string>
@@ -544,22 +473,18 @@
     <string name="room_settings_room_read_history_rules_pref_title">Доступ к истории комнаты</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Кто может читать историю?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Кто имеет доступ к комнате?</string>
-
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Все</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Только члены (с момента выбора этой опции)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Только члены (с момента приглашения)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Только члены (с момента присоединения)</string>
-
     <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Для генерации ссылки команда должна иметь адрес.</string>
     <string name="room_settings_room_access_entry_only_invited">Только приглашенные</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Все у кого есть ссылка на комнату, кроме гостей</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Все у кого есть ссылка на комнату, включая гостей</string>
-
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Забаненые пользователи</string>
-
     <!-- advanced -->
     <string name="room_settings_category_advanced_title">Дополнительно</string>
     <string name="room_settings_room_internal_id">Внутренний ID комнаты</string>
@@ -571,36 +496,27 @@
     <string name="room_settings_labs_end_to_end_warnings">Вам необходимо выйти, чтобы включить шифрование.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Шифровать сообщения только для проверенных сессий</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Никогда не отправлять шифрованное сообщение на непроверенные сессии в этой комнате с этой сессии.</string>
-
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">У этой комнаты еще нет локального адреса</string>
     <string name="room_settings_addresses_add_new_address">Новый адрес (например #foo:matrix.org")</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Неверный формат псевдонима</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' неверный формат псевдонима</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Для этой комнаты не будет основного адреса.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Предупреждения основного адреса</string>
-
     <string name="room_settings_set_main_address">Установить как основной адрес</string>
     <string name="room_settings_unset_main_address">Сбросить основной адрес</string>
     <string name="room_settings_copy_room_id">Копировать ID комнаты</string>
     <string name="room_settings_copy_room_address">Копировать адрес комнаты</string>
-
     <string name="room_settings_addresses_e2e_enabled">В этой комнате включено шифрование.</string>
     <string name="room_settings_addresses_e2e_disabled">В этой комнате выключено шифрование.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Включить шифрование 
 (внимание: не может быть снова отключено!)</string>
-
     <!-- Directory -->
     <string name="directory_title">Каталог</string>
-
     <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s пытается загрузить историю комнаты, но не может ее найти.</string>
-
-
     <!-- encryption dialog -->
     <string name="encryption_information_title">Информация о сквозном шифровании</string>
-
     <string name="encryption_information_device_info">Информация о событии</string>
     <string name="encryption_information_user_id">ID пользователя</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519 идентификационный ключ</string>
@@ -608,7 +524,6 @@
     <string name="encryption_information_algorithm">Алгоритм</string>
     <string name="encryption_information_session_id">ID сесии</string>
     <string name="encryption_information_decryption_error">Ошибка дешифровки</string>
-
     <string name="encryption_information_sender_device_information">Информация о сессии отправителя</string>
     <string name="encryption_information_device_name">Публичное имя</string>
     <string name="encryption_information_name">Публичное имя</string>
@@ -616,7 +531,6 @@
     <string name="encryption_information_device_key">Ключ сессии</string>
     <string name="encryption_information_verification">Проверка</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 отпечаток</string>
-
     <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей комнаты</string>
     <string name="encryption_export_room_keys">Экспорт ключей комнаты</string>
     <string name="encryption_export_room_keys_summary">Экспорт ключей в локальный файл</string>
@@ -626,31 +540,25 @@
     <string name="encryption_export_saved_as">E2E ключи комнаты сохранены в \'%s\'.
 
 Предупреждение: этот файл может быть удален после деинсталляции приложения.</string>
-
     <string name="encryption_import_e2e_room_keys">Импорт E2E ключей комнаты</string>
     <string name="encryption_import_room_keys">Импорт ключей комнаты</string>
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
     <string name="encryption_import_import">Импорт</string>
     <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для проверенных сессий</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Не отправлять зашифрованные сообщения непроверенным сессиям с этой сессии.</string>
-
     <string name="encryption_information_not_verified">Не проверено</string>
     <string name="encryption_information_verified">Проверено</string>
     <string name="encryption_information_blocked">В черном списке</string>
-
     <string name="encryption_information_unknown_device">неизвестная сессия</string>
     <string name="encryption_information_none">ничего</string>
-
     <string name="encryption_information_verify">Подтвердить</string>
     <string name="encryption_information_unverify">Отменить подтверждение</string>
     <string name="encryption_information_block">Блокировать</string>
     <string name="encryption_information_unblock">Разрешить</string>
-
     <string name="encryption_information_verify_device">Проверить сессию</string>
     <string name="encryption_information_verify_device_warning">Чтобы убедиться, что этой сессии можно доверять, обратитесь к его владельцу, используя другие способы (например, лично или по телефону), и спросите, соответствует ли ключ, который он видит в настройках для этой сессии:</string>
     <string name="encryption_information_verify_device_warning2">"Если совпадает, то нажмите кнопку подтвердить ниже. Если не совпадает, возможно кто-то пытается перехватить сессию и  вы захотите добавить его в черный список. В будущем данный процесс будет улучшен."</string>
     <string name="encryption_information_verify_key_match">Я проверил, что ключи совпадают</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Комната содержит неизвестные сессии</string>
     <string name="unknown_devices_alert_message">Эта комната содержит неизвестные сессии, которые не были подтверждены. 
@@ -658,7 +566,6 @@
 \nПеред продолжением рекомендуем вам пройти процесс проверки для каждой сессии, но вы можете отправить сообщение повторно, не проверяя.
 \n
 \nНеизвестные сессии:</string>
-
     <!-- directory activity  -->
     <string name="select_room_directory">Выбор списка комнат</string>
     <string name="directory_server_fail_to_retrieve_server">Сервер возможно недоступен или перегружен</string>
@@ -666,30 +573,23 @@
     <string name="directory_server_placeholder">URL домашнего сервера</string>
     <string name="directory_server_all_rooms_on_server">Все комнаты на сервере %s</string>
     <string name="directory_server_native_rooms">Все местные комнаты %s</string>
-
     <!-- historical -->
     <string name="historical_placeholder">Поиск в истории</string>
     <string name="settings_user_interface">Пользовательский интерфейс</string>
     <string name="settings_interface_language">Язык</string>
     <string name="settings_select_language">Выберите язык</string>
-
     <string name="settings_start_on_boot">Запускать при загрузке</string>
     <string name="settings_always_show_timestamps">Показывать метки времени для всех сообщений</string>
-
     <string name="media_saving_period_3_days">3 дня</string>
     <string name="media_saving_period_1_week">1 неделя</string>
     <string name="media_saving_period_1_month">1 месяц</string>
     <string name="media_saving_period_forever">Постоянно</string>
-
     <string name="settings_clear_media_cache">Очистить медиа кэш</string>
     <string name="offline">Недоступен</string>
-
     <string name="user_directory_header">Каталог пользователей</string>
     <string name="people_search_user_directory">КАТАЛОГ ПОЛЬЗОВАТЕЛЕЙ (%s)</string>
     <string name="settings_data_save_mode">Режим экономии трафика</string>
-
     <string name="settings_theme">Тема</string>
-
     <string name="font_size">Размер шрифта</string>
     <string name="tiny">Очень мелкий</string>
     <string name="small">Малый</string>
@@ -699,19 +599,15 @@
     <string name="largest">Самый большой</string>
     <string name="huge">Огромный</string>
     <string name="settings_keep_media">Сохранить медиа</string>
-
     <string name="light_theme">Светлая тема</string>
     <string name="dark_theme">Тёмная тема</string>
     <string name="black_them">Чёрная тема</string>
-
     <string name="settings_notification_ringtone">Звук уведомлений</string>
     <string name="settings_12_24_timestamps">Показывать метки времени в 12-часовом формате</string>
-
     <string name="widget_no_power_to_manage">Вам нужно разрешение на управление виджетами в этой комнате</string>
     <string name="widget_creation_failure">Создание виджета не удалось</string>
     <string name="settings_labs_create_conference_with_jitsi">Осуществлять конференц звонки через Jitsi</string>
     <string name="widget_delete_message_confirmation">Вы уверены, что хотите удалить виджет из этой комнаты?</string>
-
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Не удалось создать виджет.</string>
     <string name="widget_integration_failed_to_send_request">Не удалось отправить запрос.</string>
@@ -722,10 +618,8 @@
     <string name="widget_integration_missing_user_id">В запросе отсутствует user_id.</string>
     <string name="widget_integration_room_not_visible">Комната %s невидима.</string>
     <string name="room_add_matrix_apps">Добавить приложения Matrix</string>
-
     <string name="notification_sync_in_progress">Синхронизация…</string>
     <string name="notification_listening_for_events">Мониторинг событий</string>
-
     <string name="call">Вызов</string>
     <string name="settings_containing_my_user_name">Сообщения, содержащие мое имя пользователя</string>
     <string name="you_added_a_new_device">Вы добавили новою сессию \'%s\', запрашивающая ключи шифрования.</string>
@@ -734,97 +628,70 @@
     <string name="start_verification">Начать проверку</string>
     <string name="share_without_verifying">Поделиться без проверки</string>
     <string name="ignore_request">Игнорировать запрос</string>
-
     <string name="notification_noisy_notifications">Звуковые уведомления</string>
     <string name="notification_silent_notifications">Беззвучные уведомления</string>
-
     <string name="option_take_photo">Сделать фото</string>
     <string name="option_take_video">Снять видео</string>
-
     <string name="settings_analytics">Аналитика</string>
-
     <string name="settings_labs_native_camera">Использовать встроенную камеру</string>
-
     <!-- share keys -->
     <string name="title_activity_bug_report">Сообщить об ошибке</string>
-
     <string name="conference_call_warning_title">Внимание!</string>
     <string name="conference_call_warning_message">Конференц-связь находится в разработке и может быть ненадежной.</string>
-
     <!-- slash commands -->
     <string name="command_error">Ошибка команды</string>
     <string name="unrecognized_command">Нераспознанная команда: %s</string>
-
     <!-- notification statuses -->
     <string name="notification_off">Выкл</string>
     <string name="notification_noisy">Громко</string>
-
     <string name="encrypted_message">Зашифрованное сообщение</string>
-
     <string name="title_activity_group_details">Сведения о сообществе</string>
-
     <string name="loading">Загрузка…</string>
-
     <string name="action_exit">"Закрыть  приложение"</string>
     <string name="bottom_action_groups">Сообщества</string>
-
     <string name="home_filter_placeholder_groups">Поиск сообществ</string>
-
     <string name="groups_invite_header">Пригласить</string>
     <string name="groups_header">Сообщества</string>
     <string name="no_group_placeholder">Нет групп</string>
-
     <string name="start_new_chat_prompt_msg">Вы действительно хотите начать новый чат с %s?</string>
     <string name="start_voice_call_prompt_msg">Вы уверены, что хотите начать голосовой вызов?</string>
     <string name="start_video_call_prompt_msg">Вы уверены, что хотите начать видеовызов?</string>
-
     <string name="groups_list">Список групп</string>
-
     <string name="room_participants_ban_prompt_msg">Блокирующий пользователь выгонит их из этой комнаты и не позволит им снова присоединиться.</string>
-
     <string name="room_settings_all_messages_noisy">Все сообщения (громко)</string>
     <string name="room_settings_all_messages">Все сообщения</string>
     <string name="room_settings_mention_only">Только упоминания</string>
     <string name="room_settings_mute">Без звука</string>
-    <string name="room_settings_add_homescreen_shortcut">Добавить ярлык на главный экран</string>
-
+    <string name="room_settings_add_homescreen_shortcut">Добавить на главный экран</string>
     <string name="settings_inline_url_preview">Предпросмотр URL-адресов</string>
     <string name="settings_vibrate_on_mention">Вибрация при упоминании пользователя</string>
-
     <string name="room_settings_room_notifications_title">Уведомления</string>
     <string name="room_settings_add_new_group">Новый ID сообщества (например +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Недопустимый ID сообщества</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' недействительный ID сообщества</string>
-
-
     <string name="create">Создать</string>
     <string name="create_community">Создать сообщество</string>
     <string name="community_name">Имя сообщества</string>
     <string name="community_name_hint">Пример</string>
     <string name="community_id">ID сообщества</string>
     <string name="community_id_hint">пример</string>
-
     <!-- group details -->
     <string name="group_details_home">Начало</string>
     <string name="group_details_people">Люди</string>
     <string name="group_details_rooms">Комнаты</string>
     <string name="no_users_placeholder">Нет пользователей</string>
-
     <string name="rooms">Комнаты</string>
     <string name="joined">Присоединился</string>
     <string name="invited">Приглашен</string>
     <string name="filter_group_members">Фильтр участников группы</string>
     <string name="filter_group_rooms">Фильтр комнат группы</string>
-
     <string name="group_no_long_description">Администратор сообщества не предоставил подробного описания этого сообщества.</string>
-
     <string name="has_been_kicked">Вас выгнал %2$s из %1$s</string>
     <string name="has_been_banned">Вас забанил %2$s в %1$s</string>
     <string name="reason_colon">Причина: %1$s</string>
     <string name="rejoin">Присоединиться снова</string>
     <string name="forget_room">Забыть комнату</string>
     <string name="send_bug_report_rage_shake">Встряхните устройство, чтобы сообщить об ошибке</string>
-
     <string name="actions">Действия</string>
     <string name="list_members">Список участников</string>
     <string name="open_chat_header">Открыть заголовок</string>
@@ -833,74 +700,68 @@
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s в %2$s</string>
-
     <plurals name="active_widgets">
         <item quantity="one">%d активный виджет</item>
         <item quantity="few">%d активных виджета</item>
         <item quantity="many">%d активных виджетов</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <!-- Widget Integration Manager -->
     <string name="avatar">Аватар</string>
-
     <plurals name="room_header_active_members_count">
         <item quantity="one">%d активный участник</item>
         <item quantity="few">%d активных участника</item>
         <item quantity="many">%d активных участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d новое сообщение</item>
         <item quantity="few">%d новых сообщения</item>
         <item quantity="many">%d новых сообщений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s комната найдена для %2$s</item>
         <item quantity="few">%1$s комнаты найдено для %2$s</item>
         <item quantity="many">%1$s комнат найдено для %2$s</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="membership_changes">
         <item quantity="one">%d изменение членства</item>
         <item quantity="few">%d изменения членства</item>
         <item quantity="many">%d изменений членства</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">%d непрочитанное уведомление</item>
         <item quantity="few">%d непрочитанных уведомления</item>
         <item quantity="many">%d непрочитанных уведомлений</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="receipt_avatar">Получить аватар</string>
     <string name="notice_avatar">Заметка аватара</string>
     <string name="settings_flair">Сообщества</string>
-
     <string name="room_settings_no_flair">Эта комната не показывает любые сообщества</string>
     <string name="settings_notification_privacy">Конфиденциальность уведомлений</string>
     <string name="settings_notification_privacy_normal">Нормальный</string>
@@ -909,74 +770,55 @@
     <string name="settings_notification_privacy_metadata">• Уведомления содержат только метаданные</string>
     <string name="settings_notification_privacy_nosecure_message_content">• Уведомления содержат <b>метаданные и данные сообщения</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Уведомления <b>не будут показывать содержимое сообщения</b></string>
-
     <string name="startup_notification_privacy_title">Конфиденциальность уведомлений</string>
     <string name="startup_notification_privacy_message">Element может работать в фоновом режиме для управления конфиденциальностью и безопасностью ваших уведомлений. Это может повлиять на время работы от батареи.</string>
     <string name="startup_notification_privacy_button_grant">Предоставить разрешение</string>
     <string name="startup_notification_privacy_button_other">Выбрать другой вариант</string>
-
     <string name="settings_notification_privacy_reduced">Ограниченная конфиденциальность</string>
     <string name="settings_notification_privacy_secure_message_content"><b> надежно от Matrix-Homeserver получено </b></string>
     <string name="title_activity_choose_sticker">Отправить стикер</string>
-
     <string name="option_send_sticker">Отправить стикер</string>
     <string name="no_sticker_application_dialog_content">У вас сейчас нет доступных стикеров.
 
 Добавить сейчас?</string>
-
     <string name="settings_deactivate_account_section">Деактивация аккаунта</string>
     <string name="settings_deactivate_my_account">Деактивировать мой аккаунт</string>
-
     <string name="settings_opt_in_of_analytics">Отправка аналитических данных</string>
     <string name="settings_opt_in_of_analytics_summary">Element собирает анонимную аналитику для улучшения приложения.</string>
     <string name="settings_opt_in_of_analytics_prompt">Пожалуйста, включите аналитику, чтобы помочь нам улучшить Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Да, я хочу помочь!</string>
-
     <string name="widget_integration_missing_parameter">Обязательный параметр отсутствует.</string>
     <string name="widget_integration_invalid_parameter">Параметр недействителен.</string>
     <string name="dialog_user_consent_content">Для продолжения использования этого сервера %1$s вы должны ознакомиться и принять Условия использования.</string>
     <string name="dialog_user_consent_submit">Ознакомиться сейчас</string>
-
     <string name="deactivate_account_title">Деактивировать аккаунт</string>
     <string name="deactivate_account_delete_checkbox">Пожалуйста, удалите все сообщения, которые я отправил, после деактивации моего аккаунта (предупреждение: будущие участники увидят неполную историю разговоров)</string>
     <string name="deactivate_account_prompt_password">Чтобы продолжить, введите пароль:</string>
     <string name="deactivate_account_submit">Деактивировать аккаунт</string>
-
     <string name="deactivate_account_content">Это действие сделает вашу учетную запись непригодной для дальнейшего использования. Вы не сможете войти в систему и никто другой не сможет заново зарегистрировать учетную запись с вашим идентификатором. Также, это приведет к тому, что вы покинете все комнаты, в которых участвовали и данные о вашей учетной записи будут удалены с сервера идентификации. <b>Это действие необратимо</b>.
 
 По умолчанию, деактивация вашей учетной записи <b>не удаляет отправленные вами сообщения</b>. Если вы хотите, чтобы мы удалили все ваши сообщения - поставьте отметку в поле ниже.
 
 Видимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут показаны новым или не зарегистрированным пользователям, но те пользователи, которые уже получили эти сообщения - по прежнему будут их видеть.</string>
     <string name="dialog_title_third_party_licences">Лицензии сторонних производителей</string>
-
     <string name="download">Скачать</string>
     <string name="speak">Говорить</string>
     <string name="clear">Очистить</string>
     <string name="e2e_re_request_encryption_key">Перезапросить ключи шифрования у других ваших сессий.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Отправлен запрос ключа.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Запрос отправлен</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Запустите Element на другом устройстве, которое может расшифровать сообщение, для отправки ключа на эту сессию.</string>
-
     <string name="lock_screen_hint">Введите здесь…</string>
-
     <string name="option_send_voice">Отправить голосовое сообщение</string>
-
     <string name="go_on_with">продолжить с…</string>
     <string name="error_no_external_application_found">К сожалению, для выполнения этого действия не найдено внешнее приложение.</string>
-
     <string name="settings_labs_enable_send_voice">Отправлять голосовые сообщения</string>
-
     <string name="error_empty_field_your_password">Пожалуйста, введите ваш пароль.</string>
-
     <string name="send_bug_report_description_in_english">Если возможно, добавьте описание на английском языке.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Отправить зашифрованный ответ…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Отправить ответ (незашифрованный)…</string>
     <string name="settings_preview_media_before_sending">Предварительный просмотр медиа перед отправкой</string>
-
     <string name="settings_without_flair">В настоящее время вы не являетесь участником каких-либо сообществ.</string>
-
     <string name="settings_labs_keyboard_options_to_send_message">Использовать клавишу Enter для отправки сообщения</string>
     <string name="command_description_emote">Отображает действие</string>
     <string name="command_description_ban_user">Банит пользователя с указанным ID</string>
@@ -993,20 +835,20 @@
     <string name="room_tombstone_continuation_link">Этот разговор продолжается здесь</string>
     <string name="room_tombstone_continuation_description">Эта комната является продолжением другого разговора</string>
     <string name="room_tombstone_predecessor_link">Нажмите здесь для просмотра старых сообщений</string>
-
     <string name="command_description_join_room">Присоединиться к комнате с указанным псевдонимом</string>
     <string name="command_description_clear_scalar_token">Для исправления управления приложениями Matrix</string>
-
     <string name="missing_permissions_error">Из-за отсутствия разрешений это действие невозможно.</string>
     <plurals name="format_time_s">
-        <item quantity="one">%d секунда</item>
-        <item quantity="few">%d секунды</item>
-        <item quantity="many">%d секунд</item>
+        <item quantity="one">%d сек.</item>
+        <item quantity="few">%d сек.</item>
+        <item quantity="many">%d сек.</item>
+        <item quantity="other">%d сек.</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">%d минута</item>
-        <item quantity="few">%d минуты</item>
-        <item quantity="many">%d минут</item>
+        <item quantity="one">%d мин.</item>
+        <item quantity="few">%d мин.</item>
+        <item quantity="many">%d мин.</item>
+        <item quantity="other">%d мин.</item>
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">%d час</item>
@@ -1018,160 +860,124 @@
         <item quantity="few">%d дни</item>
         <item quantity="many">%d дней</item>
     </plurals>
-
     <string name="room_participants_now">Сейчас %1$s</string>
     <string name="room_participants_ago">%1$s %2$s назад</string>
-
     <string name="room_participants_invite_join_names">"%1$S "</string>
     <string name="room_participants_invite_join_names_and">%1$s и %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <plurals name="room_details_selected">
         <item quantity="one">%d выбран</item>
         <item quantity="few">%d выбрано</item>
         <item quantity="many">%d выбраны</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="group_members">
         <item quantity="one">%d участник</item>
         <item quantity="few">%d участника</item>
         <item quantity="many">%d участников</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="one">%d комната</item>
         <item quantity="few">%d комнаты</item>
         <item quantity="many">%d комнат</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="system_alerts_header">Системные оповещения</string>
-
     <string name="resource_limit_exceeded_title">Лимит ресурсов исчерпан</string>
     <string name="resource_limit_contact_action">Связаться с администратором</string>
-
     <string name="status_theme">Тема status.im</string>
-
     <string name="dialog_title_error">Ошибка</string>
-
     <string name="room_sliding_menu_version_x">Версия %s</string>
     <string name="passphrase_create_passphrase">Создать парольную фразу</string>
     <string name="passphrase_passphrase_does_not_match">Парольные фразы не совпадают</string>
     <string name="resource_limit_contact_admin">свяжитесь с вашим администратором</string>
-
     <string name="resource_limit_soft_default">Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут авторизоваться</b>.</string>
     <string name="resource_limit_hard_default">Превышен один из ресурсных лимитов сервера.</string>
-
     <string name="encryption_export_notice">Пожалуйста, придумайте парольную фразу для шифрования экспортируемых ключей. Вам нужно будет ввести ту же самую фразу для импорта ключей.</string>
     <string name="resource_limit_soft_mau"> Из-за ежемесячного ограничения активных пользователей сервера <b>некоторые из пользователей не смогут авторизоваться</b>.</string>
     <string name="resource_limit_hard_mau">Сервер достиг ежемесячного ограничения активных пользователей.</string>
-
     <string name="resource_limit_soft_contact">Пожалуйста %s для увеличения этого лимита.</string>
     <string name="resource_limit_hard_contact">Пожалуйста, %s, чтобы продолжить пользоваться этим сервисом.</string>
-
     <string name="settings_lazy_loading_title">Ленивая подгрузка участников</string>
     <string name="settings_lazy_loading_description">Увеличить производительность за счёт загрузки собеседников только при первом просмотре.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Ваш сервер не поддерживает ленивую подгрузку собеседников. Попробуйте позже.</string>
-
     <string name="unknown_error">Извините, произошла ошибка</string>
-
     <string name="merged_events_expand">развернуть</string>
     <string name="merged_events_collapse">свернуть</string>
-
     <string name="call_anyway">Всё равно позвонить</string>
     <string name="settings_password">Пароль</string>
     <string name="auth_accept_policies">Пожалуйста ознакомьтесь и подтвердите согласие с политикой этого сервера:</string>
-
     <string name="settings_call_category">Вызовы</string>
     <string name="settings_call_ringtone_use_app_ringtone">Использовать стандартную мелодию Element для входящих звонков</string>
     <string name="settings_call_ringtone_title">Мелодия звонка</string>
     <string name="settings_call_ringtone_dialog_title">Выберите мелодию звонка:</string>
-
     <string name="video_call_in_progress">Идёт видеозвонок …</string>
-
     <string name="room_participants_action_kick">Выгнать</string>
     <string name="reason_hint">Причина</string>
-
     <string name="settings_notification_troubleshoot">Поиск проблем с уведомлениями</string>
     <string name="settings_send_typing_notifs">Оправлять уведомления о наборе текста</string>
     <string name="settings_send_markdown">Markdown форматирование</string>
     <string name="startup_notification_fdroid_battery_optim_title">Фоновое Соединение</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Предоставить разрешение</string>
-
     <string name="account_email_error">Произошла ошибка при подтверждении вашего адреса электронной почты.</string>
-
     <string name="account_phone_number_error">Произошла ошибка при подтверждении вашего номера телефона.</string>
     <string name="account_additional_info">Дополнительная информация: %s</string>
-
     <string name="settings_labs_enable_send_voice_summary">Эта опция требует стороннего приложения для записи сообщений.</string>
-
     <string name="command_problem_with_parameters">Команде \"%s\" нужно больше параметров, или некоторые параметры неверны.</string>
     <string name="markdown_has_been_enabled">Markdown включен.</string>
     <string name="markdown_has_been_disabled">Markdown выключен.</string>
-
     <string name="show_info_area_always">Всегда</string>
     <string name="show_info_area_messages_and_errors">Для сообщений и ошибок</string>
     <string name="show_info_area_only_errors">Только для ошибок</string>
-
     <string name="accept">Принимаю</string>
-
     <string name="settings_troubleshoot_diagnostic">Результаты диагностики</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Запустить тесты</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Выполняется… (%1$d из %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_success_status">В основном, всё в порядке. Если вы по-прежнему не получаете уведомления, пожалуйста, отправьте отчет об ошибке, чтобы помочь нам разобраться.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Один или несколько тестов не пройдены, попробуйте предлагаемые решения.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Один или несколько тестов не пройдены, пожалуйста, отправьте отчет об ошибке, чтобы помочь нам исследовать проблему.</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">Настройки системы.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Уведомления включены в настройках системы.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Уведомления отключены в настройках системы.
 Пожалуйста, проверьте настройки системы.</string>
     <string name="open_settings">Открыть настройки</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Настройки аккаунта.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Уведомления включены для вашей учетной записи.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Уведомления отключены для вашей учетной записи.
 Пожалуйста, проверьте настройки аккаунта.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Включить</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Настройки сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомления включены для этой сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включено для этой сессии. 
 \nПожалуйста, проверьте настройки Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Включить</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Проверка сервисов Play</string>
     <string name="settings_troubleshoot_test_play_services_success">APK Google Play сервисов доступен и обновлён.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element использует сервисы Google Play для доставки push-сообщений, но не похоже что он настроен правильно:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Исправить сервисы Play</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Токен Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">Токен FCM успешно получен:
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">Не удалось получить токен FCM:
 %1$s</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">Регистрация токена</string>
     <string name="settings_troubleshoot_test_token_registration_success">Токен FCM успешно зарегистрирован на сервере.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Не удалось зарегистрировать токен FCM на сервере:
 %1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Служба уведомлений</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Служба уведомлений запущена.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Служба уведомлений не запущена.
 Попробуйте перезапустить приложение.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Запустить службу</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">Автоматический перезапуск службы уведомлений</string>
     <string name="settings_troubleshoot_test_service_restart_success">Служба была убита и перезапущена автоматически.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Не удалось перезапустить службу</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Запуск при загрузке</string>
     <string name="settings_troubleshoot_test_service_boot_success">Служба будет запущена после перезапуска устройства.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">При перезагрузке устройства служба не будет запущена , вы не будете получать уведомления, пока Element не будет открыт один раз.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Включить запуск при загрузке</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Проверьте фоновые ограничения</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Фоновые ограничения отключены для Element. Этот тест должен быть запущен с использованием мобильных данных (без WIFI).
 %1$s</string>
@@ -1179,12 +985,10 @@
 Работа приложения будет жестко ограничена, пока оно находится в фоновом режиме, и это может повлиять на уведомления.
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Отключить ограничения</string>
-
     <string name="settings_troubleshoot_test_battery_title">Оптимизация батареи</string>
     <string name="settings_troubleshoot_test_battery_success">Оптимизация батареи не влияет на Element.</string>
     <string name="settings_troubleshoot_test_battery_failed">Если пользователь оставляет устройство в отключенном от сети и в неподвижном состоянии в течение некоторого времени при выключенном экране, устройство переходит в режим Doze. Это предотвращает доступ приложений к сети и откладывает выполнение заданий, синхронизацию и передачу стандартных аварийных сигналов.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Игнорировать оптимизацию</string>
-
     <string name="settings_inline_url_preview_summary">Предпросмотр ссылок в чате, когда ваш домашний сервер поддерживает эту функцию.</string>
     <string name="settings_send_typing_notifs_summary">Показывать другим пользователям, что вы печатаете.</string>
     <string name="settings_send_markdown_summary">Форматировать сообщения, используя markdown. Например, позволяет использовать звездочки для выделения текста курсивом.</string>
@@ -1195,7 +999,6 @@
     <string name="settings_show_avatar_display_name_changes_messages_summary">Включает изменения аватара и отображаемого имени.</string>
     <string name="startup_notification_fdroid_battery_optim_message">Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений.
 На следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите.</string>
-
     <string name="settings_labs_native_camera_summary">Использовать системную камеру вместо камеры Element.</string>
     <string name="settings_info_area_show">Показать информацию</string>
     <string name="generic_label">%1$s:</string>
@@ -1203,43 +1006,31 @@
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Не найден APK сервисов Google Play. Уведомления могут работать неправильно.</string>
-
     <string name="settings_show_join_leave_messages_summary">Не влияет на приглашения, исключения и запреты.</string>
-
     <string name="title_activity_keys_backup_setup">Резервное копирование ключей</string>
     <string name="title_activity_keys_backup_restore">Используйте резервную копию ключа</string>
     <string name="keys_backup_is_not_finished_please_wait">Резервное копирование ключей не завершено, пожалуйста, подождите…</string>
-
     <string name="skip">Пропустить</string>
     <string name="done">Готово</string>
-
     <string name="settings_notification_advanced">Расширенные настройки уведомлений</string>
     <string name="settings_notification_by_event">Значение уведомления по событию</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">Пользовательские настройки.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Обратите внимание, для некоторых типов сообщений выбран беззвучный режим (уведомление будет, но без звука).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Некоторые уведомления отключены в настройках.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Не удалось загрузить пользовательские правила, повторите попытку.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Проверьте настройки</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Добавить аккаунт</string>
-
     <string name="settings_noisy_notifications_preferences">Настроить шумные уведомления</string>
     <string name="settings_call_notifications_preferences">Настроить уведомления о вызовах</string>
     <string name="settings_silent_notifications_preferences">Настроить беззвучные уведомления</string>
     <string name="settings_system_preferences_summary">Выбрать цвет светодиода, вибрацию, звук…</string>
-
-
     <string name="settings_cryptography_manage_keys">Управление криптографическими ключами</string>
     <string name="encryption_settings_manage_message_recovery_summary">Управление резервным копированием ключей</string>
-
     <string name="notification_silent">Беззвучный</string>
     <string name="passphrase_empty_error_message">Пожалуйста, введите парольную фразу</string>
     <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите парольную фразу, если хотите, чтобы Element сгенерировал ключ восстановления.</string>
     <string name="keys_backup_no_session_error">Matrix сессия недоступна</string>
-
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
     <string name="keys_backup_setup_step1_description">Сообщения в зашифрованных комнатах защищены сквозным шифрованием. Ключи для прочтения этих сообщений есть только у вас и получателя(ей).
 \n
@@ -1255,10 +1046,8 @@
     <string name="keys_backup_setup_backup_started_title">Резервное копирование началось</string>
     <string name="keys_backup_setup_skip_title">Уверены?</string>
     <string name="keys_backup_settings_delete_confirm_message">Удалить резервную копию ключей шифрования с сервера? Вы больше не сможете использовать ключ восстановления для чтения истории зашифрованных сообщений.</string>
-
     <string name="keys_backup_settings_delete_confirm_title">Удалить резервную копию</string>
     <string name="keys_backup_settings_delete_backup_error">Не удалось удалить резервную копию (%s)</string>
-
     <string name="keys_backup_settings_deleting_backup">Удаление резервной копии…</string>
     <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервную копию ключа в этой сессии, восстановите его с помощью своей парольной фразы или ключа восстановления.</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Резервная копия имеет недействительную подпись из подтвержденной сессии %s</string>
@@ -1267,62 +1056,46 @@
     <string name="keys_backup_settings_valid_signature_from_this_device">Резервная копия имеет действительную подпись с этой сессии.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">Резервная копия подписана сессией с идентификатором %s.</string>
     <string name="keys_backup_settings_status_not_setup">Резервные копии ключей этой сессии не сохраняются.</string>
-
-
     <string name="keys_backup_settings_status_ko">Резервное копирование ключей не активировано в этой сессии.</string>
     <string name="keys_backup_settings_status_ok">Резервное копирование ключей успешно настроено для этой сессии.</string>
     <string name="keys_backup_settings_delete_backup_button">Удалить резервную копию</string>
-
     <string name="keys_backup_settings_restore_backup_button">Восстановить из резервной копии</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Сессионное шифрование не активировано</string>
-
-
     <string name="keys_backup_recovery_code_empty_error_message">Пожалуйста, введите ключ восстановления</string>
     <string name="keys_backup_unlock_button">Разблокировать историю</string>
     <string name="keys_backup_restoring_waiting_message">Восстановление резервной копии:</string>
     <string name="keys_backup_restore_setup_recovery_key">Восстановление сообщений</string>
-
     <string name="keys_backup_restore_key_enter_hint">Введите ключ восстановления</string>
-
     <string name="keys_backup_restore_with_recovery_key">Используйте ключ восстановления для разблокировки истории зашифрованных сообщений</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для восстановления, вы можете %s.</string>
-
     <string name="keys_backup_restore_use_recovery_key">используйте ключ восстановления</string>
     <string name="keys_backup_setup_skip_msg">Вы можете потерять доступ к сообщениям, если выйдете из системы или потеряете это устройство.</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">Запрашивает версию резервной копии…</string>
     <string name="keys_backup_restore_with_passphrase">Используйте парольную фразу для разблокировки истории зашифрованных сообщений</string>
     <string name="keys_backup_restore_with_key_helper">Потеряли ключ восстановления? В настройках вы можете создать новый.</string>
     <string name="network_error_please_check_and_retry">Ошибка сети: проверьте соединение и повторите попытку.</string>
-
     <string name="keys_backup_restore_success_title">Резервная копия восстановлена %s !</string>
     <string name="keys_backup_get_trust_error">Ошибка получения информации о доверии для резервной копии (%s).</string>
-
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Резервная копия имеет недействительную подпись из неподтвержденной сессии %s</string>
     <string name="keys_backup_get_version_error">Не удалось получить последнюю версию ключей восстановления (%s).</string>
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="one">%d новый ключ был добавлен к этому устройству.</item>
         <item quantity="few">%d новых ключа были добавлены к этому устройству.</item>
         <item quantity="many">%d новых ключей были добавлены к этому устройству.</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Восстановлена резервная копия с %d ключом.</item>
         <item quantity="few">Восстановлены резервные копии с %d ключами.</item>
         <item quantity="many">Восстановлены резервные копии с %d ключами.</item>
     </plurals>
     <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого ключа восстановления: убедитесь, что вы ввели правильный ключ.</string>
-
     <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью данного пароля: убедитесь, что вы ввели верный пароль.</string>
     <string name="keys_backup_setup_backup_started_message">Ключи шифрования копируются на сервер в фоновом режиме. Первое копирование может занять несколько минут.</string>
-
-
     <string name="keys_backup_setup_step3_generating_key_status">Генерация ключей восстановления с использованием парольной фразы может занять несколько секунд.</string>
     <string name="recovery_key_export_saved_as_warning">Ключ восстановления был сохранен в \'%s\'.
 
 Предупреждение: этот файл может быть удален при удалении приложения.</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
 \nЭта ошибка вне контроля Element. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -1336,35 +1109,28 @@
     <string name="are_you_sure">Уверены?</string>
     <string name="backup">Создание резервной копии</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Сделайте резервную копию ваших ключей или потеряете доступ к вашим зашифрованным сообщениям.</string>
-
     <string name="stay">Остаться</string>
     <string name="abort">Прервать</string>
-
     <string name="action_sign_out_confirmation_simple">Уверены, что хотите выйти?</string>
     <string name="error_empty_field_enter_user_name">Пожалуйста, введите имя пользователя.</string>
     <string name="keys_backup_setup_step1_advanced">(Расширенный)</string>
     <string name="keys_backup_setup_step1_manual_export">Ручной экспорт ключей</string>
-
     <string name="keys_backup_setup_creating_backup">Создание резервной копии</string>
     <string name="keys_backup_setup_step3_success_title">Успех!</string>
     <string name="keys_backup_info_title_signature">Подпись</string>
-
     <string name="keys_backup_info_title_algorithm">Алгоритм</string>
     <string name="keys_backup_info_title_version">Версия</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Резервное копирование %d ключа…</item>
         <item quantity="few">Резервное копирование %d ключей…</item>
         <item quantity="many">Резервное копирование %d ключей…</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <string name="keys_backup_info_keys_all_backup_up">Все ключи сохранены</string>
     <string name="keys_backup_banner_in_progress">Резервное копирование ключей…</string>
-
     <string name="keys_backup_banner_recover_line1">Никогда не теряйте зашифрованные сообщения</string>
     <string name="keys_backup_banner_setup_line1">Никогда не теряйте зашифрованные сообщения</string>
     <string name="keys_backup_banner_setup_line2">Начать использовать резервное копирование ключей</string>
-
     <string name="new_recovery_method_popup_was_me">Это был я</string>
     <string name="keys_backup_setup_step3_share_recovery_file">Поделиться</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Я сделал копию</string>
@@ -1374,9 +1140,7 @@
     <string name="keys_backup_setup">Начать использовать резервное копирование ключей</string>
     <string name="new_recovery_method_popup_title">Новая резервная копия ключа</string>
     <string name="keys_backup_banner_recover_line2">Использовать резервное копирование ключей</string>
-
     <string name="keys_backup_banner_update_line2">Управление резервным копированием ключей</string>
-
     <string name="keys_backup_banner_update_line1">Новые ключи зашифрованных сообщений</string>
     <string name="new_recovery_method_popup_description">Обнаружена новая резервная копия ключа безопасных сообщений. 
 \n
@@ -1384,7 +1148,6 @@
     <string name="keys_backup_setup_step3_text_line1">Ваши ключи копируются.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Дополнительно) Настройка с ключом восстановления</string>
     <string name="settings_data_save_mode_summary">В режиме экономии траффика применяется специальный фильтр, поэтому обновление присутствия и уведомления о наборе отфильтровываются.</string>
-
     <string name="keys_backup_setup_step1_recovery_key_alternative">Или защитите резервную копию с помощью ключа восстановления, сохранив его в безопасном месте.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Безопасная резервная копия ключей должна быть активирована на всех ваших сессиях, чтобы не потерять доступ к зашифрованным сообщениям.</string>
     <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её парольной фразой.
@@ -1395,7 +1158,6 @@
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление ключа восстановления…</string>
     <string name="ignore">Игнорировать</string>
-
     <string name="notification_sync_init">Инициализация сервиса</string>
     <string name="action_mark_room_read">Отметить как прочитанное</string>
     <string name="auth_login_sso">Войти с помощью единого входа</string>
@@ -1404,43 +1166,36 @@
     <string name="settings_change_password_submit">Обновить пароль</string>
     <string name="settings_fail_to_update_password_invalid_current_password">Пароль не действителен</string>
     <string name="passwords_do_not_match">Пароли не совпадают</string>
-
     <string name="settings_media">Медиа</string>
     <string name="settings_default_compression">Сжатия по умолчанию</string>
     <string name="compression_opt_list_choose">Выберите</string>
     <string name="settings_default_media_source">Источник медиа по умолчанию</string>
     <string name="media_source_choose">Выберите</string>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: 1 сообщение</item>
+        <item quantity="one">%1$s: %2$d сообщение</item>
         <item quantity="few">%1$s: %2$d сообщения</item>
         <item quantity="many">%1$s: %2$d сообщений</item>
+        <item quantity="other">%1$s: %2$d сообщений</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d оповещение</item>
         <item quantity="few">%d оповещения</item>
         <item quantity="many">%d оповещений</item>
     </plurals>
-
     <string name="notification_unknown_new_event">Новое событие</string>
     <string name="notification_unknown_room_name">Комната</string>
     <string name="notification_new_messages">Новые сообщения</string>
     <string name="notification_new_invitation">Новое приглашение</string>
     <string name="notification_sender_me">Мне</string>
     <string name="autodiscover_well_known_autofill_confirm">Использовать настройку</string>
-
     <string name="title_activity_verify_device">Проверить сессию</string>
-
     <string name="login_error_ssl_handshake">Ваше устройство использует устаревший TLS протокол, уязвимый для атак, для вашей же безопасности вам отказано в подключении</string>
     <string name="settings_notification_privacy_no_background_sync">Приложениям <b>не</b>" нужно  подключаться к HomeServer в фоновом режиме, это должно снизить расход заряда батареи"</string>
     <string name="settings_send_message_with_enter_summary">Клавиша Ввод отправит сообщение вместо переноса строки</string>
-
     <string name="settings_play_shutter_sound">Воспроизвести звук затвора</string>
-
     <string name="encryption_information_unknown_ip">неизвестный IP</string>
     <string name="notification_inline_reply_failed">** Отправить не удалось - пожалуйста откройте комнату</string>
-
     <string name="error_jitsi_not_supported_on_old_device">К сожалению, конференц-звонки с Jitsi не поддерживаются на старых устройствах (ниже Android OS - 5.0)</string>
-
     <string name="you_added_a_new_device_with_info">Новая сессия запрашивает ключи шифрования. 
 \nИмя сессии: %1$s 
 \nПоследний раз в сети: %2$s 
@@ -1449,12 +1204,10 @@
 \nИмя сессии: %1$s 
 \nПоследний раз в сети: %2$s 
 \nЕсли вы не открывали новую сессию - проигнорируйте этот запрос.</string>
-
     <string name="start_verification_short_label">Подтвердить</string>
     <string name="share_without_verifying_short_label">Поделиться</string>
     <string name="key_share_request">Запрос поделится ключем</string>
     <string name="ignore_request_short_label">Игнорировать</string>
-
     <string name="autodiscover_invalid_response">Ошибка отклика сервера</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Дополнить параметры сервера</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element обнаружил пользовательскую конфигурацию сервера для вашего userID домена\"%1$s\":
@@ -1465,33 +1218,26 @@
     <string name="sas_incoming_request_title">Входящий запрос о проверке</string>
     <string name="sas_incoming_request_description">Проверьте эту сессию, чтобы отметить её как доверенную. Доверие сессиям партнеров позволяет быть уверенным в надёжности сквозного шифрования сообщений.</string>
     <string name="sas_incoming_request_description_2">Потдверждение этой сессии пометит её доверенной для вас и вашего партнёра.</string>
-
     <string name="sas_emoji_description">Подтвердите эту сессию, убедившись, что следующие смайлики появляются на экране партнера</string>
     <string name="sas_decimal_description">Подтвердите эту сессию, убедившись, что следующие цифры появляются на экране партнера</string>
-
     <string name="sas_incoming_verification_request_dialog">Вы получили входящий запрос на подтверждение.</string>
     <string name="sas_view_request_action">Посмотреть запрос</string>
     <string name="sas_waiting_for_partner">В ожидании партнера, чтобы подтвердить …</string>
-
     <string name="sas_verified">Проверено!</string>
     <string name="sas_verified_successful">Вы успешно подтвердили эту сессию.</string>
     <string name="sas_verified_successful_description">Защищенные сообщения от этого пользователя шифруются end-to-end и не могут быть прочитаны третьими лицами.</string>
     <string name="sas_got_it">Понял</string>
-
     <string name="sas_verifying_keys">Ничего не появляется\? Не все клиенты пока поддерживают интерактивную проверку. Используйте устаревшую проверку.</string>
     <string name="sas_legacy_verification_button_title">Используйте устаревшую проверку.</string>
-
     <string name="sas_verification_request_notification_channel_title">Проверка ключа</string>
     <string name="sas_cancelled_dialog_title">Запрос отменен</string>
     <string name="sas_cancelled_by_other">Другая сторона отменила проверку.
 \n%s</string>
     <string name="sas_cancelled_by_me">Проверка отменена.
 \nПричина: %s</string>
-
     <string name="sas_verification_request_notification_channel">Интерактивное подтверждение сессии</string>
     <string name="sas_incoming_request_notif_title">Запрос на подтверждение</string>
     <string name="sas_incoming_request_notif_content">%s желает подтвердить ваше устройство</string>
-
     <string name="sas_error_m_user">Пользователь отменил проверку</string>
     <string name="sas_error_m_timeout">Время проверки истекло</string>
     <string name="sas_error_m_unknown_transaction">Сессия не знает об этой транзакции</string>
@@ -1503,23 +1249,18 @@
     <string name="sas_error_m_key_mismatch">Несоответствие ключей</string>
     <string name="sas_error_m_user_error">Несоответствие пользователя</string>
     <string name="sas_error_unknown">Неизвестная ошибка</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Резервная копия существует на домашнем сервере</string>
     <string name="keys_backup_setup_override_backup_prompt_description">"Похоже, у вас уже есть резервная копия  ключа настройки из другой сессии. Хотите заменить его новым\?"</string>
     <string name="keys_backup_setup_override_replace">Заменить</string>
     <string name="keys_backup_setup_override_stop">Стоп</string>
-
     <string name="keys_backup_settings_checking_backup_state">Проверка состояния резервного копирования</string>
     <string name="invalid_or_expired_credentials">Вы вышли из системы из-за недействительных или истекших учетных данных.</string>
-
     <string name="edit">Редактировать</string>
     <string name="reply">Ответить</string>
-
     <string name="global_retry">Повторить</string>
     <string name="room_list_empty">Присоединитесь к комнате, чтобы начать использовать приложение.</string>
     <string name="send_you_invite">Отправил вам приглашение</string>
     <string name="invited_by">Приглашен %s</string>
-
     <string name="room_list_catchup_empty_title">Вы в курсе!</string>
     <string name="room_list_catchup_empty_body">У вас больше нет непрочитанных сообщений</string>
     <string name="room_list_catchup_welcome_title">Добро пожаловать домой!</string>
@@ -1528,22 +1269,17 @@
     <string name="room_list_people_empty_body">Здесь будут отображаться ваши диалоги</string>
     <string name="room_list_rooms_empty_title">Комнаты</string>
     <string name="room_list_rooms_empty_body">Здесь будут отображаться ваши комнаты</string>
-
     <string name="title_activity_emoji_reaction_picker">Реакции</string>
     <string name="reactions_agree">Принять</string>
     <string name="reactions_like">Нравиться</string>
     <string name="message_add_reaction">Добавить реакцию</string>
     <string name="message_view_reaction">Просмотреть реакции</string>
     <string name="settings_integration_manager">Менеджер интеграции</string>
-
     <string name="integration_manager_not_configured">Менеджер интеграции не настроен.</string>
     <string name="reactions">Реакции</string>
-
     <string name="event_redacted_by_user_reason">Событие удалено пользователем</string>
     <string name="event_redacted_by_admin_reason">Мероприятие, модерируемое администратором помещения</string>
     <string name="last_edited_info_message">Последнее изменение %1$s %2$s</string>
-
-
     <string name="malformed_message">Некорректное событие, не может быть отображено</string>
     <string name="create_new_room">Создать новую комнату</string>
     <string name="error_no_network">Сети нет. Пожалуйста, проверьте подключение к Интернету.</string>
@@ -1551,11 +1287,9 @@
     <string name="change_room_directory_network">Изменить сеть</string>
     <string name="please_wait">Пожалуйста, подождите…</string>
     <string name="group_all_communities">Все сообщества</string>
-
     <string name="room_preview_no_preview">Эту комнату нельзя предварительно просмотреть</string>
     <string name="fab_menu_create_room">Комнаты</string>
     <string name="fab_menu_create_chat">Диалоги</string>
-
     <string name="create_room_title">Новая комната</string>
     <string name="create_room_action_create">СОЗДАТЬ</string>
     <string name="create_room_name_hint">Имя комнаты</string>
@@ -1563,18 +1297,13 @@
     <string name="create_room_public_description">Любой сможет присоединиться к этой комнате</string>
     <string name="create_room_directory_title">Каталог номеров</string>
     <string name="create_room_directory_description">Опубликовать эту комнату в каталоге номеров</string>
-
     <string name="keys_backup_unable_to_get_trust_info">Произошла ошибка при получении информации о доверии</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Произошла ошибка при получении ключей резервного копирования данных</string>
-
     <string name="import_e2e_keys_from_file">Импорт ключей e2e из файла \"%1$s\".</string>
-
     <string name="settings_sdk_version">Версия Matrix SDK</string>
     <string name="settings_other_third_party_notices">Другие уведомления третьих сторон</string>
     <string name="navigate_to_room_when_already_in_the_room">Вы уже просмотрели эту комнату!</string>
-
     <string name="quick_reactions">Быстрое реагирование</string>
-
     <string name="settings_general_title">Общее</string>
     <string name="settings_preferences">Параметры</string>
     <string name="settings_security_and_privacy">Безопасность и конфиденциальность</string>
@@ -1586,89 +1315,62 @@
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Формат:</string>
-
     <string name="preference_voice_and_video">Голос и видео</string>
     <string name="preference_root_help_about">Помощь и информация</string>
-
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Регистрационный токен</string>
-
     <string name="send_suggestion">Оставить отзыв</string>
     <string name="send_suggestion_content">Пожалуйста, напишите ваше предложение ниже.</string>
     <string name="send_suggestion_report_placeholder">Опишите ваше предложение здесь</string>
     <string name="send_suggestion_sent">Спасибо, предложение было успешно отправлено</string>
     <string name="send_suggestion_failed">Предложение не было отправлено (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">Показать скрытые события в ленте сообщений</string>
-
     <string name="room_preview_world_readable_room_not_supported_yet">Предварительный просмотр открытой комнаты в Element пока не поддерживается</string>
-
     <string name="bottom_action_people_x">Диалоги</string>
-
     <string name="send_file_step_idle">Ждите…</string>
     <string name="send_file_step_encrypting_thumbnail">Шифрование миниатюры…</string>
     <string name="send_file_step_sending_thumbnail">Отправка миниатюр (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Файл шифруется…</string>
     <string name="send_file_step_sending_file">Файл отправляется (%1$s / %2$s)</string>
-
     <string name="downloading_file">Файл %1$s загружается…</string>
     <string name="downloaded_file">Файл %1$s был загружен!</string>
-
     <string name="edited_suffix">(изменено)</string>
-
-
     <string name="message_edits">Редактирование сообщений</string>
     <string name="no_message_edits_found">Изменения не найдены</string>
-
     <string name="room_filtering_filter_hint">Отфильтровывать разговоры…</string>
     <string name="room_filtering_footer_title">Не можете найти то, что ищете\?</string>
     <string name="room_filtering_footer_create_new_room">Создать новую комнату</string>
     <string name="room_filtering_footer_create_new_direct_message">Отправить новое прямое сообщение</string>
     <string name="room_filtering_footer_open_room_directory">Просмотр список комнат</string>
-
     <string name="room_directory_search_hint">Имя или ID (#example:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Включить жест смахивания для ответа в ленте сообщений</string>
-
     <string name="link_copied_to_clipboard">Ссылка скопирована в буфер обмена</string>
-
     <string name="add_by_matrix_id">Добавить по Matrix ID</string>
     <string name="creating_direct_room">Создание комнаты…</string>
     <string name="direct_room_no_known_users">"Результат не найден, используйте добавить matrix ID  для поиска на сервере."</string>
     <string name="direct_room_start_search">Начните печатать, чтобы получить результат</string>
     <string name="direct_room_filter_hint">Фильтр по имени пользователя или ID…</string>
-
     <string name="joining_room">Присоединение к комнате…</string>
-
     <string name="message_view_edit_history">История изменений</string>
-
     <string name="review">Обзор</string>
     <string name="decline">Отклонить</string>
-
     <string name="widget_integration_review_terms">Для продолжения Вам необходимо принять Условия данного сервиса.</string>
-
     <string name="settings_push_rules_no_rules">Правила push-уведомлений не определены</string>
     <string name="settings_push_gateway_no_pushers">Нет зарегистрированных push-шлюзов</string>
-
     <string name="terms_of_service">Условия предоставления услуг</string>
     <string name="review_terms">Условия просмотра</string>
     <string name="terms_description_for_identity_server">Быть доступным для других</string>
     <string name="terms_description_for_integration_manager">Используйте ботов, мосты, виджеты и стикеры</string>
-
     <string name="read_at">Читать в</string>
-
     <string name="none">Никто</string>
     <string name="revoke">Отмена</string>
     <string name="disconnect">Отключить</string>
     <string name="people_no_identity_server">Сервер идентификации не настроен.</string>
-
     <string name="call_failed_no_ice_title">Звонок не состоялся из-за неправильно настроенного сервера</string>
     <string name="call_failed_no_ice_description">Попросите администратора вашего домашнего сервера (%1$s) настроить TURN сервер, чтобы звонки работали надежно.
 \n
 \nКроме того, вы можете попробовать использовать публичный сервер по %2$s, но это будет не так надежно, и он предоставит ваш IP-адрес этому серверу. Вы также можете управлять этим в настройках.</string>
     <string name="call_failed_no_ice_use_alt">Попробуйте использовать %s</string>
     <string name="call_failed_dont_ask_again">Больше не спрашивать</string>
-
     <string name="auth_add_email_message_2">Установите адрес электронной почты для восстановления учетной записи, и позже она может будет найдена участниками, которые вас знают.</string>
     <string name="auth_add_phone_message_2">Установите телефон, и позже его могут опционально обнаруживать люди, которые вас знают.</string>
     <string name="auth_add_email_phone_message_2">Установите адрес электронной почты для восстановления аккаунта. Позже используйте электронную почту или телефон, чтобы их могли найти люди, которые вас знают.</string>
@@ -1679,8 +1381,6 @@
     <string name="settings_background_fdroid_sync_mode_real_time">Оптимизирован для работы в реальном времени</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Без фоновой синхронизации</string>
     <string name="settings_background_sync_update_error">Не удалось обновить настройки.</string>
-
-
     <string name="settings_set_workmanager_delay">Предпочтительный интервал синхронизации</string>
     <string name="settings_discovery_category">Обнаружение</string>
     <string name="settings_call_ringtone_use_default_stun_sum">Будет использовать%s в качестве помощника, если ваш домашний сервер не предлагает его (ваш IP-адрес будет доступен во время разговора)</string>
@@ -1698,9 +1398,7 @@
     <string name="device_name_warning">Публичное имя сессии видны людям, с которыми вы общаетесь</string>
     <string name="identity_server_not_defined">Вы не используете какой-либо сервер идентификации</string>
     <string name="identity_server_not_defined_for_password_reset">Идентификационный сервер не настроен, требуется сброс пароля.</string>
-
     <string name="error_user_already_logged_in">Похоже, вы пытаетесь подключиться к другому домашнему серверу. Вы хотите выйти\?</string>
-
     <string name="identity_server">Сервер идентификации</string>
     <string name="disconnect_identity_server">Отключить идентификационный сервер</string>
     <string name="add_identity_server">Настроить идентификационный сервер</string>
@@ -1710,7 +1408,6 @@
     <string name="settings_discovery_emails_title">Видимые адреса электронной почты</string>
     <string name="settings_discovery_msisdn_title">Доступные номера телефонов</string>
     <string name="settings_discovery_mail_pending">В ожидании</string>
-
     <string name="settings_discovery_enter_identity_server">Введите адрес сервера идентификации</string>
     <string name="settings_discovery_bad_identity_server">Не удалось подключиться к серверу идентификации</string>
     <string name="settings_discovery_please_enter_server">Пожалуйста, введите URL сервера идентификации</string>
@@ -1721,19 +1418,15 @@
     <string name="settings_discovery_confirm_mail">Мы отправили вам электронное письмо с подтверждением на %s, проверьте вашу электронную почту и нажмите на ссылку для подтверждения</string>
     <string name="settings_discovery_no_terms">Выбранный сервер идентификации не имеет условий обслуживания. Продолжить, только если вы доверяете владельцу службы</string>
     <string name="settings_text_message_sent">Текстовое сообщение отправлено %s. Введите код проверки, который он содержит.</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">В настоящее время вы делитесь адресами электронной почты или телефонными номерами на сервере идентификации %1$s. Вам нужно повторно подключиться к %2$s, чтобы прекратить делиться ими.</string>
     <string name="settings_agree_to_terms">Примите Условия обслуживания сервера идентификации (%s), чтобы разрешить обнаружение по адресу электронной почты или номеру телефона.</string>
     <string name="labs_allow_extended_logging">Включить подробные логи.</string>
     <string name="send_attachment">Отправить вложение</string>
-
     <string name="a11y_open_drawer">Откройте навигационный ящик</string>
     <string name="a11y_create_menu_open">Открыть меню создания комнаты</string>
     <string name="login_error_no_homeserver_found">Неверный адрес сервера Matrix</string>
     <string name="settings_add_3pid_confirm_password_title">Подтвердите пароль</string>
     <string name="settings_add_3pid_authentication_needed">Требуется аутентификация</string>
-
-
     <string name="settings_integrations">Интеграции</string>
     <string name="settings_integration_allow">Разрешить интеграции</string>
     <string name="room_widget_activity_title">Виджет</string>
@@ -1746,10 +1439,7 @@
     <string name="room_widget_permission_added_by">Этот виджет был добавлен:</string>
     <string name="room_widget_permission_theme">Ваши тема</string>
     <string name="room_widget_permission_room_id">ID комнаты</string>
-
-
     <string name="resources_script">Cyrl</string>
-
     <string name="settings_integrations_summary">Используйте менеджер интеграций чтобы управлять ботами, мостами, виджетами и наборами стикеров.
 \nМенеджеры интеграций получают данные о конфигурации, могут изменять виджеты, отправлять приглашения в комнаты и устанавливать права от вашего имени.</string>
     <string name="room_widget_permission_webview_shared_info_title">"Использование может оставить cookie на вашем устройстве и отправить данные в  %s:"</string>
@@ -1757,7 +1447,6 @@
     <string name="room_widget_failed_to_load">Не удалось загрузить виджет.
 \n%s</string>
     <string name="room_widget_revoke_access">Отозвать доступ для меня</string>
-
     <string name="room_widget_permission_display_name">Ваше отображаемое имя</string>
     <string name="room_widget_permission_avatar_url">URL вашего аватара</string>
     <string name="room_widget_permission_user_id">Ваш ID</string>
@@ -1766,7 +1455,6 @@
     <string name="room_widget_webview_access_camera">Использовать камеру</string>
     <string name="room_widget_webview_access_microphone">Использовать микрофон</string>
     <string name="room_widget_webview_read_protected_media">Получать доступ к медиа, защищённым DRM</string>
-
     <string name="a11y_create_room">Создать новую комнату</string>
     <string name="a11y_show_password">Показать пароль</string>
     <string name="a11y_hide_password">Скрыть пароль</string>
@@ -1776,7 +1464,6 @@
     <string name="attachment_type_gallery">Галерея</string>
     <string name="report_content_spam">Это спам</string>
     <string name="message_ignore_user">Игнорировать пользователя</string>
-
     <string name="room_list_quick_actions_notifications_all">Все сообщения</string>
     <string name="room_list_quick_actions_notifications_mentions">Только при упоминаниях</string>
     <string name="room_list_quick_actions_settings">Настройки</string>
@@ -1784,39 +1471,29 @@
     <string name="room_join_rules_public">%1$s сделал(а) комнату доступной для всех, у кого есть ссылка.</string>
     <string name="room_join_rules_invite">%1$s сделал(а) комнату доступной только по приглашению.</string>
     <string name="labs_allow_extended_logging_summary">Подробные логи помогут разработчикам, предоставив больше информации, когда вы отправляете RageShake. Даже когда они разрешены, приложение не логирует ваши сообщения и другие приватные данные.</string>
-
-
     <string name="a11y_create_menu_close">Отменить создание комнаты…</string>
     <string name="a11y_jump_to_bottom">Вниз</string>
-
     <string name="attachment_type_contact">Контакт</string>
     <string name="attachment_type_sticker">Стикер</string>
     <string name="report_content_custom_hint">Причина жалобы на контент</string>
     <string name="report_content_custom_submit">Пожаловаться</string>
     <string name="block_user">ИГНОРИРОВАТЬ ПОЛЬЗОВАТЕЛЯ</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">Все сообщения (громко)</string>
     <string name="room_list_quick_actions_notifications_mute">Без звука</string>
     <string name="command_description_spoiler">Отправить данное сообщение под спойлером</string>
     <string name="spoiler">Спойлер</string>
     <string name="reaction_search_type_hint">Введите ключевые слова, чтобы найти реакцию.</string>
-
     <string name="help_long_click_on_room_for_more_options">Долгий клик по комнате покажет дополнительные опции</string>
-
-
     <string name="timeline_unread_messages">Непрочитанные сообщения</string>
-
     <string name="login_splash_title">Это ваш разговор. Владейте им.</string>
     <string name="login_splash_text1">Общайтесь с людьми напрямую или в группах</string>
     <string name="login_splash_submit">Начать</string>
-
     <string name="login_server_title">Выберите сервер</string>
     <string name="login_server_text">Как и у электронной почты, у учётных записей один дом, хотя вы можете общаться с кем угодно</string>
     <string name="login_server_modular_text">Премиум-хостинг для организаций</string>
     <string name="login_server_modular_learn_more">Узнать больше</string>
     <string name="login_server_other_title">Другой</string>
     <string name="login_server_other_text">Пользовательские и расширенные настройки</string>
-
     <string name="login_continue">Продолжить</string>
     <string name="login_connect_to">Подключиться к %1$s</string>
     <string name="login_connect_to_modular">Подключиться к Element Matrix Services</string>
@@ -1824,7 +1501,6 @@
     <string name="login_signup">Зарегистрироваться</string>
     <string name="login_signin">Войти в систему</string>
     <string name="login_signin_sso">Продолжить с SSO</string>
-
     <string name="login_server_url_form_modular_hint">Модульный адрес</string>
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум-хостинг для организаций</string>
@@ -1836,20 +1512,15 @@
     <string name="login_registration_not_supported">Приложение не может создать учётную запись на этом домашнем сервере. 
 \n 
 \nХотите зарегистрироваться через веб-клиент\?</string>
-
     <string name="login_login_with_email_error">Этот адрес электронной почты не связан ни с одной учетной записью.</string>
-
     <string name="login_reset_password_on">Сбросить пароль на %1$s</string>
     <string name="login_reset_password_submit">Далее</string>
     <string name="login_reset_password_email_hint">Email</string>
     <string name="login_reset_password_password_hint">Новый пароль</string>
-
     <string name="login_reset_password_warning_title">Внимание!</string>
     <string name="login_reset_password_warning_content">Смена пароля приведёт к сбросу всех сквозных ключей шифрования во всех ваших сессиях, что сделает зашифрованную историю разговоров нечитаемой. Настройте резервное копирование ключей или экспортируйте ключи от комнаты из другой сессии, прежде чем сбрасывать пароль.</string>
     <string name="login_reset_password_warning_submit">Продолжить</string>
-
     <string name="login_reset_password_error_not_found">Данный email не связан ни с одним аккаунтом</string>
-
     <string name="login_reset_password_mail_confirmation_title">Проверьте свою почту</string>
     <string name="login_reset_password_mail_confirmation_notice">Письмо с подтверждением было отправлено на %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Нажмите на ссылку, чтобы подтвердить свой новый пароль. Как только вы перейдете по ссылке, которую он содержит, нажмите ниже.</string>
@@ -1857,33 +1528,27 @@
     <string name="login_reset_password_success_notice">Ваш пароль был сброшен.</string>
     <string name="login_reset_password_success_notice_2">Вы вышли из всех сессий и больше не будете получать push-уведомления. Чтобы возобновить уведомления, войдите снова на каждом устройстве.</string>
     <string name="login_reset_password_success_submit">Назад, чтобы войти в систему</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Предупреждение</string>
     <string name="login_reset_password_cancel_confirmation_content">Ваш пароль еще не изменен.
 \n
 \nОстановить процесс смены пароля\?</string>
-
     <string name="login_set_email_title">Задать адрес электронной почты</string>
     <string name="login_set_email_mandatory_hint">Электронная почта</string>
     <string name="login_set_email_optional_hint">Электронная почта (по желанию)</string>
     <string name="login_set_email_submit">Далее</string>
-
     <string name="login_set_msisdn_title">Установить номер телефона</string>
     <string name="login_set_msisdn_notice">Укажите номер своего телефона, чтобы разрешить знакомым найти вас.</string>
     <string name="login_set_msisdn_notice2">Пожалуйста, используйте международный формат.</string>
     <string name="login_set_msisdn_mandatory_hint">Номер телефона</string>
     <string name="login_set_msisdn_optional_hint">Номер телефона (необязательно)</string>
     <string name="login_set_msisdn_submit">Далее</string>
-
     <string name="login_msisdn_confirm_title">Подтвердить номер телефона</string>
     <string name="login_msisdn_confirm_notice">Мы только что отправили код на %1$s. Введите его ниже, чтобы подтвердить, что это вы.</string>
     <string name="login_msisdn_confirm_hint">Введите код</string>
     <string name="login_msisdn_confirm_send_again">Отправить повторно</string>
     <string name="login_msisdn_confirm_submit">Далее</string>
-
     <string name="login_msisdn_error_not_international">Международные телефонные номера должны начинаться с \'+\'</string>
     <string name="login_msisdn_error_other">Номер телефона кажется недействительным. Пожалуйста, проверьте его</string>
-
     <string name="login_signup_to">Зарегистрироваться в %1$s</string>
     <string name="login_signin_username_hint">Имя пользователя или email</string>
     <string name="login_signup_username_hint">Имя пользователя</string>
@@ -1894,25 +1559,21 @@
     <string name="login_signup_cancel_confirmation_content">Ваш аккаунт еще не создан.
 \n
 \nОстановить процесс регистрации\?</string>
-
     <string name="login_a11y_choose_matrix_org">Выбрать matrix.org</string>
     <string name="login_a11y_choose_modular">Выбрать Element Matrix Services</string>
     <string name="login_a11y_choose_other">Выбрать другой сервер</string>
     <string name="login_a11y_captcha_container">Пожалуйста, пройдите проверку капчей</string>
     <string name="login_terms_title">Примите условия для продолжения</string>
-
     <string name="login_wait_for_email_title">Пожалуйста, проверьте ваш email</string>
     <string name="login_wait_for_email_notice">Мы только что отправили email на %1$s.
 \nПожалуйста, нажмите на содержащуюся в нём ссылку, чтобы продолжить создание аккаунта.</string>
     <string name="login_error_outdated_homeserver_title">Домашний сервер устарел</string>
     <string name="login_error_outdated_homeserver_content">Этот домашний сервер использует слишком старую версию для подключения. Попросите администратора обновить домашний сервер.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Отправлено слишком много запросов. Вы сможете повторить попытку через %1$d секунду…</item>
         <item quantity="few">Отправлено слишком много запросов. Вы сможете повторить попытку через %1$d секунды…</item>
         <item quantity="many">Отправлено слишком много запросов. Вы сможете повторить попытку через %1$d секунд…</item>
     </plurals>
-
     <string name="signed_out_title">Вы вышли из системы</string>
     <string name="signed_out_notice">Это могло произойти по разным причинам: 
 \n 
@@ -1922,7 +1583,6 @@
 \n 
 \n• Администратор вашего сервера заблокировал вам доступ из соображений безопасности.</string>
     <string name="signed_out_submit">Войти снова</string>
-
     <string name="soft_logout_title">Вы вышли из системы</string>
     <string name="soft_logout_signin_title">Войти</string>
     <string name="soft_logout_signin_notice">Администратор вашего домашнего сервера (%1$s) вывел вас из вашего аккаунта %2$s (%3$s).</string>
@@ -1934,7 +1594,6 @@
 \n 
 \nУдалите их, если вы закончили использовать это устройство или хотите войти в другую учётную запись.</string>
     <string name="soft_logout_clear_data_submit">Очистить все данные</string>
-
     <string name="soft_logout_clear_data_dialog_title">Очистить данные</string>
     <string name="soft_logout_clear_data_dialog_content">Очистить все данные, хранящиеся в данный момент на этом устройстве\? 
 \nВойдите заново, чтобы получить доступ к данным своей учётной записи и сообщениям.</string>
@@ -1942,10 +1601,8 @@
     <string name="soft_logout_clear_data_dialog_submit">Очистить данные</string>
     <string name="soft_logout_sso_not_same_user_error">Текущая сессия предназначена для пользователя %1$s, а вы предоставляете учётные данные для пользователя %2$s. Это не поддерживается в Element.
 \nПожалуйста, сначала очистите данные, а затем снова войдите под другим аккаунтом.</string>
-
     <string name="permalink_malformed">Ваша ссылка на matrix.to неверна</string>
     <string name="bug_report_error_too_short">Описание слишком короткое</string>
-
     <string name="settings_show_devices_list">Посмотреть все мои сессии</string>
     <string name="settings_advanced_settings">Дополнительные настройки</string>
     <string name="settings_developer_mode">Режим разработчика</string>
@@ -1953,7 +1610,6 @@
     <string name="settings">Настройки</string>
     <string name="devices_current_device">Текущая сессия</string>
     <string name="devices_other_devices">Другие сессии</string>
-
     <string name="create_room_encryption_title">Включено шифрование</string>
     <string name="verification_conclusion_warning">Недоверенный вход</string>
     <string name="room_profile_section_more_uploads">Вложения</string>
@@ -1962,7 +1618,6 @@
     <string name="error_empty_field_choose_password">Пожалуйста, выберите пароль.</string>
     <string name="message_action_item_redact">Удалить…</string>
     <string name="seen_by">Просмотрено</string>
-
     <string name="room_profile_section_security_learn_more">Узнать больше</string>
     <string name="room_profile_section_more_settings">Настройки комнаты</string>
     <string name="room_profile_section_more_notifications">Уведомления</string>
@@ -1975,120 +1630,92 @@
     <string name="room_member_power_level_admins">Администраторы</string>
     <string name="room_member_power_level_moderators">Модераторы</string>
     <string name="room_member_power_level_users">Пользователи</string>
-
     <string name="event_redacted">Сообщение удалено</string>
     <string name="uploads_media_title">МЕДИА</string>
     <string name="uploads_media_no_result">В этой комнате нет медиафайлов</string>
     <string name="uploads_files_title">ФАЙЛЫ</string>
     <string name="uploads_files_no_result">В этой комнате нет файлов</string>
-
     <string name="report_content_inappropriate">Это недопустимо</string>
     <string name="report_content_custom">Другая причина…</string>
     <string name="report_content_custom_title">Пожаловаться на контент</string>
     <string name="room_profile_section_security">Безопасность</string>
     <string name="room_profile_section_more">Ещё</string>
     <string name="a11y_qr_code_for_verification">QR-код</string>
-
     <string name="no_connectivity_to_the_server_indicator">Соединение с сервером потеряно</string>
     <string name="verification_cannot_access_other_session">Используйте пароль восстановления или ключ</string>
     <string name="e2e_use_keybackup">Разблокировать историю зашифрованных сообщений</string>
-
     <string name="verify_cancelled_notice">Проверьте свои устройства в разделе Настройки.</string>
     <string name="recovery_passphrase">Парольная фраза для восстановления</string>
     <string name="account_password">Пароль учётной записи</string>
-
     <string name="set_recovery_passphrase">Задайте %s</string>
     <string name="enter_account_password">Введите %s, чтобы продолжить.</string>
-
     <string name="bootstrap_info_text">%s способствует доверию, защищает и разблокирует зашифрованные сообщения.</string>
     <string name="bootstrap_dont_reuse_pwd">Не переиспользуйте пароль учётной записи.</string>
-
-
     <string name="bootstrap_loading_text">Это может занять несколько секунд, пожалуйста, наберитесь терпения.</string>
     <string name="room_created_summary_item">%s создал(а) и настроил(а) комнату.</string>
-
     <string name="room_message_placeholder">Сообщение…</string>
-
     <string name="upgrade_security">Доступно обновление шифрования</string>
     <string name="security_prompt_text">Проверьте себя и других для защиты ваших бесед</string>
-
     <string name="backup_recovery_passphrase">Парольная фраза для восстановления</string>
     <string name="crosssigning_verify_session">Подтвердите вход</string>
     <string name="confirm_your_identity">Подтвердите свою личность и получите доступ к зашифрованным сообщениям, подтвердив этот вход в другой сессии.</string>
     <string name="settings_category_timeline">Лента сообщений</string>
-
     <string name="message_key">Ключ сообщения</string>
     <string name="generate_message_key">Сгенерировать ключ сообщения</string>
-
     <string name="bootstrap_crosssigning_print_it">Распечатайте его и храните в безопасном месте</string>
     <string name="bootstrap_skip_text">Установка парольной фразы для восстановления позволяет защитить и разблокировать зашифрованные сообщения и доверие.
 \n 
 \nЕсли вы не хотите устанавливать пароль сообщения, создайте вместо него ключ сообщения.</string>
     <string name="bootstrap_skip_text_no_gen_key">Установка парольной фразы для восстановления позволяет защитить и разблокировать зашифрованные сообщения и доверие.</string>
-
-
     <string name="encryption_enabled">Шифрование включено</string>
     <string name="encryption_not_enabled">Шифрование не включено</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="settings_show_redacted">Показывать удалённые сообщения</string>
     <string name="settings_show_redacted_summary">Показывать заглушку на месте удалённых сообщений</string>
     <string name="settings_discovery_confirm_mail_not_clicked">Мы отправили письмо для подтверждения на %s, проверьте почту и нажмите на ссылку для подтверждения</string>
     <string name="settings_text_message_sent_wrong_code">Код подтверждения неверный.</string>
-
     <string name="error_terms_not_accepted">Попробуйте снова после принятия условий обслуживания на вашем домашнем сервере.</string>
-
     <string name="error_network_timeout">Похоже, сервер долгое время не отвечает, что может быть вызвано плохим соединением или ошибкой на сервере. Попробуйте снова через некоторое время.</string>
-
     <string name="room_list_sharing_header_recent_rooms">Недавние комнаты</string>
     <string name="room_list_sharing_header_other_rooms">Прочие комнаты</string>
-
     <string name="change_password_summary">Сменить пароль учётной записи…</string>
-
     <string name="command_description_discard_session_not_handled">Поддерживается только в зашифрованных комнатах</string>
     <string name="a11y_create_direct_message">Создать новый диалог</string>
     <string name="three_users_read">%1$s, %2$s и %3$s прочли</string>
     <string name="two_users_read">%1$s и %2$s прочли</string>
     <string name="error_file_too_big">Файл \'%1$s\' (%2$s) слишком большой. Максимальный размер для загрузки %3$s.</string>
-
     <string name="error_attachment">Произошла ошибка при загрузке вложения.</string>
     <string name="uploads_files_subtitle">%1$s %2$s</string>
     <string name="content_reported_title">Жалоба отправлена</string>
-    <string name="content_reported_content">Жалоба на контент отправлена.
-\n
-\nЕсли вы не хотите видеть контент этого пользователя, вы можете его заблокировать, чтобы скрыть его сообщения</string>
+    <string name="content_reported_content">Жалоба на контент отправлена. 
+\n 
+\nЕсли вы не хотите видеть контент этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
     <string name="content_reported_as_spam_title">Отмечено как спам</string>
-    <string name="content_reported_as_spam_content">Этот контент был отмечен как спам.
-\n
-\nЕсли вы не хотите видеть контент этого пользователя, вы можете его заблокировать, чтобы скрыть его сообщения</string>
+    <string name="content_reported_as_spam_content">Этот контент был отмечен как спам. 
+\n 
+\nЕсли вы не хотите видеть контент этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
     <string name="content_reported_as_inappropriate_title">Жалоба на неприемлемое содержание отправлена</string>
-    <string name="content_reported_as_inappropriate_content">Этот контент был отмечен как неприемлемый.
-\n
-\nЕсли вы не хотите видеть контент этого пользователя, вы можете его заблокировать, чтобы скрыть его сообщения</string>
-
+    <string name="content_reported_as_inappropriate_content">Этот контент был отмечен как неприемлемый. 
+\n 
+\nЕсли вы не хотите видеть контент этого пользователя, вы можете его игнорировать, чтобы скрыть его сообщения.</string>
     <string name="verification_sas_match">Они совпадают</string>
     <string name="verification_sas_do_not_match">Они не совпадают</string>
     <string name="a11y_close_keys_backup_banner">Закрыть окно бэкапа ключей</string>
     <string name="one_user_read">%s прочитано</string>
     <string name="error_handling_incoming_share">Не удалось обработать данные</string>
-
     <string name="permissions_rationale_msg_keys_backup_export">Element требуются права для сохранения ваших ключей шифрования на диск.
 \n
 \nПожалуйста, разрешите доступ в следующем всплывающем окне, чтобы экспортировать ключи вручную.</string>
-
     <string name="no_network_indicator">Нет подключения к сети</string>
-
     <string name="play_video">Воспроизвести</string>
     <string name="pause_video">Приостановить</string>
     <string name="action_copy">Копировать</string>
     <string name="dialog_title_success">Выполнено</string>
-
     <string name="bottom_action_notification">Уведомления</string>
     <string name="call_failed_no_connection">Звонок не состоялся</string>
     <string name="call_failed_no_connection_description">Не удалось установить соединение реального времени.
 \nПопросите администратора вашего сервера настроить сервер TURN, чтобы звонки работали надёжно.</string>
-
     <string name="call_select_sound_device">Выберите звуковое устройство</string>
     <string name="sound_device_phone">Телефон</string>
     <string name="sound_device_speaker">Динамик</string>
@@ -2099,21 +1726,15 @@
     <string name="call_camera_back">Задняя</string>
     <string name="call_format_turn_hd_off">Выключить HD</string>
     <string name="call_format_turn_hd_on">Включить HD</string>
-
     <string name="login_error_ssl_peer_unverified">Ошибка SSL: не удалось идентифицировать другого абонента.</string>
     <string name="login_error_ssl_other">Ошибка SSL.</string>
     <string name="active_call_with_duration">Активный звонок (%s)</string>
     <string name="return_to_call">Вернуться к звонку</string>
-
     <string name="room_participants_action_cancel_invite">Отменить приглашение</string>
     <string name="room_participants_power_level_demote_warning_title">Снизить собственные полномочия\?</string>
     <string name="dismiss">Отклонить</string>
-
-
     <string name="room_participants_power_level_demote_warning_prompt">Вы не сможете отменить это изменение, поскольку вы понижаете себя в должности, а если вы последний привилегированный пользователь в комнате, то восстановить привилегии будет невозможно.</string>
     <string name="room_participants_power_level_demote">Понизить</string>
-
-
     <string name="room_participants_action_ignore_title">Игнорировать пользователя</string>
     <string name="room_participants_action_ignore_prompt_msg">Игнорирование этого пользователя приведет к удалению его сообщений из общих комнат.
 \n
@@ -2131,7 +1752,6 @@
     <string name="room_participants_ban_reason">Причина блокировки</string>
     <string name="room_participants_unban_title">Разблокировать пользователя</string>
     <string name="room_participants_unban_prompt_msg">Разблокирование пользователя позволит ему снова присоединиться к комнате.</string>
-
     <string name="settings_secure_backup_section_title">Безопасное резервное копирование</string>
     <string name="settings_secure_backup_manage">Управление</string>
     <string name="settings_secure_backup_setup">Настройка безопасного резервного копирования</string>
@@ -2140,43 +1760,32 @@
     <string name="settings_secure_backup_section_info">Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.</string>
     <string name="reset_secure_backup_title">Создайте новый ключ безопасности или задайте новую секретную фразу для существующей резервной копии.</string>
     <string name="reset_secure_backup_warning">Это заменит ваш текущий ключ или фразу.</string>
-
     <string name="disabled_integration_dialog_title">Интеграции отключены</string>
     <string name="disabled_integration_dialog_content">Включите «Управление интеграциями» в настройках, чтобы сделать это.</string>
-
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d пользователь заблокирован</item>
         <item quantity="few">%d пользователей заблокировано</item>
         <item quantity="many">%d пользователей заблокировано</item>
     </plurals>
-
     <string name="encryption_exported_successfully">Ключи успешно экспортированы</string>
-
     <string name="active_widget_view_action">ОБЗОР</string>
     <string name="active_widgets_title">Активные виджеты</string>
-
-
     <string name="recovery_key_export_saved">Ключ восстановления был сохранён.</string>
-
     <string name="secure_backup_banner_setup_line1">Безопасное резервное копирование</string>
     <string name="secure_backup_banner_setup_line2">Защита от потери доступа к зашифрованным сообщениям и данным</string>
-
     <string name="secure_backup_setup">Настроить безопасное резервное копирование</string>
-
     <string name="labs_show_unread_notifications_as_tab">Добавьте специальную вкладку для непрочитанных уведомлений на главном экране.</string>
-
     <plurals name="fallback_users_read">
-        <item quantity="one">Прочитал 1 пользователь</item>
+        <item quantity="one">Прочитал %d пользователь</item>
         <item quantity="few">Прочитано %d пользователями</item>
         <item quantity="many">Прочитано %d пользователями</item>
+        <item quantity="other">Прочитано %d пользователями</item>
     </plurals>
-
     <string name="room_list_quick_actions_favorite_add">Добавить в избранное</string>
     <string name="room_list_quick_actions_favorite_remove">Убрать из избранного</string>
     <string name="notice_member_no_changes">%1$s не внес никаких изменений</string>
     <string name="notice_member_no_changes_by_you">Вы не внесли никаких изменений</string>
     <string name="no_ignored_users">Вы не игнорируете никаких пользователей</string>
-
     <string name="room_join_rules_public_by_you">Вы сделали комнату доступной для всех, у кого есть ссылка.</string>
     <string name="room_join_rules_invite_by_you">Вы сделали комнату только по приглашению.</string>
     <string name="login_splash_text2">Сохраняйте приватность ваших переписок с помощью шифрования</string>
@@ -2185,10 +1794,8 @@
     <string name="login_signin_to">Войти в %1$s</string>
     <string name="login_server_url_form_other_notice">Введите адрес сервера или Element, к которому вы хотите подключиться</string>
     <string name="login_server_url_form_common_notice">Введите адрес сервера, который вы хотите использовать</string>
-
     <string name="login_reset_password_notice">На ваш почтовый ящик будет отправлено письмо с подтверждением установки нового пароля.</string>
     <string name="login_reset_password_mail_confirmation_submit">Я подтвердил свою электронную почту</string>
-
     <string name="login_set_email_notice">Установите адрес электронной почты для восстановления вашей учетной записи. Позже вы можете дополнительно разрешить людям, которых вы знаете, обнаружить вас по электронной почте.</string>
     <string name="login_validation_code_is_not_correct">Введенный код неверен. Пожалуйста, проверьте.</string>
     <string name="login_connect_using_matrix_id_notice">Кроме того, если у вас уже есть учетная запись и вы знаете свой идентификатор Matrix и пароль, вы можете использовать этот метод:</string>
@@ -2199,28 +1806,20 @@
     <string name="login_signin_matrix_id_password_notice">Если вы не знаете свой пароль, вернитесь, чтобы сбросить его.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Это недопустимый идентификатор пользователя. Ожидаемый формат: \'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Не удалось найти действительный домашний сервер. Пожалуйста, проверьте свой идентификатор</string>
-
     <string name="notification_initial_sync">Первичная синхронизация…</string>
-
     <string name="settings_rageshake">Rageshake</string>
     <string name="settings_rageshake_detection_threshold">Порог обнаружения</string>
     <string name="settings_rageshake_detection_threshold_summary">Встряхните телефон, чтобы проверить порог обнаружения</string>
     <string name="rageshake_detected">Тряска зафиксирована!</string>
     <string name="autocomplete_limited_results">Показываем только первые результаты, наберите больше букв…</string>
-
     <string name="settings_developer_mode_fail_fast_title">Раннее падение</string>
     <string name="settings_developer_mode_fail_fast_summary">Element может падать чаще, когда происходит непредвиденная ошибка</string>
-
     <string name="command_description_shrug">Добавляет смайл ¯\\_(ツ)_/¯ в начало сообщения</string>
-
     <string name="create_room_encryption_description">После включения шифрования оно не может быть отключено.</string>
-
     <string name="login_error_threepid_denied">Ваш почтовый домен не имеет права регистрироваться на этом сервере</string>
-
     <string name="verify_user_sas_emoji_help_text">Проверьте этого пользователя, подтвердив, что следующие уникальные смайлики появляются на его экране в том же порядке.</string>
     <string name="verify_user_sas_emoji_security_tip">Для максимальной безопасности используйте другое надежное средство связи или сделайте это лично.</string>
     <string name="verification_green_shield">Ищите зеленый щит, чтобы убедиться, что пользователь доверенный. Доверяйте всем пользователям в комнате, чтобы обеспечить безопасность комнаты.</string>
-
     <string name="verification_conclusion_not_secure">Не безопасно</string>
     <string name="verification_conclusion_compromised">Одно из следующих условий может быть скомпрометировано:
 \n
@@ -2228,13 +1827,11 @@
 \n— Домашний сервер, к которому подключен пользователь, которого вы проверяете
 \n— Ваше или подключение к интернету других пользователей
 \n— Ваше или устройство других пользователей</string>
-
     <string name="sent_a_video">Видео.</string>
     <string name="sent_an_image">Изображение.</string>
     <string name="sent_an_audio_file">Аудио</string>
     <string name="sent_a_file">Файл</string>
     <string name="send_a_sticker">Стикер</string>
-
     <string name="verification_request_waiting">Ожидание…</string>
     <string name="verification_request_other_cancelled">%s отменено</string>
     <string name="verification_request_you_cancelled">Вы отменили</string>
@@ -2244,21 +1841,15 @@
     <string name="verification_request">Запрос на подтверждение</string>
     <string name="verification_verify_device">Подтвердите эту сессию</string>
     <string name="verification_verify_device_manually">Подтверждение вручную</string>
-
     <string name="you">Вы</string>
-
     <string name="verification_scan_notice">Сканируйте код с помощью устройства другого пользователя, чтобы надежно проверить друг друга</string>
     <string name="verification_scan_their_code">Сканировать их код</string>
     <string name="verification_scan_emoji_title">Невозможно сканировать</string>
     <string name="verification_scan_emoji_subtitle">Если вы не можете лично, сравните эмодзи в таком случае</string>
-
     <string name="verification_no_scan_emoji_title">Подтвердить при помощи сравнения эмодзи</string>
-
     <string name="verify_by_emoji_title">Подтверждение с помощью эмодзи</string>
     <string name="verify_by_emoji_description">Если вы не можете отсканировать приведенный выше код, проверьте это, сравнив короткий уникальный набор эмодзи.</string>
-
     <string name="a13n_qr_code_description">Изображение QR-кода</string>
-
     <string name="verification_verify_user">Подтверждено %s</string>
     <string name="verification_verified_user">Подтверждённых %s</string>
     <string name="verification_request_waiting_for">Ожидание для %s…</string>
@@ -2271,45 +1862,33 @@
 \nВаши сообщения защищены замками, и только у вас и получателя есть уникальные ключи, чтобы разблокировать их.</string>
     <string name="room_profile_section_admin">Действия Администратора</string>
     <string name="room_profile_leaving_room">Покинуть комнату…</string>
-
     <string name="room_member_power_level_custom">Пользовательский</string>
     <string name="room_member_power_level_invites">Приглашения</string>
     <string name="room_member_power_level_admin_in">Администратор в %1$s</string>
     <string name="room_member_power_level_moderator_in">Модератор в %1$s</string>
     <string name="room_member_power_level_default_in">По умолчанию в %1$s</string>
     <string name="room_member_power_level_custom_in">Пользовательский (%1$d) в %2$s</string>
-
     <string name="room_member_jump_to_read_receipt">Перейти к последнему прочтённому им сообщению</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element не обрабатывает события типа \'%1$s\'</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element не обрабатывает сообщения типа \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element столкнулся с проблемой при отображении содержимого события с идентификатором \'%1$s\'</string>
-
     <string name="unignore">Перестать игнорировать</string>
-
     <string name="verify_cannot_cross_sign">Эта сессия не может поделиться подтверждением с другими сессиями.
 \nПодтверждение будет сохранено локально и отправится в будущей версии приложения.</string>
-
     <string name="command_description_rainbow">Посылает сообщение, окрашенное в цвет радуги</string>
     <string name="command_description_rainbow_emote">Посылает данную эмоцию, окрашенную в цвет радуги</string>
-
     <string name="settings_category_composer">Редактор сообщений</string>
-
     <string name="room_settings_enable_encryption">Включить сквозное шифрование</string>
     <string name="room_settings_enable_encryption_warning">После включения шифрования оно не может быть отключено.</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Активировать шифрование\?</string>
     <string name="room_settings_enable_encryption_dialog_content">После включения шифрование для комнаты не может быть отключено. Сообщения, отправленные в зашифрованном помещении, не могут быть замечены сервером, только участниками помещения. Включение шифрования может помешать правильной работе многих ботов и мостов.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Активировать шифрование</string>
-
     <string name="verification_request_notice">Чтобы быть в безопасности, проверьте %s, проверив одноразовый код.</string>
     <string name="verification_request_start_notice">Чтобы обезопасить себя, сделайте это лично или используйте другой способ общения.</string>
-
     <string name="verification_emoji_notice">Сравните уникальные эмодзи, убедившись, что они появились в том же порядке.</string>
     <string name="verification_code_notice">Сравните код с тем, который отображается на экране другого пользователя.</string>
     <string name="verification_conclusion_ok_notice">Сообщения с этим пользователем полностью зашифрованы и не могут быть прочитаны третьими лицами.</string>
     <string name="verification_conclusion_ok_self_notice">Ваша новая сесия теперь подтверждена. Она имеет доступ к вашим зашифрованным сообщениям, и другие пользователи будут считать её надежной.</string>
-
     <string name="encryption_information_cross_signing_state">Кросс-подпись</string>
     <string name="encryption_information_dg_xsigning_complete">Кросс-подпись включена
 \nПриватные ключи хранятся на устройстве.</string>
@@ -2319,68 +1898,51 @@
     <string name="encryption_information_dg_xsigning_not_trusted">Кросс-подпись включена.
 \nКлючи являются ненадёжными</string>
     <string name="encryption_information_dg_xsigning_disabled">Кросс-подпись выключена</string>
-
     <string name="settings_hs_admin_e2e_disabled">Администратор вашего сервера отключил сквозное шифрование по умолчанию в приватных комнатах и диалогах.</string>
     <string name="settings_active_sessions_list">Активные сессии</string>
     <string name="settings_active_sessions_show_all">Показать все сессии</string>
     <string name="settings_active_sessions_manage">Управление сессиями</string>
     <string name="settings_active_sessions_signout_device">Выйти из этой сессии</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Нет доступного шифрования информации</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d сессия активна</item>
         <item quantity="few">%d сессии активны</item>
         <item quantity="many">%d сессий активно</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Подтвердите эту сессию</string>
     <string name="verification_open_other_to_verify">Используйте существующую сессию для подтверждения этой, предоставив ей доступ к зашифрованным сообщениям.</string>
-
-
     <string name="settings_dev_tools">Инструменты для разработчиков</string>
     <string name="settings_account_data">Данные учётной записи</string>
     <string name="verification_use_passphrase">Если вы не можете получить доступ к существующей сессии</string>
-
     <string name="settings_key_requests">Запросы ключей</string>
-
     <string name="verify_new_session_notice">Используйте эту сессию для подтверждения новой сессии, предоставляя ей доступ к зашифрованным сообщениям.</string>
     <string name="bootstrap_cross_signing_success">Ваши %2$s и %1$s установлены.
 \n
 \nДержите их в безопасности! Они понадобятся для разблокировки зашифрованных сообщений и защиты информации, если у вас не останется активных сессий.</string>
-
     <string name="bootstrap_cancel_text">Если вы отмените сейчас, вы можете потерять зашифрованные сообщения и данные, если потеряете доступ к своим логинам.
 \n
 \nВы также можете настроить безопасное резервное копирование и управлять своими ключами в настройках.</string>
-
     <string name="encryption_enabled_tile_description">Сообщения в этой комнате зашифрованы сквозным шифрованием. Посмотрите подробности и подтвердите пользователей в их профиле.</string>
     <string name="settings_notification_configuration">Параметры уведомлений</string>
     <string name="settings_messages_at_room">Сообщения, содержащие @room</string>
     <string name="settings_troubleshoot_title">Отладка</string>
     <string name="settings_notification_advanced_summary">Настройки важности уведомлений для событий</string>
-
     <string name="use_other_session_content_description">Используйте последнюю версию Element на других ваших устройствах, веб-клиент Element, Element для ПК, Element для iOS, Element для Андроид или другой клиент Matrix, поддерживающий кросс-подпись</string>
     <string name="use_latest_app">Используйте последнюю версию Element на других ваших устройствах:</string>
     <string name="verify_this_session">Подтвердите новую сессию вашей учетной записи: %1$s</string>
-
     <string name="settings_setup_secure_backup">Настроить безопасное резервное копирование</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">Безопасное резервное копирование</string>
     <string name="settings_active_sessions_verified_device_desc">Эта сессия является доверенной для безопасного обмена сообщениями, потому что вы проверили её:</string>
     <string name="settings_active_sessions_unverified_device_desc">Подтвердите эту сессию, чтобы пометить её доверенной и предоставить ей доступ к зашифрованным сообщениям. Если вы не входили в эту сессю, ваша учетная запись может быть скомпрометирована:</string>
-
     <string name="crosssigning_other_user_not_trust">Другие пользователи могут не доверять ему</string>
     <string name="complete_security">Завершите настройку безопасности</string>
-
     <string name="verification_profile_verify">Верифицировать</string>
     <string name="verification_profile_verified">Верифицировано</string>
     <string name="verification_profile_warning">Внимание</string>
-
     <string name="room_member_profile_failed_to_get_devices">Ошибка получения списка сессий</string>
     <string name="room_member_profile_sessions_section_title">Сессии</string>
     <string name="trusted">Доверенные</string>
     <string name="not_trusted">Недоверенные</string>
-
     <string name="verification_profile_device_verified_because">Эта сессия является доверенной для безопасного обмена сообщениями, так как %1$s (%2$s) проверил(а) его:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) вошел(ла), используя новую сессию:</string>
     <plurals name="poll_info">
@@ -2396,54 +1958,39 @@
     <string name="poll_item_selected_aria">Выберите вариант</string>
     <string name="command_description_poll">Создать простой опрос</string>
     <string name="new_signin">Новый вход</string>
-
     <string name="verification_profile_device_untrust_info">Пока этот пользователь не доверяет этой сессии, сообщения, отправленные в обе стороны, помечаются предупреждениями. Кроме того, вы можете подтвердить сессию вручную.</string>
-
-
     <string name="initialize_cross_signing">Инициализировать кросс-подпись</string>
     <string name="reset_cross_signing">Сбросить ключи</string>
-
     <string name="qr_code_scanned_by_other_notice">Почти готово! Отображает ли %s такой же щит\?</string>
     <string name="qr_code_scanned_by_other_yes">Да</string>
     <string name="qr_code_scanned_by_other_no">Нет</string>
-
     <string name="no_connectivity_to_the_server_indicator_airplane">Активирован режим \"В самолёте\"</string>
-
     <string name="enter_secret_storage_invalid">Не удалось найти данные в хранилище</string>
     <string name="enter_secret_storage_passphrase">Введите парольную фразу для секретного хранилища</string>
     <string name="enter_secret_storage_passphrase_warning">Предупреждение:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Вы должны получать доступ к секретному хранилищу только с доверенного устройства</string>
-
     <string name="share_confirm_room">Вы хотите отправить это вложение в %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Отправить изображение в оригинальном размере</item>
         <item quantity="few">Отправить изображения в оригинальном размере</item>
         <item quantity="many">Отправить изображения в оригинальном размере</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Подтвердите удаление</string>
     <string name="delete_event_dialog_content">Вы уверены, что хотите скрыть (удалить) это событие\? Обратите внимание, что если вы удалите название комнаты или измените тему, это может отменить изменение.</string>
     <string name="delete_event_dialog_reason_checkbox">Указать причину</string>
     <string name="delete_event_dialog_reason_hint">Причина редактирования</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Событие удалено пользователем, Причина: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Событие модерируется администратором комнаты, Причина: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Ключи успешно обновлены!</string>
-
     <string name="login_default_session_public_name">Element для Android</string>
-
     <string name="refresh">Обновить</string>
-
     <string name="new_session">Новый вход в вашу учётную запись. Это были Вы\?</string>
     <string name="new_session_review">Нажмите, чтобы просмотреть и проверить</string>
     <string name="verify_new_session_was_not_me">Это был не я</string>
     <string name="verify_new_session_compromized">Ваш аккаунт может оказаться под угрозой</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на этом устройстве, а другие пользователи не будут доверять ему</string>
     <string name="verify_cancel_self_verification_from_trusted">Если вы прервёте процедуру, то не сможете читать зашифрованные сообщения на своем новом устройстве, а другие пользователи не будут доверять ему</string>
     <string name="verify_cancel_other">Если вы прервёте процедуру, пользователь %1$s (%2$s) не будет подтверждён. Начните заново в профиле этого пользователя.</string>
-
     <string name="verify_not_me_self_verification">Что-то из этого может быть скомпрометировано:
 \n
 \n- Ваш пароль
@@ -2452,9 +1999,7 @@
 \n- Интернет-соединение, используемое этим или другим устройством
 \n
 \nМы рекомендуем вам немедленно изменить свой пароль и ключ восстановления в настройках.</string>
-
     <string name="verification_cancelled">Подтверждение отменено</string>
-
     <string name="bootstrap_crosssigning_progress_pbkdf2">Генерация ключа безопасности из парольной фразы</string>
     <string name="bootstrap_progress_generating_ssss">Генерация ключа SSSS из парольной фразы</string>
     <string name="bootstrap_progress_generating_ssss_with_info">Генерация ключа SSSS из парольной фразы (%s)</string>
@@ -2462,70 +2007,51 @@
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для резервного копирования ключей, вы можете %s.</string>
     <string name="power_level_edit_title">Задать роль</string>
     <string name="confirm_recovery_passphrase">Подтвердить %s</string>
-
     <string name="bootstrap_info_confirm_text">Введите свою %s еще раз для подтверждения.</string>
     <string name="bootstrap_info_text_2">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
-
     <string name="bootstrap_loading_title">Настройка восстановления.</string>
     <string name="your_recovery_key">Ваш ключ восстановления</string>
     <string name="bootstrap_finish_title">Готово!</string>
     <string name="keep_it_safe">Храните его в безопасности</string>
     <string name="finish">Завершить</string>
-
     <string name="bootstrap_save_key_description">Используйте %1$s как подстраховку на случай, если вы забудете %2$s.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Публикация созданных ключей идентификации</string>
     <string name="bootstrap_crosssigning_progress_default_key">Определение ключа SSSS по умолчанию</string>
     <string name="bootstrap_crosssigning_progress_save_msk">Синхронизация мастер-ключа</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Синхронизация ключа пользователя</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Синхронизация ключа самоподписи</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Настройка резервного копирования ключей</string>
-
-
     <string name="bootstrap_crosssigning_save_usb">Сохраните на USB-флешку или резервный диск</string>
     <string name="bootstrap_crosssigning_save_cloud">Скопируйте в персональное облачное хранилище</string>
-
     <string name="auth_flow_not_supported">Вы не можете сделать это с телефона</string>
-
     <string name="encryption_unknown_algorithm_tile_description">Шифрование этой комнаты не поддерживается</string>
-
     <string name="room_created_summary_item_by_you">Вы создали и настроили комнату.</string>
-
     <string name="qr_code_scanned_self_verif_notice">Почти готово! Отображается ли такой же щит в другой вашей сессии\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Почти готово! Ожидание подтверждения…</string>
     <string name="qr_code_scanned_verif_waiting">Ожидание для %s…</string>
-
     <string name="error_failed_to_import_keys">Не удалось импортировать ключи</string>
-
     <string name="settings_messages_in_e2e_one_to_one">Зашифрованные сообщения в персональных чатах</string>
     <string name="settings_messages_in_e2e_group_chat">Зашифрованные сообщения в групповых чатах</string>
     <string name="settings_when_rooms_are_upgraded">При обновлении комнат</string>
     <string name="command_description_plain">Посылает сообщение в виде простого текста, не интерпретируя его как разметку</string>
-
     <string name="auth_invalid_login_param_space_in_password">Неверное имя пользователя и/или пароль. Введенный пароль начинается или заканчивается пробелами, пожалуйста, проверьте.</string>
     <string name="auth_invalid_login_deactivated_account">Эта учётная запись была деактивирована.</string>
-
     <string name="setup_cross_signing">Активировать кросс-подпись</string>
     <string name="bootstrap_enter_recovery">Введите %s, чтобы продолжить</string>
     <string name="use_file">Использовать файл</string>
-
     <string name="enter_backup_passphrase">Введите %s</string>
     <string name="bootstrap_invalid_recovery_key">Это недействительный ключ восстановления</string>
     <string name="recovery_key_empty_error_message">Пожалуйста, введите ключ восстановления</string>
-
     <string name="bootstrap_progress_checking_backup">Проверка ключа резервного копирования</string>
     <string name="bootstrap_progress_checking_backup_with_info">Проверка ключа резервного копирования (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Получение кривой ключа</string>
     <string name="bootstrap_progress_generating_ssss_recovery">Генерация ключа SSSS из ключа восстановления</string>
     <string name="bootstrap_progress_storing_in_sss">Сохранение резервной копии ключа в SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_use_recovery_key">используйте ваш ключ восстановления ключа резервной копии</string>
     <string name="bootstrap_migration_backup_recovery_key">Ключ восстановления ключа резервной копии</string>
-
     <string name="settings_security_prevent_screenshots_title">Блокировать скриншоты в приложении</string>
     <string name="settings_security_prevent_screenshots_summary">Включение этого параметра добавляет FLAG_SECURE ко всем действиям. Перезапустите приложение, чтобы изменения вступили в силу.</string>
-
     <string name="media_file_added_to_gallery">Медиафайл добавлен в галерею</string>
     <string name="error_adding_media_file_to_gallery">Не удалось добавить медиафайл в галерею</string>
     <string name="error_saving_media_file">Не удалось сохранить медиафайл</string>
@@ -2540,21 +2066,17 @@
     <string name="enter_secret_storage_input_key">Выберите ключ восстановления или введите его вручную, введя или вставив из буфера обмена</string>
     <string name="keys_backup_recovery_key_error_decrypt">Невозможно расшифровать резервную копию с помощью этого ключа восстановления: убедитесь, что вы ввели правильный ключ.</string>
     <string name="failed_to_access_secure_storage">Не удалось получить доступ к защищенному хранилищу данных</string>
-
     <string name="unencrypted">Не зашифровано</string>
     <string name="encrypted_unverified">Зашифровано неподтверждённой сессией</string>
     <string name="review_logins">Проверьте, где вы вошли</string>
     <string name="verify_other_sessions">Подтвердите все свои сессии, чтобы убедиться в безопасности вашей учетной записи и сообщений</string>
     <string name="cross_signing_verify_by_text">Ручная проверка с помощью текста</string>
     <string name="mark_as_verified">Пометить как надежный</string>
-
     <string name="external_link_confirmation_title">Перепроверьте эту ссылку</string>
     <string name="external_link_confirmation_message">Ссылка %1$s перенаправит вас на другой сайт: %2$s.
 \n
 \nВы уверены, что хотите продолжить\?</string>
-
     <string name="create_room_dm_failure">Мы не смогли создать эту беседу. Пожалуйста, проверьте пользователей, которых вы приглашаете, и попробуйте ещё раз.</string>
-
     <string name="add_members_to_room">Добавить участников</string>
     <string name="invite_users_to_room_action_invite">ПРИГЛАСИТЬ</string>
     <string name="inviting_users_to_room">Приглашаем пользователей…</string>
@@ -2567,11 +2089,9 @@
         <item quantity="many">Приглашения отправлены %1$s и еще %2$d пользователям</item>
     </plurals>
     <string name="invite_users_to_room_failure">Мы не могли пригласить этих пользователей. Пожалуйста, проверьте пользователей, которых вы хотите пригласить, и повторите попытку.</string>
-
     <string name="choose_locale_current_locale_title">Текущий язык</string>
     <string name="choose_locale_other_locales_title">Другие доступные языки</string>
     <string name="choose_locale_loading_locales">Загрузка доступных языков…</string>
-
     <string name="open_terms_of">Посмотреть условия %s</string>
     <string name="disconnect_identity_server_dialog_content">Отключиться от сервера идентификации %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Этот сервер идентификации устарел. Element поддерживает только API V2.</string>
@@ -2581,7 +2101,6 @@
     <string name="identity_server_error_bulk_sha256_not_supported">Для вашей приватности, Element поддерживает отправку адреса электронной почты и номера телефона только в хэшированном виде.</string>
     <string name="identity_server_error_binding_error">Привязка не удалась.</string>
     <string name="identity_server_error_no_current_binding_error">Текущая взаимосвязь с этим идентификатором отсутствует.</string>
-
     <string name="identity_server_set_default_notice">Ваш домашний сервер (%1$s) предлагает использовать %2$s для вашего сервера идентификации</string>
     <string name="identity_server_set_default_submit">Использовать %1$s</string>
     <string name="identity_server_set_alternative_notice">Кроме того, вы можете ввести любой другой URL-адрес сервера идентификации</string>
@@ -2593,29 +2112,23 @@
     <string name="a11y_unmute_microphone">Включить звук микрофона</string>
     <string name="a11y_stop_camera">Отключить камеру</string>
     <string name="a11y_start_camera">Включить камеру</string>
-
     <string name="bottom_sheet_setup_secure_backup_subtitle">Защитите себя от потери доступа к зашифрованным сообщениям и данным, создав резервные копии ключей шифрования на вашем сервере.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Настроить</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Используйте ключ безопасности</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Создайте ключ безопасности для хранения в надежном месте, например в менеджере паролей или сейфе.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать секретную фразу</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите секретную фразу, известную только вам, и создайте ключ для резервного копирования.</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">Сохраните свой ключ безопасности</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе.</string>
-
     <string name="set_a_security_phrase_title">Задайте секретную фразу</string>
     <string name="set_a_security_phrase_notice">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
     <string name="set_a_security_phrase_hint">Секретная фраза</string>
     <string name="set_a_security_phrase_again_notice">Для подтверждения введите вашу секретную фразу ещё раз.</string>
-
     <string name="save_your_security_key_title">Сохраните ваш ключ безопасности</string>
     <string name="save_your_security_key_notice">Храните ключ безопасности в надежном месте, например в менеджере паролей или сейфе.</string>
-
     <string name="room_settings_name_hint">Название комнаты</string>
     <string name="room_settings_topic_hint">Тема</string>
     <string name="room_settings_save_success">Вы успешно изменили настройки комнаты</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">У вас нет доступа к этому сообщению</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Расшифровка этого сообщения может занять некоторое время</string>
     <string name="crypto_utd">Не удалось расшифровать</string>
@@ -2624,17 +2137,12 @@
     <string name="crypto_error_withheld_unverified">Нет доступа к этому сообщению, так как отправитель не доверяет вашей сессии</string>
     <string name="crypto_error_withheld_generic">Вы не можете получить доступ к этому сообщению, потому что отправитель намеренно не отправил ключи</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Ожидание истории шифрования</string>
-
     <string name="element_disclaimer_title">Riot теперь Element!</string>
     <string name="element_disclaimer_content">Мы рады сообщить, что сменили имя! Ваше приложение обновлено, и вы вошли в свою учетную запись.</string>
     <string name="element_disclaimer_negative_button">ПОНЯТНО</string>
     <string name="element_disclaimer_positive_button">УЗНАТЬ БОЛЬШЕ</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Сохранить ключ восстановления в</string>
-
     <string name="add_from_phone_book">Добавить из моей телефонной книги</string>
     <string name="empty_phone_book">Ваша телефонная книга пуста</string>
     <string name="phone_book_title">Телефонная книга</string>
@@ -2642,13 +2150,10 @@
     <string name="loading_contact_book">Получаем ваши контакты…</string>
     <string name="empty_contact_book">Ваша контактная книга пуста</string>
     <string name="contacts_book_title">Книга контактов</string>
-
     <string name="three_pid_revoke_invite_dialog_title">Отозвать приглашение</string>
     <string name="three_pid_revoke_invite_dialog_content">Отозвать приглашение для %1$s\?</string>
-
     <string name="member_banned_by">Забанен %1$s</string>
     <string name="failed_to_unban">Не удалось разбанить пользователя</string>
-
     <string name="alert_push_are_disabled_title">Push-уведомления отключены</string>
     <string name="alert_push_are_disabled_description">Просмотрите свои настройки, чтобы включить push-уведомления</string>
     <string name="create_pin_title">Выберите PIN-код для обеспечения безопасности</string>
@@ -2678,13 +2183,11 @@
         <item quantity="few">%1$d/%2$d ключа успешно импортированы.</item>
         <item quantity="many">%1$d/%2$d ключей успешно импортировано.</item>
     </plurals>
-
     <string name="room_manage_integrations">Управление интеграциями</string>
     <string name="room_no_active_widgets">Нет активных виджетов</string>
     <string name="create_room_federation_error">Комната создана, но некоторые приглашения не отправлены по следующей причине:
 \n
 \n%s</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="one">%1$s, %2$s и %3$d читает</item>
         <item quantity="few">%1$s, %2$s и %3$d других читают</item>
@@ -2704,15 +2207,12 @@
     <string name="settings_phone_numbers">Телефонные номера</string>
     <string name="settings_remove_three_pid_confirmation_content">Удалить %s\?</string>
     <string name="error_threepid_auth_failed">Убедитесь, что вы перешли по ссылке в электронном письме, которое мы вам отправили.</string>
-
     <string name="settings_emails_and_phone_numbers_title">Электронная почта и номера телефонов</string>
     <string name="settings_emails_and_phone_numbers_summary">Управляйте электронной почтой и номерами телефонов, привязанными к вашей учетной записи Matrix</string>
-
     <string name="settings_text_message_sent_hint">Код</string>
     <string name="login_msisdn_notice">Используйте международный формат (номер телефона должен начинаться с \'+\')</string>
     <string name="confirm_your_identity_quad_s">Подтвердите свою личность, проверив этот логин, предоставив ему доступ к зашифрованным сообщениям.</string>
     <string name="error_sso_flow_not_supported_yet">К сожалению, эта операция пока недоступна для учетных записей, подключенных с помощью единого входа.</string>
-
     <string name="error_opening_banned_room">Невозможно открыть комнату, в которую вам запрещён доступ.</string>
     <string name="room_error_not_found">Невозможно найти эту комнату. Убедитесь, что она существует.</string>
     <plurals name="seconds">
@@ -2720,18 +2220,58 @@
         <item quantity="few">%d секунды</item>
         <item quantity="many">%d секунд</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">Показать события статуса участников комнаты</string>
     <string name="settings_show_room_member_state_events_summary">Включает в себя события приглашения/ присоединения/выхода/исключения/бана и изменение аватара/отображаемого имени.</string>
     <string name="sent_a_poll">Голосование</string>
     <string name="sent_a_bot_buttons">Кнопки бота</string>
     <string name="sent_a_reaction">Отреагировал: %s</string>
     <string name="sent_verification_conclusion">Результат проверки</string>
-
     <string name="universal_link_malformed">Ссылка была искажена</string>
     <string name="no_permissions_to_start_webrtc_call">У вас нет разрешения на запуск звонка в этой комнате</string>
     <string name="delete_account_data_warning">Удалить данные учетной записи типа %1$s\?
 \n
 \nИспользуйте с осторожностью, это может привести к неожиданному поведению.</string>
-
-</resources>
+    <string name="settings_security_pin_code_grace_period_summary_off">ПИН-код потребуется каждый раз, когда вы откроете Element.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">ПИН-код потребуется через 2 минуты неиспользования Element.</string>
+    <string name="settings_security_pin_code_grace_period_title">Требовать PIN-код через 2 минуты</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Отображать только количество непрочитанных сообщений в простом уведомлении.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Показывать подробности, такие как названия комнат и содержание сообщений.</string>
+    <string name="settings_security_pin_code_notifications_title">Показывать содержимое в уведомлениях</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-код - единственный способ разблокировать Element.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Включить биометрические данные устройства, такие как отпечатки пальцев и распознавание лиц.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Включить биометрию</string>
+    <string name="settings_security_application_protection_screen_title">Настроить защиту</string>
+    <string name="settings_security_application_protection_summary">Защитите доступ с помощью PIN-кода и биометрии.</string>
+    <string name="settings_security_application_protection_title">Защита доступа</string>
+    <string name="secure_backup_reset_no_history">Вы перезапустите приложение без истории, сообщений, доверенных устройств или доверенных пользователей</string>
+    <string name="secure_backup_reset_if_you_reset_all">Если сбросить все</string>
+    <string name="secure_backup_reset_all_no_other_devices">Делайте это только в том случае, если у вас нет другого устройства, с которого вы можете проверить это устройство.</string>
+    <string name="secure_backup_reset_all">Сбросить все</string>
+    <string name="bad_passphrase_key_reset_all_action">Забыли или потеряли все варианты восстановления\? Сбросить все</string>
+    <string name="direct_room_created_summary_item_by_you">Вы вошли.</string>
+    <string name="direct_room_created_summary_item">%s вошёл(ла).</string>
+    <string name="direct_room_encryption_enabled_tile_description">Сообщения в этой комнате зашифрованы сквозным шифрованием.</string>
+    <string name="direct_room_profile_section_more_leave">Покинуть</string>
+    <string name="direct_room_profile_section_more_settings">Настройки</string>
+    <string name="direct_room_profile_encrypted_subtitle">Сообщения здесь зашифрованы.
+\n
+\nВаши сообщения защищены замками, и только у вас и получателя есть уникальные ключи для их разблокировки.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Сообщения здесь не зашифрованы.</string>
+    <string name="login_error_outdated_homeserver_warning_content">На этом домашнем сервере работает старая версия. Попросите администратора вашего домашнего сервера выполнить обновление. Вы можете продолжить, но некоторые функции могут работать некорректно.</string>
+    <string name="direct_room_join_rules_invite_by_you">Вы сделали доступ только по приглашению.</string>
+    <string name="direct_room_join_rules_invite">%@ сделал(а) доступ только по приглашению.</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Показать полную историю в зашифрованных комнатах</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s и %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s в %2$s и %3$s</string>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d приглашение</item>
+        <item quantity="few">%d приглашения</item>
+        <item quantity="many">%d приглашений</item>
+        <item quantity="other">%d приглашений</item>
+    </plurals>
+    <string name="search_is_not_supported_in_e2e_room">Поиск в зашифрованных комнатах пока не поддерживается.</string>
+    <string name="search_banned_user_hint">Фильтр заблокированных пользователей</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">У вас нет разрешения на запуск звонка</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">У вас нет разрешения на запуск конференции</string>
+    <string name="reset">Сброс</string>
+</resources>
\ No newline at end of file

From 843d1d57cfceffac1c27fb9a48098c0b80bfdf09 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 14 Oct 2020 07:30:16 +0000
Subject: [PATCH 257/278] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hant/
---
 .../src/main/res/values-zh-rTW/strings.xml    | 65 +++++++------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
index 355890923c..4a3293b195 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rTW/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s：%2$s</string>
     <string name="summary_user_sent_image">%1$s 傳送了一張圖片。</string>
-
     <string name="notice_room_invite_no_invitee">%s 的邀請</string>
     <string name="notice_room_invite">%1$s 邀請了 %2$s</string>
     <string name="notice_room_invite_you">%1$s 邀請您</string>
@@ -30,52 +29,38 @@
     <string name="notice_room_visibility_world_readable">任何人。</string>
     <string name="notice_room_visibility_unknown">未知 (%s)。</string>
     <string name="notice_end_to_end">%1$s 開啟了端對端加密 (%2$s)</string>
-
     <string name="notice_requested_voip_conference">%1$s 請求了 VoIP 會議通話</string>
     <string name="notice_voip_started">VoIP 會議通話已開始</string>
     <string name="notice_voip_finished">VoIP 會議通話已結束</string>
-
     <string name="notice_avatar_changed_too">（大頭貼也變更了）</string>
     <string name="notice_room_name_removed">%1$s 移除了房間名稱</string>
     <string name="notice_room_topic_removed">%1$s 移除了房間主題</string>
     <string name="notice_profile_change_redacted">%1$s 更新了他們的基本資料 %2$s</string>
     <string name="notice_room_third_party_invite">%1$s 傳送加入房間的邀請給 %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受 %2$s 的邀請</string>
-
     <string name="notice_crypto_unable_to_decrypt">** 無法解密：%s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">傳送者的裝置並未在此訊息傳送他們的金鑰。</string>
-
     <string name="could_not_redact">無法編輯</string>
     <string name="unable_to_send_message">無法傳送訊息</string>
-
     <string name="message_failed_to_upload">上傳圖片失敗</string>
-
     <string name="network_error">網路錯誤</string>
     <string name="matrix_error">Matrix 錯誤</string>
-
     <string name="room_error_join_failed_empty_room">目前無法重新加入空房間。</string>
-
     <string name="encrypted_message">已加密的訊息</string>
-
     <string name="medium_email">電子郵件</string>
     <string name="medium_phone_number">電話號碼</string>
-
     <string name="summary_user_sent_sticker">%1$s 傳送了一張貼圖。</string>
-
     <string name="room_displayname_invite_from">來自%s 的邀請</string>
     <string name="room_displayname_room_invite">聊天室邀請</string>
     <string name="room_displayname_two_members">%1$s 和 %2$s</string>
-
     <string name="room_displayname_empty_room">空聊天室</string>
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="other">%1$s 和 和其他 %2$d 個人</item>
     </plurals>
-
     <string name="notice_event_redacted">訊息已移除</string>
     <string name="notice_event_redacted_by">訊息已被 %1$s 移除</string>
     <string name="notice_event_redacted_with_reason">訊息已移除 [理由：%1$s]</string>
     <string name="notice_event_redacted_by_with_reason">訊息已被 %1$s 移除 [理由：%2$s]</string>
-
     <string name="initial_sync_start_importing_account">初始化同步：
 \n正在匯入帳號……</string>
     <string name="initial_sync_start_importing_account_crypto">初始化同步：
@@ -92,12 +77,9 @@
 \n正在匯入社群</string>
     <string name="initial_sync_start_importing_account_data">初始化同步：
 \n正在匯入帳號資料</string>
-
     <string name="notice_room_update">%s 已升級此聊天室。</string>
-
     <string name="event_status_sending_message">正在傳送訊息……</string>
     <string name="clear_timeline_send_queue">清除傳送佇列</string>
-
     <string name="notice_room_third_party_revoked_invite">%1$s 撤銷了 %2$s 加入聊天室的邀請</string>
     <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀請。理由：%2$s</string>
     <string name="notice_room_invite_with_reason">%1$s 邀請了 %2$s。理由：%3$s</string>
@@ -112,32 +94,23 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤銷了 %2$s 加入聊天室的邀請。理由：%3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s 撤回了對 %2$s 的邀請。理由：%3$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="other">%1$s 新增了 %2$s 為此聊天室的地址。</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="other">%1$s 移除了此聊天室的 %3$s 地址。</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s 為此聊天室新增 %2$s 並移除 %3$s 地址。</string>
-
     <string name="notice_room_canonical_alias_set">%1$s 為此聊天室設定了 %2$s 為主地址。</string>
     <string name="notice_room_canonical_alias_unset">%1$s 為此聊天室移除了主要地址。</string>
-
     <string name="notice_room_guest_access_can_join">%1$s 已允許訪客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止訪客加入聊天室。</string>
-
     <string name="notice_end_to_end_ok">%1$s 已開啟端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s 已開啟端到端加密（無法識別的演算法 %2$s）。</string>
-
     <string name="key_verification_request_fallback_message">%s 正在請求驗證您的金鑰，但您的客戶端不支援聊天中金鑰驗證。您將必須使用舊版的金鑰驗證來驗證金鑰。</string>
-
     <string name="notice_room_created">%1$s 建立了聊天室</string>
     <string name="summary_you_sent_image">您傳送了圖片。</string>
     <string name="summary_you_sent_sticker">您傳送了貼圖。</string>
-
     <string name="notice_room_invite_no_invitee_by_you">您的邀請</string>
     <string name="notice_room_created_by_you">您建立了聊天室</string>
     <string name="notice_room_invite_by_you">您邀請了 %1$s</string>
@@ -165,7 +138,6 @@
     <string name="notice_made_future_room_visibility_by_you">您已將未來的聊天室歷史設定為對 %1$s 可見</string>
     <string name="notice_end_to_end_by_you">您開啟了端到端加密 (%1$s)</string>
     <string name="notice_room_update_by_you">您升級了此聊天室。</string>
-
     <string name="notice_requested_voip_conference_by_you">您請求了 VoIP 會議</string>
     <string name="notice_room_name_removed_by_you">您移除了聊天室名稱</string>
     <string name="notice_room_topic_removed_by_you">您移除了聊天室主題</string>
@@ -175,24 +147,20 @@
     <string name="notice_room_third_party_invite_by_you">您傳送了邀請給 %1$s 以加入聊天室</string>
     <string name="notice_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 加入聊天室的邀請</string>
     <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀請</string>
-
     <string name="notice_widget_added">%1$s 新增了 %2$s 小工具</string>
     <string name="notice_widget_added_by_you">您新增了 %1$s 小工具</string>
     <string name="notice_widget_removed">%1$s 移除了 %2$s 小工具</string>
     <string name="notice_widget_removed_by_you">您移除了 %1$s 小工具</string>
     <string name="notice_widget_modified">%1$s 修改了 %2$s 小工具</string>
     <string name="notice_widget_modified_by_you">您修改了 %1$s 小工具</string>
-
     <string name="power_level_admin">管理員</string>
     <string name="power_level_moderator">板主</string>
     <string name="power_level_default">預設</string>
     <string name="power_level_custom">自訂 (%1$d)</string>
     <string name="power_level_custom_no_value">自訂</string>
-
     <string name="notice_power_level_changed_by_you">您變更了 %1$s 的權力等級。</string>
     <string name="notice_power_level_changed">%1$s 變更了 %2$s 的權力等級。</string>
     <string name="notice_power_level_diff">%1$s 從 %2$s 到 %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀請。理由：%1$s</string>
     <string name="notice_room_invite_with_reason_by_you">您邀請了 %1$s。理由：%2$s</string>
     <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
@@ -205,24 +173,39 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤銷了 %1$s 加入聊天室的邀請。理由：%2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀請。理由：%2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀請。理由：%2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="other">您為此聊天室新增了 %1$s 作為地址。</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="other">您為此聊天室移除了 %2$s 作為地址。</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">您為此聊天室新增了 %1$s 並移除了 %2$s 作為地址。</string>
-
     <string name="notice_room_canonical_alias_set_by_you">您將此聊天室的主要地址設定為 %1$s。</string>
     <string name="notice_room_canonical_alias_unset_by_you">您將此聊天室的主要地址移除。</string>
-
     <string name="notice_room_guest_access_can_join_by_you">您已允許訪客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden_by_you">您已阻止訪客加入聊天室。</string>
-
     <string name="notice_end_to_end_ok_by_you">您開啟了端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">您開啟了端到端加密（無法識別的演算法 %1$s）。</string>
-
-</resources>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">您已避免訪客加入此聊天室。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s 已避免訪客加入此聊天室。</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">您已允許訪客加入這裡。</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s 已允許訪客加入這裡。</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">您已離開。理由：%1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s 已離開。理由：%2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s 已加入。理由：%2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">您已撤銷對 %1$s 的邀請</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s 已撤銷對 %2$s 的邀請</string>
+    <string name="notice_direct_room_third_party_invite_by_you">您已邀請了 %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s 邀請了 %2$s</string>
+    <string name="notice_direct_room_update_by_you">您已在此升級。</string>
+    <string name="notice_direct_room_update">%s 已在此升級。</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">您讓未來的訊息對 %1$s 可見</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s 已讓未來的訊息對 %2$s 可見</string>
+    <string name="notice_direct_room_leave_by_you">您已離開聊天室</string>
+    <string name="notice_direct_room_leave">%1$s 已離開聊天室</string>
+    <string name="notice_direct_room_join_by_you">您已加入</string>
+    <string name="notice_direct_room_join">%1$s 已加入</string>
+    <string name="notice_direct_room_created_by_you">您已建立此討論</string>
+    <string name="notice_direct_room_created">%1$s 已建立此討論</string>
+</resources>
\ No newline at end of file

From 28df01b1843e5268c89dc34a76eca30c96f69da1 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Mon, 12 Oct 2020 20:08:37 +0000
Subject: [PATCH 258/278] Translated using Weblate (German)

Currently translated at 96.8% (184 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/de/
---
 .../src/main/res/values-de/strings.xml        | 67 ++++++-------------
 1 file changed, 20 insertions(+), 47 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-de/strings.xml b/matrix-sdk-android/src/main/res/values-de/strings.xml
index ae80edb47f..9b10aae10d 100644
--- a/matrix-sdk-android/src/main/res/values-de/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-de/strings.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s hat ein Bild gesendet.</string>
-
     <string name="notice_room_invite_no_invitee">Einladung von %s</string>
     <string name="notice_room_invite">%1$s hat %2$s eingeladen</string>
     <string name="notice_room_invite_you">%1$s hat dich eingeladen</string>
@@ -31,69 +29,50 @@
     <string name="notice_room_visibility_world_readable">Jeder.</string>
     <string name="notice_room_visibility_unknown">Unbekannt (%s).</string>
     <string name="notice_end_to_end">%1$s hat die Ende-zu-Ende-Verschlüsselung aktiviert (%2$s)</string>
-
     <string name="notice_requested_voip_conference">%1$s möchte eine VoIP-Konferenz beginnen</string>
     <string name="notice_voip_started">VoIP-Konferenz gestartet</string>
     <string name="notice_voip_finished">VoIP-Konferenz beendet</string>
-
     <string name="notice_avatar_changed_too">(Profilbild wurde ebenfalls geändert)</string>
     <string name="notice_room_name_removed">%1$s hat den Raumnamen entfernt</string>
     <string name="notice_room_topic_removed">%1$s hat das Raum-Thema entfernt</string>
     <string name="notice_profile_change_redacted">%1$s hat das Benutzerprofil aktualisiert %2$s</string>
     <string name="notice_room_third_party_invite">%1$s hat eine Einladung an %2$s gesendet</string>
     <string name="notice_room_third_party_registered_invite">%1$s hat die Einladung in %2$s akzeptiert</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Nicht entschlüsselbar: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Das absendende Gerät hat uns keine Schlüssel für diese Nachricht übermittelt.</string>
-
     <!-- Room Screen -->
     <string name="could_not_redact">Entfernen nicht möglich</string>
     <string name="unable_to_send_message">Nachricht kann nicht gesendet werden</string>
-
     <string name="message_failed_to_upload">Bild konnte nicht hochgeladen werden</string>
-
     <!-- general errors -->
     <string name="network_error">Netzwerk-Fehler</string>
     <string name="matrix_error">Matrix-Fehler</string>
-
     <!-- Home Screen -->
-
     <!-- Last seen time -->
-
     <!-- call events -->
-
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">Es ist aktuell nicht möglich, einen leeren Raum erneut zu betreten.</string>
-
     <string name="encrypted_message">Verschlüsselte Nachricht</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">E-Mail-Adresse</string>
     <string name="medium_phone_number">Telefonnummer</string>
-
     <string name="summary_user_sent_sticker">%1$s sandte einen Sticker.</string>
-
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Einladung von %s</string>
     <string name="room_displayname_room_invite">Raumeinladung</string>
     <string name="room_displayname_two_members">%1$s und %2$s</string>
     <string name="room_displayname_empty_room">Leerer Raum</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s und 1 andere(r)</item>
         <item quantity="other">%1$s und %2$d andere</item>
     </plurals>
-
-
     <string name="notice_event_redacted">Nachricht entfernt</string>
     <string name="notice_event_redacted_by">Nachricht entfernt von %1$s</string>
     <string name="notice_event_redacted_with_reason">Nachricht entfernt [Grund: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Nachricht entfernt von %1$s [Grund: %2$s]</string>
     <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
-
     <string name="event_status_sending_message">Sende eine Nachricht…</string>
     <string name="clear_timeline_send_queue">Sendewarteschlange leeren</string>
-
     <string name="initial_sync_start_importing_account">Erste Synchronisation: Importiere Benutzerkonto…</string>
     <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation: Importiere Cryptoschlüssel</string>
     <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation: Importiere Räume</string>
@@ -102,7 +81,6 @@
     <string name="initial_sync_start_importing_account_left_rooms">Erste Synchronisation: Importiere verlassene Räume</string>
     <string name="initial_sync_start_importing_account_groups">Erste Synchronisation: Importiere Gemeinschaften</string>
     <string name="initial_sync_start_importing_account_data">Erste Synchronisation: Importiere Benutzerdaten</string>
-
     <string name="notice_room_third_party_revoked_invite">%1$s hat die Einladung an %2$s, den Raum zu betreten, zurückgezogen</string>
     <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s Einladung. Grund: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s hat %2$s eingeladen. Grund: %3$s</string>
@@ -117,33 +95,24 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s hat Einladung an %2$s zu Betreten dieses Raumes zurückgezogen. Grund: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s hat die Einladung für %2$s angenommen. Grund: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s hat Einladung für %2$s verworfen. Grund: %3$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s fügt %2$s als eine Adresse für diesen Raum hinzu.</item>
         <item quantity="other">%1$s fügt %2$s als Adressen für diesen Raum hinzu.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s entfernt %2$s als eine Adresse für diesen Raum.</item>
         <item quantity="other">%1$s entfernt %2$s als Adressen für diesen Raum.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s fügt %2$s als Adresse für diesen Raum hinzu und entfernt %3$s.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s legt die Hauptadresse fest für diesen Raum als %2$s fest.</string>
     <string name="notice_room_canonical_alias_unset">%1$s entfernt die Hauptadresse für diesen Raum.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s hat Gästen erlaubt den Raum zu betreten.</string>
     <string name="notice_room_guest_access_forbidden">%1$s hat Gäste unterbunden den Raum zu betreten.</string>
-
     <string name="notice_end_to_end_ok">%1$s aktivierte Ende-zu-Ende-Verschlüsselung.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s aktivierte Ende-zu-Ende-Verschlüsselung (unbekannter Algorithmus %2$s).</string>
-
     <string name="key_verification_request_fallback_message">%s fordert zur Überprüfung deines Schlüssels auf, jedoch unterstützt dein Client nicht die Schlüsselüberprüfung im Chat. Du musst die herkömmliche Schlüsselüberprüfung verwenden, um die Schlüssel zu überprüfen.</string>
-
     <string name="summary_you_sent_image">Du hast ein Bild gesendet.</string>
     <string name="summary_you_sent_sticker">Du hast einen Sticker gesendet.</string>
-
     <string name="notice_room_invite_no_invitee_by_you">Deine Einladung</string>
     <string name="notice_room_created">%1$s hat den Raum erstellt</string>
     <string name="notice_room_created_by_you">Du hast den Raum erstellt</string>
@@ -170,7 +139,6 @@
     <string name="notice_made_future_room_visibility_by_you">Du hast den zukünftigen Nachrichtenverlauf für %1$s sichtbar gemacht</string>
     <string name="notice_end_to_end_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (%1$s)</string>
     <string name="notice_room_update_by_you">Du hast den Raum aufgwertet.</string>
-
     <string name="notice_requested_voip_conference_by_you">Du hast eine VoIP-Konferenz angefordert</string>
     <string name="notice_room_name_removed_by_you">Du hast den Raumnamen entfernt</string>
     <string name="notice_room_topic_removed_by_you">Du hast das Raumthema entfernt</string>
@@ -180,24 +148,20 @@
     <string name="notice_room_third_party_invite_by_you">Du hast %1$s in den Raum eingeladen</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgenommen</string>
     <string name="notice_room_third_party_registered_invite_by_you">Du hast die Einladung für %1$s akzeptiert</string>
-
     <string name="notice_widget_added">%1$s hat das %2$s Widget hinzugefügt</string>
     <string name="notice_widget_added_by_you">Du hast das %1$s Widget hinzugefügt</string>
     <string name="notice_widget_removed">%1$s hat das %2$s Widget entfernt</string>
     <string name="notice_widget_removed_by_you">Du hast das %1$s Widget entfernt</string>
     <string name="notice_widget_modified">%1$s hat das %2$s Widget modifiziert</string>
     <string name="notice_widget_modified_by_you">Du hast das %1$s Widget modifiziert</string>
-
     <string name="power_level_admin">Administrator</string>
     <string name="power_level_moderator">Moderator</string>
     <string name="power_level_default">Standard</string>
     <string name="power_level_custom">Benutzerdefiniert (%1$d)</string>
     <string name="power_level_custom_no_value">Benutzerdefiniert</string>
-
     <string name="notice_power_level_changed_by_you">Du hast die Berechtigungsstufe von %1$s geändert.</string>
     <string name="notice_power_level_changed">%1$s hat die Berechtigungsstufe von %2$s geändert.</string>
     <string name="notice_power_level_diff">%1$s von %2$s zu %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Deine Einladung. Grund: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Du hast %1$s eingeladen. Grund: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">Du bist dem Raum beigetreten. Grund: %1$s</string>
@@ -210,28 +174,37 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Du hast die Einladung für %1$s zurückgenommen. Grund: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du hast die Einladung von %1$s angenommen. Grund: %2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Du hast die Einladung von %1$s abgelehnt. Grund: %2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Du hast die Raumaddresse %1$s hinzugefügt.</item>
         <item quantity="other">Du hast die Raumaddressen %1$s hinzugefügt.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">Du hast die Raumaddresse %1$s vom Raum entfernt.</item>
-        <item quantity="other">Du hast die Raumaddressen %1$s vom Raum entfernt.</item>
+        <item quantity="one">Du hast die Raum-Adresse %1$s vom Raum entfernt.</item>
+        <item quantity="other">Du hast die Raum-Adressen %1$s vom Raum entfernt.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">Du hast den Raumaddressen %1$s hinzugefügt und %2$s entfernt.</string>
-
     <string name="notice_room_canonical_alias_set_by_you">Du hast die Hauptaddresse für diesen Raum auf %1$s gesetzt.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Du hast die Hauptaddresse des Raums entfernt.</string>
-
     <string name="notice_room_guest_access_can_join_by_you">Du hast Gästen erlaubt dem Raum beizutreten.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Du hast Gästen untersagt dem Raum beizutreten.</string>
-
     <string name="notice_end_to_end_ok_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Du hast Ende-zu-Ende-Verschlüsselung aktiviert (unbekannter Algorithmus %1$s).</string>
-
     <string name="notice_call_candidates">%s hat Daten gesendet, um einen Anruf zu starten.</string>
     <string name="notice_call_candidates_by_you">Du hast Daten geschickt, um eine Anruf zu starten.</string>
-</resources>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Du hast Gästen erlaubt hier beizutreten.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s hat Gästen erlaubt hier beizutreten.</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Du bist beigetreten. Grund: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s ist beigetreten. Grund: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du hast die Einladung für %1$s zurückgezogen</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s hat die Einladung für %2$s zurückgezogen</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Du hast %1$s eingeladen</string>
+    <string name="notice_direct_room_third_party_invite">%1$s hat %2$s eingeladen</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Du hast zukünftige Nachrichten für %2$s sichtbar gemacht</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s hat zukünftige Nachrichten für %2$s sichtbar gemacht</string>
+    <string name="notice_direct_room_leave_by_you">Du hast den Raum verlassen</string>
+    <string name="notice_direct_room_leave">%1$s hat den Raum verlassen</string>
+    <string name="notice_direct_room_join_by_you">Du bist beigetreten</string>
+    <string name="notice_direct_room_join">%1$s ist beigetreten</string>
+    <string name="notice_direct_room_created_by_you">Du hast eine Diskussion erstellt</string>
+    <string name="notice_direct_room_created">%1$s hat eine Diskussion erstellt</string>
+</resources>
\ No newline at end of file

From 1692a52e0a3ce8abce913fc2c5e00e5db1300ea2 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Wed, 14 Oct 2020 13:04:52 +0000
Subject: [PATCH 259/278] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 vector/src/main/res/values-zh-rCN/strings.xml | 575 ++----------------
 1 file changed, 66 insertions(+), 509 deletions(-)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 5504dbc81f..17bf14161c 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1,14 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">zh</string>
     <string name="resources_country_code">CN</string>
-
     <string name="call_notification_answer">接受</string>
     <string name="call_notification_reject">拒绝</string>
     <string name="call_notification_hangup">挂断</string>
-
     <string name="resend">重新发送</string>
     <string name="quote">引用</string>
     <string name="share">分享</string>
@@ -26,31 +24,23 @@
     <string name="login">登录</string>
     <string name="logout">登出</string>
     <string name="search">搜索</string>
-
     <string name="start_new_chat">发起新的聊天</string>
     <string name="option_send_files">发送文件</string>
-
     <string name="yesterday">昨天</string>
     <string name="today">今天</string>
-
     <string name="room_info_room_name">聊天室名称</string>
     <string name="room_info_room_topic">聊天室主题</string>
-
     <string name="call_ended">通话结束</string>
     <string name="media_picker_both_capture_title">拍摄照片或视频</string>
     <string name="media_picker_cannot_record_video">无法录制视频</string>
-
     <string name="media_slider_saved">已保存</string>
     <string name="_continue">继续</string>
-
     <string name="join">加入</string>
     <string name="preview">查看</string>
     <string name="reject">拒绝</string>
-
     <string name="room_preview_invitation_format">%s 邀请您加入这个聊天室</string>
     <string name="room_creation_title">新的聊天</string>
     <string name="room_creation_add_member">添加成员</string>
-
     <string name="room_participants_leave_prompt_title">退出聊天室</string>
     <string name="room_participants_leave_prompt_msg">您确定要退出聊天室吗？</string>
     <string name="room_participants_remove_prompt_msg">您确定要把 %s 从这个聊天中移除吗？</string>
@@ -62,23 +52,18 @@
     <string name="title_activity_room">聊天室</string>
     <string name="title_activity_settings">设置</string>
     <string name="title_activity_member_details">成员信息</string>
-
     <string name="save">保存</string>
     <string name="leave">离开</string>
     <string name="send">发送</string>
     <string name="view_source">查看源代码</string>
     <string name="view_decrypted_source">查看解密后的源代码</string>
     <string name="or">或</string>
-
     <string name="action_sign_out">登出</string>
     <string name="disable">禁用</string>
-
     <string name="dialog_title_warning">警告</string>
-
     <string name="send_bug_report_description">请描述您遇到的问题。您做了什么？您期望发生什么？实际上发生了什么？</string>
     <string name="send_bug_report_placeholder">在这里描述您的问题</string>
     <string name="send_bug_report_progress">进度（%s%%）</string>
-
     <string name="hs_url">主服务器 URL</string>
     <string name="identity_url">身份服务器 URL</string>
     <string name="auth_login">登入</string>
@@ -120,7 +105,6 @@
     <string name="login_error_registration_network_error">无法注册：网络错误</string>
     <string name="login_error_unable_register">无法注册</string>
     <string name="login_error_invalid_home_server">请输入有效的 URL</string>
-
     <string name="login_error_forbidden">无效的的用户名/密码</string>
     <string name="login_error_not_json">没有包含有效的 JSON</string>
     <string name="login_error_limit_exceeded">发送了过多的请求</string>
@@ -128,7 +112,6 @@
     <string name="compression_opt_list_large">大</string>
     <string name="compression_opt_list_medium">中</string>
     <string name="compression_opt_list_small">小</string>
-
     <string name="attachment_cancel_download">取消下载？</string>
     <string name="attachment_cancel_upload">取消上传？</string>
     <string name="yes">是</string>
@@ -136,21 +119,17 @@
     <string name="room_preview_try_join_an_unknown_room_default">一个聊天室</string>
     <string name="room_title_one_member">1 位成员</string>
     <string name="room_participants_create">创建</string>
-
     <string name="room_details_files">文件</string>
-
     <string name="search_hint">搜索</string>
     <string name="search_members_hint">过滤聊天室成员</string>
     <string name="search_no_results">没有结果</string>
     <string name="tab_title_search_rooms">聊天室</string>
     <string name="tab_title_search_messages">消息</string>
     <string name="tab_title_search_files">文件</string>
-
     <string name="room_recents_join">加入</string>
     <string name="room_recents_conversations">聊天室</string>
     <string name="room_recents_start_chat">开始聊天</string>
     <string name="room_recents_create_room">创建聊天室</string>
-
     <string name="room_settings_direct_chat">私聊</string>
     <string name="room_sliding_menu_messages">消息</string>
     <string name="room_sliding_menu_settings">设置</string>
@@ -168,7 +147,6 @@
     <string name="devices_details_device_name">设备名称</string>
     <string name="devices_delete_pswd">密码：</string>
     <string name="devices_delete_submit_button_label">提交</string>
-
     <string name="settings_change_password">修改密码</string>
     <string name="settings_new_password">新密码</string>
     <string name="settings_confirm_password">确认新密码</string>
@@ -179,14 +157,12 @@
     <string name="encryption_information_algorithm">算法</string>
     <string name="encryption_information_session_id">会话 ID</string>
     <string name="encryption_information_decryption_error">解密错误</string>
-
     <string name="encryption_information_sender_device_information">发送者的会话信息</string>
     <string name="encryption_information_device_name">公开名称</string>
     <string name="encryption_information_device_id">会话 ID</string>
     <string name="encryption_information_device_key">会话密钥</string>
     <string name="encryption_information_verification">验证</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519 指纹</string>
-
     <string name="encryption_import_import">导入</string>
     <string name="encryption_information_verified">已验证</string>
     <string name="cancel">取消</string>
@@ -201,12 +177,9 @@
     <string name="dialog_title_confirmation">确认</string>
     <string name="send_bug_report_include_crash_logs">发送崩溃日志</string>
     <string name="send_bug_report_app_crashed">上次启动后本应用发生了崩溃。是否打开崩溃报告页面？</string>
-
     <string name="start_voice_call">开始语音通话</string>
     <string name="start_video_call">开始视频通话</string>
-
     <string name="option_take_photo_video">拍摄照片或视频</string>
-
     <string name="auth_repeat_password_placeholder">重复密码</string>
     <string name="auth_use_server_options">使用自定义服务器选项（高级）</string>
     <string name="auth_email_validation_message">请检查您的电子邮箱以继续注册</string>
@@ -214,7 +187,6 @@
     <string name="auth_reset_password_email_validation_message">一封电子邮件已发送至 %s。点击了其中的链接后，请点击下面。</string>
     <string name="auth_reset_password_error_unauthorized">电子邮箱地址验证失败：请确保您已点击邮件中的链接</string>
     <string name="auth_reset_password_success_message">密码已重置。 您已从所有设备注销并且不再接受推送通知。要重新启用通知，请重新在相应设备上登录。</string>
-
     <string name="compression_opt_list_original">原始</string>
     <string name="attachment_remaining_time_seconds">%d 秒</string>
     <string name="call_connected">通话已连接</string>
@@ -228,7 +200,6 @@
     <string name="room_participants_header_admin_tools">管理工具</string>
     <string name="room_participants_header_direct_chats">私聊</string>
     <string name="room_participants_header_devices">设备列表</string>
-
     <string name="room_participants_action_invite">邀请</string>
     <string name="room_participants_action_leave">退出这个聊天室</string>
     <string name="room_participants_action_remove">从这个聊天室移除</string>
@@ -243,9 +214,7 @@
     <string name="room_participants_action_mention">提及</string>
     <string name="room_participants_action_devices_list">显示设备列表</string>
     <string name="room_participants_invite_prompt_msg">您确定要邀请 %s 到这个聊天吗？</string>
-
     <string name="people_search_local_contacts">本地联系人（%d 个）</string>
-
     <string name="room_two_users_are_typing">%1$s 和 %2$s 正在输入…</string>
     <string name="room_many_users_are_typing">%1$s 和 %2$s 及其他人正在输入…</string>
     <string name="room_message_placeholder_encrypted">发送一条加密消息…</string>
@@ -259,7 +228,6 @@
     <string name="room_delete_unsent_messages">删除未发送的消息</string>
     <string name="room_message_file_not_found">文件未找到</string>
     <string name="room_do_not_have_permission_to_post">您没有发送到这个聊天室的权限</string>
-
     <string name="ssl_trust">信任</string>
     <string name="ssl_do_not_trust">不信任</string>
     <string name="ssl_logout_account">注销</string>
@@ -270,36 +238,29 @@
     <string name="room_details_settings">设置</string>
     <string name="room_details_people_invited_group_name">已邀请</string>
     <string name="room_details_people_present_group_name">已加入</string>
-
     <string name="room_event_action_report_prompt_ignore_user">您要隐藏所有来自这个用户的消息吗？
 
 注意，此操作会重启应用并将花费一些时间。</string>
     <string name="room_event_action_cancel_upload">取消上传</string>
     <string name="room_event_action_cancel_download">取消下载</string>
-
     <string name="room_recents_favourites">收藏夹</string>
     <string name="room_recents_low_priority">低优先级</string>
     <string name="room_settings_de_prioritize">降低优先级</string>
     <string name="room_settings_leave_conversation">退出对话</string>
-
     <string name="room_sliding_menu_copyright">版权</string>
     <string name="room_sliding_menu_privacy_policy">隐私政策</string>
-
     <string name="settings_phone_number">手机号码</string>
     <string name="settings_app_info_link_title">应用信息</string>
-
     <string name="settings_enable_all_notif">启用这个账户的通知</string>
     <string name="settings_enable_this_device">启用这个设备的通知</string>
     <string name="settings_messages_in_one_to_one">来自私聊的消息</string>
     <string name="settings_messages_in_group_chat">来自群聊的消息</string>
     <string name="settings_invited_to_room">当我被邀请加入聊天室时</string>
     <string name="settings_messages_sent_by_bot">来自机器人的消息</string>
-
     <string name="settings_background_sync">后台同步</string>
     <string name="settings_enable_background_sync">启用后台同步</string>
     <string name="settings_set_sync_timeout">同步请求超时</string>
     <string name="settings_set_sync_delay">每次同步请求之间的间隔</string>
-
     <string name="settings_copyright">版权</string>
     <string name="settings_privacy_policy">隐私政策</string>
     <string name="settings_clear_cache">清空缓存</string>
@@ -314,9 +275,7 @@
     <string name="settings_unignore_user">是否重新显示所有来自 %s 的消息？
 
 注意，此操作会重启应用并将花费一些时间。</string>
-
     <string name="settings_select_country">选择国家</string>
-
     <string name="settings_phone_number_country_label">国家</string>
     <string name="settings_phone_number_country_error">请选择一个国家</string>
     <string name="settings_phone_number_verification">手机验证</string>
@@ -329,18 +288,14 @@
     <string name="room_settings_room_read_history_rules_pref_title">聊天室历史可见性</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">谁可以阅读历史消息？</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">谁可以访问这个聊天室？</string>
-
     <string name="room_settings_read_history_entry_anyone">任何人</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">仅本群成员（自选中此项后开始）</string>
     <string name="room_settings_read_history_entry_members_only_invited">只有成员（从他们被邀请开始）</string>
     <string name="room_settings_read_history_entry_members_only_joined">只有成员（从他们加入开始）</string>
-
     <string name="room_settings_room_access_entry_only_invited">只有被邀请的人</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">除游客之外任何知道这个聊天室链接的人</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">任何知道这个聊天室链接的人，包括游客</string>
-
     <string name="room_settings_banned_users_title">被封禁的用户</string>
-
     <string name="room_settings_category_advanced_title">高级</string>
     <string name="room_settings_room_internal_id">此聊天室的内部 ID</string>
     <string name="room_settings_addresses_pref_title">地址</string>
@@ -348,10 +303,8 @@
     <string name="room_settings_labs_end_to_end">端对端加密</string>
     <string name="room_settings_labs_end_to_end_warnings">您需要注销来启用加密。</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">在此聊天室中、使用本设备时，从不向未验证的设备发送加密消息。</string>
-
     <string name="room_settings_addresses_no_local_addresses">这个聊天室没有本地地址</string>
     <string name="room_settings_addresses_add_new_address">新地址（如 #foo:matrix.org）</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">别名格式无效</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">“%s” 不是有效的别名格式</string>
     <string name="room_settings_addresses_e2e_enabled">这个聊天室已启用加密。</string>
@@ -359,9 +312,7 @@
     <string name="room_settings_addresses_e2e_encryption_warning">启用加密
 （警告：无法再禁用！）</string>
     <string name="directory_title">目录</string>
-
     <string name="encryption_information_title">端对端加密信息</string>
-
     <string name="encryption_information_device_info">事件信息</string>
     <string name="encryption_information_user_id">用户 ID</string>
     <string name="encryption_export_e2e_room_keys">导出端到端聊天室密钥</string>
@@ -373,20 +324,17 @@
     <string name="encryption_export_saved_as">端到端聊天室密钥已经被保存到“%s”。
 \n
 \n注意：如果应用被卸载，此文件可能将会被移除。</string>
-
     <string name="encryption_import_e2e_room_keys">导入端到端聊天室密钥</string>
     <string name="encryption_import_room_keys">导入聊天室密钥</string>
     <string name="encryption_import_room_keys_summary">从本地文件导入密钥</string>
     <string name="encryption_never_send_to_unverified_devices_title">仅向已验证的设备发送加密消息</string>
     <string name="encryption_never_send_to_unverified_devices_summary">使用本设备时，从不向未验证的设备发送加密消息。</string>
-
     <string name="encryption_information_not_verified">未验证</string>
     <string name="encryption_information_unknown_device">未知会话</string>
     <string name="encryption_information_verify">验证</string>
     <string name="encryption_information_unverify">取消验证</string>
     <string name="encryption_information_verify_device">验证设备</string>
     <string name="encryption_information_verify_key_match">我验证此密钥匹配</string>
-
     <string name="unknown_devices_alert_title">聊天室包含未知设备</string>
     <string name="later">稍后再说</string>
     <string name="permalink">永久链接</string>
@@ -404,7 +352,6 @@
     <string name="send_bug_report_sent">问题反馈发送成功</string>
     <string name="send_bug_report_failed">问题反馈发送失败（%s）</string>
     <string name="read_receipt">阅读</string>
-
     <string name="auth_invalid_token">无效令牌</string>
     <string name="auth_threepid_warning_message">在出现相应的 API 前，暂不支持同时使用电子邮箱地址与手机号码注册。只有手机号码会被添加到此帐户。
 
@@ -414,20 +361,16 @@
     <string name="login_error_unknown_token">无法识别指定的访问令牌</string>
     <string name="login_error_bad_json">异常的 JSON</string>
     <string name="login_error_login_email_not_yet">您还未点击电子邮件链接</string>
-
     <string name="attachment_remaining_time_minutes">%1$d 分钟 %2$d 秒</string>
-
     <string name="call_ring">正在呼叫…</string>
     <string name="incoming_call">呼入的通话</string>
     <string name="incoming_video_call">呼入的视频通话</string>
     <string name="incoming_voice_call">呼入的语音通话</string>
     <string name="call_in_progress">通话中…</string>
-
     <string name="call_error_user_not_responding">通话未被接听。</string>
     <string name="call_error_ice_failed">媒体连接失败</string>
     <string name="call_error_camera_init_failed">无法初始化相机</string>
     <string name="call_error_answered_elsewhere">其他设备已接听</string>
-
     <string name="permissions_rationale_popup_title">信息</string>
     <string name="permissions_rationale_msg_camera_explanation">"
 \n
@@ -439,16 +382,13 @@
 
 请在接下来弹出的窗口中授权允许访问。</string>
     <string name="permissions_action_not_performed_missing_permissions">对不起。因为权限不足，操作已取消</string>
-
     <string name="media_slider_saved_message">保存至下载？</string>
     <string name="remove">移除</string>
     <string name="room_preview_unlinked_email_warning">此邀请已发送至未与此账户关联的 %s。 您可能希望用一个不同的账户登录，或者把这个电子邮箱加入到这个账户。</string>
     <string name="room_preview_room_interactions_disabled">这是此聊天室的预览。与聊天室的交互已禁用。</string>
-
     <string name="room_participants_header_call">通话</string>
     <string name="room_participants_power_level_prompt">您将不能撤销这个修改，因为您正在让这个用户和您拥有相同的特权级别。
 您确定吗？</string>
-
     <string name="ssl_cert_not_trust">这可能意味着有人在恶意劫持您的通讯，或者您的手机不信任远程服务器的数字证书。</string>
     <string name="ssl_cert_new_account_expl">如果服务器管理员说这是正常的，请确保以下的指纹与管理员提供的指纹相符。</string>
     <string name="room_event_action_report_prompt_reason">报告这个内容的原因</string>
@@ -456,13 +396,11 @@
     <string name="room_recents_invites">邀请</string>
     <string name="directory_search_results_title">浏览目录</string>
     <string name="directory_searching_title">正在搜索目录…</string>
-
     <string name="room_settings_favourite">收藏夹</string>
     <string name="room_sliding_menu_term_and_conditions">使用条款</string>
     <string name="settings_display_name">昵称</string>
     <string name="settings_app_info_link_summary">显示系统设置中的应用程序信息。</string>
     <string name="settings_turn_screen_on">点亮屏幕 3 秒</string>
-
     <string name="settings_call_invitations">通话请求</string>
     <string name="settings_app_term_conditions">使用条款</string>
     <string name="settings_other">其他</string>
@@ -470,42 +408,31 @@
     <string name="settings_logged_in">登录为</string>
     <string name="account_email_validation_message">请检查您的电子邮箱并点击里面包含的链接。完成时请点击继续。</string>
     <string name="account_email_validation_error">无法验证电子邮箱地址。请检查您的邮件并点击其中的链接。完成后，请点击“继续”。</string>
-
     <string name="account_email_already_used_error">此电子邮箱地址已被使用。</string>
     <string name="account_email_not_found_error">找不到此电子邮箱地址。</string>
     <string name="account_phone_number_already_used_error">此手机号码已被使用。</string>
-
     <string name="settings_delete_notification_targets_confirmation">您确认要移除此通知目标吗？</string>
-
     <string name="settings_delete_threepid_confirmation">您确认要移除 %1$s %2$s 吗?</string>
-
     <string name="settings_phone_number_error">无效的已选国家的手机号码</string>
     <string name="room_settings_room_photo">聊天室图片</string>
     <string name="room_settings_room_tag">聊天室标签</string>
     <string name="room_settings_tag_pref_dialog_title">标签为：</string>
-
     <string name="room_settings_tag_pref_entry_favourite">收藏夹</string>
     <string name="room_settings_tag_pref_entry_low_priority">低优先级</string>
     <string name="room_settings_tag_pref_entry_none">无</string>
-
     <string name="room_settings_room_access_warning">要链接一个聊天室，必须有一个地址。</string>
     <string name="room_settings_never_send_to_unverified_devices_title">仅向已验证的设备发送加密消息</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">您没有指定此聊天室的主地址。</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">主地址警告</string>
-
     <string name="room_settings_set_main_address">设置为主地址</string>
     <string name="room_settings_unset_main_address">取消设置为主地址</string>
     <string name="room_settings_copy_room_id">复制聊天室 ID</string>
     <string name="room_settings_copy_room_address">复制聊天室地址</string>
-
     <string name="encryption_information_claimed_ed25519_fingerprint_key">声称的 Ed25519 指纹密钥</string>
     <string name="encryption_information_blocked">已列入黑名单</string>
-
     <string name="encryption_information_none">无</string>
-
     <string name="encryption_information_block">列入黑名单</string>
     <string name="encryption_information_unblock">移出黑名单</string>
-
     <string name="ok">确认</string>
     <string name="redact">移除</string>
     <string name="send_bug_report_alert_message">您似乎沮丧地摇了摇手机。您想打开问题反馈界面吗？</string>
@@ -518,9 +445,7 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element 需要访问您的通讯录，才能根据电子邮箱地址和手机号码查找其他 Matrix 用户。
 
 允许 Element 访问您的通讯录？</string>
-
     <string name="room_participants_idle">空闲</string>
-
     <string name="people_search_filter_text">仅 Matrix 用户</string>
     <string name="ssl_unexpected_existing_expl">您的手机信任的证书已被更改。这<b>非常反常</b>。建议您<b>不要接受</b>此新证书。</string>
     <string name="ssl_expected_existing_expl">证书已从以前受信任的更改为不受信任的证书。服务器可能已更新其证书。请联系管理员并核对服务器的指纹。</string>
@@ -555,7 +480,6 @@
 \n我们建议您在继续操作之前，先验证每个设备，但如果您愿意也可以不验证而重新发送消息。
 \n
 \n未知设备：</string>
-
     <string name="title_activity_historical">历史消息</string>
     <string name="invite">邀请</string>
     <string name="action_global_search">全局搜索</string>
@@ -563,16 +487,13 @@
     <string name="bottom_action_favourites">收藏夹</string>
     <string name="bottom_action_people">联系人</string>
     <string name="bottom_action_rooms">聊天室</string>
-
     <string name="home_filter_placeholder_home">按聊天室名称过滤</string>
     <string name="home_filter_placeholder_favorites">按收藏夹过滤</string>
     <string name="home_filter_placeholder_people">按联系人过滤</string>
     <string name="home_filter_placeholder_rooms">按聊天室名称过滤</string>
-
     <!-- Home fragment -->
     <string name="invitations_header">邀请</string>
     <string name="low_priority_header">低优先级</string>
-
     <!-- People fragment -->
     <string name="direct_chats_header">对话</string>
     <string name="local_address_book_header">本地通讯录</string>
@@ -580,18 +501,15 @@
     <string name="no_conversation_placeholder">没有对话</string>
     <string name="no_result_placeholder">没有结果</string>
     <string name="no_contact_access_placeholder">您没有授予 Element 访问本地通讯录的权限</string>
-
     <!-- Rooms fragment -->
     <string name="rooms_header">聊天室</string>
     <string name="rooms_directory_header">聊天室目录</string>
     <string name="no_room_placeholder">没有聊天室</string>
     <string name="no_public_room_placeholder">没有公开聊天室</string>
-
     <string name="people_search_invite_by_id_dialog_title">用 ID 邀请用户</string>
     <string name="people_search_invite_by_id_dialog_description">请输入一个或多个电子邮箱地址或 Matrix ID</string>
     <string name="people_search_invite_by_id_dialog_hint">电子邮箱地址或 Matrix ID</string>
     <string name="room_settings_forget">忘记</string>
-
     <!-- directory activity  -->
     <string name="select_room_directory">选择一个聊天室目录</string>
     <string name="directory_server_fail_to_retrieve_server">服务器可能不可用或过载</string>
@@ -599,44 +517,33 @@
     <string name="directory_server_placeholder">主服务器 URL</string>
     <string name="directory_server_all_rooms_on_server">%s 服务器上的所有聊天室</string>
     <string name="directory_server_native_rooms">所有本地 %s 聊天室</string>
-
     <!-- historical -->
     <string name="historical_placeholder">搜索历史</string>
-
     <string name="action_historical">历史消息</string>
-
     <string name="people_search_invite_by_id"><u>用 ID 邀请</u></string>
     <string name="room_recents_join_room">进入聊天室</string>
     <string name="room_recents_join_room_title">进入一个聊天室</string>
     <string name="room_recents_join_room_prompt">输入聊天室 ID 或者聊天室别名</string>
-
     <string name="room_jump_to_first_unread">跳到第一条未读消息。</string>
-
     <string name="settings_home_display">主页显示</string>
     <string name="settings_pin_missed_notifications">置顶含有错过的通知的聊天室</string>
     <string name="settings_pin_unread_messages">置顶含有未读消息的聊天室</string>
     <string name="settings_user_interface">用户界面</string>
     <string name="settings_interface_language">语言</string>
     <string name="settings_select_language">请选择语言</string>
-
     <string name="offline">离线</string>
-
     <string name="user_directory_header">用户目录</string>
     <string name="people_search_user_directory">用户目录（%s）</string>
     <string name="settings_start_on_boot">开机时自动启动</string>
     <string name="settings_clear_media_cache">清空缓存的媒体文件</string>
     <string name="settings_keep_media">保留媒体文件</string>
-
     <string name="settings_always_show_timestamps">为所有消息显示时间戳</string>
     <string name="settings_data_save_mode">省流量模式</string>
-
     <string name="media_saving_period_3_days">3天</string>
     <string name="media_saving_period_1_week">1周</string>
     <string name="media_saving_period_1_month">1个月</string>
     <string name="media_saving_period_forever">永远</string>
-
     <string name="settings_theme">主题</string>
-
     <string name="font_size">文字大小</string>
     <string name="tiny">微小</string>
     <string name="small">小</string>
@@ -648,15 +555,12 @@
     <string name="light_theme">浅色主题</string>
     <string name="dark_theme">深色主题</string>
     <string name="black_them">黑色主题</string>
-
     <string name="settings_notification_ringtone">通知声音</string>
     <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
-
     <string name="widget_no_power_to_manage">您需要权限来管理这个聊天室的小部件</string>
     <string name="widget_creation_failure">创建小部件失败</string>
     <string name="settings_labs_create_conference_with_jitsi">用 jitsi 创建会议通话</string>
     <string name="widget_delete_message_confirmation">您确定要删除这个小部件吗？</string>
-
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">无法创建小部件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
@@ -669,7 +573,6 @@
     <string name="room_add_matrix_apps">添加 Matrix 应用</string>
     <string name="notification_sync_in_progress">正在同步…</string>
     <string name="notification_listening_for_events">监听事件更新</string>
-
     <string name="call">通话</string>
     <string name="settings_containing_my_display_name">包含我昵称的消息</string>
     <string name="settings_containing_my_user_name">包含我用户名的消息</string>
@@ -678,76 +581,53 @@
     <string name="start_verification">开始验证</string>
     <string name="share_without_verifying">不验证而分享</string>
     <string name="ignore_request">忽略请求</string>
-
     <string name="title_activity_bug_report">反馈问题</string>
-
     <string name="option_take_photo">拍摄照片</string>
     <string name="option_take_video">拍摄视频</string>
-
     <string name="settings_labs_native_camera">使用原生相机</string>
-
     <!-- share keys -->
     <string name="conference_call_warning_title">警告！</string>
     <string name="conference_call_warning_message">会议通话正在开发中，可能不可靠。</string>
-
     <!-- slash commands -->
     <string name="command_error">命令错误</string>
     <string name="unrecognized_command">不可识别的命令：%s</string>
-
     <!-- notification statuses -->
     <string name="notification_off">关闭</string>
     <string name="encrypted_message">已加密消息</string>
-
     <string name="notification_noisy_notifications">响铃通知</string>
     <string name="notification_silent_notifications">静默通知</string>
-
     <string name="settings_analytics">数据收集</string>
-
     <string name="notification_noisy">响铃</string>
-
     <string name="loading">正在加载…</string>
-
     <string name="action_exit">退出</string>
     <string name="groups_invite_header">邀请</string>
     <string name="start_new_chat_prompt_msg">您确定要与 %s 发起新的聊天吗？</string>
     <string name="start_voice_call_prompt_msg">您确定要发起语音通话吗？</string>
     <string name="start_video_call_prompt_msg">您确定要发起视频通话吗？</string>
-
     <string name="room_participants_ban_prompt_msg">封禁踢掉将从聊天室中踢掉他们并阻止他们再次加入。</string>
-
     <string name="room_settings_all_messages">全部消息</string>
     <string name="room_settings_mention_only">只限提及</string>
     <string name="room_settings_mute">静音</string>
-    <string name="room_settings_add_homescreen_shortcut">添加主屏幕快捷方式</string>
-
+    <string name="room_settings_add_homescreen_shortcut">添加到主屏幕</string>
     <string name="settings_inline_url_preview">启用链接预览</string>
     <string name="settings_vibrate_on_mention">使用 @ 时震动</string>
-
     <string name="room_settings_room_notifications_title">通知</string>
     <string name="create">创建</string>
     <string name="community_name_hint">样例名称</string>
-
     <plurals name="room_new_messages_notification">
         <item quantity="other">%d 条新消息</item>
     </plurals>
-
     <string name="rejoin">重新加入</string>
     <string name="forget_room">忘记聊天室</string>
     <string name="room_settings_all_messages_noisy">所有消息（响铃）</string>
     <string name="title_activity_group_details">社区信息</string>
-
     <string name="actions">操作</string>
     <string name="bottom_action_groups">社区</string>
-
     <string name="home_filter_placeholder_groups">按社区名称过滤</string>
-
     <string name="groups_header">社区</string>
     <string name="no_group_placeholder">没有群组</string>
-
     <string name="send_bug_report_rage_shake">摇一摇快捷反馈问题</string>
-
     <string name="groups_list">群组列表</string>
-
     <string name="room_sync_in_progress">正在同步…</string>
     <plurals name="room_header_active_members_count">
         <item quantity="other">%d 人在线</item>
@@ -755,14 +635,11 @@
     <plurals name="membership_changes">
         <item quantity="other">%d 位成员的状态发生了变化</item>
     </plurals>
-
     <plurals name="room_title_members">
         <item quantity="other">%d 位成员</item>
     </plurals>
     <string name="room_settings_invalid_group_format_dialog_title">无效的社区 ID</string>
     <string name="room_settings_invalid_group_format_dialog_body">“%s” 不是一个有效的社区 ID</string>
-
-
     <plurals name="notification_unread_notified_messages">
         <item quantity="other">%d 条未读消息</item>
     </plurals>
@@ -775,14 +652,12 @@
     <string name="settings_notification_privacy">通知隐私</string>
     <string name="settings_notification_privacy_need_permission">本应用需要在后台运行的权限</string>
     <string name="settings_flair">徽章</string>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="other">%d 个聊天室</item>
     </plurals>
     <plurals name="active_widgets">
         <item quantity="other">已启用 %d 个小部件</item>
     </plurals>
-
     <!-- Widget Integration Manager -->
     <string name="community_name">社区名称</string>
     <string name="community_id">社区 ID</string>
@@ -791,25 +666,20 @@
     <string name="group_details_rooms">聊天室</string>
     <string name="rooms">聊天室</string>
     <string name="no_users_placeholder">没有用户</string>
-
     <string name="joined">已加入</string>
     <string name="invited">已邀请</string>
     <string name="filter_group_members">过滤社区成员</string>
     <string name="filter_group_rooms">过滤社区聊天室</string>
-
     <string name="has_been_kicked">您已被 %2$s 从 %1$s 中移除</string>
     <string name="has_been_banned">您已被 %2$s 从 %1$s 中封禁</string>
     <string name="reason_colon">理由：%1$s</string>
     <string name="avatar">头像</string>
-
     <string name="receipt_avatar">已读提示头像</string>
     <string name="notice_avatar">通知头像</string>
-
     <plurals name="directory_search_rooms_for">
         <item quantity="other">有 %1$s 个聊天室符合 “%2$s”</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s 条在 %2$s 中</string>
-
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="other">%d 条未读消息</item>
     </plurals>
@@ -817,24 +687,19 @@
     <string name="startup_notification_privacy_message">Element 可以在后台运行以安全隐密地管理您的通知（这可能会影响电池消耗）。</string>
     <string name="startup_notification_privacy_button_grant">获取权限</string>
     <string name="startup_notification_privacy_button_other">选择其他选项</string>
-
     <string name="settings_notification_privacy_fcm">• 通知通过 Firebase Cloud Messaging 发送</string>
     <string name="settings_notification_privacy_metadata">• 通知只含有元数据</string>
     <string name="settings_notification_privacy_message_content_not_shown">• 通知<b>不会显示消息内容</b></string>
-
     <string name="room_settings_add_new_group">新的社区ID（如 +foo:matrix.org）</string>
     <string name="group_no_long_description">社区管理员没有提供这个社区的具体描述。</string>
-
     <string name="settings_notification_privacy_normal">标准</string>
     <string name="settings_notification_privacy_reduced">低隐私模式</string>
     <string name="settings_deactivate_account_section">停用账户</string>
     <string name="settings_deactivate_my_account">停用我的账户</string>
-
     <string name="settings_opt_in_of_analytics">发送统计分析数据</string>
     <string name="settings_opt_in_of_analytics_summary">Element 会收集匿名统计数据来帮助我们改进程序。</string>
     <string name="settings_opt_in_of_analytics_prompt">请允许资料分析以帮助我们改进 Element。</string>
     <string name="settings_opt_in_of_analytics_ok">是的，我愿意帮助！</string>
-
     <string name="deactivate_account_title">停用账户</string>
     <string name="deactivate_account_content">这将使您的账户永远不再可用。您将不能登录，或使用相同的用户 ID 重新注册。您的账户将退出所有已加入的聊天室，身份服务器上的账户信息也会被删除。<b>此操作是不可逆的。</b>
 
@@ -844,52 +709,37 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="deactivate_account_delete_checkbox">请在我停用账户的同时忘记我发送的所有消息（警告：这将导致未来的用户看到残缺的对话）</string>
     <string name="deactivate_account_prompt_password">请输入您的密码以继续：</string>
     <string name="deactivate_account_submit">停用账户</string>
-
     <string name="title_activity_choose_sticker">发送贴纸</string>
-
     <string name="option_send_sticker">发送贴纸</string>
     <string name="no_sticker_application_dialog_content">您目前没有启用任何贴纸包。
 \n
 \n要添加一些吗？</string>
-
     <string name="settings_notification_privacy_secure_message_content">• 通知中的消息内容<b>从 Matrix 主服务器直接安全的获取</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• 通知含有<b>消息与元数据</b></string>
     <string name="room_settings_no_flair">这个聊天室不会显示任何社区的徽章</string>
     <string name="widget_integration_missing_parameter">缺少所需的参数。</string>
     <string name="widget_integration_invalid_parameter">无效参数。</string>
     <string name="community_id_hint">样例 ID</string>
-
     <string name="dialog_user_consent_content">要想继续使用主服务器 %1$s 您必须阅读并同意其服务条款。</string>
     <string name="dialog_user_consent_submit">现在阅读</string>
-
     <string name="dialog_title_third_party_licences">第三方开源协议</string>
-
     <string name="download">下载</string>
     <string name="clear">清除</string>
     <string name="option_send_voice">发送语音消息</string>
-
     <string name="go_on_with">使用…打开</string>
     <string name="error_no_external_application_found">对不起，没有可完成此操作的外部应用。</string>
-
     <string name="e2e_re_request_encryption_key">从其他设备上 <u>重新请求密钥</u>。</string>
-
     <string name="e2e_re_request_encryption_key_sent">已发送密钥共享请求。</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">已请求</string>
     <string name="e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 Element，以便其将密钥发送至当前设备。</string>
-
     <string name="lock_screen_hint">在此输入…</string>
-
     <string name="settings_labs_enable_send_voice">发送语音消息</string>
-
     <string name="error_empty_field_your_password">请输入您的密码。</string>
-
     <string name="speak">发言</string>
     <string name="send_bug_report_description_in_english">如果可能的话，请使用英文撰写问题描述。</string>
     <string name="room_message_placeholder_reply_to_encrypted">发送加密的回复…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">发送回复（未加密）…</string>
     <string name="settings_preview_media_before_sending">发送前预览媒体文件</string>
-
     <string name="settings_labs_keyboard_options_to_send_message">使用回车键发送消息</string>
     <string name="command_description_emote">显示动作</string>
     <string name="command_description_ban_user">依照 ID 封禁用户</string>
@@ -904,19 +754,15 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="command_description_nick">更改您显示的昵称</string>
     <string name="command_description_markdown">打开/关闭 markdown</string>
     <string name="command_description_clear_scalar_token">修复 Matrix Apps 管理</string>
-
     <string name="room_tombstone_versioned_description">这个聊天室已经被替换并且不再活跃</string>
     <string name="room_tombstone_continuation_link">对话在此继续</string>
     <string name="room_tombstone_continuation_description">这个聊天室是另一个对话的延续</string>
     <string name="room_tombstone_predecessor_link">点击此处查看更早的消息</string>
-
     <string name="settings_without_flair">您目前不是任何社区的成员。</string>
-
     <string name="missing_permissions_error">由于缺少权限，此操作无法完成。</string>
     <plurals name="public_room_nb_users">
         <item quantity="other">%d 个用户</item>
     </plurals>
-
     <plurals name="format_time_s">
         <item quantity="other">%d 秒</item>
     </plurals>
@@ -929,58 +775,41 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <plurals name="format_time_d">
         <item quantity="other">%d 天</item>
     </plurals>
-
     <string name="room_participants_now">现在%1$s</string>
     <string name="room_participants_ago">%2$s前%1$s</string>
-
     <string name="room_participants_invite_join_names">"%1$s、 "</string>
     <string name="room_participants_invite_join_names_and">%1$s 和 %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s%2$s</string>
-
     <plurals name="room_details_selected">
         <item quantity="other">已选择 %d 个</item>
     </plurals>
     <plurals name="group_members">
         <item quantity="other">%d 个成员</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="other">%d 个聊天室</item>
     </plurals>
     <string name="system_alerts_header">系统警告</string>
-
     <string name="resource_limit_exceeded_title">超出资源限制</string>
     <string name="resource_limit_contact_action">联系管理员</string>
-
     <string name="resource_limit_contact_admin">联系您的服务管理员</string>
-
     <string name="resource_limit_soft_default">本服务器其中一项资源已超出限制，<b>部分用户将无法登录</b>。</string>
     <string name="resource_limit_hard_default">本服务器其中一项资源已超出限制。</string>
-
     <string name="resource_limit_soft_mau"> 本服务器已达到每月活跃用户限制，<b>部分用户将无法登录</b>。</string>
     <string name="resource_limit_hard_mau">本服务器已达到每月活跃用户限制。</string>
-
     <string name="resource_limit_hard_contact">请 %s 以继续使用本服务。</string>
-
     <string name="resource_limit_soft_contact">请 %s 以增加此限制的额度。</string>
-
     <string name="status_theme">Status.im 主题</string>
-
     <string name="call_anyway">仍然呼叫</string>
     <string name="accept">接受</string>
-
     <string name="dialog_title_error">错误</string>
-
     <string name="auth_accept_policies">请审阅并接受此主服务器的政策：</string>
-
     <string name="settings_call_category">通话</string>
     <string name="settings_call_ringtone_use_app_ringtone">为来电使用 Element 的默认铃声</string>
     <string name="settings_call_ringtone_title">来电铃声</string>
     <string name="settings_call_ringtone_dialog_title">请选择来电铃声：</string>
-
     <string name="room_participants_action_kick">移除</string>
     <string name="reason_hint">理由</string>
-
     <string name="room_sliding_menu_version_x">版本 %s</string>
     <string name="settings_notification_troubleshoot">通知故障排除</string>
     <string name="settings_troubleshoot_diagnostic">故障排除诊断</string>
@@ -989,54 +818,44 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="settings_troubleshoot_diagnostic_success_status">基本诊断结果正常。若您还是沒有收到通知，请提交错误报告以协助我们调查此问题。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">一个或多个测试没有通过，请尝试建议的修复方法。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">一个或多个测试没有通过，请提交错误反馈以协助我们调查此问题。</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">系统设置。</string>
     <string name="settings_troubleshoot_test_system_settings_success">通知已在系统设置中启用。</string>
     <string name="settings_troubleshoot_test_system_settings_failed">通知已在系统设置中禁用。
 请检查系统设置。</string>
     <string name="open_settings">打开设置</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">帐号设置。</string>
     <string name="settings_troubleshoot_test_account_settings_success">您的帐号已启用通知。</string>
     <string name="settings_troubleshoot_test_account_settings_failed">您的帐号已禁用通知。
 请检查帐号设置。</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">启用</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">设备设置。</string>
     <string name="settings_troubleshoot_test_device_settings_success">已为此设备启用通知。</string>
     <string name="settings_troubleshoot_test_device_settings_failed">已为此设备禁用通知。
 请检查 Element 设置。</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">启用</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Play 服务检查</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play 服务的 APK 文件可用且为最新版本。</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element 使用 Google Play 服务来推送通知，但它似乎并未正确设置：
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">修复 Play 服务</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Firebase 令牌</string>
     <string name="settings_troubleshoot_test_fcm_success">成功获取 FCM Token：
 %1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM Token 获取失败：
 %1$s</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">注册 Token</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM Token 已成功注册至主服务器。</string>
     <string name="settings_troubleshoot_test_token_registration_failed">将 FCM Token 注册至主服务器时失败：
 %1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">通知服务</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">通知服务正在运行。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">通知服务尚未运行。
 请尝试重启本应用程序。</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">启动服务</string>
-
     <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 Element 内置的相机界面。</string>
     <string name="settings_labs_enable_send_voice_summary">此选项需要第三方应用录制消息。</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">开机时启动</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">启用开机时启动</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">检查后台限制</string>
     <string name="settings_troubleshoot_test_battery_title">电池优化</string>
     <string name="settings_inline_url_preview_summary">若主服务器支持本功能，在聊天时预览链接内容。</string>
@@ -1054,13 +873,10 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="startup_notification_fdroid_battery_optim_message">Element需要保持一个低影响的后台连接才能保证可靠的通知。
 在下一个弹出窗口中，系统将提示您允许 Element 始终在后台运行，请点击“允许“。</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">授予权限</string>
-
     <string name="account_email_error">在验证您的电子邮件地址时发生了一个错误。</string>
-
     <string name="settings_password">密码</string>
     <string name="account_phone_number_error">在验证您的手机号码时发生了一个错误。</string>
     <string name="account_additional_info">额外信息：%s</string>
-
     <string name="x_plus">%d+</string>
     <string name="plus_x">+%d</string>
     <string name="generic_label_and_value">%1$s：%2$s</string>
@@ -1068,26 +884,19 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
     <string name="show_info_area_always">总是</string>
     <string name="show_info_area_messages_and_errors">消息与错误</string>
     <string name="show_info_area_only_errors">仅错误</string>
-
     <string name="settings_info_area_show">显示信息区域</string>
     <string name="merged_events_collapse">收起</string>
-
     <string name="merged_events_expand">展开</string>
     <string name="unknown_error">抱歉，发生了一个错误</string>
-
     <string name="error_lazy_loading_not_supported_by_home_server">您的主服务器尚未支持延迟加载聊天室成员，请稍候再试。</string>
-
     <string name="settings_lazy_loading_description">通过仅载入最近聊天中出现的聊天室成员来提升性能。</string>
     <string name="settings_lazy_loading_title">延迟加载聊天室成员</string>
     <string name="markdown_has_been_disabled">已停用 Markdown。</string>
-
     <string name="markdown_has_been_enabled">已启用 Markdown。</string>
     <string name="video_call_in_progress">视频通话中…</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">自动重启通知服务</string>
     <string name="settings_troubleshoot_test_service_restart_success">服务被停止，并已自动重启。</string>
     <string name="settings_troubleshoot_test_service_restart_failed">服务重启失败</string>
-
     <string name="settings_troubleshoot_test_service_boot_success">服务将在设备重启后启动。</string>
     <string name="settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在您打开 Element 一次之前您将不会收到消息通知。</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">对 Element 的后台限制已被关闭。此测试应在移动数据（无Wi-Fi）环境下进行。
@@ -1096,20 +905,16 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意
 Element 在后台时的工作将被显著的限制，这可能会影响消息通知。
 %1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">关闭后台限制</string>
-
     <string name="settings_troubleshoot_test_battery_success">Element 未被电池优化影响。</string>
     <string name="settings_troubleshoot_test_battery_failed">如果设备在未充电的情况下关屏静置一段时间，其将进入打盹模式（Doze）。这将阻止应用访问网络并延后其运行、同步、与响铃。</string>
     <string name="settings_troubleshoot_test_battery_quickfix">忽略电池优化</string>
-
     <string name="encryption_export_notice">请输入用于加密密钥备份的密码。您在恢复此备份时需要使用此密码。</string>
     <string name="passphrase_create_passphrase">创建密码</string>
     <string name="passphrase_passphrase_does_not_match">密码必须对应</string>
     <string name="command_problem_with_parameters">指令 %s 需要更多参数，或者有些参数不正确。</string>
     <string name="no_valid_google_play_services_apk">没有可用的 Google Play Services APK。消息通知可能不能正常工作。</string>
-
     <string name="title_activity_keys_backup_setup">密钥备份</string>
     <string name="title_activity_keys_backup_restore">使用备份密钥</string>
-
     <string name="keys_backup_is_not_finished_please_wait">密钥备份尚未完成，请等待…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">如果您此时登出账号，您将会失去您的已加密信息</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">密钥备份进行中。如果您此时登出账号将无法再访问您的已加密信息。</string>
@@ -1120,22 +925,18 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="are_you_sure">确定吗？</string>
     <string name="backup">备份</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">如果您在登出账号之前不备份密钥，您将失去您的已加密信息的访问权。</string>
-
     <string name="stay">留下</string>
     <string name="skip">跳过</string>
     <string name="done">完成</string>
     <string name="abort">中止</string>
-
     <string name="action_sign_out_confirmation_simple">您确定要登出账号吗？</string>
     <string name="settings_notification_advanced">高级通知设置</string>
     <string name="settings_notification_by_event">事件的通知重要程度</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">自定义设置。</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">请注意一些消息类型已设置为静音（将会生成一条没有铃声的通知）。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">有些通知已在您的自定义设置中被禁用。</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">自定义规则加载失败，请重试。</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">检查设置</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \n此错误不受 Element 控制，根据 Google 的说法，此错误表示该设备在 FCM 中注册了太多应用。该错误仅在应用程序数量极多的情况下发生，因此不应影响普通用户。</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -1143,27 +944,20 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \n此错误不受 Element 控制。此设备上没有登录 Google 账号。请打开账号管理器并添加一个 Google 账号。</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">添加账号</string>
-
     <string name="settings_noisy_notifications_preferences">设置响铃通知</string>
     <string name="settings_call_notifications_preferences">设置电话通知</string>
     <string name="settings_silent_notifications_preferences">设置静音通知</string>
     <string name="settings_system_preferences_summary">选择指示灯颜色，震动，铃声…</string>
-
-
     <string name="settings_cryptography_manage_keys">加密密钥管理</string>
     <string name="settings_data_save_mode_summary">省流量模式使用了特定的过滤器，所以状态更新和输入状态通知将会被过滤掉。</string>
-
     <string name="encryption_message_recovery">已加密信息恢复</string>
     <string name="encryption_settings_manage_message_recovery_summary">管理密钥备份</string>
-
     <string name="notification_silent">静音</string>
     <string name="error_empty_field_enter_user_name">请输入一个用户名。</string>
     <string name="passphrase_empty_error_message">请输入密码</string>
     <string name="passphrase_passphrase_too_weak">密码太弱</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">如果您想要 Element 生成一个恢复密钥，请删除密码。</string>
     <string name="keys_backup_no_session_error">没有可用的 Matrix 会话</string>
-
     <string name="keys_backup_setup_step1_title">已加密信息永不丢失</string>
     <string name="keys_backup_setup_step1_description">加密聊天室中的信息会被端对端加密以确保安全。只有您和拥有密钥的接收方可以读取这些信息。
 \n
@@ -1171,7 +965,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="keys_backup_setup">开始使用备份密钥</string>
     <string name="keys_backup_setup_step1_advanced">（高级）</string>
     <string name="keys_backup_setup_step1_manual_export">手动导出密钥</string>
-
     <string name="keys_backup_setup_step2_text_title">使用密码以保护您的备份。</string>
     <string name="keys_backup_setup_step2_text_description">我们将会在主服务器上保存一份您的密钥的加密拷贝。设置一个密码来保护您的备份的安全。
 \n
@@ -1193,7 +986,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="recovery_key_export_saved_as_warning">恢复密钥已被保存到 \'%s\' 。
 \n
 \n警告：如果应用被卸载，此文件可能会被删除。</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">请制作一份拷贝</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">分享恢复密钥 …</string>
     <string name="keys_backup_setup_step3_generating_key_status">用密码来生成恢复密钥，此过程可能会花费几秒钟。</string>
@@ -1201,25 +993,18 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="unexpected_error">意外错误</string>
     <string name="keys_backup_setup_backup_started_title">备份开始</string>
     <string name="keys_backup_setup_backup_started_message">您的加密密钥正在后台被备份到您的主服务器上。初始备份可能花费几分钟。</string>
-
-
     <string name="keys_backup_setup_skip_title">您确定吗？</string>
     <string name="keys_backup_setup_skip_msg">如果您登出账号或者丢失此设备，您可能再也无法访问您的信息。</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">正在获取备份的版本 …</string>
     <string name="keys_backup_restore_with_passphrase">使用恢复密码解锁您的已加密历史消息</string>
     <string name="keys_backup_restore_use_recovery_key">使用您的恢复密钥</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">不知道您的恢复密码，您可以 %s 。</string>
-
     <string name="keys_backup_restore_with_recovery_key">使用恢复密钥解锁您的已加密历史消息</string>
     <string name="keys_backup_restore_key_enter_hint">输入恢复密钥</string>
-
     <string name="keys_backup_restore_setup_recovery_key">信息恢复</string>
-
     <string name="keys_backup_restore_with_key_helper">丢失了恢复密钥？您可以在设置中新建一个。</string>
     <string name="keys_backup_passphrase_error_decrypt">无法使用此密码解密备份：请检查您输入的恢复密码是否正确。</string>
     <string name="network_error_please_check_and_retry">网络错误：请检查您的网络连接并重试。</string>
-
     <string name="keys_backup_restoring_waiting_message">备份恢复中：</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">恢复密钥计算中 …</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">密钥下载中 …</string>
@@ -1227,7 +1012,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="keys_backup_unlock_button">解锁历史</string>
     <string name="keys_backup_recovery_code_empty_error_message">请输入恢复密钥</string>
     <string name="keys_backup_recovery_code_error_decrypt">无法使用此恢复密钥解密备份：请检查您输入的恢复密钥是否正确。</string>
-
     <string name="keys_backup_restore_success_title">备份已恢复 %s ！</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="other">恢复了一个包含 %d 个密钥的备份。</item>
@@ -1235,18 +1019,13 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <plurals name="keys_backup_restore_success_description_part2">
         <item quantity="other">%d 个新密钥已被添加到此设备中。</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">无法获取最新的恢复密钥版本 (%s) 。</string>
     <string name="keys_backup_no_keysbackup_sdk_error">会话加密没有被启用</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">从备份恢复</string>
     <string name="keys_backup_settings_delete_backup_button">删除备份</string>
-
     <string name="keys_backup_settings_status_ok">已为此设备正确设置密钥备份。</string>
     <string name="keys_backup_settings_status_ko">密钥备份在此设备上未激活。</string>
     <string name="keys_backup_settings_status_not_setup">您的密钥未从此设备备份。</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">备份含有一个来自 ID 为 %s 的未知设备的签名。</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">备份具有此设备的有效签名。</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">备份具有已验证设备 %s 的有效签名。</string>
@@ -1254,14 +1033,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="keys_backup_settings_invalid_signature_from_verified_device">备份具有已验证设备 %s 的无效签名</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">备份具有未验证设备 %s 的无效签名</string>
     <string name="keys_backup_get_trust_error">无法获得备份 （%s）的信任信息。</string>
-
     <string name="keys_backup_settings_untrusted_backup">要在此设备上使用密钥备份，请立即使用密码或恢复密钥进行恢复。</string>
     <string name="keys_backup_settings_deleting_backup">备份删除中 …</string>
     <string name="keys_backup_settings_delete_backup_error">备份（%s）删除失败</string>
-
     <string name="keys_backup_settings_delete_confirm_title">删除备份</string>
     <string name="keys_backup_settings_delete_confirm_message">要从此服务器中删除您备份的加密密钥吗？您将无法再使用恢复密钥来读取加密的历史消息。</string>
-
     <string name="new_recovery_method_popup_title">备份新密钥</string>
     <string name="new_recovery_method_popup_description">已检测到新的安全消息密钥备份。
 \n
@@ -1269,42 +1045,32 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="new_recovery_method_popup_was_me">那是我</string>
     <string name="keys_backup_banner_setup_line1">永不丢失已加密信息</string>
     <string name="keys_backup_banner_setup_line2">开始使用备份密钥</string>
-
     <string name="keys_backup_banner_recover_line1">永不丢失已加密信息</string>
     <string name="keys_backup_banner_recover_line2">使用备份密钥</string>
-
     <string name="keys_backup_banner_update_line1">新加密信息密钥</string>
     <string name="keys_backup_banner_update_line2">管理密钥备份</string>
-
     <string name="keys_backup_banner_in_progress">密钥备份中 …</string>
-
     <string name="keys_backup_info_keys_all_backup_up">所有密钥都已备份</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="other">%d 个密钥备份中 …</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">版本</string>
     <string name="keys_backup_info_title_algorithm">算法</string>
     <string name="keys_backup_info_title_signature">签名</string>
-
     <string name="ignore">忽略</string>
-
     <string name="auth_login_sso">以单点登录方式登入</string>
     <string name="login_error_unknown_host">无法连接到此 URL，请检查</string>
     <string name="login_error_ssl_handshake">您的设备使用了过时的 TLS 安全协议，容易受到攻击，为保证安全，您将无法进行连接</string>
     <string name="settings_send_message_with_enter">按回车发送消息</string>
     <string name="settings_send_message_with_enter_summary">软键盘的 Enter 按钮将发送消息而不是添加换行符</string>
-
     <string name="settings_change_password_submit">密码更新</string>
     <string name="settings_fail_to_update_password_invalid_current_password">密码无效</string>
     <string name="passwords_do_not_match">密码不匹配</string>
-
     <string name="autodiscover_invalid_response">无效的主服务器探测响应</string>
     <string name="autodiscover_well_known_autofill_dialog_title">自动完成服务器选项</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element 侦测到您的 userId 域名 \"%1$s\" 有自定义的服务器设置：
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">使用设置</string>
-
     <string name="notification_sync_init">正在初始化服务</string>
     <string name="settings_media">媒体</string>
     <string name="settings_default_compression">默认压缩</string>
@@ -1312,7 +1078,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_default_media_source">默认媒体来源</string>
     <string name="media_source_choose">选择</string>
     <string name="settings_play_shutter_sound">播放快门声</string>
-
     <string name="action_mark_room_read">标记为已读</string>
     <string name="settings_notification_privacy_no_background_sync">本应用 <b>不</b> 需要在后台连接主服务器，应能减少电量消耗</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -1321,18 +1086,14 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <plurals name="notification_compat_summary_title">
         <item quantity="other">%d 条通知</item>
     </plurals>
-
     <string name="notification_unknown_new_event">新活动</string>
     <string name="notification_unknown_room_name">聊天室</string>
     <string name="notification_new_messages">新消息</string>
     <string name="notification_new_invitation">新邀请</string>
     <string name="notification_sender_me">我</string>
     <string name="notification_inline_reply_failed">** 发送失败 - 请打开聊天室</string>
-
     <string name="error_jitsi_not_supported_on_old_device">抱歉，旧设备（Android 系统版本低于 5.0）不支持使用 Jitsi 创建电话会议</string>
-
     <string name="title_activity_verify_device">验证会话</string>
-
     <string name="encryption_information_unknown_ip">未知 IP</string>
     <string name="you_added_a_new_device_with_info">一个新设备正在请求加密密钥。
 \n设备名称：%1$s
@@ -1342,15 +1103,12 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 \n设备名称：%1$s
 \n最近上线于：%2$s
 \n若您未曾在另一个设备上登录，请忽略此请求。</string>
-
     <string name="start_verification_short_label">验证</string>
     <string name="share_without_verifying_short_label">分享</string>
     <string name="key_share_request">密钥分享请求</string>
     <string name="ignore_request_short_label">忽略</string>
-
     <string name="keys_backup_setup_override_replace">替换</string>
     <string name="keys_backup_setup_override_stop">终止</string>
-
     <string name="keys_backup_settings_checking_backup_state">正在检查备份状态</string>
     <string name="sas_verify_title">通过对比一段简短的文本字符串来验证设备。</string>
     <string name="sas_security_advise">为保证尽可能高的安全性，我们建议您与对方当面交换，或使用另一种可信任的通讯方式。</string>
@@ -1358,30 +1116,22 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="sas_incoming_request_title">传入的验证请求</string>
     <string name="sas_view_request_action">查看请求</string>
     <string name="sas_waiting_for_partner">正在等待对方确认…</string>
-
     <string name="sas_verified">已验证！</string>
     <string name="sas_verified_successful">您已成功验证此设备。</string>
     <string name="sas_got_it">了解了</string>
-
     <string name="sas_verifying_keys">什么都没有出现？并非所有的客户端都已支持交互式验证。使用旧版验证吧。</string>
     <string name="sas_legacy_verification_button_title">使用旧版验证。</string>
-
     <string name="sas_verification_request_notification_channel_title">密钥验证</string>
     <string name="sas_cancelled_dialog_title">请求已取消</string>
     <string name="sas_verification_request_notification_channel">交互式设备验证</string>
     <string name="sas_incoming_request_notif_title">验证请求</string>
     <string name="sas_incoming_request_notif_content">%s 想验证您的装置</string>
-
     <string name="sas_error_unknown">未知错误</string>
-
-
     <string name="edit">编辑</string>
     <string name="reply">回复</string>
-
     <string name="global_retry">重试</string>
     <string name="send_you_invite">向您发送邀请</string>
     <string name="invited_by">由 %s 邀请</string>
-
     <string name="room_list_catchup_welcome_title">欢迎回家！</string>
     <string name="room_list_people_empty_title">对话</string>
     <string name="room_list_rooms_empty_title">聊天室</string>
@@ -1391,13 +1141,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="message_add_reaction">响应</string>
     <string name="message_view_reaction">查看响应</string>
     <string name="reactions">响应</string>
-
     <string name="event_redacted_by_user_reason">由用户删除的事件</string>
     <string name="create_new_room">创建新聊天室</string>
     <string name="action_change">修改</string>
     <string name="please_wait">请稍候…</string>
     <string name="group_all_communities">所有社区</string>
-
     <string name="room_preview_no_preview">无法预览此聊天室</string>
     <string name="fab_menu_create_room">聊天室</string>
     <string name="create_room_action_create">创建</string>
@@ -1405,7 +1153,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="create_room_directory_title">聊天室目录</string>
     <string name="settings_sdk_version">Matrix SDK 版本</string>
     <string name="quick_reactions">快捷响应</string>
-
     <string name="settings_general_title">通用</string>
     <string name="settings_preferences">选项</string>
     <string name="settings_security_and_privacy">安全与隐私</string>
@@ -1413,37 +1160,28 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_push_rules">推送规则</string>
     <string name="settings_push_rules_no_rules">尚未定义任何推送规则</string>
     <string name="settings_push_gateway_no_pushers">没有已注册的推送通道</string>
-
     <string name="push_gateway_item_app_id">app_id：</string>
     <string name="push_gateway_item_push_key">push_key：</string>
     <string name="push_gateway_item_app_display_name">app_display_name：</string>
     <string name="push_gateway_item_device_name">device_name：</string>
     <string name="push_gateway_item_url">URL：</string>
     <string name="push_gateway_item_format">格式：</string>
-
     <string name="preference_voice_and_video">音频与视频</string>
     <string name="preference_root_help_about">帮助和关于</string>
-
-
     <string name="edited_suffix">（已编辑）</string>
-
     <string name="none">无</string>
     <string name="revoke">撤消</string>
     <string name="disconnect">断开连接</string>
     <string name="review">检查</string>
     <string name="decline">拒绝</string>
-
     <string name="people_no_identity_server">没有设置身份服务器。</string>
-
     <string name="call_failed_no_ice_title">服务器的错误配置导致通话失败</string>
     <string name="resources_script">Hans</string>
-
     <string name="call_failed_no_ice_description">请要求您的家庭服务器 (%1$s) 的管理员配置 TURN 服务器，以使通话可靠地工作。
 \n
 \n或者，您可以尝试使用 %2$s 的公共服务器，但这将不那么可靠，并且它将与该服务器共享您的 IP 地址。您也可以在“设置”中进行管理。</string>
     <string name="call_failed_no_ice_use_alt">尝试使用 %s</string>
     <string name="call_failed_dont_ask_again">不要再问我</string>
-
     <string name="auth_add_email_message_2">设置用于帐户恢复的电子邮件，然后就可以让认识您的人选择性探索到您。</string>
     <string name="auth_add_phone_message_2">设定电话，然后就可以让认识您的人选择性探索到您。</string>
     <string name="auth_add_email_phone_message_2">设定电子邮件以供帐号复原。 然后就可以让认识您的人用电子邮件或电话选择性探索到您。</string>
@@ -1454,16 +1192,12 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="play_video">播放</string>
     <string name="pause_video">暂停</string>
     <string name="dismiss">忽略</string>
-
-
     <string name="action_copy">复制</string>
     <string name="dialog_title_success">成功</string>
-
     <string name="bottom_action_notification">通知</string>
     <string name="call_failed_no_connection">Element 呼叫失败</string>
     <string name="call_failed_no_connection_description">无法建立实时连接。
 \n请要求您的家庭服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
-
     <string name="call_select_sound_device">选择声音设备</string>
     <string name="sound_device_phone">电话</string>
     <string name="sound_device_speaker">扬声器</string>
@@ -1474,20 +1208,16 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="call_camera_back">后</string>
     <string name="call_format_turn_hd_off">关闭 HD</string>
     <string name="call_format_turn_hd_on">打开 HD</string>
-
     <string name="login_error_ssl_peer_unverified">SSL 错误：尚未验证对等端身份。</string>
     <string name="login_error_ssl_other">SSL 错误。</string>
     <string name="settings_call_ringtone_use_default_stun_sum">当您的家庭服务器未提供时将使用 %s 作为辅助（在通话时将分享您的 IP 地址）</string>
     <string name="active_call_with_duration">活动通话 (%s)</string>
     <string name="return_to_call">返回通话</string>
-
     <string name="invite_no_identity_server_error">在您的设置中添加身份服务器以执行此操作。</string>
     <string name="room_participants_action_cancel_invite">取消邀请</string>
     <string name="room_participants_power_level_demote_warning_title">降低您自己的级别？</string>
     <string name="room_participants_power_level_demote_warning_prompt">您家无法撤销此操作因为您正在降低您的级别，如果您是聊天室中最后一个特权用户将无法恢复特权。</string>
     <string name="room_participants_power_level_demote">降级</string>
-
-
     <string name="room_participants_action_ignore_title">忽略用户</string>
     <string name="room_participants_action_ignore_prompt_msg">忽略此用户将从您共享的聊天室移除他们的消息。
 \n
@@ -1505,12 +1235,9 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="room_participants_ban_reason">封禁理由</string>
     <string name="room_participants_unban_title">取消封禁用户</string>
     <string name="room_participants_unban_prompt_msg">取消封禁用户将允许他们再次加入聊天室。</string>
-
     <string name="settings_add_3pid_confirm_password_title">确认您的密码</string>
     <string name="settings_add_3pid_flow_not_supported">您无法在 Element 移动版中这么做</string>
     <string name="settings_add_3pid_authentication_needed">需要身份认证</string>
-
-
     <string name="settings_background_fdroid_sync_mode">后台同步模式</string>
     <string name="settings_background_fdroid_sync_mode_battery">电池优化</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">Element 将在后台以保留设备有限资源（电池）的方式同步。
@@ -1521,8 +1248,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_background_fdroid_sync_mode_disabled">无后台同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">应用在后台时您不会收到消息通知。</string>
     <string name="settings_background_sync_update_error">更新设置失败。</string>
-
-
     <string name="settings_set_workmanager_delay">偏好同步间隔</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \n取决于资源（电量）或设备状态（睡眠）同步可能会延迟。</string>
@@ -1537,30 +1262,22 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_secure_backup_section_info">通过在您的服务器上备份加密密钥保障加密消息和数据的访问权。</string>
     <string name="reset_secure_backup_title">为您已有的备份生成新的安全密钥或设置新的安全口令。</string>
     <string name="reset_secure_backup_warning">这将替换您的当前密钥或短语。</string>
-
     <string name="settings_discovery_category">发现</string>
     <string name="settings_discovery_manage">管理您的发现设置。</string>
     <string name="settings_integration_allow">允许集成</string>
     <string name="settings_integration_manager">集成管理器</string>
-
     <string name="disabled_integration_dialog_title">集成已禁用</string>
     <string name="disabled_integration_dialog_content">请在设置中启用“允许集成”。</string>
-
     <plurals name="room_settings_banned_users_count">
         <item quantity="other">%d 个封禁用户</item>
     </plurals>
-
     <string name="encryption_information_device_name_with_warning">公开名称（对通信参与者可见）</string>
     <string name="device_name_warning">会话的公开名称对通信的参与者可见</string>
     <string name="encryption_exported_successfully">成功导出密钥</string>
-
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="active_widget_view_action">查看</string>
     <string name="active_widgets_title">活动小部件</string>
-
-
     <string name="room_widget_activity_title">小部件</string>
     <string name="room_widget_permission_title">载入小部件</string>
     <string name="room_widget_permission_added_by">此小部件添加者：</string>
@@ -1571,49 +1288,37 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="room_widget_reload">重载小部件</string>
     <string name="room_widget_open_in_browser">在浏览器中打开</string>
     <string name="room_widget_revoke_access">撤消我的访问权限</string>
-
     <string name="room_widget_permission_display_name">您的昵称</string>
     <string name="room_widget_permission_avatar_url">您的头像 URL</string>
     <string name="room_widget_permission_user_id">您的用户 ID</string>
     <string name="room_widget_permission_theme">您的主题</string>
     <string name="room_widget_permission_widget_id">小部件 ID</string>
     <string name="room_widget_permission_room_id">聊天室 ID</string>
-
-
     <string name="room_widget_resource_permission_title">小部件想使用以下资源：</string>
     <string name="room_widget_resource_grant_permission">允许</string>
     <string name="room_widget_resource_decline_permission">阻止全部</string>
     <string name="room_widget_webview_access_camera">使用相机</string>
     <string name="room_widget_webview_access_microphone">使用麦克风</string>
     <string name="room_widget_webview_read_protected_media">读取受 DRM 保护的媒体</string>
-
     <string name="integration_manager_not_configured">未配置集成管理器。</string>
     <string name="widget_integration_review_terms">若要继续请接受服务条款。</string>
-
     <string name="recovery_key_export_saved">恢复密钥已保存。</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">您的家庭服务器上已存在备份</string>
     <string name="keys_backup_setup_override_backup_prompt_description">您似乎已在另一个会话中设置密钥备份。您想要将其替换为正在创建的吗？</string>
     <string name="secure_backup_banner_setup_line1">安全备份</string>
     <string name="secure_backup_banner_setup_line2">保护加密信息及数据的访问权</string>
-
     <string name="secure_backup_setup">设置安全备份</string>
-
     <string name="invalid_or_expired_credentials">由于无效或过期的凭据您已登出。</string>
-
     <string name="sas_incoming_request_description">验证会话已将其标记为可信。当使用端到端加密消息时信任参与者的会话将给您额外的内心平静。</string>
     <string name="sas_incoming_request_description_2">验证会话将标记其为可信，同时将您的会话对对方标记为可信。</string>
-
     <string name="sas_emoji_description">通过确认以下表情符号出现在对方的屏幕上来验证此会话</string>
     <string name="sas_decimal_description">通过确认屏幕上对方显示以下数字来验证此会话</string>
-
     <string name="sas_incoming_verification_request_dialog">您收到传入验证请求。</string>
     <string name="sas_verified_successful_description">与此用户的安全消息端到端加密，无法被第三方读取。</string>
     <string name="sas_cancelled_by_other">对方取消了验证。
 \n%s</string>
     <string name="sas_cancelled_by_me">验证已取消。
 \n理由：%s</string>
-
     <string name="sas_error_m_user">用户已取消验证</string>
     <string name="sas_error_m_timeout">验证过程超时</string>
     <string name="sas_error_m_unknown_transaction">会话不知此事务</string>
@@ -1626,98 +1331,70 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="sas_error_m_user_error">用户不匹配</string>
     <string name="identity_server_not_defined">您未使用身份服务器</string>
     <string name="identity_server_not_defined_for_password_reset">未配置身份服务器，需要重置您的密码。</string>
-
     <string name="error_user_already_logged_in">您似乎正在试图连接到另一个家庭服务器。您想要登出吗？</string>
-
     <string name="room_list_empty">加入一个聊天室开始使用应用。</string>
     <string name="room_list_catchup_empty_title">您已经跟上了！</string>
     <string name="room_list_catchup_empty_body">您没有未读消息</string>
     <string name="room_list_catchup_welcome_body">从这里跟上未读消息</string>
     <string name="room_list_people_empty_body">您的私聊消息将在此处显示</string>
     <string name="room_list_rooms_empty_body">您的聊天室将在此显示</string>
-
     <string name="event_redacted">消息已删除</string>
     <string name="settings_show_redacted">显示已移除消息</string>
     <string name="settings_show_redacted_summary">对已移除消息显示占位符</string>
     <string name="event_redacted_by_admin_reason">聊天室管理员主持的事件</string>
     <string name="last_edited_info_message">最后由 %1$s 编辑于 %2$s</string>
-
-
     <string name="malformed_message">格式错误事件，无法显示</string>
     <string name="error_no_network">无网络。请检查您的网络连接。</string>
     <string name="change_room_directory_network">更改网络</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Element 尚不支持公开聊天室预览</string>
-
     <string name="fab_menu_create_chat">私聊消息</string>
-
     <string name="create_room_title">新聊天室</string>
     <string name="create_room_public_title">公开</string>
     <string name="create_room_public_description">任何人都可以加入此聊天室</string>
     <string name="create_room_directory_description">将此聊天室发布到聊天室目录</string>
-
     <string name="keys_backup_unable_to_get_trust_info">获取信任信息时发生错误</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">获取密钥备份数据时发生错误</string>
-
     <string name="import_e2e_keys_from_file">从文件 \"%1$s\" 导入端到端密钥。</string>
-
     <string name="settings_other_third_party_notices">其他第三方通知</string>
     <string name="navigate_to_room_when_already_in_the_room">您已经在查看此聊天室！</string>
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">注册令牌</string>
-
     <string name="send_suggestion">提出建议</string>
     <string name="send_suggestion_content">请在下方写下您的建议。</string>
     <string name="send_suggestion_report_placeholder">请在此描述您的建议</string>
     <string name="send_suggestion_sent">谢谢，建议已成功发送</string>
     <string name="send_suggestion_failed">建议发送失败 (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">在时间线上显示隐藏事件</string>
-
     <string name="bottom_action_people_x">私聊消息</string>
-
     <string name="send_file_step_idle">正在等待…</string>
     <string name="send_file_step_encrypting_thumbnail">正在加密缩略图…</string>
     <string name="send_file_step_sending_thumbnail">正在发送缩略图 (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">正在加密文件…</string>
     <string name="send_file_step_sending_file">正在发送文件 (%1$s / %2$s)</string>
-
     <string name="downloading_file">正在下载文件 %1$s…</string>
     <string name="downloaded_file">"文件 %1$s  已下载！"</string>
-
     <string name="message_edits">消息编辑</string>
     <string name="no_message_edits_found">未找到编辑</string>
-
     <string name="room_filtering_filter_hint">过滤对话…</string>
     <string name="room_filtering_footer_title">找不到您要找的？</string>
     <string name="room_filtering_footer_create_new_room">创建新聊天室</string>
     <string name="room_filtering_footer_create_new_direct_message">发送新私聊消息</string>
     <string name="room_filtering_footer_open_room_directory">查看聊天室目录</string>
-
     <string name="room_directory_search_hint">名称或 ID (#example:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">在时间线中启用滑动回复</string>
     <string name="labs_show_unread_notifications_as_tab">在主屏幕上添加未读通知选项卡。</string>
-
     <string name="link_copied_to_clipboard">链接已复制到剪贴板</string>
-
     <string name="add_by_matrix_id">通过 matrix ID 添加</string>
     <string name="creating_direct_room">正在创建聊天室…</string>
     <string name="direct_room_no_known_users">无结果，使用通过 matrix ID 添加在服务器上搜索。</string>
     <string name="direct_room_start_search">开始输入以获得结果</string>
     <string name="direct_room_filter_hint">按用户名或 ID 过滤…</string>
-
     <string name="joining_room">正在加入聊天室…</string>
-
     <string name="message_view_edit_history">查看编辑历史</string>
-
     <string name="terms_of_service">服务条款</string>
     <string name="review_terms">审核条款</string>
     <string name="terms_description_for_identity_server">可被其他人发现</string>
     <string name="terms_description_for_integration_manager">使用机器人，小部件和贴纸包</string>
-
     <string name="read_at">已读于</string>
-
-
     <string name="identity_server">身份服务器</string>
     <string name="disconnect_identity_server">断开身份服务器</string>
     <string name="add_identity_server">配置身份服务器</string>
@@ -1732,7 +1409,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_discovery_confirm_mail">我们向 %s 给您发送了确认电子邮件，检查您的电子邮件并点击确认链接</string>
     <string name="settings_discovery_confirm_mail_not_clicked">我们向 %s 给您发送了确认电子邮件，请先检查您的电子邮件并点击确认链接</string>
     <string name="settings_discovery_mail_pending">正在等待</string>
-
     <string name="settings_discovery_enter_identity_server">输入身份服务器 URL</string>
     <string name="settings_discovery_bad_identity_server">无法连接到身份服务器</string>
     <string name="settings_discovery_please_enter_server">请输入身份服务器 url</string>
@@ -1740,20 +1416,13 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_discovery_no_terms">您选择的身份服务器无任何服务条款。仅在您信任服务所有者时继续</string>
     <string name="settings_text_message_sent">已向 %s 发送文字消息。请输入它包含的验证码。</string>
     <string name="settings_text_message_sent_wrong_code">验证码不正确。</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">您当前在身份服务器 %1$s 上分享电子邮件地址或电话号码。您需要重连接 %2$s 已停止分享。</string>
     <string name="settings_agree_to_terms">同意身份服务器 (%s) 服务条款使您可以通过电子邮件地址或电话号码被发现。</string>
-
     <string name="labs_allow_extended_logging">启用详细日志。</string>
     <string name="labs_allow_extended_logging_summary">当您发送 RageShake 时详细日志将帮助开发者提供更多日志。即使启用，应用也不会记录消息内容或任何其他私有数据。</string>
-
-
     <string name="error_terms_not_accepted">接收您的家庭服务器条款和条件后请重试。</string>
-
     <string name="error_network_timeout">服务器似乎响应时间太长，这可能是由于连接不良或服务器错误引起的。 请稍后再试。</string>
-
     <string name="send_attachment">发送附件</string>
-
     <string name="a11y_open_drawer">打开导航菜单</string>
     <string name="a11y_create_menu_open">打开创建聊天室菜单</string>
     <string name="a11y_create_menu_close">关闭创建聊天室菜单…</string>
@@ -1763,16 +1432,13 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="a11y_show_password">显示密码</string>
     <string name="a11y_hide_password">隐藏密码</string>
     <string name="a11y_jump_to_bottom">跳到底部</string>
-
     <string name="three_users_read">%1$s，%2$s 和 %3$s 已读</string>
     <string name="two_users_read">%1$s 和 %2$s 已读</string>
     <string name="one_user_read">%s 已读</string>
     <plurals name="fallback_users_read">
         <item quantity="other">%d 个用户已读</item>
     </plurals>
-
     <string name="error_file_too_big">上传文件 \'%1$s\' (%2$s) 过大。限制为 %3$s。</string>
-
     <string name="error_attachment">获取附件时出错。</string>
     <string name="attachment_type_file">文件</string>
     <string name="attachment_type_contact">联系人</string>
@@ -1781,13 +1447,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="attachment_type_gallery">相册</string>
     <string name="attachment_type_sticker">贴纸</string>
     <string name="error_handling_incoming_share">无法处理共享数据</string>
-
     <string name="uploads_media_title">媒体</string>
     <string name="uploads_media_no_result">此聊天室中无媒体</string>
     <string name="uploads_files_title">文件</string>
     <string name="uploads_files_subtitle">%1$s 于 %2$s</string>
     <string name="uploads_files_no_result">此聊天室中无文件</string>
-
     <string name="report_content_spam">垃圾信息</string>
     <string name="report_content_inappropriate">不合适的内容</string>
     <string name="report_content_custom">自定义报告……</string>
@@ -1795,28 +1459,23 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="report_content_custom_hint">报告此内容的理由</string>
     <string name="report_content_custom_submit">报告</string>
     <string name="block_user">忽略用户</string>
-
     <string name="content_reported_title">内容已报告</string>
-    <string name="content_reported_content">此内容已报告。
-\n
-\n如果您不希望再看到此用户的更多内容，您可以屏蔽他以隐藏他的信息</string>
+    <string name="content_reported_content">此内容已报告。 
+\n 
+\n如果您不希望再看到此用户的更多内容，您可以忽略他们以隐藏他们的信息。</string>
     <string name="content_reported_as_spam_title">报告为垃圾信息</string>
-    <string name="content_reported_as_spam_content">此内容已报告为垃圾信息。
-\n
-\n如果您不希望再看到此用户的更多内容，您可以屏蔽他以隐藏他的信息</string>
+    <string name="content_reported_as_spam_content">此内容已报告为垃圾信息。 
+\n 
+\n如果您不希望再看到此用户的更多内容，您可以忽略他们以隐藏他们的信息。</string>
     <string name="content_reported_as_inappropriate_title">报告为不合适的内容</string>
-    <string name="content_reported_as_inappropriate_content">此内容已报告为不合适。
-\n
-\n如果您不希望再看到此用户的更多内容，您可以屏蔽他以隐藏他的信息</string>
-
+    <string name="content_reported_as_inappropriate_content">此内容已报告为不合适。 
+\n 
+\n如果您不希望再看到此用户的更多内容，您可以忽略他们以隐藏他们的消息。</string>
     <string name="permissions_rationale_msg_keys_backup_export">Element 需要权限在磁盘上保存您的端到端密钥。
 \n
 \n请在下个弹窗中允许访问以便手动导出密钥。</string>
-
     <string name="no_network_indicator">目前没有网络连接</string>
-
     <string name="message_ignore_user">忽略用户</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">全部消息（嘈杂）</string>
     <string name="room_list_quick_actions_notifications_all">全部消息</string>
     <string name="room_list_quick_actions_notifications_mentions">仅提到我的</string>
@@ -1828,22 +1487,17 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="notice_member_no_changes">%1$s 未做更改</string>
     <string name="notice_member_no_changes_by_you">您未做更改</string>
     <string name="no_ignored_users">您未忽略任何用户</string>
-
     <string name="help_long_click_on_room_for_more_options">长按聊天室查看更多选项</string>
-
-
     <string name="room_join_rules_public">%1$s 将聊天室设为对任何知道链接的用户公开。</string>
     <string name="room_join_rules_public_by_you">您将聊天室设为对任何知道链接的用户公开。</string>
     <string name="room_join_rules_invite">%1$s 将聊天室设为仅限邀请。</string>
     <string name="room_join_rules_invite_by_you">您将聊天室设为仅限邀请。</string>
     <string name="timeline_unread_messages">未读消息</string>
-
     <string name="login_splash_title">这是你的对话。拥有它。</string>
     <string name="login_splash_text1">与人们私聊或群聊</string>
     <string name="login_splash_text2">通过加密保证对话私密</string>
     <string name="login_splash_text3">扩展 &amp; 自定义您的体验</string>
     <string name="login_splash_submit">开始吧</string>
-
     <string name="login_server_title">选择服务器</string>
     <string name="login_server_text">就像电子邮件，账户有一个家，尽管您可以与任何人聊天</string>
     <string name="login_server_matrix_org_text">在最大的公共服务器上免费加入数百万用户</string>
@@ -1851,7 +1505,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_server_modular_learn_more">了解更多</string>
     <string name="login_server_other_title">其他</string>
     <string name="login_server_other_text">自定义 &amp; 高级设置</string>
-
     <string name="login_continue">继续</string>
     <string name="login_connect_to">连接到 %1$s</string>
     <string name="login_connect_to_modular">连接到 Element Matrix 服务</string>
@@ -1860,14 +1513,12 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_signup">注册</string>
     <string name="login_signin">登入</string>
     <string name="login_signin_sso">使用单点登录继续</string>
-
     <string name="login_server_url_form_modular_hint">Element Matrix 服务地址</string>
     <string name="login_server_url_form_other_hint">地址</string>
     <string name="login_server_url_form_modular_text">面向组织的高级托管</string>
     <string name="login_server_url_form_modular_notice">输入 Modular Element 或您想使用的服务器地址</string>
     <string name="login_server_url_form_other_notice">输入您想要连接的服务器或 Element 的地址</string>
     <string name="login_server_url_form_common_notice">输入您想使用的服务器的地址</string>
-
     <string name="login_sso_error_message">载入页面时出错：%1$s (%2$d)</string>
     <string name="login_mode_not_supported">应用无法登录到此家庭服务器。家庭服务器支持以下登录类型：%1$s。
 \n
@@ -1876,58 +1527,46 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_registration_not_supported">应用无法在此服务器上创建账户。 
 \n 
 \n您想要通过网页客户端注册吗？</string>
-
     <string name="login_login_with_email_error">电子邮件未关联到任何账户。</string>
-
     <string name="login_reset_password_on">在 %1$s 上重置密码</string>
     <string name="login_reset_password_notice">验证邮件将发送到您的收件箱以确认设置您的新密码。</string>
     <string name="login_reset_password_submit">下一个</string>
     <string name="login_reset_password_email_hint">电子邮件</string>
     <string name="login_reset_password_password_hint">新密码</string>
-
     <string name="login_reset_password_warning_title">注意！</string>
     <string name="login_reset_password_warning_content">更改您的密码将重置所有会话上的端到端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出聊天室密钥。</string>
     <string name="login_reset_password_warning_submit">继续</string>
-
     <string name="login_reset_password_error_not_found">电子邮件未链接到任何账户</string>
-
     <string name="login_reset_password_mail_confirmation_title">检查您的收件箱</string>
     <string name="login_reset_password_mail_confirmation_notice">验证电子邮件已发送到 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">点击链接以确认您的新密码。跟随包含的链接验证后，请点击下方。</string>
     <string name="login_reset_password_mail_confirmation_submit">我已验证我的电子邮件地址</string>
-
     <string name="login_reset_password_success_title">成功！</string>
     <string name="login_reset_password_success_notice">您的密码已重置。</string>
     <string name="login_reset_password_success_notice_2">您已登出全部会话，不会再接收到推送通知。若要重新启用通知，请在每个设备上再次登录。</string>
     <string name="login_reset_password_success_submit">返回登录</string>
-
     <string name="login_reset_password_cancel_confirmation_title">注意</string>
     <string name="login_reset_password_cancel_confirmation_content">您的密码尚未更改。
 \n
 \n是否中止密码更改过程？</string>
-
     <string name="login_set_email_title">设置电子邮件地址</string>
     <string name="login_set_email_notice">设置电子邮件用于恢复您的帐户。之后，您可以选择允许您认识的人通过电子邮件发现您。</string>
     <string name="login_set_email_mandatory_hint">电子邮件</string>
     <string name="login_set_email_optional_hint">电子邮件（可选）</string>
     <string name="login_set_email_submit">下一个</string>
-
     <string name="login_set_msisdn_title">设置电话号码</string>
     <string name="login_set_msisdn_notice">设置电话号码，以选择允许您认识的人发现您。</string>
     <string name="login_set_msisdn_notice2">请使用国际格式。</string>
     <string name="login_set_msisdn_mandatory_hint">电话号码</string>
     <string name="login_set_msisdn_optional_hint">电话号码（可选）</string>
     <string name="login_set_msisdn_submit">下一个</string>
-
     <string name="login_msisdn_confirm_title">确认电话号码</string>
     <string name="login_msisdn_confirm_notice">我们向 %1$s 发送了验证码。在下方输入它以验证您的身份。</string>
     <string name="login_msisdn_confirm_hint">输入验证码</string>
     <string name="login_msisdn_confirm_send_again">重新发送</string>
     <string name="login_msisdn_confirm_submit">下一个</string>
-
     <string name="login_msisdn_error_not_international">国际电话号码必须以 ‘+’ 开头</string>
     <string name="login_msisdn_error_other">电话号码似乎无效。请检查</string>
-
     <string name="login_signup_to">在 %1$s 上注册</string>
     <string name="login_signin_username_hint">用户名或电子邮件</string>
     <string name="login_signup_username_hint">用户名</string>
@@ -1938,24 +1577,20 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_signup_cancel_confirmation_content">您的帐户尚未创建。
 \n
 \n是否中止注册过程？</string>
-
     <string name="login_a11y_choose_matrix_org">选择 matrix.org</string>
     <string name="login_a11y_choose_modular">选择 Element Matrix Services</string>
     <string name="login_a11y_choose_other">选择自定义家庭服务器</string>
     <string name="login_a11y_captcha_container">请进行人机验证</string>
     <string name="login_terms_title">接受条款以继续</string>
-
     <string name="login_wait_for_email_title">请检查您的电子邮件</string>
     <string name="login_wait_for_email_notice">我们向 %1$s 发送了电子邮件。
 \n请点击其中包含的链接继续账户创建。</string>
     <string name="login_validation_code_is_not_correct">输入的验证码不正确。请检查。</string>
     <string name="login_error_outdated_homeserver_title">过时的家庭服务器</string>
     <string name="login_error_outdated_homeserver_content">此家庭服务器运行的版本过旧以至于无法连接。要求您的家庭服务器管理员升级。</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="other">发送了太多请求。您可以在 %1$d 秒后重试…</item>
     </plurals>
-
     <string name="login_connect_using_matrix_id_notice">或者，如果您已经拥有账户并知道您的 Matrix 标识符和密码，您可以使用这种方式：</string>
     <string name="login_connect_using_matrix_id_submit">使用 Matrix ID 登录</string>
     <string name="login_signin_matrix_id_title">使用 Matrix ID 登录</string>
@@ -1964,7 +1599,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="login_signin_matrix_id_password_notice">如果您不知道您的密码，返回并重置。</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">这不是一个有效的用户标识符。期望的格式：\'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">无法找到有效的家庭服务器。请检查您的标识符</string>
-
     <string name="signed_out_title">您已登出</string>
     <string name="signed_out_notice">这可能由于多种原因：
 \n
@@ -1974,7 +1608,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 \n
 \n• 您的服务器管理员出于安全原因已取消您的访问权限。</string>
     <string name="signed_out_submit">重新登入</string>
-
     <string name="soft_logout_title">您已登出</string>
     <string name="soft_logout_signin_title">登入</string>
     <string name="soft_logout_signin_notice">您的家庭服务器 (%1$s) 管理员将您从您的账户 %2$s (%3$s) 登出。</string>
@@ -1986,7 +1619,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 \n
 \n如果您不再使用此设备，或想登入另一个帐户，请清除它。</string>
     <string name="soft_logout_clear_data_submit">清除全部数据</string>
-
     <string name="soft_logout_clear_data_dialog_title">清除数据</string>
     <string name="soft_logout_clear_data_dialog_content">是否清除当前存储在此设备上的全部数据？
 \n再次登入以访问您的帐户数据和消息。</string>
@@ -1994,12 +1626,9 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="soft_logout_clear_data_dialog_submit">清除数据</string>
     <string name="soft_logout_sso_not_same_user_error">当前会话用于用户 %1$s 而您提供了用户 %2$s 的凭证。Element 不支持此功能。
 \n请先清除数据，然后重新登入另一个账户。</string>
-
     <string name="permalink_malformed">您的 matrix.to 链接更是不正确</string>
     <string name="bug_report_error_too_short">描述太短</string>
-
     <string name="notification_initial_sync">初始同步…</string>
-
     <string name="settings_show_devices_list">查看我的全部会话</string>
     <string name="settings_advanced_settings">高级设置</string>
     <string name="settings_developer_mode">开发者模式</string>
@@ -2011,26 +1640,19 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings">设置</string>
     <string name="devices_current_device">当前会话</string>
     <string name="devices_other_devices">其他会话</string>
-
     <string name="autocomplete_limited_results">仅显示第一个结果，请输入更多字符…</string>
-
     <string name="settings_developer_mode_fail_fast_title">快速失败</string>
     <string name="settings_developer_mode_fail_fast_summary">发生意外错误时，Element 可能更经常崩溃</string>
-
     <string name="command_description_shrug">在明文消息前添加 ¯\\_(ツ)_/¯</string>
-
     <string name="create_room_encryption_title">启用加密</string>
     <string name="create_room_encryption_description">一旦启用，加密无法禁用。</string>
-
     <string name="login_error_threepid_denied">您的电子邮件域无权注册此服务器</string>
-
     <string name="verification_conclusion_warning">不可信登入</string>
     <string name="verification_sas_match">匹配</string>
     <string name="verification_sas_do_not_match">不匹配</string>
     <string name="verify_user_sas_emoji_help_text">确认下方独特表情以相同顺序出现在他们的屏幕上，以验证此用户。</string>
     <string name="verify_user_sas_emoji_security_tip">为了获得最高的安全性，请使用其他可信通信方式或亲自确认。</string>
     <string name="verification_green_shield">寻找绿色盾牌以确保用户可信。信任聊天室中的所有用户以确保聊天室的安全。</string>
-
     <string name="verification_conclusion_not_secure">不安全</string>
     <string name="verification_conclusion_compromised">以下其中一项可能会受到威胁：
 \n
@@ -2038,13 +1660,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 \n - 您验证的用户连接到的家庭服务器
 \n - 您或其它用户的网络连接
 \n - 您或其他用户的设备</string>
-
     <string name="sent_a_video">视频。</string>
     <string name="sent_an_image">图片。</string>
     <string name="sent_an_audio_file">音频</string>
     <string name="sent_a_file">文件</string>
     <string name="send_a_sticker">贴纸</string>
-
     <string name="verification_request_waiting">正在等待…</string>
     <string name="verification_request_other_cancelled">%s 已取消</string>
     <string name="verification_request_you_cancelled">您已取消</string>
@@ -2054,21 +1674,15 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="verification_request">验证请求</string>
     <string name="verification_verify_device">验证此会话</string>
     <string name="verification_verify_device_manually">手动验证</string>
-
     <string name="you">您</string>
-
     <string name="verification_scan_notice">使用其他用户的设备扫描此码以安全地相互验证</string>
     <string name="verification_scan_their_code">扫描他们的码</string>
     <string name="verification_scan_emoji_title">无法扫描</string>
     <string name="verification_scan_emoji_subtitle">如果您不在现场，请比较表情符号</string>
-
     <string name="verification_no_scan_emoji_title">通过比较表情符号验证</string>
-
     <string name="verify_by_emoji_title">通过表情验证</string>
     <string name="verify_by_emoji_description">如果您无法扫描上方的码，通过比较简短独特的表情序列验证。</string>
-
     <string name="a13n_qr_code_description">二维码图片</string>
-
     <string name="verification_verify_user">验证 %s</string>
     <string name="verification_verified_user">已验证 %s</string>
     <string name="verification_request_waiting_for">正在等待 %s…</string>
@@ -2091,52 +1705,38 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="room_profile_section_more_uploads">上传</string>
     <string name="room_profile_section_more_leave">离开聊天室</string>
     <string name="room_profile_leaving_room">正在离开聊天室…</string>
-
     <string name="room_member_power_level_admins">管理员</string>
     <string name="room_member_power_level_moderators">审查员</string>
     <string name="room_member_power_level_custom">自定义</string>
     <string name="room_member_power_level_invites">邀请</string>
     <string name="room_member_power_level_users">用户</string>
-
     <string name="room_member_power_level_admin_in">%1$s 管理员</string>
     <string name="room_member_power_level_moderator_in">%1$s 审查员</string>
     <string name="room_member_power_level_default_in">%1$s 默认权限</string>
     <string name="room_member_power_level_custom_in">%2$s 自定义权限 (%1$d)</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element 无法处理 \'%1$s\' 类型事件</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element 无法处理 \'%1$s\' 类型消息</string>
     <string name="rendering_event_error_exception">Element 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
-
     <string name="unignore">取消忽略</string>
-
     <string name="verify_cannot_cross_sign">该会话无法与您的其他会话共享此验证。
 \n验证将保存在本地，并在此应用的未来版本中共享。</string>
-
     <string name="room_list_sharing_header_recent_rooms">最近使用的聊天室</string>
     <string name="room_list_sharing_header_other_rooms">其他聊天室</string>
-
     <string name="command_description_rainbow">发送彩虹色给定消息</string>
     <string name="command_description_rainbow_emote">发送彩虹色给定表情</string>
-
     <string name="settings_category_timeline">时间线</string>
-
     <string name="settings_category_composer">消息编辑器</string>
-
     <string name="room_settings_enable_encryption">启用端到端加密</string>
     <string name="room_settings_enable_encryption_warning">一旦启用，加密无法禁用。</string>
-
     <string name="room_settings_enable_encryption_dialog_title">是否启用加密？</string>
     <string name="room_settings_enable_encryption_dialog_content">启用后，将无法禁用聊天室加密。服务器无法看到加密聊天室中发送的消息，只有聊天室的参与者才能看到。启用加密可能会阻止许多机器人和桥接正常工作。</string>
     <string name="room_settings_enable_encryption_dialog_submit">启用加密</string>
-
     <string name="verification_request_notice">为保证安全，通过检查一次性代码验证 %s。</string>
     <string name="verification_request_start_notice">为保证安全，亲自或使用其他通信方式验证。</string>
-
     <string name="verification_emoji_notice">比较独特表情，确保它们以相同顺序出现。</string>
     <string name="verification_code_notice">与其他用户设备上显示的代码比较。</string>
     <string name="verification_conclusion_ok_notice">与此用户的消息端到端加密，无法被第三方读取。</string>
     <string name="verification_conclusion_ok_self_notice">您的新会话已验证。它可以访问您的加密消息，其他用户会将其视为可信。</string>
-
     <string name="encryption_information_cross_signing_state">交叉签名</string>
     <string name="encryption_information_dg_xsigning_complete">交叉签名已启用
 \n设备上的私钥。</string>
@@ -2146,55 +1746,39 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="encryption_information_dg_xsigning_not_trusted">交叉签名已启用。
 \n密钥不可信</string>
     <string name="encryption_information_dg_xsigning_disabled">交叉签名未启用</string>
-
     <string name="settings_hs_admin_e2e_disabled">您的服务器管理员已默认禁用私有聊天室和私聊消息端到端加密。</string>
     <string name="settings_active_sessions_list">激活会话</string>
     <string name="settings_active_sessions_show_all">显示全部会话</string>
     <string name="settings_active_sessions_manage">管理会话</string>
     <string name="settings_active_sessions_signout_device">登出此会话</string>
-
     <string name="settings_failed_to_get_crypto_device_info">加密信息不可用</string>
-
     <string name="settings_active_sessions_verified_device_desc">此会话对安全消息可信因为您已验证它：</string>
     <string name="settings_active_sessions_unverified_device_desc">验证此会话以将其标记为可信，并授予其访问加密消息的权限。如果您未登录此会话，则您的帐户可能已被盗：</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d 个活动会话</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">验证此登录</string>
     <string name="crosssigning_other_user_not_trust">其他用户可能不信任它</string>
     <string name="complete_security">完善安全</string>
-
     <string name="verification_open_other_to_verify">使用现有会话来验证此会话，并授予其访问加密消息的权限。</string>
-
-
     <string name="verification_profile_verify">验证</string>
     <string name="verification_profile_verified">已验证</string>
     <string name="verification_profile_warning">注意</string>
-
     <string name="room_member_profile_failed_to_get_devices">无法获取会话</string>
     <string name="room_member_profile_sessions_section_title">会话</string>
     <string name="trusted">可信</string>
     <string name="not_trusted">不可信</string>
-
     <string name="verification_profile_device_verified_because">此会话对加密消息可信，%1$s (%2$s) 已验证它：</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) 使用新会话登入：</string>
     <string name="verification_profile_device_untrust_info">在此用户信任此会话之前，发送到该会话和从该会话发送的消息均标有警告。或者，您可以手动进行验证。</string>
-
-
     <string name="initialize_cross_signing">初始化交叉签名</string>
     <string name="reset_cross_signing">重置密钥</string>
-
     <string name="a11y_qr_code_for_verification">二维码</string>
-
     <string name="qr_code_scanned_by_other_notice">快要完成了！%s 显示相同的盾牌了吗？</string>
     <string name="qr_code_scanned_by_other_yes">使</string>
     <string name="qr_code_scanned_by_other_no">否</string>
-
     <string name="no_connectivity_to_the_server_indicator">到服务器的连接已丢失</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">飞行模式已打开</string>
-
     <string name="settings_dev_tools">开发工具</string>
     <string name="settings_account_data">账户数据</string>
     <plurals name="poll_info">
@@ -2207,44 +1791,33 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="command_description_poll">创建简单调查</string>
     <string name="verification_cannot_access_other_session">使用恢复短语或密钥</string>
     <string name="verification_use_passphrase">如果您无法访问已有会话</string>
-
     <string name="new_signin">新登入</string>
-
     <string name="enter_secret_storage_invalid">无法在存储中找到秘密</string>
     <string name="enter_secret_storage_passphrase">输入秘密存储密码</string>
     <string name="enter_secret_storage_passphrase_warning">注意：</string>
     <string name="enter_secret_storage_passphrase_warning_text">您应仅在可信设备上访问秘密存储</string>
-
     <string name="message_action_item_redact">移除…</string>
     <string name="share_confirm_room">您想要发送此附件到 %1$s 吗？</string>
     <plurals name="send_images_with_original_size">
         <item quantity="other">发送原始尺寸图片</item>
     </plurals>
-
     <string name="delete_event_dialog_title">确认移除</string>
     <string name="delete_event_dialog_content">您确实想要移除（删除）此事件吗？注意如果您删除聊天室名或话题更改，可以撤销更改。</string>
     <string name="delete_event_dialog_reason_checkbox">附加理由</string>
     <string name="delete_event_dialog_reason_hint">编辑理由</string>
-
     <string name="event_redacted_by_user_reason_with_reason">事件被用户删除，理由：%1$s</string>
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="settings_key_requests">密钥请求</string>
-
     <string name="e2e_use_keybackup">解锁加密消息历史</string>
-
     <string name="refresh">刷新</string>
-
     <string name="new_session">新登录。是您吗？</string>
     <string name="new_session_review">轻按以审核和验证</string>
     <string name="verify_new_session_notice">使用此会话验证新的会话，授权访问加密消息。</string>
     <string name="verify_new_session_was_not_me">这不是我</string>
     <string name="verify_new_session_compromized">您的账户可能已被盗用</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">如果您取消，您将无法在此设备上读取加密消息，其他用户不会信任它</string>
     <string name="verify_cancel_self_verification_from_trusted">如果您取消，您将无法在新设备上读取加密消息，其他用户不会信任它</string>
     <string name="verify_cancel_other">如果您现在取消将不会验证 %1$s (%2$s)。在他们的用户个人档案中重新开始。</string>
-
     <string name="verify_not_me_self_verification">以下其中一项可能有风险：
 \n
 \n- 您的密码
@@ -2253,35 +1826,25 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
 \n- 设备使用的网络连接
 \n
 \n我们推荐您在设置中立即更换您的密码和恢复密钥。</string>
-
     <string name="verify_cancelled_notice">通过设置验证您的设备。</string>
     <string name="verification_cancelled">验证已取消</string>
-
     <string name="recovery_passphrase">恢复密码</string>
     <string name="message_key">消息密钥</string>
     <string name="account_password">账户密码</string>
-
     <string name="set_recovery_passphrase">设置一个 %s</string>
     <string name="generate_message_key">生成消息密钥</string>
-
     <string name="confirm_recovery_passphrase">确认 %s</string>
-
     <string name="enter_account_password">输入您的 %s 以继续。</string>
-
     <string name="bootstrap_info_confirm_text">再次输入您的 %s 确认。</string>
     <string name="bootstrap_dont_reuse_pwd">不要使用您的账户密码。</string>
-
     <string name="bootstrap_info_text_2">输入只有你知道的安全口令，用于保护服务器上的秘密。</string>
-
     <string name="bootstrap_loading_text">这可能会花费数秒，请耐心等待。</string>
     <string name="bootstrap_loading_title">设置恢复。</string>
     <string name="your_recovery_key">您的恢复密钥</string>
     <string name="bootstrap_finish_title">完成了！</string>
     <string name="keep_it_safe">保持安全</string>
     <string name="finish">完成</string>
-
     <string name="bootstrap_save_key_description">使用此 %1$s 作为安全网以防您忘记您的 %2$s。</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">发布创建的身份密钥</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">从密码生成安全密钥</string>
     <string name="bootstrap_crosssigning_progress_default_key">正在定义 SSSS 默认密钥</string>
@@ -2289,31 +1852,21 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="bootstrap_crosssigning_progress_save_usk">正在同步用户密钥</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">正在同步自签名密钥</string>
     <string name="bootstrap_crosssigning_progress_key_backup">正在设置密钥备份</string>
-
-
     <string name="bootstrap_cross_signing_success">您的 %2$s 和 %1$s 已设置。
 \n
 \n请安全地保管它。如果您丢失了全部活动会话您将需要使用它们解锁加密消息和安全信息。</string>
-
     <string name="bootstrap_crosssigning_print_it">将它打印出来并存放在安全的地方</string>
     <string name="command_description_spoiler">发送爆雷信息</string>
     <string name="spoiler">爆雷</string>
     <string name="reaction_search_type_hint">输入关键字以查找表情。</string>
-
     <string name="seen_by">已阅</string>
-
     <string name="room_member_jump_to_read_receipt">跳至已读回执</string>
-
     <string name="event_redacted_by_admin_reason_with_reason">事件被聊天室管理员调整，理由：%1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">密钥已是最新！</string>
-
     <string name="bootstrap_info_text">保护与解锁已加密信息并信任%s。</string>
     <string name="bootstrap_crosssigning_save_usb">保存到优盘或者备份盘</string>
     <string name="bootstrap_crosssigning_save_cloud">复制到您的个人云存储</string>
-
     <string name="auth_flow_not_supported">您无法在移动设备上执行此操作</string>
-
     <string name="bootstrap_skip_text">设置恢复密码让您能够保护和解锁加密信息并信任设备。
 \n
 \n如果您不希望设置文本密码，那么生成密钥亦可。</string>
@@ -2321,21 +1874,16 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="bootstrap_cancel_text">如果您现在取消，那么当您失去登录权限时也会丢失加密的信息和数据。
 \n
 \n您也可以通过设置菜单来建立保护备份以及管理您的密钥。</string>
-
     <string name="encryption_enabled">加密开启</string>
     <string name="encryption_enabled_tile_description">本聊天室信息已经端对端加密。验证成员时，请查看其个人档案以了解更多信息。</string>
     <string name="encryption_not_enabled">加密未开启</string>
     <string name="encryption_unknown_algorithm_tile_description">不支持本聊天室使用的加密方式</string>
-
     <string name="room_created_summary_item">%s 创建并配置了聊天室。</string>
     <string name="room_created_summary_item_by_you">您创建并配置了聊天室。</string>
-
     <string name="qr_code_scanned_self_verif_notice">接近完成！另外的设备是否正显示相同的盾牌图标？</string>
     <string name="qr_code_scanned_verif_waiting_notice">接近完成！等候确认……</string>
     <string name="qr_code_scanned_verif_waiting">正在等候 %s…</string>
-
     <string name="error_failed_to_import_keys">导入密钥失败</string>
-
     <string name="settings_notification_configuration">通知配置</string>
     <string name="settings_messages_in_e2e_one_to_one">一对一聊天的加密信息</string>
     <string name="settings_messages_in_e2e_group_chat">群聊的加密信息</string>
@@ -2343,26 +1891,19 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_when_rooms_are_upgraded">当聊天室升级</string>
     <string name="settings_troubleshoot_title">故障诊断</string>
     <string name="settings_notification_advanced_summary">按事件设置通知重要性</string>
-
     <string name="command_description_plain">以纯文本形式发送消息，而不将其解释为 markdown</string>
-
     <string name="auth_invalid_login_param_space_in_password">用户名和/或密码不正确。输入的密码以空格开头或结尾，请检查。</string>
     <string name="auth_invalid_login_deactivated_account">此帐户已停用。</string>
-
     <string name="room_message_placeholder">消息…</string>
-
     <string name="upgrade_security">加密升级可用</string>
     <string name="setup_cross_signing">启用交叉签名</string>
     <string name="security_prompt_text">验证您自己和其他人以保证您的聊天安全</string>
-
     <string name="bootstrap_enter_recovery">输入您的 %s 以继续</string>
     <string name="use_file">使用文件</string>
-
     <string name="enter_backup_passphrase">输入 %s</string>
     <string name="backup_recovery_passphrase">恢复密码</string>
     <string name="bootstrap_invalid_recovery_key">无效的恢复密钥</string>
     <string name="recovery_key_empty_error_message">请输入恢复密钥</string>
-
     <string name="bootstrap_progress_checking_backup">检查备份密钥</string>
     <string name="bootstrap_progress_checking_backup_with_info">检查备份密钥 (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">获取曲线密钥</string>
@@ -2371,20 +1912,16 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="bootstrap_progress_generating_ssss_recovery">从恢复密钥生成 SSSS 密钥</string>
     <string name="bootstrap_progress_storing_in_sss">正在在 SSSS 中保存密钥备份秘密</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_enter_backup_password">输入您的密钥备份密码以继续。</string>
     <string name="bootstrap_migration_use_recovery_key">使用您的密钥备份恢复密钥</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道您的密钥备份密码，您可以 %s。</string>
     <string name="bootstrap_migration_backup_recovery_key">密钥备份恢复密钥</string>
-
     <string name="settings_security_prevent_screenshots_title">阻止应用内屏幕截图</string>
     <string name="settings_security_prevent_screenshots_summary">启用此设置添加 FLAG_SECURE 到所有活动。重启应用使更改生效。</string>
-
     <string name="media_file_added_to_gallery">媒体文件已添加到相册</string>
     <string name="error_adding_media_file_to_gallery">无法添加媒体文件到相册</string>
     <string name="error_saving_media_file">无法保存媒体文件</string>
     <string name="change_password_summary">选择新的账户密码…</string>
-
     <string name="use_other_session_content_description">在您的其他设备上使用最新的 Element，Element Web，Element Desktop，Element iOS，Element for Android，或其他能够交叉签名的 Matrix 客户端</string>
     <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
@@ -2399,28 +1936,23 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="enter_secret_storage_input_key">选择您的恢复密钥，或手动输入或从剪贴板粘贴</string>
     <string name="keys_backup_recovery_key_error_decrypt">无法使用此恢复密钥解密备份：请确认您输入了正确的恢复密钥。</string>
     <string name="failed_to_access_secure_storage">访问安全存储失败</string>
-
     <string name="unencrypted">未加密</string>
     <string name="encrypted_unverified">由未验证设备加密</string>
     <string name="review_logins">查看您的登入位置</string>
     <string name="verify_other_sessions">验证您的全部会话确保您的账户和消息安全</string>
     <string name="verify_this_session">验证访问您的账户的新登录：%1$s</string>
-
     <string name="cross_signing_verify_by_text">使用文本手动验证</string>
     <string name="crosssigning_verify_session">验证登录</string>
     <string name="cross_signing_verify_by_emoji">使用表情交互式验证</string>
     <string name="confirm_your_identity">通过从您的其他会话验证此登录确认您的身份，授权它访问您的加密消息。</string>
     <string name="mark_as_verified">标记为可信</string>
-
     <string name="error_empty_field_choose_user_name">请选择用户名。</string>
     <string name="error_empty_field_choose_password">请选择密码。</string>
     <string name="external_link_confirmation_title">仔细检查此链接</string>
     <string name="external_link_confirmation_message">链接 %1$s 正在将您带到另一个站点：%2$s。
 \n
 \n您确定想要继续吗？</string>
-
     <string name="create_room_dm_failure">我们无法创建您的私聊消息。请检查您要邀请的用户并重试。</string>
-
     <string name="add_members_to_room">添加成员</string>
     <string name="invite_users_to_room_action_invite">邀请</string>
     <string name="inviting_users_to_room">正在邀请用户…</string>
@@ -2431,11 +1963,9 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
         <item quantity="other">邀请已发送到 %1$s 和 %2$s 等</item>
     </plurals>
     <string name="invite_users_to_room_failure">我们无法邀请用户，请检查您想要邀请的用户并重试。</string>
-
     <string name="choose_locale_current_locale_title">当前语言</string>
     <string name="choose_locale_other_locales_title">其他可用语言</string>
     <string name="choose_locale_loading_locales">正在载入可用语言…</string>
-
     <string name="open_terms_of">打开 %s 条款</string>
     <string name="disconnect_identity_server_dialog_content">是否从身份服务器 %s 断开？</string>
     <string name="identity_server_error_outdated_identity_server">身份服务器已过期。Element 仅支持 API V2。</string>
@@ -2445,7 +1975,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="identity_server_error_bulk_sha256_not_supported">为了您的隐私，Element 仅支持发送用户电子邮件和电话号码的哈希值。</string>
     <string name="identity_server_error_binding_error">关联失败。</string>
     <string name="identity_server_error_no_current_binding_error">此标识符无当前关联。</string>
-
     <string name="identity_server_set_default_notice">您的家庭服务器 (%1$s) 建议使用 %2$s 作为您的身份服务器</string>
     <string name="identity_server_set_default_submit">使用 %1$s</string>
     <string name="identity_server_set_alternative_notice">或者，您可以输入任何其他身份服务器 URL</string>
@@ -2458,9 +1987,7 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="a11y_unmute_microphone">取消静音麦克风</string>
     <string name="a11y_stop_camera">停止相机</string>
     <string name="a11y_start_camera">启动相机</string>
-
     <string name="settings_setup_secure_backup">设置安全备份</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">安全备份</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">通过在您的服务器上备份加密密钥防止丢失对加密消息和数据的访问。</string>
     <string name="bottom_sheet_setup_secure_backup_submit">设置</string>
@@ -2468,22 +1995,17 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥存储在安全的地方如密码管理器或保险箱。</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全口令</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有您知道的安全口令，生成备份用的密钥。</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">保存您的安全密钥</string>
     <string name="bottom_sheet_save_your_recovery_key_content">将您的安全密钥存储在安全的地方如密码管理器或保险箱。</string>
-
     <string name="set_a_security_phrase_title">设置安全口令</string>
     <string name="set_a_security_phrase_notice">输入只有您知道的安全口令，用于保护您的服务器上的秘密。</string>
     <string name="set_a_security_phrase_hint">安全口令</string>
     <string name="set_a_security_phrase_again_notice">再次输入您的安全口令以确认。</string>
-
     <string name="save_your_security_key_title">保存您的安全密钥</string>
     <string name="save_your_security_key_notice">将您的安全密钥存储在安全的地方如密码管理器或保险箱。</string>
-
     <string name="room_settings_name_hint">聊天室名称</string>
     <string name="room_settings_topic_hint">主题</string>
     <string name="room_settings_save_success">您已成功更改聊天室设置</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">您无法访问此消息</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此消息，可能会花费一些时间</string>
     <string name="crypto_utd">无法解密</string>
@@ -2492,17 +2014,12 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="crypto_error_withheld_unverified">您无法访问此消息因为您的会话不被发送者信任</string>
     <string name="crypto_error_withheld_generic">您无法访问此消息因为发送者有意不发送密钥</string>
     <string name="notice_crypto_unable_to_decrypt_merged">正在等待加密历史</string>
-
     <string name="element_disclaimer_title">Riot 现在是 Element！</string>
     <string name="element_disclaimer_content">我们兴奋地宣布我们改名了！您的应用已经是最新的并且您已登入您的帐户。</string>
     <string name="element_disclaimer_negative_button">明白了</string>
     <string name="element_disclaimer_positive_button">了解更多</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
-
     <string name="add_from_phone_book">从我的电话簿添加</string>
     <string name="empty_phone_book">您的电话簿是空的</string>
     <string name="phone_book_title">电话簿</string>
@@ -2510,22 +2027,19 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="loading_contact_book">正在获取您的联系人…</string>
     <string name="empty_contact_book">您的通讯录是空的</string>
     <string name="contacts_book_title">通讯录</string>
-
     <string name="three_pid_revoke_invite_dialog_title">撤销邀请</string>
     <string name="three_pid_revoke_invite_dialog_content">是否撤销对 %1$s 的邀请？</string>
-
     <string name="member_banned_by">被 %1$s 封禁</string>
     <string name="failed_to_unban">解封用户失败</string>
-
     <string name="alert_push_are_disabled_title">推送通知已禁用</string>
     <string name="alert_push_are_disabled_description">查看您的设置以启用推送通知</string>
     <string name="create_pin_title">选择 PIN 以确保安全</string>
     <string name="create_pin_confirm_title">确认 PIN</string>
-    <string name="create_pin_confirm_failure">验证 pin 失败，请输入新的。</string>
+    <string name="create_pin_confirm_failure">验证 PIN 失败，请输入新的。</string>
     <string name="auth_pin_title">输入您的 PIN</string>
     <string name="auth_pin_forgot">忘记 PIN？</string>
-    <string name="auth_pin_reset_title">重置 pin</string>
-    <string name="auth_pin_new_pin_action">新 pin</string>
+    <string name="auth_pin_reset_title">重置 PIN</string>
+    <string name="auth_pin_new_pin_action">新 PIN</string>
     <string name="auth_pin_reset_content">为重置您的 PIN，您将需要重新登录并创建新的。</string>
     <string name="settings_security_pin_code_title">启用 PIN</string>
     <string name="settings_security_pin_code_summary">如果您想要重置您的 PIN，点按忘记 PIN 登出并重置。</string>
@@ -2544,13 +2058,11 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <plurals name="encryption_import_room_keys_success">
         <item quantity="other">成功导入 %1$d/%2$d 个密钥。</item>
     </plurals>
-
     <string name="room_manage_integrations">管理集成</string>
     <string name="room_no_active_widgets">无活动小部件</string>
     <string name="create_room_federation_error">聊天室已创建，但由于以下原因一些邀请尚未发送：
 \n
 \n%s</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="other">%1$s，%2$s 和其他 %3$d 人已读</item>
     </plurals>
@@ -2566,32 +2078,77 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="settings_phone_numbers">电话号码</string>
     <string name="settings_remove_three_pid_confirmation_content">移除 %s？</string>
     <string name="error_threepid_auth_failed">请确认您已点击我们向您发送的电子邮件中的链接。</string>
-
     <string name="settings_emails_and_phone_numbers_title">电子邮件和电话号码</string>
     <string name="settings_emails_and_phone_numbers_summary">管理链接到您的 Matrix 账户的电子邮件和电话号码</string>
-
     <string name="settings_text_message_sent_hint">代码</string>
     <string name="login_msisdn_notice">请使用国际格式（电话号码必须以 ‘+’ 开始）</string>
     <string name="confirm_your_identity_quad_s">通过验证此登录确认您的身份，授权它访问加密信息。</string>
     <string name="error_sso_flow_not_supported_yet">抱歉，对于连接到单点登录的账户此操作尚不可用。</string>
-
     <string name="error_opening_banned_room">无法打开您被封禁的聊天室。</string>
     <string name="room_error_not_found">无法找到此聊天室。请确认它存在。</string>
     <string name="no_permissions_to_start_webrtc_call">您没有权限在此聊天室发起通话</string>
     <plurals name="seconds">
         <item quantity="other">%d 秒</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">显示聊天室成员状态事件</string>
     <string name="settings_show_room_member_state_events_summary">包括邀请/加入/离开/踢掉/封禁事件和头像/昵称变更。</string>
     <string name="sent_a_poll">轮询</string>
     <string name="sent_a_bot_buttons">机器人按钮</string>
     <string name="sent_a_reaction">回应：%s</string>
     <string name="sent_verification_conclusion">验证结果</string>
-
     <string name="delete_account_data_warning">是否删除类型 %1$s 的账户数据？
 \n
 \n小心使用，它可能导致意外行为。</string>
-
     <string name="universal_link_malformed">链接格式不正确</string>
-</resources>
+    <string name="settings_security_pin_code_grace_period_summary_off">每次打开 Element 都要求 PIN 码。</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">在 2 分钟未使用 Element 后要求 PIN 码。</string>
+    <string name="settings_security_pin_code_grace_period_title">2 分钟后要求 PIN</string>
+    <string name="settings_security_pin_code_notifications_summary_off">仅在一个简单通知中显示未读消息内容数量。</string>
+    <string name="settings_security_pin_code_notifications_summary_on">显示细节如聊天室名称和消息内容。</string>
+    <string name="settings_security_pin_code_notifications_title">在通知中显示内容</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">PIN 码是解锁 Element 的唯一方式。</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">启用设备特定的生物特征识别，如指纹和面部识别。</string>
+    <string name="settings_security_pin_code_use_biometrics_title">启用生物特征识别</string>
+    <string name="settings_security_application_protection_screen_title">配置保护</string>
+    <string name="settings_security_application_protection_summary">使用 PIN 和生物特征识别保护访问。</string>
+    <string name="settings_security_application_protection_title">保护访问</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="other">显示您现在可以验证的 ％d 个设备</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">您将重新启动，没有历史记录，消息，受信任的设备或受信任的用户</string>
+    <string name="secure_backup_reset_if_you_reset_all">如果您重置一切</string>
+    <string name="secure_backup_reset_all_no_other_devices">仅当没有其他设备可用来验证此设备时，才执行此操作。</string>
+    <string name="secure_backup_reset_all">重置一切</string>
+    <string name="bad_passphrase_key_reset_all_action">忘记或丢失了所有的回复选项？重置一切</string>
+    <string name="direct_room_created_summary_item_by_you">您已加入。</string>
+    <string name="direct_room_created_summary_item">%s 已加入。</string>
+    <string name="direct_room_encryption_enabled_tile_description">此聊天室的消息是端到端加密的。</string>
+    <string name="direct_room_profile_section_more_leave">离开</string>
+    <string name="direct_room_profile_section_more_settings">设置</string>
+    <string name="direct_room_profile_encrypted_subtitle">此处的消息是端到端加密的，
+\n
+\n您的消息已用锁保护并且只有您和收件人拥有唯一的钥匙解锁它们。</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">此处的消息不是端到端加密。</string>
+    <string name="login_error_outdated_homeserver_warning_content">此家庭服务器正在运行较旧版本。要求您的家庭服务器管理员升级。您可以继续，但一些功能可能无法正确工作。</string>
+    <string name="direct_room_join_rules_invite_by_you">您仅发出此邀请。</string>
+    <string name="direct_room_join_rules_invite">%1$s 仅发出此邀请。</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">在加密聊天室显示完整历史</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s 和 %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s 条在 %2$s 和 %3$s 中</string>
+    <plurals name="notification_invitations">
+        <item quantity="other">%d 个邀请</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">通知已点击！</string>
+    <string name="settings_troubleshoot_test_notification_notice">请点击通知。如果您未看到通知，请检查系统设置。</string>
+    <string name="settings_troubleshoot_test_notification_title">通知显示</string>
+    <string name="settings_troubleshoot_test_push_notification_content">您正在查看通知！点我！</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">接受推送失败。重装应用或可解决。</string>
+    <string name="settings_troubleshoot_test_push_loop_success">应用正在接受推送</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">应用正在等待推送</string>
+    <string name="settings_troubleshoot_test_push_loop_title">测试推送</string>
+    <string name="search_is_not_supported_in_e2e_room">尚不支持在加密聊天室中搜索。</string>
+    <string name="search_banned_user_hint">过滤被封禁的用户</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">您没有权限发起通话</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">您没有权限发起会议通话</string>
+    <string name="reset">重置</string>
+</resources>
\ No newline at end of file

From ab8c9bd269a73a36ceaa4d8e7b443926a817194f Mon Sep 17 00:00:00 2001
From: TR_SLimey <tr_slimey@protonmail.com>
Date: Tue, 13 Oct 2020 19:53:44 +0000
Subject: [PATCH 260/278] Translated using Weblate (Polish)

Currently translated at 79.7% (1529 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
---
 vector/src/main/res/values-pl/strings.xml | 486 +++-------------------
 1 file changed, 47 insertions(+), 439 deletions(-)

diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 690849ff6a..6501b49aee 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1,11 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="title_activity_home">Wiadomości</string>
     <string name="title_activity_room">Pokój</string>
     <string name="title_activity_settings">Ustawienia</string>
     <string name="title_activity_member_details">Informacje o użytkowniku</string>
     <string name="title_activity_historical">Archiwum</string>
-
     <string name="ok">OK</string>
     <string name="cancel">Anuluj</string>
     <string name="save">Zapisz</string>
@@ -30,15 +29,14 @@
     <string name="ongoing_conference_call_video">Wideo</string>
     <string name="cannot_start_call">Nie można rozpocząć połączenia, spróbuj ponownie później</string>
     <string name="missing_permissions_warning">Ze względu na brak pewnych uprawnień, niektóre funkcje mogą nie działać…</string>
-    <string name="missing_permissions_to_start_conf_call">Musisz być uprawniony, aby rozpocząć połączenie grupowe</string>
+    <string name="missing_permissions_to_start_conf_call">Musisz posiadać uprawninenia, aby rozpocząć połączenie grupowe</string>
     <string name="missing_permissions_title_to_start_conf_call">Nie można rozpocząć połączenia</string>
     <string name="device_information">Informacje o sesji</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Połączenia grupowe nie są obsługiwane w szyfrowanych pokojach</string>
-    <string name="send_anyway">Wyślij mimo wszystko</string>
+    <string name="send_anyway">Wyślij mimo to</string>
     <string name="or">i</string>
     <string name="invite">Zaproś</string>
     <string name="offline">Offline</string>
-
     <string name="action_sign_out">Wyloguj się</string>
     <string name="action_voice_call">Połączenie głosowe</string>
     <string name="action_video_call">Połączenie wideo</string>
@@ -50,23 +48,18 @@
     <string name="action_close">Zamknij</string>
     <string name="copied_to_clipboard">Skopiowano do schowka</string>
     <string name="disable">Wyłącz</string>
-
     <string name="dialog_title_confirmation">Potwierdzenie</string>
     <string name="dialog_title_warning">Ostrzeżenie</string>
-
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Ulubione</string>
     <string name="bottom_action_people">Ludzie</string>
     <string name="bottom_action_rooms">Pokoje</string>
-
     <string name="home_filter_placeholder_home">Filtruj nazwy pokojów</string>
     <string name="home_filter_placeholder_favorites">Filtruj ulubione</string>
     <string name="home_filter_placeholder_people">Filtruj ludzi</string>
     <string name="home_filter_placeholder_rooms">Filtruj nazwy pokojów</string>
-
     <string name="invitations_header">Zaproszenia</string>
     <string name="low_priority_header">Niski priorytet</string>
-
     <string name="direct_chats_header">Rozmowy</string>
     <string name="local_address_book_header">Lokalna książka adresowa</string>
     <string name="user_directory_header">Katalog użytkowników</string>
@@ -74,7 +67,6 @@
     <string name="no_conversation_placeholder">Brak rozmów</string>
     <string name="no_contact_access_placeholder">Nie udzieliłeś(-aś) uprawnienia na dostęp do listy kontaktów</string>
     <string name="no_result_placeholder">Brak wyników</string>
-
     <string name="rooms_header">Pokoje</string>
     <string name="rooms_directory_header">Katalog pokojów</string>
     <string name="no_room_placeholder">Brak pokojów</string>
@@ -84,7 +76,6 @@
         <item quantity="few">%d użytkowników</item>
         <item quantity="many">%d użytkowników</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">Wyślij dzienniki</string>
     <string name="send_bug_report_include_crash_logs">Wyślij dzienniki awarii</string>
     <string name="send_bug_report_include_screenshot">Wyślij zrzut ekranu</string>
@@ -94,14 +85,11 @@
     <string name="send_bug_report_logs_description">W celu zdiagnozowania problemów, logi z tego klienta zostaną wysłane wraz z tym raportem o błędzie. Ten raport o błędzie, w tym dzienniki i zrzut ekranu, nie będzie publicznie widoczny. Jeśli wolisz wysłać tylko powyższy tekst, odznacz:</string>
     <string name="send_bug_report_alert_message">Wygląda na to, że potrząsasz telefonem ze zdenerwowania. Czy chcesz otworzyć ekran zgłaszania błędu\?</string>
     <string name="send_bug_report_app_crashed">Przy wcześniejszym użyciu aplikacja napotkała błąd. Czy chcesz zgłosić raport o nieoczekiwanym zamknięciu\?</string>
-
     <string name="send_bug_report_sent">Pomyślnie zgłoszono błąd</string>
     <string name="send_bug_report_failed">Nie udało się zgłosić błędu (%s)</string>
     <string name="send_bug_report_progress">Postęp (%s%%)</string>
-
     <string name="send_files_in">Wyślij do</string>
     <string name="read_receipt">Przeczytano</string>
-
     <string name="join_room">Dołącz do pokoju</string>
     <string name="username">Nazwa użytkownika</string>
     <string name="create_account">Stwórz konto</string>
@@ -109,18 +97,14 @@
     <string name="logout">Wyloguj</string>
     <string name="hs_url">Adres serwera</string>
     <string name="search">Szukaj</string>
-
     <string name="start_new_chat">Rozpocznij nową rozmowę</string>
     <string name="start_voice_call">Rozpocznij połączenie telefoniczne</string>
     <string name="start_video_call">Rozpocznij połączenie wideo</string>
-
     <string name="resources_language">pl</string>
     <string name="resources_country_code">PL</string>
-
     <string name="identity_url">Adres serwera tożsamości</string>
     <string name="option_send_files">Wyślij pliki</string>
     <string name="option_take_photo_video">Zrób zdjęcie lub film</string>
-
     <string name="auth_login">Zaloguj się</string>
     <string name="auth_register">Stwórz konto</string>
     <string name="auth_submit">Wyślij</string>
@@ -166,32 +150,25 @@
     <string name="login_error_registration_network_error">Nie udało się zarejestrować: Błąd sieci</string>
     <string name="login_error_unable_register">Nie udało się zarejestrować</string>
     <string name="login_error_invalid_home_server">Proszę wprowadzić prawidłowy adres URL</string>
-
     <string name="login_error_forbidden">Nieprawidłowa nazwa użytkownika/hasło</string>
     <string name="login_error_not_json">Nie zawiera prawidłowego JSON</string>
     <string name="login_error_limit_exceeded">Wysłano zbyt wiele żądań</string>
     <string name="login_error_user_in_use">Ta nazwa użytkownika jest już używana</string>
     <string name="login_error_login_email_not_yet">Nie kliknięto odnośnika z wiadomości e-mail</string>
-
     <string name="read_receipts_list">Przeczytaj listę odbiorców</string>
-
     <string name="compression_options">"Wyślij jako "</string>
     <string name="compression_opt_list_original">Oryginalny</string>
     <string name="compression_opt_list_large">Duży</string>
     <string name="compression_opt_list_medium">Średni</string>
     <string name="compression_opt_list_small">Mały</string>
-
     <string name="attachment_cancel_download">Anulować pobieranie?</string>
     <string name="attachment_cancel_upload">Anulować wysyłanie?</string>
     <string name="attachment_remaining_time_seconds">%d sek.</string>
     <string name="attachment_remaining_time_minutes">%1$d min. %2$d sek.</string>
-
     <string name="yesterday">Wczoraj</string>
     <string name="today">Dzisiaj</string>
-
     <string name="room_info_room_name">Nazwa pokoju</string>
     <string name="room_info_room_topic">Temat pokoju</string>
-
     <string name="call_connected">Połączono</string>
     <string name="call_connecting">Łączenie…</string>
     <string name="call_ended">Zakończono połączenie</string>
@@ -200,13 +177,10 @@
     <string name="incoming_video_call">Przychodzące połączenie wideo</string>
     <string name="incoming_voice_call">Przychodzące połączenie głosowe</string>
     <string name="call_in_progress">W trakcie połączenia…</string>
-
     <string name="call_error_ice_failed">Połączenie multimedialne nie powiodło się</string>
     <string name="call_error_camera_init_failed">Nie udało się zainicjalizować aparatu</string>
-
     <string name="media_picker_both_capture_title">Zrób zdjęcie lub nagraj film</string>
     <string name="media_picker_cannot_record_video">Nie można nagrać filmu</string>
-
     <string name="permissions_rationale_popup_title">Informacja</string>
     <string name="permissions_rationale_msg_storage">Element wymaga uprawnienia, aby wysyłać i zapisywać pliki multimedialne.
 
@@ -214,43 +188,34 @@ Przyznaj dostęp w następnym oknie.</string>
     <string name="permissions_rationale_msg_camera">Element wymaga uprawnienia, aby wykonywać zdjęcia i nawiązywać połączenia wideo.</string>
     <string name="permissions_rationale_msg_record_audio">Element wymaga uprawnienia, aby przeprowadzić połączenie audio.</string>
     <string name="permissions_action_not_performed_missing_permissions">Nie można wykonać operacji, ze względu na brak wymaganych uprawnień</string>
-
     <string name="media_slider_saved">Zapisano</string>
     <string name="media_slider_saved_message">Zapisać do pobranych?</string>
     <string name="yes">TAK</string>
     <string name="no">NIE</string>
     <string name="_continue">Kontynuuj</string>
-
     <string name="remove">Usuń</string>
     <string name="join">Dołącz</string>
     <string name="preview">Podgląd</string>
     <string name="reject">Odrzuć</string>
-
     <string name="room_jump_to_first_unread">Przejdź do pierwszej nieprzeczytanej wiadomości.</string>
-
     <string name="room_preview_invitation_format">Zostałeś(-aś) zaproszony(-a) do tego pokoju przez %s</string>
     <string name="room_preview_try_join_an_unknown_room">Próbujesz uzyskać dostęp do %s. Czy chcesz dołączyć do pokoju, aby wziąć udział w dyskusji?</string>
     <string name="room_preview_try_join_an_unknown_room_default">pokój</string>
     <string name="room_preview_room_interactions_disabled">To jest podgląd pokoju. Interakcje zostały zablokowane.</string>
-
     <string name="room_creation_title">Nowa rozmowa</string>
     <string name="room_creation_add_member">Dodaj członka</string>
     <string name="room_title_one_member">1 członek</string>
-
     <string name="room_participants_leave_prompt_title">Opuść pokój</string>
     <string name="room_participants_leave_prompt_msg">Czy na pewno chcesz opuścić pokój?</string>
     <string name="room_participants_remove_prompt_msg">Czy na pewno chcesz usunąć %s z rozmowy?</string>
     <string name="room_participants_create">Utwórz</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Bezczynny(-a)</string>
-
     <string name="room_participants_header_admin_tools">NARZĘDZIA ADMINISTRACYJNE</string>
     <string name="room_participants_header_call">DZWOŃ</string>
     <string name="room_participants_header_direct_chats">WIADOMOŚCI BEZPOŚREDNIE</string>
     <string name="room_participants_header_devices">SESJE</string>
-
     <string name="room_participants_action_invite">Zaproś</string>
     <string name="room_participants_action_leave">Opuść pokój</string>
     <string name="room_participants_action_remove">Usuń z pokoju</string>
@@ -265,16 +230,13 @@ Przyznaj dostęp w następnym oknie.</string>
     <string name="room_participants_action_mention">Wspomnij</string>
     <string name="room_participants_action_devices_list">Pokaż listę sesji</string>
     <string name="room_participants_invite_prompt_msg">Czy na pewno chcesz zaprosić %s do tej rozmowy?</string>
-
     <string name="people_search_invite_by_id"><u>Zaproś przez ID</u></string>
     <string name="people_search_local_contacts">LOKALNE KONTAKTY (%d)</string>
     <string name="people_search_user_directory">KATALOG UŻYTKOWNIKÓW (%s)</string>
     <string name="people_search_filter_text">Tylko użytkownicy Matrixa</string>
-
     <string name="people_search_invite_by_id_dialog_title">Zaproś użytkowników po ID</string>
     <string name="people_search_invite_by_id_dialog_description">Wprowadź jeden lub więcej adresów e-mail lub ID Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">E-mail lub ID Matrix</string>
-
     <string name="room_menu_search">Szukaj</string>
     <string name="room_one_user_is_typing">%s pisze…</string>
     <string name="room_two_users_are_typing">%1$s i %2$s piszą…</string>
@@ -288,28 +250,24 @@ Przyznaj dostęp w następnym oknie.</string>
     <string name="room_delete_unsent_messages">Usuń niewysłane wiadomości</string>
     <string name="room_message_file_not_found">Nie znaleziono pliku</string>
     <string name="room_do_not_have_permission_to_post">Nie masz uprawnień, aby pisać w tym pokoju</string>
-
     <string name="ssl_trust">Ufaj</string>
     <string name="ssl_do_not_trust">Nie ufaj</string>
     <string name="ssl_logout_account">Wyloguj</string>
     <string name="ssl_remain_offline">Ignoruj</string>
     <string name="ssl_fingerprint_hash">Odcisk palca (%s):</string>
     <string name="ssl_could_not_verify">Nie można zweryfikować tożsamości serwera.</string>
-
     <string name="room_details_title">Szczegóły pokoju</string>
     <string name="room_details_people">Ludzie</string>
     <string name="room_details_files">Pliki</string>
     <string name="room_details_settings">Ustawienia</string>
     <string name="room_details_people_invited_group_name">ZAPROSZENI</string>
     <string name="room_details_people_present_group_name">DOŁĄCZENI</string>
-
     <string name="room_event_action_report_prompt_reason">Powód zgłoszenia zawartości</string>
     <string name="room_event_action_report_prompt_ignore_user">Czy chcesz ukrywać wszystkie wiadomości od tego użytkownika?
 
 Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to trochę potrwać.</string>
     <string name="room_event_action_cancel_upload">Anuluj wysyłanie</string>
     <string name="room_event_action_cancel_download">Anuluj pobieranie</string>
-
     <string name="search_hint">Szukaj</string>
     <string name="search_members_hint">Filtruj członków pokoju</string>
     <string name="search_no_results">Brak wyników</string>
@@ -317,7 +275,6 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="tab_title_search_messages">WIADOMOŚCI</string>
     <string name="tab_title_search_people">LUDZIE</string>
     <string name="tab_title_search_files">PLIKI</string>
-
     <string name="room_recents_join">DOŁĄCZ</string>
     <string name="room_recents_directory">KATALOG</string>
     <string name="room_recents_favourites">ULUBIONE</string>
@@ -329,23 +286,19 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="room_recents_join_room">Dołącz do pokoju</string>
     <string name="room_recents_join_room_title">Dołącz do pokoju</string>
     <string name="room_recents_join_room_prompt">Wprowadź ID lub nazwę pokoju</string>
-
     <string name="directory_search_results_title">Przeglądaj katalog</string>
     <string name="directory_searching_title">Przeszukiwanie katalogu…</string>
-
     <string name="room_settings_favourite">Dodaj do ulubionych</string>
     <string name="room_settings_de_prioritize">Usuń z priorytetyzowanych</string>
     <string name="room_settings_direct_chat">Rozmawiaj bezpośrednio</string>
     <string name="room_settings_leave_conversation">Opuść rozmowę</string>
     <string name="room_settings_forget">Zapomnij</string>
-
     <string name="room_sliding_menu_messages">Wiadomości</string>
     <string name="room_sliding_menu_settings">Ustawienia</string>
     <string name="room_sliding_menu_version">Wersja</string>
     <string name="room_sliding_menu_term_and_conditions">Warunki użytkowania</string>
     <string name="room_sliding_menu_copyright">Prawa autorskie</string>
     <string name="room_sliding_menu_privacy_policy">Polityka prywatności</string>
-
     <string name="settings_profile_picture">Obraz profilowy</string>
     <string name="settings_display_name">Wyświetlana nazwa</string>
     <string name="settings_email_address">E-mail</string>
@@ -353,21 +306,17 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="settings_phone_number">Numer telefonu</string>
     <string name="settings_add_phone_number">Dodaj numer telefonu</string>
     <string name="settings_app_info_link_title">Informacje o aplikacji</string>
-
     <string name="settings_enable_all_notif">Włącz powiadomienia dla tego konta</string>
     <string name="settings_enable_this_device">Włącz powiadomienia dla tej sesji</string>
     <string name="settings_turn_screen_on">Podświetl ekran na 3 sekundy</string>
-
     <string name="settings_messages_in_one_to_one">Wiadomości bezpośrednie</string>
     <string name="settings_messages_in_group_chat">Wiadomości w rozmowach grupowych</string>
     <string name="settings_invited_to_room">Kiedy zostanę zaproszony(-a) do pokoju</string>
     <string name="settings_call_invitations">Zaproszenia do rozmów</string>
     <string name="settings_messages_sent_by_bot">Wiadomości od botów</string>
-
     <string name="settings_start_on_boot">Rozpocznij przy uruchomieniu systemu</string>
     <string name="settings_background_sync">Synchronizacja w tle</string>
     <string name="settings_enable_background_sync">Włącz synchronizację w tle</string>
-
     <string name="settings_version">Wersja</string>
     <string name="settings_app_term_conditions">Zasady użytkowania</string>
     <string name="settings_copyright">Prawa autorskie</string>
@@ -387,7 +336,6 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="settings_devices_list">Sesje</string>
     <string name="settings_always_show_timestamps">Pokaż czas wysłania dla wszystkich wiadomości</string>
     <string name="settings_data_save_mode">Tryb oszczędzania danych</string>
-
     <string name="devices_details_dialog_title">Szczegóły o sesji</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Nazwa publiczna</string>
@@ -399,16 +347,13 @@ Wprowadź hasło, aby kontynuować.</string>
     <string name="devices_delete_dialog_title">Uwierzytelnianie</string>
     <string name="devices_delete_pswd">Hasło:</string>
     <string name="devices_delete_submit_button_label">Wyślij</string>
-
     <string name="settings_logged_in">Zalogowany jako</string>
     <string name="settings_user_interface">Interfejs użytkownika</string>
     <string name="settings_interface_language">Język</string>
     <string name="settings_select_language">Wybierz język</string>
-
     <string name="account_email_validation_title">Oczekiwanie na weryfikację</string>
     <string name="account_email_already_used_error">Ten e-mail jest już używany.</string>
     <string name="account_phone_number_already_used_error">Ten numer telefonu jest już używany.</string>
-
     <string name="settings_change_password">Zmień hasło</string>
     <string name="settings_old_password">Bieżące hasło</string>
     <string name="settings_new_password">Nowe hasło</string>
@@ -418,9 +363,7 @@ Wprowadź hasło, aby kontynuować.</string>
     <string name="settings_unignore_user">Pokazywać wszystkie wiadomości od %s?
 
 Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to trochę potrwać.</string>
-
     <string name="settings_select_country">Wybierz kraj</string>
-
     <string name="settings_phone_number_country_label">Kraj</string>
     <string name="settings_phone_number_country_error">Wybierz kraj</string>
     <string name="settings_phone_number_label">Numer telefonu</string>
@@ -428,17 +371,14 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="settings_phone_number_verification_error_empty_code">Wprowadź kod aktywacyjny</string>
     <string name="settings_phone_number_verification_error">Wystąpił błąd podczas weryfikowania numeru telefonu</string>
     <string name="settings_phone_number_code">Kod</string>
-
     <string name="media_saving_period_3_days">3 dni</string>
     <string name="media_saving_period_1_week">1 tydzień</string>
     <string name="media_saving_period_1_month">1 miesiąc</string>
     <string name="media_saving_period_forever">Na zawsze</string>
-
     <string name="room_settings_room_photo">Obraz pokoju</string>
     <string name="room_settings_room_name">Nazwa pokoju</string>
     <string name="room_settings_topic">Temat</string>
     <string name="room_settings_room_tag">Tag pokoju</string>
-
     <string name="room_settings_tag_pref_entry_favourite">Ulubione</string>
     <string name="room_settings_tag_pref_entry_low_priority">Niski priorytet</string>
     <string name="room_settings_tag_pref_entry_none">Nic</string>
@@ -448,11 +388,9 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="room_settings_room_read_history_rules_pref_title">Dostęp do historii pokoju</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Kto może czytać historię?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Kto może uzyskać dostęp do pokoju?</string>
-
     <string name="room_settings_read_history_entry_anyone">Każdy</string>
     <string name="room_settings_room_access_entry_only_invited">Tylko dla zaproszonych</string>
     <string name="room_settings_banned_users_title">Zablokowani użytkownicy</string>
-
     <string name="room_settings_category_advanced_title">Zaawansowane</string>
     <string name="room_settings_room_internal_id">Wewnętrzne ID tego pokoju</string>
     <string name="room_settings_addresses_pref_title">Adresy</string>
@@ -461,18 +399,15 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="room_settings_labs_end_to_end">Szyfrowanie End-to-End</string>
     <string name="room_settings_labs_end_to_end_is_active">Szyfrowanie End-to-End jest aktywne</string>
     <string name="room_settings_addresses_add_new_address">Nowy adres (np. #foo:matrix.org)</string>
-
     <string name="room_settings_set_main_address">Ustaw jako główny adres</string>
     <string name="room_settings_copy_room_id">Kopiuj ID pokoju</string>
     <string name="room_settings_copy_room_address">Kopiuj adres pokoju</string>
-
     <string name="room_settings_addresses_e2e_enabled">Szyfrowanie jest włączone w tym pokoju.</string>
     <string name="room_settings_addresses_e2e_disabled">Szyfrowanie jest wyłączone w tym pokoju.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Włącz szyfrowanie 
 (ostrzeżenie: nie może zostać wyłączone!)</string>
     <string name="directory_title">Katalog</string>
     <string name="settings_theme">Motyw</string>
-
     <string name="encryption_information_user_id">ID użytkownika</string>
     <string name="encryption_information_algorithm">Algorytm</string>
     <string name="encryption_information_session_id">ID sesji</string>
@@ -481,31 +416,25 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="encryption_information_device_id">ID</string>
     <string name="encryption_information_verification">Weryfikacja</string>
     <string name="encryption_information_ed25519_fingerprint">Odcisk palca Ed25519</string>
-
     <string name="encryption_export_export">Eksportuj</string>
     <string name="passphrase_enter_passphrase">Wprowadź hasło</string>
     <string name="passphrase_confirm_passphrase">Potwierdź hasło</string>
     <string name="encryption_information_not_verified">Nie zweryfikowano</string>
     <string name="encryption_information_verified">Zweryfikowano</string>
     <string name="encryption_information_blocked">Na czarnej liście</string>
-
     <string name="encryption_information_unknown_device">nieznana sesja</string>
     <string name="encryption_information_none">brak</string>
-
     <string name="encryption_information_verify">Weryfikuj</string>
     <string name="encryption_information_block">Dodaj na czarną listę</string>
     <string name="encryption_information_unblock">Usuń z czarnej listy</string>
-
     <string name="encryption_information_verify_device">Weryfikuj sesję</string>
     <string name="encryption_information_verify_key_match">Te klucze są ze sobą zgodne</string>
-
     <string name="unknown_devices_alert_title">Pokój zawiera nieznane sesje</string>
     <string name="select_room_directory">Wybierz katalog pokojów</string>
     <string name="directory_server_fail_to_retrieve_server">Serwer może być wyłączony lub przeciążony</string>
     <string name="directory_server_placeholder">Adres serwera domowego</string>
     <string name="directory_server_all_rooms_on_server">Wszystkie pokoje na serwerze %s</string>
     <string name="historical_placeholder">Szukaj w archiwum</string>
-
     <string name="font_size">Rozmiar czcionki</string>
     <string name="tiny">Bardzo mały</string>
     <string name="small">Mały</string>
@@ -517,10 +446,8 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="light_theme">Jasny motyw</string>
     <string name="dark_theme">Ciemny motyw</string>
     <string name="black_them">Czarny motyw</string>
-
     <string name="call">Zadzwoń</string>
     <string name="avatar">Awatar</string>
-
     <string name="reason_colon">Powód: %1$s</string>
     <string name="has_been_banned">Zostałeś zbanowany z %1$s przez %2$s</string>
     <string name="has_been_kicked">Zostałeś wyrzucony z %1$s przez %2$s</string>
@@ -529,10 +456,8 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="group_details_people">Ludzie</string>
     <string name="community_name_hint">Przykład</string>
     <string name="community_id_hint">przykład</string>
-
     <!-- group details -->
     <string name="encrypted_message">Wiadomość zaszyfrowana</string>
-
     <!-- groups creation -->
     <string name="create">Utwórz</string>
     <string name="notification_off">Off</string>
@@ -541,50 +466,37 @@ Zauważ, że ta czynność spowoduje ponowne uruchomienie aplikacji i może to t
     <string name="notification_listening_for_events">Nasłuchiwanie zdarzeń</string>
     <string name="notification_noisy_notifications">Głośne powiadomienia</string>
     <string name="notification_silent_notifications">Ciche powiadomienia</string>
-
     <string name="title_activity_bug_report">Zgłoś błąd</string>
     <string name="title_activity_group_details">Informacje o społeczności</string>
-
     <string name="loading">Wczytywanie…</string>
-
     <string name="action_exit">Opuść</string>
     <string name="actions">Działania</string>
     <string name="bottom_action_groups">Społeczności</string>
-
     <string name="home_filter_placeholder_groups">Filtruj nazwy społeczności</string>
-
     <string name="groups_invite_header">Zaproś</string>
     <string name="groups_header">Społeczności</string>
     <string name="no_group_placeholder">Brak grup</string>
-
     <string name="send_bug_report_rage_shake">Potrząśnij wściekle, aby zgłosić błąd</string>
-
     <string name="start_new_chat_prompt_msg">Czy jesteś pewien, że chcesz rozpocząć nową rozmowę z %s?</string>
     <string name="start_voice_call_prompt_msg">Czy jesteś pewien, że chcesz rozpocząć rozmowę głosową?</string>
     <string name="start_video_call_prompt_msg">Czy jesteś pewien, że chcesz rozpocząć wideorozmowę?</string>
-
     <string name="option_take_photo">Zrób zdjęcie</string>
     <string name="option_take_video">Nagraj film</string>
-
     <string name="auth_threepid_warning_message">Rejestracja jednocześnie za pomocą numeru telefonu i adresu e-mail nie jest obsługiwana dopóki nie pojawi się odpowiednie API. Tylko numer telefonu będzie brany pod uwagę.
 
 Możesz dodać adres e-mail do swojego profilu w ustawieniach.</string>
     <string name="auth_home_server">Serwer Domowy:</string>
     <string name="auth_identity_server">Serwer Tożsamości:</string>
     <string name="auth_reset_password_success_message">Twoje hasło zostało zresetowane. Zostałeś wylogowany ze wszystkich sesji i nie będziesz więcej otrzymywać powiadomień push. Aby ponownie włączyć powiadomienia, zaloguj się ponownie na każdym urządzeniu.</string>
-
     <string name="login_error_unknown_token">Wprowadzony token dostępu nie został rozpoznany</string>
     <string name="login_error_bad_json">Uszkodzony JSON</string>
-
     <string name="groups_list">Lista grup</string>
-
     <plurals name="membership_changes">
         <item quantity="one">%d zmiana członkostwa</item>
         <item quantity="few">%d zmiany członkostwa</item>
         <item quantity="many">%d zmian członkostwa</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <string name="call_error_user_not_responding">Rozmówca nie połączył się.</string>
     <string name="permissions_rationale_msg_camera_explanation">
 
@@ -599,7 +511,6 @@ Przyznaj dostęp w następnym oknie.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Element wymaga dostępu do kontaktów, aby znajdywać innych użytkowników Matrixa bazując na adresie e-mail i numerze telefonu.
 \n
 \nZezwolić Element na dostęp do kontaktów\?</string>
-
     <string name="list_members">Lista uczestników</string>
     <string name="open_chat_header">Otwarty nagłówek</string>
     <string name="room_sync_in_progress">Synchronizacja…</string>
@@ -609,57 +520,50 @@ Przyznaj dostęp w następnym oknie.</string>
         <item quantity="one">Jeden aktywny członek</item>
         <item quantity="few">Kilku aktywnych członków</item>
         <item quantity="many">%d aktywnych członków</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="room_title_members">
         <item quantity="one">1 członek</item>
         <item quantity="few">kilku członków</item>
         <item quantity="many">%d członków</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <string name="room_participants_power_level_prompt">Nie będziesz w stanie cofnąć tej zmiany, ponieważ przyznajesz użytkownikowi uprawnienia równe swoim. 
 Jesteś pewien?</string>
-
     <string name="room_participants_ban_prompt_msg">Czy chcesz zablokować tego użytkownika w tej rozmowie?</string>
-
     <string name="login_error_unable_register_mail_ownership">Nie udało się zarejestrować: błąd własności e-maila</string>
     <string name="call_error_answered_elsewhere">połączenie odebrane gdzie indziej</string>
-
     <string name="room_unsent_messages_notification">Wiadomość nie została wysłana. Czy %1$s lub %2$s teraz?</string>
     <string name="room_unknown_devices_messages_notification">Wiadomość niewysłana z powodu obecności nieznanych sesji. Czy %1$s lub %2$s teraz\?</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">Nowa wiadomość</item>
         <item quantity="few">Kilka nowych wiadomości</item>
         <item quantity="many">%d nowych wiadomości</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <string name="ssl_cert_not_trust">Może to oznaczać że ktoś zakłóca twoje połączenie, lub Twój telefon nie ufa certyfikatowi dostarczonemu przez zdalny serwer.</string>
     <string name="ssl_cert_new_account_expl">Jeśli administrator serwera oświadczył, że jest to oczekiwane, upewnij się, że poniższy odcisk palca odpowiada odciskowi palca dostarczonemu przez niego.</string>
     <string name="ssl_unexpected_existing_expl">Certyfikat różni się od tego zaufanego w twoim telefonie. Serwer mógł odnowić certyfikat. Skontaktuj się z administratorem serwera w celu weryfikacji odcisku palca.</string>
     <string name="ssl_expected_existing_expl">Certyfikat zmienił stan z zaufanego na niezaufany. jest to NIEZWYKLE RZADKIE. Rekomendowane jest NIE AKCEPTOWANIE nowego certyfikatu.</string>
     <string name="ssl_only_accept">Akceptuj certyfikat tylko wtedy gdy administrator opublikował odcisk palca pasujący do tego powyżej.</string>
     <string name="malformed_id">Uszkodzony ID. Powinien być adres e-mail lub Matrix ID podobny do \'@localpart:domain\'</string>
-
     <plurals name="directory_search_rooms">
         <item quantity="one">1 pokój</item>
         <item quantity="few">%d pokoje</item>
         <item quantity="many">%d pokoi</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="directory_search_rooms_for">
         <item quantity="one">%1$s pokój znaleziony dla %2$s</item>
         <item quantity="few">Kilka pokoi znalezionych dla %2$s</item>
         <item quantity="many">%1$s pokoi znalezionych dla %2$s</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="room_settings_all_messages_noisy">Wszystkie wiadomości (hałaśliwy)</string>
     <string name="room_settings_all_messages">Wszystkie wiadomości</string>
     <string name="room_settings_mention_only">Tylko wspomnienia</string>
     <string name="room_settings_mute">Wycisz</string>
     <string name="room_settings_add_homescreen_shortcut">Dodaj skrót do ekranu domowego</string>
-
     <string name="room_sliding_menu_third_party_notices">Informacje o trzecich stronach</string>
     <string name="settings_app_info_link_summary">Pokaż informacje o aplikacji w ustawieniach systemu.</string>
     <string name="settings_notification_ringtone">Dźwięk powiadomień</string>
@@ -670,69 +574,52 @@ Jesteś pewien?</string>
     <string name="settings_olm_version">Wersja olm</string>
     <string name="settings_third_party_notices">Informacje o stronach trzecich</string>
     <string name="settings_keep_media">Zatrzymaj media</string>
-
     <string name="settings_contacts_phonebook_country">Kraj książki adresowej</string>
     <string name="settings_home_display">Ekran domowy</string>
     <string name="settings_inline_url_preview">Podgląd zawartości URL</string>
     <string name="settings_12_24_timestamps">Pokaż czas w formacie 12-godzinnym</string>
     <string name="settings_vibrate_on_mention">Wibruj gdy ktoś wspomni o Tobie</string>
-
     <string name="settings_analytics">Analityka</string>
-
     <string name="settings_home_server">Serwer domowy</string>
     <string name="settings_identity_server">Serwer Tożsamości</string>
-
     <string name="account_email_validation_message">Sprawdź pocztę e-mail i kliknij odnośnik, który zawiera. Gdy to zrobisz, kliknij przycisk Kontynuuj.</string>
     <string name="account_email_validation_error">Nie udało się zweryfikować adresu e-mail. Sprawdź swoją skrzynkę i kliknij w link. Gdy to zrobisz, kliknij kontynuuj.</string>
     <string name="account_email_not_found_error">Adres e-mail nie został znaleziony.</string>
     <string name="settings_delete_threepid_confirmation">Czy na pewno chcesz usunąć %1$s %2$s?</string>
-
     <string name="settings_phone_number_error">Nieprawidłowy numer telefonu dla wybranego kraju</string>
     <string name="settings_phone_number_verification_instruction">Wysłaliśmy SMS z kodem aktywacyjnym. Podaj ten kod poniżej.</string>
     <string name="room_settings_tag_pref_dialog_title">Otagowany jako:</string>
-
     <string name="room_settings_room_notifications_title">Powiadomienia</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Tylko członkowie (od momentu włączenia tej opcji)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Tylko członkowie (od kiedy zostali zaproszeni)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Tylko członkowie (od kiedy dołączyli)</string>
-
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Każdy kto zna link pokoju, poza gośćmi</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Każdy kto zna link pokoju, razem z gośćmi</string>
-
     <string name="room_settings_labs_end_to_end_warnings">Musisz się wylogować aby uruchomić szyfrowanie.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Szyfruj wiadomości tylko do zaufanych sesji</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesjiw tym pokoju z tego urządzenia.</string>
-
     <string name="room_settings_addresses_no_local_addresses">Ten pokój nie ma adresu lokalnego</string>
     <string name="room_settings_add_new_group">Nowe ID społęczności (np. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Niepoprawne ID społeczności</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' jest niepoprawnym ID społeczności</string>
-
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Nieznany format aliasu</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' jest nieznanym formatem dla aliasu</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Nie będziesz mieć podanego głównego adresu dla tego pokoju.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Ostrzeżenia głównego adresu</string>
-
     <string name="room_settings_unset_main_address">NIe ustawiaj jako główny adres</string>
     <string name="encryption_information_decryption_error">Błąd odszyfrowywania</string>
-
     <string name="encryption_information_device_key">Klucz sesji</string>
     <string name="encryption_export_room_keys">Wyeksportuj klucze pokoju</string>
     <string name="encryption_export_room_keys_summary">Eksportuj klucze do pliku lokalnego</string>
     <string name="rejoin">Dołącz ponownie</string>
     <string name="forget_room">Zapomnij pokój</string>
-
     <string name="download">Pobierz</string>
     <string name="clear">Wyczyść</string>
     <string name="option_send_sticker">Wyślij naklejkę</string>
     <string name="e2e_re_request_encryption_key"><u>Poproś ponownie o klucze szyfrujące</u> z innych Twoich sesji.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Prośba o klucz wysłana.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Prośba wysłana</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Uruchom proszę Element na innym urządzeniu, które może odszyfrować wiadomość, aby wysłać klucze do tej sesji.</string>
-
     <string name="settings_notification_privacy">Prywatność powiadomień</string>
     <string name="settings_notification_privacy_normal">Standardowa</string>
     <string name="settings_notification_privacy_reduced">Zmniejszona prywatność</string>
@@ -742,97 +629,77 @@ Jesteś pewien?</string>
     <string name="settings_notification_privacy_secure_message_content">• Treść powiadomienia jest <b>bezpiecznie pobierana z domowego serwera Matrix</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Powiadomienia zawierają <b>meta-dane oraz treść wiadomości</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Powiadomienia <b>nie będą pokazywać treści wiadomości</b></string>
-
     <string name="settings_notifications_targets">Cele powiadomień</string>
     <string name="settings_deactivate_account_section">Dezaktywuj konto</string>
     <string name="settings_deactivate_my_account">Dezaktywuj moje konto</string>
-
     <string name="startup_notification_privacy_title">Prywatność powiadomień</string>
     <string name="startup_notification_privacy_message">Element może działać w tle aby bezpiecznie i prywatnie zarządzać Twoimi powiadomieniami. To może mieć wpływ na zużycie baterii.</string>
     <string name="startup_notification_privacy_button_grant">Nadaj uprawnienie</string>
     <string name="startup_notification_privacy_button_other">Wybierz inną opcję</string>
-
     <string name="settings_opt_in_of_analytics">Wysyłaj dane analityczne</string>
     <string name="settings_opt_in_of_analytics_summary">Element zbiera anonimowe informacje które pozwolą ulepszyć aplikację.</string>
     <string name="settings_opt_in_of_analytics_prompt">Włącz proszę dane analityczne, aby pomóc nam ulepszyć Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Tak, chcę pomóc!</string>
-
     <string name="settings_delete_notification_targets_confirmation">Czy na pewno chcesz usunąć ten cel powiadomień?</string>
-
     <string name="room_settings_room_access_warning">Aby móc stworzyć link do pokoju musi on mieć swój adres.</string>
-
     <string name="failed_to_load_timeline_position">%s próbował załadować konkretny punkt na osi czasu tego pokoju, ale nie był w stanie go znaleźć.</string>
-
     <string name="encryption_information_title">Informacje o szyfrowaniu end-to-end</string>
-
     <string name="encryption_information_device_info">Informacje zdarzenia</string>
     <string name="encryption_information_sender_device_information">Informacja o sesji nadawcy</string>
     <string name="encryption_export_e2e_room_keys">Eksportuj klucze E2E pokoju</string>
     <string name="encryption_export_saved_as">Klucze pokoju zostały zapisane w \'%s\'
 
 Uwaga: ten plik może zostać usunięty, jeśli aplikacja zostanie odinstalowana.</string>
-
     <string name="encryption_import_e2e_room_keys">Importuj klucze E2E pokoju</string>
     <string name="encryption_import_room_keys">Importuj klucze pokoju</string>
     <string name="encryption_import_room_keys_summary">Importuj klucze z lokalnego pliku</string>
     <string name="encryption_import_import">Importuj</string>
     <string name="encryption_never_send_to_unverified_devices_title">Szyfruj wiadomości tylko do zaufanych sesji</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Nigdy nie wysyłaj zaszyfrowanych wiadomości do niezweryfikowanych sesji w tym pokoju z tej sesji.</string>
-
     <string name="encryption_information_unverify">Usuń weryfikację</string>
     <string name="encryption_information_verify_device_warning">Aby sprawdzić czy ta sesja jest zaufana, skontaktuj się z jej właścicielem używając innych form (np. osobiście lub telefonicznie) i zapytaj czy klucz, który widzą w ustawieniach użytkownika dla tego urządzenia pasuje do klucza poniżej:</string>
     <string name="encryption_information_verify_device_warning2">Jeśli klucz pasuje, potwierdź to przyciskiem poniżej. Jeśli nie, to ktoś inny najprawdopodobniej przejmuje lub podszywa się pod tą sesję i powinieneś dodać tę sesję do czarnej listy. W przyszłości proces weryfikacji będzie bardziej skomplikowany.</string>
-
     <string name="unknown_devices_alert_message">Ten pokój zawiera nieznane sesje, które nie zostały zweryfikowane. Oznacza to brak gwarancji, że sesje należą do użytkowników do których twierdzą, że należą. Przed kontynuowaniem, zalecamy wykonanie procesu weryfikacji każdego urządzenia, ale możesz ponownie wysłać wiadomość bez weryfikacji, jeśli wolisz. Nieznane sesje:</string>
-
     <string name="title_activity_choose_sticker">Wyślij naklejkę</string>
-
     <string name="dialog_title_third_party_licences">Licencje osób trzecich</string>
-
     <string name="error_no_external_application_found">Niestety, nie znaleziono zewnętrznej aplikacji, która ukończy to działanie.</string>
-
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">1 pokój</item>
         <item quantity="few">%d pokoje</item>
         <item quantity="many">%d pokoi</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="active_widgets">
         <item quantity="one">1 aktywny widżet</item>
         <item quantity="few">%d aktywne widżety</item>
         <item quantity="many">%d aktywnych widżetów</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
     <string name="widget_integration_room_not_visible">Pokój %s nie jest widoczny.</string>
     <string name="settings_labs_native_camera">Użyj natywnej kamery</string>
     <string name="speak">Mów</string>
     <string name="option_send_voice">Wyślij głos</string>
-
     <string name="no_sticker_application_dialog_content">Nie masz obecnie włączonych żadnych pakietów naklejek.
 
 Czy chcesz dodać teraz kilka?</string>
-
     <string name="go_on_with">zadziałaj poprzez…</string>
     <string name="encryption_information_curve25519_identity_key">Klucz tożsamości Curve25519</string>
     <string name="encryption_information_claimed_ed25519_fingerprint_key">Zażądano klucza odcisku palca Ed25519</string>
     <string name="directory_server_type_homeserver">Wpisz serwer domowy, aby pobrać z niego listę publicznych pokoi</string>
     <string name="lock_screen_hint">Napisz tutaj…</string>
-
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">1 nieprzeczytana wiadomość powiadomienia</item>
         <item quantity="few">%d nieprzeczytane wiadomości powiadomienia</item>
         <item quantity="many">%d nieprzeczytanych wiadomości powiadomienia</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
         <item quantity="one">1 nieprzeczytana wiadomość powiadomienia</item>
         <item quantity="few">%d nieprzeczytane wiadomości powiadomienia</item>
         <item quantity="many">%d nieprzeczytanych wiadomości powiadomienia</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s w %2$s</string>
-
     <string name="widget_no_power_to_manage">Potrzebujesz uprawnień do zarządzania widżetami w tym pokoju</string>
     <string name="widget_creation_failure">Utworzenie widżetu nie powiodło się</string>
     <string name="settings_labs_create_conference_with_jitsi">Utwórz połączenia konferencyjne za pomocą jitsi</string>
@@ -843,7 +710,6 @@ Czy chcesz dodać teraz kilka?</string>
     <string name="widget_integration_must_be_in_room">Nie jesteś w tym pokoju.</string>
     <string name="widget_integration_no_permission_in_room">Nie masz uprawnień, aby zrobić to w tym pokoju.</string>
     <string name="settings_flair">Wyróżnik społeczności</string>
-
     <string name="room_settings_no_flair">Ten pokój nie wyświetla wyróżników dla żadnych społeczności</string>
     <string name="widget_integration_missing_room_id">Brakujące room_id w żądaniu.</string>
     <string name="widget_integration_missing_user_id">Brakujące user_id w żądaniu.</string>
@@ -851,45 +717,33 @@ Czy chcesz dodać teraz kilka?</string>
     <string name="widget_integration_invalid_parameter">Parametr jest niepoprawny.</string>
     <string name="room_add_matrix_apps">Dodaj aplikacje Matrix</string>
     <string name="settings_labs_enable_send_voice">Wyślij wiadomości głosowe</string>
-
     <string name="you_added_a_new_device">Dodałeś(-aś) nową sesję \'%s\', która żąda kluczy szyfrujących.</string>
     <string name="your_unverified_device_requesting">Twoje niezweryfikowana sesja \'%s\' żąda kluczy szyfrujących.</string>
     <string name="start_verification">Rozpocznij weryfikację</string>
     <string name="share_without_verifying">Współdziel bez weryfikacji</string>
     <string name="ignore_request">Zignoruj żądanie</string>
-
     <string name="conference_call_warning_message">Połączenia konferencyjne są w stadium rozwoju i mogą nie być niezawodne.</string>
-
     <string name="command_error">Błąd polecenia</string>
     <string name="unrecognized_command">Nierozpoznane polecenie: %s</string>
-
     <string name="notification_noisy">Głośne</string>
-
     <string name="create_community">Utwórz społeczność</string>
     <string name="community_name">Nazwa społeczności</string>
     <string name="community_id">Identyfikator społeczności</string>
     <string name="group_details_home">Strona startowa</string>
     <string name="no_users_placeholder">Brak użytkowników</string>
-
     <string name="rooms">Pokoje</string>
     <string name="invited">Zaproszeni</string>
     <string name="filter_group_members">Filtrowanie członków grupy</string>
     <string name="filter_group_rooms">Filtrowanie pokoi grupy</string>
-
     <string name="group_no_long_description">Administrator społeczności nie podał długiego opisu tej społeczności.</string>
-
     <string name="deactivate_account_title">Dezaktywuj konto</string>
     <string name="directory_server_native_rooms">Wszystkie lokalne pokoje %s</string>
-
     <string name="dialog_user_consent_content">Aby kontynuować korzystanie z serwera domowego %1$s, musisz przejrzeć i zaakceptować warunki korzystania z usługi.</string>
     <string name="dialog_user_consent_submit">Przejrzyj teraz</string>
-
     <string name="deactivate_account_delete_checkbox">Proszę zapomnieć o wszystkich wiadomościach, które wysłałem, gdy moje konto zostało dezaktywowane (<b>Ostrzeżenie:</b> spowoduje to, że przyszli użytkownicy zobaczą niepełny obraz rozmów)</string>
     <string name="deactivate_account_prompt_password">Aby kontynuować, wpisz swoje hasło:</string>
     <string name="deactivate_account_submit">Dezaktywuj konto</string>
-
     <string name="error_empty_field_your_password">Prosimy wpisać swoje hasło.</string>
-
     <string name="deactivate_account_content">To sprawi, że Twoje konto stanie się na stałe niezdatne do użytku. Nie będziesz mógł się zalogować i nikt nie będzie mógł ponownie zarejestrować tego samego identyfikatora użytkownika. Spowoduje to, że Twoje konto opuści wszystkie pokoje, w których uczestniczy, i usunie dane Twojego konta z serwera tożsamości. <b>Ta czynność jest nieodwracalna</b>.
 
 Dezaktywacja konta <b>domyślnie nie powoduje zapomnienia wysłanych przez Ciebie wiadomości</b>. Jeśli chcesz, abyśmy zapomnieli o Twoich wiadomościach, zaznacz pole poniżej.
@@ -898,10 +752,8 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="receipt_avatar">Uzyskaj awatar</string>
     <string name="notice_avatar">Zamień awatar</string>
     <string name="dialog_title_error">Błąd</string>
-
     <string name="room_participants_now">%1$s teraz</string>
     <string name="room_participants_ago">%1$s %2$s temu</string>
-
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s i %2$s</string>
     <string name="room_message_placeholder_reply_to_encrypted">Wyślij zaszyfrowaną odpowiedź…</string>
@@ -912,57 +764,49 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <plurals name="group_members">
         <item quantity="one">1 członek</item>
         <item quantity="few">%d członków</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="one">1 pokój</item>
         <item quantity="few">%d pokoje</item>
         <item quantity="many">%d pokoi</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="room_tombstone_predecessor_link">Kliknij tutaj, aby zobaczyć starsze wiadomości</string>
-
     <string name="unknown_error">Przepraszamy, wystąpił błąd</string>
-
     <string name="status_theme">Motyw Status.im</string>
-
     <string name="missing_permissions_error">Z powodu braku uprawnień to działanie nie jest możliwe.</string>
     <string name="system_alerts_header">Alerty systemowe</string>
-
     <string name="send_bug_report_description_in_english">Jeżeli to możliwe, proszę napisz opis w języku angielskim.</string>
     <plurals name="format_time_s">
         <item quantity="one">1 sekunda</item>
         <item quantity="few">%d sek.</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <plurals name="format_time_m">
         <item quantity="one">1 minuta</item>
         <item quantity="few">%d min.</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <plurals name="format_time_h">
         <item quantity="one">1 godzina</item>
         <item quantity="few">%s godz.</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">1 dzień</item>
         <item quantity="few">%d dni</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <plurals name="room_details_selected">
         <item quantity="one">1 zaznaczone</item>
         <item quantity="few">%d zaznaczone</item>
         <item quantity="many">%d zaznaczonych</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
     <string name="room_sliding_menu_version_x">Wersja %s</string>
     <string name="settings_preview_media_before_sending">Podgląd mediów przed wysłaniem</string>
-
     <string name="settings_without_flair">Nie jesteś obecnie członkiem żadnej społeczności.</string>
-
     <string name="encryption_export_notice">Utwórz hasło, aby zaszyfrować wyeksportowane klucze. Będziesz musiał wpisać to samo hasło, aby móc zaimportować klucze.</string>
     <string name="passphrase_create_passphrase">Utwórz hasło</string>
     <string name="passphrase_passphrase_does_not_match">Hasło musi się zgadzać</string>
@@ -977,49 +821,36 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="command_description_kick_user">Wyrzuca użytkownika z podanym ID</string>
     <string name="command_description_nick">Zmienia twój wyświetlany nick</string>
     <string name="command_description_clear_scalar_token">Do naprawiania zarządzania aplikacjami Matrix</string>
-
     <string name="room_tombstone_versioned_description">Ten pokój został zamieniony i nie jest już aktywny</string>
     <string name="room_tombstone_continuation_link">Konwersacja jest kontynuowana tutaj</string>
     <string name="room_tombstone_continuation_description">Ten pokój jest kontynuacją innej rozmowy</string>
     <string name="resource_limit_exceeded_title">Limit pakietów został przekroczony</string>
     <string name="resource_limit_contact_action">Skontaktuj się z administratorem</string>
-
     <string name="resource_limit_contact_admin">Skontaktuj się z administratorem usług</string>
-
     <string name="resource_limit_soft_default">Ten serwer przekroczył jeden z limitów, więc <b>niektórzy użytkownicy nie będą mogli się zalogować</b>.</string>
     <string name="resource_limit_hard_default">Ten serwer przekroczył jeden z limitów zasobów.</string>
-
     <string name="resource_limit_soft_mau"> Ten serwer osiągnął miesięczny limit aktywnego użytkownika, więc <b>niektórzy użytkownicy nie będą mogli się zalogować</b>.</string>
     <string name="resource_limit_hard_mau">Ten serwer osiągnął miesięczny limit aktywnego użytkownika.</string>
-
     <string name="resource_limit_soft_contact">Proszę %s, aby zwiększył ten limit.</string>
     <string name="resource_limit_hard_contact">Proszę %s, aby kontynuować z tej usługi.</string>
-
     <string name="settings_lazy_loading_description">Zwiększ wydajność, ładując tylko członków pokoju w pierwszym widoku.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Twój serwer nie obsługuje jeszcze powolnego ładowania członków pokoju. Spróbuj później.</string>
-
     <string name="merged_events_expand">Rozwiń</string>
     <string name="merged_events_collapse">Zwiń</string>
-
     <string name="settings_lazy_loading_title">Powolne ładowanie członków pokojów</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="settings_call_ringtone_title">Dzwonek przychodzących połączeń</string>
     <string name="settings_call_ringtone_dialog_title">Wybierz dzwonek dla połączeń:</string>
-
     <string name="reason_hint">Powód</string>
-
     <string name="settings_send_typing_notifs">Wyślij powiadomienia o pisaniu</string>
     <string name="settings_password">Hasło</string>
     <string name="markdown_has_been_enabled">Markdown został włączony.</string>
     <string name="markdown_has_been_disabled">Markdown został wyłączony.</string>
-
     <string name="show_info_area_always">Zawsze</string>
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
-
     <string name="settings_call_ringtone_use_app_ringtone">Użyj domyślnego dzwonka Element dla przychodzących połączeń</string>
     <string name="call_anyway">Zadzwoń mimo to</string>
     <string name="settings_call_category">Połączenia</string>
@@ -1028,7 +859,6 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="settings_show_join_leave_messages">Pokaż zdarzenia dołączenia i wyjścia</string>
     <string name="show_info_area_messages_and_errors">Dla komunikatów i błędów</string>
     <string name="show_info_area_only_errors">Tylko dla błędów</string>
-
     <string name="settings_show_read_receipts">Wyświetl potwierdzenia odczytu</string>
     <string name="settings_show_avatar_display_name_changes_messages_summary">Obejmuje zmiany awatara i nazwy wyświetlania.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Pokaż zdarzenia konta</string>
@@ -1037,29 +867,22 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo
     <string name="command_problem_with_parameters">Komenda „%s” potrzebuje więcej parametrów lub niektóre parametry są niepoprawne.</string>
     <string name="settings_info_area_show">Pokaż obszar informacyjny</string>
     <string name="accept">Akceptuj</string>
-
     <string name="auth_accept_policies">Przeczytaj i zaakceptuj zasady tego serwera domowego:</string>
-
     <string name="settings_labs_enable_send_voice_summary">Ta opcja wymaga aplikacji osoby trzeciej do nagrywania wiadomości.</string>
-
     <string name="settings_troubleshoot_diagnostic_run_button_title">Uruchom Testy</string>
     <string name="settings_troubleshoot_test_system_settings_title">Ustawienia Systemowe.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Powiadomienia są włączone w ustawieniach systemowych.</string>
     <string name="open_settings">Otwórz Ustawienia</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Ustawienia Konta.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Powiadomienia są właczone dla twojego konta.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Włącz</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Ustawienia Sesji.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Powiadomienia są włączone dla tej sesji.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Włącz</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Token Firebase</string>
     <string name="settings_troubleshoot_test_token_registration_title">Rejestracja Tokena</string>
     <string name="settings_troubleshoot_test_service_boot_title">Rozpocznij przy uruchomieniu systemu</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Nadaj uprawnienie</string>
-
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Jeden lub więcej testów nie powiodło się, spróbuj sugerowaną poprawkę(-ki).</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Powiadomienia są wyłączone w ustawieniach systemowych.
 Sprawdź ustawienia systemowe.</string>
@@ -1067,65 +890,50 @@ Sprawdź ustawienia systemowe.</string>
 Sprawdź ustawienia konta.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Powiadomienia nie są włączone dla tej sesji. Proszę sprawdź ustawienia Element.</string>
     <string name="account_additional_info">Dodatkowe informacje: %s</string>
-
     <string name="account_phone_number_error">Wystąpił błąd podczas weryfikowania numeru telefonu.</string>
     <string name="account_email_error">Wystąpił błąd podczas weryfikowania adresu e-mail.</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">Połączenie w tle</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignoruj Optymalizację</string>
-
     <string name="settings_troubleshoot_test_battery_title">Optymalizacja Baterii</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Jeden lub więcej testów nie powiodło się, prosimy o przesłanie raportu o błędzie, aby pomóc nam w zbadaniu problemu.</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Uruchom Usługę</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Usługa Powiadomień</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Usługa Powiadomień jest uruchomiona.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Usługa Powiadomień nie jest uruchomiona.
 Spróbuj uruchomić ponownie aplikację.</string>
     <string name="video_call_in_progress">Połączenie wideo trwa…</string>
-
     <string name="title_activity_keys_backup_setup">Kopia Zapasowa Klucza</string>
     <string name="keys_backup_is_not_finished_please_wait">Kopia zapasowa kluczy nie jest zakończona, proszę czekać…</string>
     <string name="skip">Pomiń</string>
     <string name="settings_notification_advanced">Zaawansowane ustawienia powiadomień</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Sprawdź ustawienia</string>
-
     <string name="keys_backup_info_title_algorithm">Algorytm</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Stracisz zaszyfrowane wiadomości, jeśli się teraz wylogujesz</string>
     <string name="are_you_sure">Jesteś pewien?</string>
     <string name="abort">Przerwij</string>
-
     <string name="action_sign_out_confirmation_simple">Czy na pewno chcesz się wylogować?</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Trwa tworzenie kopii zapasowej klucza. Jeśli wylogujesz się teraz utracisz dostęp do zaszyfrowanych wiadomości.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Nie chcę moich zaszyfrowanych wiadomości</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Utracisz dostęp do zaszyfrowanych wiadomości, chyba że wykonasz kopię zapasową kluczy przed wylogowaniem się.</string>
-
     <string name="stay">Zostań</string>
     <string name="ignore">Ignoruj</string>
-
     <string name="settings_default_compression">Domyślna kompresja</string>
     <string name="settings_noisy_notifications_preferences">Konfiguruj głośne powiadomienia</string>
     <string name="settings_silent_notifications_preferences">Konfiguruj ciche powiadomienia</string>
     <string name="notification_silent">Ciche</string>
     <string name="keys_backup_settings_restore_backup_button">Przywróć z kopii zapasowej</string>
     <string name="keys_backup_settings_delete_backup_button">Usuń kopię zapasową</string>
-
     <string name="keys_backup_settings_delete_confirm_title">Usuń kopię zapasową</string>
     <string name="keys_backup_info_title_version">Wersja</string>
     <string name="title_activity_verify_device">Zweryfikuj sesję</string>
-
     <string name="action_mark_room_read">Oznacz jako przeczytane</string>
     <string name="sas_verified">Zweryfikowano!</string>
     <string name="sas_verification_request_notification_channel_title">Weryfikacja klucza</string>
     <string name="sas_incoming_request_notif_title">Żądanie weryfikacji</string>
     <string name="sas_incoming_request_notif_content">%s chce zweryfikować twoją sesję</string>
-
     <string name="sas_error_unknown">Nieznany błąd</string>
-
     <string name="keys_backup_activate">Użyj kopii zapasowej klucza</string>
     <string name="keys_backup_info_title_signature">Podpis</string>
-
     <string name="you_added_a_new_device_with_info">Nowa sesja żąda kluczy szyfrujących. 
 \nNazwa sesji: %1$s 
 \nOstatnio widziana: %2$s 
@@ -1134,40 +942,33 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \nNazwa sesji: %1$s 
 \nOstatnio widziana: %2$s 
 \nJeśli to nie Ty zalogowałeś(-aś) się na innej sesji, zignoruj to żądanie.</string>
-
     <string name="start_verification_short_label">Weryfikuj</string>
     <string name="share_without_verifying_short_label">Udostępnij</string>
     <string name="key_share_request">Żądanie udostępnienia klucza</string>
     <string name="ignore_request_short_label">Ignoruj</string>
-
     <string name="keys_backup_setup_step3_share_recovery_file">Udostępnij</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Przywrócono kopię zapasową z %d kluczem.</item>
         <item quantity="few">Przywrócono kopię zapasową z %d kluczami.</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <string name="title_activity_keys_backup_restore">Użyj kopii zapasowej klucza</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Uruchamianie… (%1$d z %2$d)</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Ustawienia niestandardowe.</string>
     <string name="encryption_settings_manage_message_recovery_summary">Zarządzaj kopią zapasową klucza</string>
-
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Udostępnij klucz odzyskiwania z…</string>
     <string name="keys_backup_settings_delete_confirm_message">Usunąć klucze szyfrowania z serwera\? Nie będziesz mógł/mogła używać klucza odzyskiwania do odczytywania historii zaszyfrowanych wiadomości.</string>
-
     <string name="keys_backup_info_keys_all_backup_up">Wszystkie klucze mają kopię zapasową</string>
     <string name="settings_change_password_submit">Zaktualizuj hasło</string>
     <string name="done">Zrobione</string>
     <string name="keys_backup_setup_step3_button_title">Zrobione</string>
     <string name="edit">Edytuj</string>
     <string name="reply">Odpowiedz</string>
-
     <string name="room_list_rooms_empty_title">Pokoje</string>
     <string name="message_add_reaction">Dodaj reakcję</string>
     <string name="create_new_room">Utwórz nowy pokój</string>
     <string name="group_all_communities">Wszystkie społeczności</string>
-
     <string name="fab_menu_create_chat">Wiadomości Bezpośrednie</string>
-
     <string name="create_room_title">Nowy pokój</string>
     <string name="create_room_action_create">STWÓRZ</string>
     <string name="create_room_name_hint">Nazwa pokoju</string>
@@ -1179,7 +980,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="change_room_directory_network">Zmień sieć</string>
     <string name="fab_menu_create_room">Pokoje</string>
     <string name="create_room_directory_description">Opublikuj pokój do spisu pokojów</string>
-
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Aby nie utracić dostępu do Twoich zaszyfrowanych wiadomości, powinienieś aktywować kopię zapasową klucza na wszystkich aktywnych sesjach.</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Tworzenie kopii zapasowej kluczy…</string>
     <string name="backup">Utwórz kopię zapasową</string>
@@ -1188,13 +988,11 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="notification_sync_init">Inicjalizacja usługi</string>
     <string name="auth_login_sso">Zaloguj się za pomocą logowania jednorazowego</string>
     <string name="settings_notification_by_event">Ważność powiadomień ze względu na wydarzenie</string>
-
     <string name="settings_notification_troubleshoot">Diagnostyka powiadomień</string>
     <string name="settings_troubleshoot_diagnostic">Rozwiązywanie problemów</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Diagnostyka podstawowa nie wykazała problemów. Jeżeli wciąż nie otrzymujesz powiadomień, prosimy o przesłanie raportu o błędach, w celu ich rozwiązania.</string>
     <string name="settings_notification_privacy_no_background_sync">Aplikacja <b>nie</b> potrzebuje łączyć się z serwerem domowym w tle, powinno to zredukować użycie baterii</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Jeżeli nie pamiętasz swoich danych odzystkiwania, możesz %s.</string>
-
     <string name="keys_backup_restore_with_key_helper">Zgubiłeś (-łaś) swój klucz odzyskiwania\? Możesz ustawić nowy w ustawieniach.</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">Kopia zapasowa posiada poprawną sygnaturę z niezweryfikowanej sesji %s</string>
     <string name="new_recovery_method_popup_description">Wykryto nową, bezpieczną kopię kluczy wiadomości.
@@ -1205,24 +1003,18 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="revoke">Unieważnij</string>
     <string name="disconnect">Rozłącz</string>
     <string name="call_failed_dont_ask_again">Nie pytaj ponownie</string>
-
     <string name="login_error_no_homeserver_found">To nie jest prawidłowy adres serwera Matrix</string>
     <string name="settings_add_3pid_confirm_password_title">Potwierdź swoje hasło</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Napraw Usługi Play</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Dodaj Konto</string>
-
     <string name="settings_cryptography_manage_keys">Zarządzanie Kluczami Kryptograficznymi</string>
     <string name="settings_integration_allow">Zezwól na integracje</string>
     <string name="settings_integration_manager">Menadżer Integracji</string>
-
     <string name="settings_fail_to_update_password_invalid_current_password">Hasło jest nieprawidłowe</string>
     <string name="passwords_do_not_match">Hasła nie pasują do siebie</string>
-
     <string name="compression_opt_list_choose">Wybierz</string>
     <string name="media_source_choose">Wybierz</string>
     <string name="settings_play_shutter_sound">Odtwarzaj dźwięk migawki</string>
-
     <string name="encryption_information_device_name_with_warning">Nazwa urządzenia (widoczna dla osób, z którymi się komunikujesz)</string>
     <string name="device_name_warning">Publiczna nazwa urządzenia jest widoczna dla ludzi, z którymi się komunikujesz</string>
     <string name="encryption_information_unknown_ip">nieznany adres ip</string>
@@ -1232,8 +1024,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_widget_open_in_browser">Otwórz w przeglądarce</string>
     <string name="room_widget_permission_theme">Twój motyw</string>
     <string name="room_widget_permission_room_id">Identyfikator Pokoju</string>
-
-
     <string name="room_widget_resource_grant_permission">Zezwól</string>
     <string name="error_empty_field_enter_user_name">Wprowadź nazwę użytkownika.</string>
     <string name="passphrase_empty_error_message">Wprowadź hasło</string>
@@ -1243,17 +1033,13 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="keys_backup_setup_step3_text_line1">Twoje klucze są archiwizowane.</string>
     <string name="keys_backup_setup_override_replace">Zastąp</string>
     <string name="keys_backup_setup_override_stop">Zatrzymaj</string>
-
     <string name="recovery_key">Klucz Odzyskiwania</string>
     <string name="unexpected_error">Nieoczekiwany błąd</string>
     <string name="keys_backup_setup_skip_title">Czy na pewno\?</string>
     <string name="keys_backup_restore_is_getting_backup_version">Pobieranie wersji kopii zapasowej…</string>
     <string name="keys_backup_restore_key_enter_hint">Wprowadź Klucz Odzyskiwania</string>
-
     <string name="keys_backup_restore_setup_recovery_key">Odzyskiwanie Wiadomości</string>
-
     <string name="network_error_please_check_and_retry">Błąd sieci: sprawdź połączenie i spróbuj ponownie.</string>
-
     <string name="keys_backup_restoring_computing_key_waiting_message">Obliczanie klucza odzyskiwania…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Pobieranie kluczy…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Importowanie kluczy…</string>
@@ -1265,20 +1051,15 @@ Spróbuj uruchomić ponownie aplikację.</string>
         <item quantity="few">dodano %d nowe klucze do tej sesji.</item>
         <item quantity="many">dodano %d nowych kluczy do tej sesji.</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">Niepowodzenie przy pobieraniu wersji kluczy (%s).</string>
     <string name="keys_backup_settings_deleting_backup">Usuwanie kopii zapasowej…</string>
     <string name="keys_backup_settings_checking_backup_state">Sprawdzanie stanu kopii zapasowej</string>
     <string name="sas_waiting_for_partner">Oczekiwanie na potwierdzenie partnera…</string>
-
     <string name="sas_verified_successful">Sesja została z powodzeniem zweryfikowana.</string>
     <string name="sas_cancelled_by_other">Druga strona odrzuciła weryfikację.
 \n%s</string>
     <string name="reactions">Reakcje</string>
-
     <string name="last_edited_info_message">Ostatnio zmieniony %2$s przez %1$s</string>
-
-
     <string name="error_no_network">Brak sieci. Sprawdź swoje połączenie z Internetem.</string>
     <string name="please_wait">Proszę czekać…</string>
     <string name="room_preview_no_preview">Tego pokoju nie można podejrzeć</string>
@@ -1289,21 +1070,16 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="send_file_step_sending_thumbnail">Wysyłanie miniatury (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Szyfrowanie pliku…</string>
     <string name="send_file_step_sending_file">Wysyłanie pliku (%1$s / %2$s)</string>
-
     <string name="downloading_file">Pobieranie pliku %1$s…</string>
     <string name="downloaded_file">Plik %1$s został pobrany!</string>
-
     <string name="creating_direct_room">Tworzę pokój…</string>
     <string name="terms_of_service">Warunki Usługi</string>
     <string name="send_attachment">Wyśli załącznik</string>
-
     <string name="a11y_create_room">Utwórz nowy pokój</string>
     <string name="a11y_show_password">Pokaż hasło</string>
     <string name="a11y_hide_password">Ukryj hasło</string>
     <string name="a11y_jump_to_bottom">Przewiń do dołu</string>
-
     <string name="error_file_too_big">Plik \'%1$s\' (%2$s) jest zbyt duży do przesłania. Limit wynosi %3$s.</string>
-
     <string name="attachment_type_file">Plik</string>
     <string name="attachment_type_contact">Kontakt</string>
     <string name="attachment_type_gallery">Galeria</string>
@@ -1315,40 +1091,31 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="report_content_custom_hint">Powód zgłoszenia treści</string>
     <string name="report_content_custom_submit">ZGŁOŚ</string>
     <string name="block_user">ZABLOKUJ UŻYTKOWNIKA</string>
-
     <string name="content_reported_title">Treść zgłoszona</string>
     <string name="content_reported_as_spam_title">Zgłoszone jako spam</string>
     <string name="sas_cancelled_by_me">Weyfikacja zostaje anulowana.
 \nPowód: %s</string>
-
     <string name="send_suggestion_content">Proszę napisz swoją sugestię poniżej.</string>
     <string name="send_suggestion_report_placeholder">Opisz swoją sugestię tutaj</string>
     <string name="a11y_create_direct_message">Utwórz nową rozmowę bezpośrednią</string>
     <string name="no_connectivity_to_the_server_indicator">Połączenie z serwerem zostało utracone</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Proszę wykonać kopię</string>
     <string name="settings_preferences">Preferencje</string>
     <string name="preference_voice_and_video">Głos i wideo</string>
     <string name="bottom_action_people_x">Wiadomości Bezpośrednie</string>
-
     <string name="room_filtering_filter_hint">Filtruj rozmowy…</string>
     <string name="room_filtering_footer_create_new_direct_message">Wyślij nową wiadomość bezpośrednią</string>
     <string name="add_by_matrix_id">Dodaj przez matrix ID</string>
     <string name="direct_room_filter_hint">Filtruj wg nazwy użytkownika lub ID…</string>
-
     <string name="settings_sdk_version">Wersja Matrix SDK</string>
     <string name="preference_root_help_about">Pomoc i o aplikacji</string>
-
-
     <string name="room_list_quick_actions_notifications_all_noisy">Wszystkie wiadomości (hałaśliwy)</string>
     <string name="room_list_quick_actions_notifications_all">Wszystkie wiadomości</string>
     <string name="room_list_quick_actions_notifications_mentions">Tylko wspomnienia</string>
     <string name="room_list_quick_actions_notifications_mute">Wycisz</string>
     <string name="room_list_quick_actions_settings">Ustawienia</string>
     <string name="no_ignored_users">Nie ignorujesz żadnych użytkowników</string>
-
     <string name="seen_by">Widziany przez</string>
-
     <string name="settings_advanced_settings">Zaawansowane ustawienia</string>
     <string name="settings_developer_mode">Tryb programisty</string>
     <string name="settings">Ustawienia</string>
@@ -1360,7 +1127,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_settings_enable_encryption">Włącz szyfrowanie end-to-end</string>
     <string name="none">Brak</string>
     <string name="people_no_identity_server">Brak skonfigurowanego serwera tożsamości.</string>
-
     <string name="call_failed_no_ice_description">Poproś administratora serwera (%1$s) o skonfigurowanie usługi TURN, aby połączenia mogły działać prawidłowo.
 \n
 \nMożesz także użyć publicznego serwera %2$s, choć nie będzie on tak niezawodny i pozna twój adres IP. Wybór możesz zmienić w Ustawieniach.</string>
@@ -1370,8 +1136,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="login_error_homeserver_not_found">Nie udało się połączyć z serwerem o podanym adresie URL, upewnij się, że wpisano go poprawnie</string>
     <string name="invite_no_identity_server_error">Dodaj serwer tożsamości w ustawieniach, aby móc wykonać tę akcję.</string>
     <string name="settings_add_3pid_authentication_needed">Wymagane jest uwierzytelnienie</string>
-
-
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Niektóre rodzaje wiadomości będą ciche (wygenerują powiadomienie bez dźwięku).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Nie udało się wczytać niestandardowych reguł, spróbuj ponowić.</string>
     <string name="settings_troubleshoot_test_play_services_title">Weryfikacja Usług Google</string>
@@ -1386,10 +1150,8 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM z powodzeniem zarejestrowany na serwerze domowym.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Niepowodzenie przy rejestracji tokena FCM na serwerze domowym:
 \n%1$s</string>
-
     <string name="settings_troubleshoot_test_service_restart_success">Usługa została zatrzymana i automatycznie uruchomiona ponownie.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Usługa nie uruchomiła się ponownie</string>
-
     <string name="settings_troubleshoot_test_service_boot_success">Usługa zostanie uruchomiona przy starcie urządzenia.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">Usługa nie zostanie uruchomiona przy starcie urządzenia, nie otrzymasz żadnych powiadomień, dopóki Element nie zostanie uruchomiony.</string>
     <string name="sas_security_advise">Dla zwiększenia bezpieczeństwa, zalecamy aby wykonać ten krok osobiście lub przez inne zaufane środki komunikacji.</string>
@@ -1401,14 +1163,10 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \nJeśli nie chcesz więcej widzieć treści tego użytkownika,możesz go zablokować by ukryć jego wiadomości</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Sprawdź ograniczenia pracy w tle</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Wyłącz ograniczenia</string>
-
     <string name="settings_call_notifications_preferences">Konfiguruj powiadomienia połączeń</string>
     <string name="settings_system_preferences_summary">Wybierz kolor diody LED, wibrację, dźwięk…</string>
-
-
     <string name="settings_integrations">Integracje</string>
     <string name="resources_script">Latn</string>
-
     <string name="auth_add_email_phone_message_2">Wprowadź adres e-mail, aby możliwe było odzyskiwanie konta. Opcjonalnie użyj adresu e-mail lub numeru telefonu aby móc zostać odkrytym przez znajomych.</string>
     <string name="auth_add_email_and_phone_message_2">Wprowadź adres e-mail, aby możliwe było odzyskiwanie konta. Opcjonalnie użyj adresu e-mail lub numeru telefonu aby móc zostać odkrytym przez znajomych.</string>
     <string name="settings_call_ringtone_use_default_stun">Pozwól na awaryjny serwer wspomagania połączeń</string>
@@ -1418,7 +1176,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nBłąd jest poza kontrolą Element. Może on występować z wielu powodów. Przypuszczalnie aplikacja powróci do normalnego stanu po spróbowaniu ponownie, chociaż można sprawdzić także w ustawieniach systemu uprawnienia Usług Google Play dotyczące dostępu do sieci, sprawdzić prawidłowość zegaru urządzenia lub też, może być to błąd niestandardowego oprogramowania systemowego.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Aktywuj uruchamianie przy starcie systemu</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_success">Restrykcje dotyczące działania aplikacji w tle są wyłączone dla Element. Test powinen zostać uruchomiony używając danych komórkowych (bez WIFI).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">"Restrykcje dotyczące działania aplikacji w tle są włączone dla Element.
@@ -1436,8 +1193,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Brak synchronizacji w tle</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Nie będziesz otrzymywać powiadomień o przychodzących wiadomościach gdy aplikacja będzie działać w tle.</string>
     <string name="settings_background_sync_update_error">Niepowodzenie przy aktualizacji ustawień.</string>
-
-
     <string name="settings_set_workmanager_delay">Preferowany interwał synchronizacji</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nSynchronizacja może zostać opóźniona w zależności od zasobów (bateria) lub stanu urządzenia (hibernacja).</string>
@@ -1448,32 +1203,28 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_show_join_leave_messages_summary">Nie wpływa to na zaproszenia, wyrzucenia oraz bany.</string>
     <string name="settings_send_message_with_enter">Wysyłaj wiadomości za pomocą klawisza enter</string>
     <string name="settings_send_message_with_enter_summary">Przycisk enter na klawiaturze programowej wyśle wiadomość zamiast wprowadzania łamanania linii</string>
-
     <string name="settings_discovery_category">Znajdź</string>
     <string name="settings_discovery_manage">Zarządzaj ustawieniami wyszukiwania.</string>
     <string name="startup_notification_fdroid_battery_optim_message">Element potrzebuje utrzymać mało wpływowe połączenie w tle, w celu otrzymywania wiarygodnych powiadomień.
 \nNa następnym ekranie zostanie się poproszonym o pozwolenie działania w tle dla Element, proszę zaakceptować.</string>
     <string name="settings_data_save_mode_summary">Tryb oszczędzania danych użyje filtra szczegółowego, w związku z czym aktualizacje o obecności i powiadomienia o pisaniu zostaną przefiltrowane.</string>
-
     <string name="settings_media">Media</string>
     <string name="settings_default_media_source">Domyślne źródło mediów</string>
     <string name="encryption_message_recovery">Odzyskiwanie zaszyforwanych wiadomości</string>
     <plurals name="notification_compat_summary_line_for_room">
         <item quantity="one">%1$s: 1 wiadomość</item>
         <item quantity="few">%1$s: %2$d wiadomości</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d powiadomienie</item>
         <item quantity="few">%d powiadomień</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <string name="notification_unknown_new_event">Nowe wydarzenie</string>
     <string name="notification_new_messages">Nowe wiadomości</string>
     <string name="notification_sender_me">Ja</string>
     <string name="notification_inline_reply_failed">** Nie udało się wysłać - proszę otworzyć pokój</string>
-
     <string name="room_widget_activity_title">Widżet</string>
     <string name="room_widget_permission_title">Załaduj widżet</string>
     <string name="room_widget_permission_webview_shared_info_title">Używając tego pliki cookies mogą zostać ustawione i dane wspóldzielone z %s:</string>
@@ -1482,7 +1233,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \n%s</string>
     <string name="room_widget_reload">Przeładuj widżet</string>
     <string name="room_widget_revoke_access">Cofnij dostęp dla mnie</string>
-
     <string name="room_widget_permission_display_name">Wyświetlana nazwa</string>
     <string name="room_widget_permission_avatar_url">Adres URL awatara</string>
     <string name="room_widget_permission_user_id">Twój ID użytkownika</string>
@@ -1493,25 +1243,19 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="room_widget_webview_access_camera">Użyj aparatu</string>
     <string name="room_widget_webview_access_microphone">Użyj mikrofonu</string>
     <string name="room_widget_webview_read_protected_media">Odczytaj media zabezpieczone DRM</string>
-
     <string name="integration_manager_not_configured">Nie skonfigurowano menedżera integracji.</string>
     <string name="settings_labs_native_camera_summary">Uruchom systemową kamerę zamiast niestandardowego ekranu kamery w aplikacji.</string>
     <string name="widget_integration_review_terms">Aby kontynuować, musisz zaakceptować Warunki użytkowania dla tej usługi.</string>
-
     <string name="no_valid_google_play_services_apk">Nie znaleziono prawidłowej aplikacji Usługi Google Play. Powiadomienia mogą nie działać prawidłowo.</string>
-
     <string name="passphrase_passphrase_too_weak">Hasło jest zbyt słabe</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Proszę usunąć hasło, jeżeli chcesz aby Element wygenerował klucz odzyskiwania.</string>
     <string name="keys_backup_no_session_error">Brak dostępnych sesji Matrix</string>
-
     <string name="keys_backup_setup_step1_title">Nie utrać zaszyfrowanych wiadomości</string>
     <string name="keys_backup_setup_step1_description">Wiadomości w pokojach zaszyfrowanych są bezpieczne dzięki szyfrowaniu end-to-end. Jedynie Ty i Twój odbiorca posiadają klucze dla tych wiadomości.
 \n
 \nBezpiecznie utwórz kopię zapasową, aby ich nie utracić.</string>
     <string name="keys_backup_setup">Zacznij używać Kopii Zapasowej Kluczy</string>
     <string name="keys_backup_setup_step1_manual_export">Wyeksportuj klucze ręcznie</string>
-
     <string name="keys_backup_setup_step2_text_title">Zabezpiecz swoją kopię zapasową używając hasła.</string>
     <string name="keys_backup_setup_step2_text_description">Będziemy przechowywać zaszyfrowaną kopię Twoich kluczy na serwerze domowym. Chroń swoją kopię zapasową hasłem, aby pozostała bezpieczna.
 \n
@@ -1528,72 +1272,54 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="recovery_key_export_saved_as_warning">"Klucz odzyskiwania został zapisany do  \'%s\'.
 \n
 \nUwaga: plik może zostać usunięty, jeżeli aplikacja jest odinstalowana."</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Kopia zapasowa już istnieje na Twoim serwerze domowym</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Wygląda na to, iż kopia zapasowa kluczy została skonfigurowana za pomocą innej sesji. Czy chcesz zastąpić ją tą, którą tworzysz\?</string>
     <string name="keys_backup_setup_step3_generating_key_status">Generowanie Klucza Odzyskiwania używając hasła, proces może zająć kilka sekund.</string>
     <string name="keys_backup_setup_backup_started_title">Kopia zapasowa uruchomiona</string>
     <string name="keys_backup_setup_backup_started_message">Twoje klucze szyfrujące będą kopiowane do kopii zapasowej w tle przez Twój serwer domowy. Wstępna kopia zapasowa może zająć kilka minut.</string>
-
-
     <string name="keys_backup_setup_skip_msg">Utracisz dostęp do swoich wiadomości jeżeli wylogujesz się lub utracisz to urządzenie.</string>
-
     <string name="keys_backup_restore_with_passphrase">Użyj kopii zapasowej klucza aby odblokować historię zaszyfrowanych wiadomości</string>
     <string name="keys_backup_restore_use_recovery_key">użyj klucza odzyskiwania</string>
     <string name="keys_backup_restore_with_recovery_key">Użyj Klucza Odzyskiwania aby odblokować historię zaszyfrowanych wiadomości</string>
     <string name="keys_backup_passphrase_error_decrypt">Kopia zapasowa nie może zostać zdeszyfrowana za pomocą tego hasła: proszę upewnij się, czy wprowadzone hasło jest poprawne.</string>
     <string name="keys_backup_restoring_waiting_message">Przywracanie kopii zapasowej:</string>
     <string name="keys_backup_recovery_code_error_decrypt">Kopia zapasowa nie może zostać zdeszyfrowana za pomocą tego klucza odzyskiwania: proszę upewnij się, czy wprowadzony klucz odzyskiwania jest poprawny.</string>
-
     <string name="keys_backup_no_keysbackup_sdk_error">Szyfrowanie sesji nie jest aktywowane</string>
-
-
     <string name="keys_backup_settings_status_ko">Kopia zapasowa klucza nie jest aktywna dla tej sesji.</string>
     <string name="keys_backup_settings_status_not_setup">Twoje klucze nie są będą zapisywane w kopii zapasowej od tej sesji.</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">Kopia zapasowa posiada sygnaturę od nieznanej sesji z ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Kopia zapasowa posiada prawidłową sygnaturę dla tej sesji.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Kopia zapasowa posiada prawidłową sygnaturę z zweryfikowanej sesji %s.</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Kopia zapasowa posiada nieprawidłową sygnaturę ze zweryfikowej sesji %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Kopia zapasowa posiada niezweryfikową sygnaturę z nieznanej sesji %s</string>
     <string name="keys_backup_get_trust_error">Nie udało się uzyskać zaufanych informacji dla kopii zapasowej (%s).</string>
-
     <string name="keys_backup_settings_untrusted_backup">Aby użyć Kopii Zapasowej Kluczy dla tej sesji, przywróć ją za pomocą hasła lub klucza odzyskiwania.</string>
     <string name="keys_backup_settings_delete_backup_error">Usuwanie kopii zapasowej nie powiodło się (%s)</string>
-
     <string name="new_recovery_method_popup_title">Nowa kopia zapasowa kluczy</string>
     <string name="new_recovery_method_popup_was_me">To byłem(-łam) ja</string>
     <string name="keys_backup_banner_setup_line1">Nigdy nie utrać zaszyfrowanych wiadomości</string>
     <string name="keys_backup_banner_setup_line2">Zacznij korzystać z Kopii Zapasowej Kluczy</string>
-
     <string name="keys_backup_banner_recover_line1">Nigdy nie utrać zaszyfrowanych wiadomości</string>
     <string name="keys_backup_banner_recover_line2">Użyj Kopii Zapasowej Kluczy</string>
-
     <string name="keys_backup_banner_update_line1">Nowe klucze szyfrowanych wiadomości</string>
     <string name="keys_backup_banner_update_line2">Zarządzaj w Kopii Zapasowej Kluczy</string>
-
     <string name="keys_backup_banner_in_progress">Tworzenei kopii zapasowej kluczy…</string>
-
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Kopiowanie %d klucza…</item>
         <item quantity="few">Kopiowanie %d kluczy…</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <string name="autodiscover_invalid_response">Nieprawidłowa odpowiedź funkcji autoodkrywania serwera domowego</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opcje automatycznego uzupełniania serwerów</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element wykryło niestandardową konfigurację serwera dla Twojej domeny userID \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Użyj Konfiguracji</string>
-
     <string name="invalid_or_expired_credentials">Zostałeś(-łaś) wylogowana ze względu na nieprawidłowe lub wygasłe dane logowania.</string>
-
     <string name="sas_verify_title">Zweryfikuj porównując krótki ciąg tekstowy.</string>
     <string name="sas_verify_start_button_title">Rozpocznij weryfikację</string>
     <string name="sas_incoming_request_title">Przychodzące żądanie weryfikacji</string>
     <string name="sas_incoming_request_description">Zweryfikuj tą sesję poprzez oznaczenie jej jako zaufanej. Zaufanie sesji innych osób przynosi spokój na umyśle gdy są to szyfrowane wiadomości end-to-end.</string>
     <string name="sas_incoming_request_description_2">Werfikacja tej sesji oznaczy ją jako zaufaną, a także oznaczy Twoją sesję jako zaufaną dla rozmówcy.</string>
-
     <string name="sas_view_request_action">Wyświetl żądanie</string>
     <string name="sas_verified_successful_description">Bezpieczne wiadomości od tego użytkownika są zabezpeiczone za pomocą szyfrowania end-to-end i są nie do odczytania przez osoby trzecie.</string>
     <string name="call_failed_no_ice_title">Połączenie nie powiodło się z powodu niewłaściwie skonfigurowanego serwera</string>
@@ -1603,13 +1329,10 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Automatycznie uruchom ponownie usługę powiadomień</string>
     <string name="sas_emoji_description">Potwierdź, że następujące emoji pojawiły się na ekranie partnera</string>
     <string name="sas_decimal_description">Potwierdź, że następujące liczby pojawiły się na ekranie partnera</string>
-
     <string name="sas_incoming_verification_request_dialog">Otrzymano przychodzące żądanie weryfikacji.</string>
     <string name="sas_got_it">Rozumiem</string>
-
     <string name="sas_verifying_keys">Nic się nie pojawiło\? Nie wszystkie aplikacje obsługują już interaktywną weryfikację. Spróbuj weryfikacji starszego typu.</string>
     <string name="sas_legacy_verification_button_title">Użyj weryfikacji starszego typu.</string>
-
     <string name="sas_cancelled_dialog_title">Weryfikacja Anulowana</string>
     <string name="sas_verification_request_notification_channel">Interaktywna Weryfikacja Sesji</string>
     <string name="sas_error_m_user">Użytkownik anulował weryfikację</string>
@@ -1620,60 +1343,40 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="sas_error_m_mismatched_sas">SAS nie zgadza się</string>
     <string name="sas_error_m_unexpected_message">Sesja otrzymała niespodziewaną wiadomość</string>
     <string name="sas_error_m_invalid_message">Otrzymano nieprawidłową wiadomość</string>
-
     <string name="room_list_empty">Dołącz do pokoju, aby rozpocząć korzystanie z aplikacji.</string>
     <string name="room_list_catchup_welcome_body">Zapoznaj się z nieprzeczytanymi wiadomościami tutaj</string>
     <string name="room_list_people_empty_body">Twoje rozmowy bezpośrednie będą wyświetlane tutaj</string>
     <string name="room_list_rooms_empty_body">Twoje pokoje będą wyświetlane tutaj</string>
-
     <string name="malformed_message">Nieprawidłowe zdarzenie, nie można wyświetlić</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Podgląd globalnego, publicznego pokoju nie jest wciąż wspierany w Element</string>
-
     <string name="keys_backup_unable_to_get_trust_info">Wystąpił błąd podczas otrzymywania zaufanych informacji</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Wystąpił błąd podczas uzyskiwania danych kluczy kopii zapasowej</string>
-
     <string name="import_e2e_keys_from_file">Importowanie kluczy E2E z pliku \"%1$s\".</string>
-
     <string name="settings_other_third_party_notices">Informacje o stronach trzecich</string>
     <string name="navigate_to_room_when_already_in_the_room">Już wyświetlasz ten pokój!</string>
-
     <string name="push_gateway_item_app_id">id_aplikacji:</string>
     <string name="push_gateway_item_push_key">klucz_push:</string>
     <string name="push_gateway_item_app_display_name">wyświetlana_nazwa_aplikacji:</string>
     <string name="push_gateway_item_device_name">nazwa_sesji:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Zarejestruj token</string>
-
     <string name="send_suggestion_sent">Dziękujemy, sugestia została szczęśliwie wysłana</string>
     <string name="send_suggestion_failed">Wysłanie sugestii nie powiodło się (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">Wyświetl ukryte wydarzenia na linii czasowej</string>
-
     <string name="edited_suffix">(edytowano)</string>
-
-
     <string name="message_edits">Edycje wiadomości</string>
     <string name="no_message_edits_found">Nie znaleziono edycji</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Aktywuj gest przesunięcia, aby odpowiedzieć na osi czasu</string>
-
     <string name="link_copied_to_clipboard">Link skopiowany do schowka</string>
-
     <string name="direct_room_no_known_users">Nie znaleziono, użyj Dodaj poprzez ID Matrix aby wyszukać na serwerze.</string>
     <string name="direct_room_start_search">Zacznij pisać, aby uzyskać rezultaty</string>
     <string name="joining_room">Dołączanie do pokoju…</string>
-
     <string name="message_view_edit_history">Wyświetl historię edycji</string>
-
     <string name="review_terms">Sprawdź Warunki</string>
     <string name="terms_description_for_identity_server">Bądź odkryty przez innych</string>
     <string name="terms_description_for_integration_manager">Używaj Botów, mostów, widżetów i paczek naklejek</string>
-
     <string name="read_at">Czytaj na</string>
-
-
     <string name="settings_discovery_identity_server_info">Obecnie używasz %1$s aby odkrywać i być odkrytym przez kontakty, które znasz.</string>
     <string name="settings_discovery_identity_server_info_none">Nie używasz serwera tożsamości. Aby odkrywać i być odkrywanym przez kontakty, które znasz, skonfiguruj jeden poniżej.</string>
     <string name="settings_discovery_emails_title">Rozpoznawalny adres e-mail</string>
@@ -1683,25 +1386,18 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="settings_discovery_msisdn_title">Rozpoznawalne numery telefonu</string>
     <string name="settings_discovery_confirm_mail">Wysłaliśmy e-mail potwierdzający do %s, sprawdź swoją skrzynkę i naciśnij link potwierdzający</string>
     <string name="settings_discovery_mail_pending">Oczekiwanie</string>
-
     <string name="settings_discovery_enter_identity_server">Wprowadź nowy serwer tożsamości</string>
     <string name="settings_discovery_bad_identity_server">Nie można połączyć z serwerem tożsamości</string>
     <string name="settings_discovery_please_enter_server">Wprowadź adres serwera tożsamości</string>
     <string name="settings_discovery_no_terms_title">Serwer tożsamości nie posiada warunków usługi</string>
     <string name="settings_discovery_no_terms">Wybrany system tożsamości nie posiada jakichkolwiek warunków usługi. Kontynuuj jedynie, gdy ufasz właścicielowi usługi</string>
     <string name="settings_text_message_sent">Wiadomość tekstowa wysłana do %s. Proszę wprowadzić kod weryfikacyjny w niej zawarty.</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">Udostępniasz adres e-mail lub numer telefonu serwerowi tożsamości %1$s. Musisz ponownie połączyć się z %2$s aby ich nie udostępniać.</string>
     <string name="settings_agree_to_terms">Akceptuj Warunki Usługi serwera tożsamości (%s) aby pozwolić na bycie odkrytym za pomocą adresu e-mail lub numeru telefonu.</string>
-
     <string name="labs_allow_extended_logging">Aktywuj szczegółowe dzienniki.</string>
     <string name="labs_allow_extended_logging_summary">Dzienniki szczegółowe pomogą twórcom poprzez udostępnianie większej ilości danych, które zostaną wysłane, gdy potrząśniesz wściekle. Nawet jeżeli zostaną aktywowane, aplikacja nie zapisuje szczegółów wiadomości oraz innych danych prywatnych.</string>
-
-
     <string name="error_terms_not_accepted">Spróbuj ponownie, gdy zaakceptujesz warunki usługi oraz warunki ogólne serwera domowego.</string>
-
     <string name="error_network_timeout">Wygląda na to, iż serwer potrzebuje wiele czasu aby odpowiedzieć i może być to spowodowane zarówno słabą łącznością jak i problemem z serwerem. Spróbuj ponownie za chwilę.</string>
-
     <string name="a11y_open_drawer">Otwórz panel nawigacji</string>
     <string name="a11y_create_menu_open">Otwórz menu tworzenia pokoju</string>
     <string name="a11y_create_menu_close">Zamknij menu tworzenia pokoju…</string>
@@ -1712,41 +1408,32 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <plurals name="fallback_users_read">
         <item quantity="one">1 użytkownik odczytał</item>
         <item quantity="few">%d użytkowników odczytało</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <string name="error_attachment">Wystąpił błąd poczas otrzymywania załącznika.</string>
     <string name="attachment_type_audio">Audio</string>
     <string name="error_handling_incoming_share">Nie można obsłużyć otrzymanych danych</string>
-
     <string name="content_reported_as_inappropriate_title">Zgłoszono jako nieodpowiedni</string>
     <string name="content_reported_as_inappropriate_content">Zawartość została zgłoszona jako niewłaścwa.
 \n
 \nJeżeli nie chcesz widzieć treści od tego użytkownika, możesz go zablokować aby ukryć jego wiadomości</string>
-
     <string name="permissions_rationale_msg_keys_backup_export">Element potrzebuje uprawnień aby zapisywać klucze E2E na dysku.
 \n
 \nPozwól na dostęp w następnym oknie aby móc eksportować klucze ręcznie.</string>
-
     <string name="room_list_quick_actions_leave">Opuść pokój</string>
     <string name="notice_member_no_changes">%1$s nie dokona(-ła) zmian</string>
     <string name="command_description_spoiler">Wysyła wiadomość jako spoiler</string>
     <string name="spoiler">Spoiler</string>
     <string name="reaction_search_type_hint">Wprowadź słowa kluczowe aby znaleźć reakcję.</string>
-
     <string name="help_long_click_on_room_for_more_options">Naciśnij długo na pokój aby wyświetlić więcej opcji</string>
-
-
     <string name="room_join_rules_public">%1$s ustawił(-a) pokój dostępnym publicznie dla każdego, kto zna link.</string>
     <string name="room_join_rules_invite">%1$s ustawił(-a) pokój tylko dla zaproszonych.</string>
     <string name="timeline_unread_messages">Nieprzeczytane wiadomości</string>
-
     <string name="login_splash_title">Wyzwól swoją komunikację</string>
     <string name="login_splash_text1">Czatuj z osobami bezpośrednio lub w grupach</string>
     <string name="login_splash_text2">Pozostaw konwersacje prywatnymi za pomocą szyfrowania</string>
     <string name="login_splash_text3">Rozszerz i dopasuj swoje doświadczenie</string>
     <string name="login_splash_submit">Rozpocznij</string>
-
     <string name="login_server_title">Wybierz serwer</string>
     <string name="login_server_text">Tak jak adres e-mail, konta mają jeden dom, aczkolwiek możesz rozmawiać ze wszystkimi</string>
     <string name="login_server_matrix_org_text">Dołącz do milionów, za darmo, na największym publicznym serwerze</string>
@@ -1754,7 +1441,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="login_server_modular_learn_more">Dowiedz się więcej</string>
     <string name="login_server_other_title">Inne</string>
     <string name="login_server_other_text">Ustawienia niestandardowe i zaawansowane</string>
-
     <string name="login_continue">Kontynuuj</string>
     <string name="login_connect_to">Połącz z %1$s</string>
     <string name="login_connect_to_modular">Połącz z Element Matrix Services</string>
@@ -1763,13 +1449,11 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="login_signup">Zarejestruj</string>
     <string name="login_signin">Zaloguj się</string>
     <string name="login_signin_sso">Kontynuuj za pomocą logowania jednostopniowego</string>
-
     <string name="login_server_url_form_modular_hint">Adres Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adres</string>
     <string name="login_server_url_form_modular_text">Hosting premium dla organizacji</string>
     <string name="login_server_url_form_modular_notice">Wprowadź adres Element Modular lub serwera którego chcesz użyć</string>
     <string name="login_server_url_form_other_notice">Wprowadź adres serwera lub Element z którym chcesz się połączyć</string>
-
     <string name="login_sso_error_message">Wystąpił błąd podczas ładowania strony: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">Aplikacja nie jest w stanie zalogować się do tego serwera domowego. Serwer domowy obsluguje następujące metody logowania: %1$s.
 \n
@@ -1778,58 +1462,46 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="login_registration_not_supported">Aplikacja nie jest w stanie utworzyć konta na tym serwerze domowym.
 \n
 \nCzy chcesz zarejestrować się używając klienta sieciowego\?</string>
-
     <string name="login_login_with_email_error">E-mail nie jest powiązany z kontem.</string>
-
     <string name="login_reset_password_on">Zresetuj hasło na %1$s</string>
     <string name="login_reset_password_notice">Wiadomość weryfikacyjna zostanie wysłana na adres e-mail aby potwierdzić ustawienie nowego hasła.</string>
     <string name="login_reset_password_submit">Dalej</string>
     <string name="login_reset_password_email_hint">E-mail</string>
     <string name="login_reset_password_password_hint">Nowe hasło</string>
-
     <string name="login_reset_password_warning_title">Uwaga!</string>
     <string name="login_reset_password_warning_content">Zmiana hasła zresetuje wszystkie klucze szyfrowania end-to-end dla wszystkich twoich sesji, czyniąc zaszyfrowaną historię czasu nie do odczytania. Ustaw Kopię Zapasową Kluczy lub wyeksportuj klucze pokoju do innej sesji przed resetowaniem hasła.</string>
     <string name="login_reset_password_warning_submit">Kontynuuj</string>
-
     <string name="login_reset_password_error_not_found">Adres e-mail nie został połączony z kontem</string>
-
     <string name="login_reset_password_mail_confirmation_title">Sprawdź swoją skrzynkę</string>
     <string name="login_reset_password_mail_confirmation_notice">E-mail weryfikacyjny został wysłany do %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Naciśnij na link aby potwierdzić nowe hasło. Po naciśnięciu na link, który je zawiera, naciśnij poniżej.</string>
     <string name="login_reset_password_mail_confirmation_submit">Zweryfikowałem(-łam) swój adres e-mail</string>
-
     <string name="login_reset_password_success_title">Sukces!</string>
     <string name="login_reset_password_success_notice">Hasło zostało zresetowane.</string>
     <string name="login_reset_password_success_notice_2">Zostałeś(-łaś) wylogowany(-na) ze wszystkich sesji i nie będziesz otrzymywać powiadomień push. Aby re-aktywować powiadomienia, zaloguj się ponownie na każdym z urządzeń.</string>
     <string name="login_reset_password_success_submit">Powróć do logowania</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Ostrzeżenie</string>
     <string name="login_reset_password_cancel_confirmation_content">Hasło wciąż nie zostało zmienione.
 \n
 \nZatrzymać proces zmiany hasła\?</string>
-
     <string name="login_set_email_title">Ustaw adres e-mail</string>
     <string name="login_set_email_notice">Ustaw e-mail aby odzyskać konto. Później, opcjonalnie, będziesz w stanie pozwolić na odkrycie Ciebie za pomocą Twojego adresu e-mail.</string>
     <string name="login_set_email_mandatory_hint">E-mail</string>
     <string name="login_set_email_optional_hint">E-mail (nieobowiązkowy)</string>
     <string name="login_set_email_submit">Dalej</string>
-
     <string name="login_set_msisdn_title">Ustaw numer telefonu</string>
     <string name="login_set_msisdn_notice">Ustaw numer telefonu, aby pozwolić innym na odkrycie Ciebie za pomocą numeru telefonu.</string>
     <string name="login_set_msisdn_notice2">Użyj formatu międzynarodowego.</string>
     <string name="login_set_msisdn_mandatory_hint">Numer telefonu</string>
     <string name="login_set_msisdn_optional_hint">Numer telefonu (nieobowiązkowy)</string>
     <string name="login_set_msisdn_submit">Dalej</string>
-
     <string name="login_msisdn_confirm_title">Potwierdź numer telefonu</string>
     <string name="login_msisdn_confirm_notice">Wysłaliśmy kod do %1$s. Wprowadź go poniżej, aby potwierdzić, że to Ty.</string>
     <string name="login_msisdn_confirm_hint">Wprowadź kod</string>
     <string name="login_msisdn_confirm_send_again">Wyślij ponownie</string>
     <string name="login_msisdn_confirm_submit">Dalej</string>
-
     <string name="login_msisdn_error_not_international">Międzynarodowe numery telefonów muszą zaczynać się od \'+\'</string>
     <string name="login_msisdn_error_other">Numer telefonu wydaje się być nieprawidłowy. Sprawdź</string>
-
     <string name="login_signup_to">Zaloguj się do %1$s</string>
     <string name="login_signin_username_hint">Nazwa użytkownika lub e-mail</string>
     <string name="login_signup_username_hint">Nazwa użytkownika</string>
@@ -1840,26 +1512,22 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="login_signup_cancel_confirmation_content">Twoje konto wciąż nie zostalo utworzone.
 \n
 \nZatrzymać proces rejestracji\?</string>
-
     <string name="login_a11y_choose_matrix_org">Wybierz matrix.org</string>
     <string name="login_a11y_choose_modular">Wybierz Element Matrix Services</string>
     <string name="login_a11y_choose_other">Wybierz niestandardowy serwer domowy</string>
     <string name="login_a11y_captcha_container">Wypełnij zadanie Captcha</string>
     <string name="login_terms_title">Zaakceptuj warunki aby kontynuować</string>
-
     <string name="login_wait_for_email_title">Sprawdź swój e-mail</string>
     <string name="login_wait_for_email_notice">Wysłaliśmy e-mail do %1$s.
 \nProszę nacisnąć na link który zawiera aby kontynuować tworzenie konta.</string>
     <string name="login_validation_code_is_not_correct">Wprowadzony kod jest nieprawidłowy. Sprawdź.</string>
     <string name="login_error_outdated_homeserver_title">Nieaktualny serwer domowy</string>
     <string name="login_error_outdated_homeserver_content">Ten serwer domowy pracuje pod kontrolą zbyt starej wersji, aby się z nim połączyć. Zapytaj administratora serwera domowego o aktualizację.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Zostało wysłane zbyt wiele żądań. Możesz spróbować ponownie za %1$d sekundę…</item>
         <item quantity="few">Zostało wysłane zbyt wiele żądań. Możesz spróbować ponownie za %1$d sekundy…</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <string name="signed_out_title">Wylogowałeś(-łaś) się</string>
     <string name="signed_out_notice">Mogło to się stać z wielu powodów:
 \n
@@ -1869,7 +1537,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \n
 \n• Administrator Twojego serwera unieważnił dostęp ze względów bezpieczeństwa.</string>
     <string name="signed_out_submit">Zaloguj ponownie</string>
-
     <string name="soft_logout_title">Wylogowałeś(-łaś) się</string>
     <string name="soft_logout_signin_title">Zaloguj się</string>
     <string name="soft_logout_signin_notice">Administaror twojego serwera domowego (%1$s) wylogował cię z konta %2$s (%3$s).</string>
@@ -1881,7 +1548,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \n
 \nWyczyść je, jeżeli skończyłeś(-łaś) używać tego urządzenia, lub chcesz zalogować się na inne konto.</string>
     <string name="soft_logout_clear_data_submit">Wyczyść wszystkie dane</string>
-
     <string name="soft_logout_clear_data_dialog_title">Wyczyść dane</string>
     <string name="soft_logout_clear_data_dialog_content">Wyczyścić wszystkie dane przechowywane na tym urządzeniu\?
 \nZaloguj się ponownie aby uzyskać dostęp do danych konta i wiadomości.</string>
@@ -1889,12 +1555,9 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="soft_logout_clear_data_dialog_submit">Wyczyść dane</string>
     <string name="soft_logout_sso_not_same_user_error">Aktualna sesja jest dla użytkownika %1$s, podajesz natomiast dane dla użytkownika %2$s. Nie jest to wspierane przez Element.
 \nNa początku usuń dane, następnie zaloguj ponownie na innym koncie.</string>
-
     <string name="permalink_malformed">Link matrix.to został zdeformowany</string>
     <string name="bug_report_error_too_short">Opis zbyt krótki</string>
-
     <string name="notification_initial_sync">Synchronizacja wstępna…</string>
-
     <string name="settings_show_devices_list">Zobacz wszystkie sesje</string>
     <string name="settings_rageshake">Wściekłe potrząśnięcie</string>
     <string name="settings_rageshake_detection_threshold">Próg detekcji</string>
@@ -1902,26 +1565,19 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="rageshake_detected">Potrząśnięcie wykryte!</string>
     <string name="devices_current_device">Aktualna sesja</string>
     <string name="devices_other_devices">Inne sesje</string>
-
     <string name="autocomplete_limited_results">Wyświetlanie jedynie początkowych wyników, wprowadź więcej znaków…</string>
-
     <string name="settings_developer_mode_fail_fast_title">Bezproblemowy</string>
     <string name="settings_developer_mode_fail_fast_summary">Element może zawieszać się częściej gdy napotka na niespodziewany błąd</string>
-
     <string name="command_description_shrug">Preparuje ¯\\_(ツ)_/¯ dla zwykłej wiadomości tekstowej</string>
-
     <string name="create_room_encryption_title">Aktywuj szyfrowanie</string>
     <string name="create_room_encryption_description">Odkąd zostanie włączone, szyfrowanie nie może zostać wyłączone.</string>
-
     <string name="login_error_threepid_denied">Twoja domena adresu e-mail nie została dopuszczona do rejestracji na tym serwerze</string>
-
     <string name="verification_conclusion_warning">Niezaufane logowanie</string>
     <string name="verification_sas_match">Zgadzają się</string>
     <string name="verification_sas_do_not_match">Nie zgadzają się</string>
     <string name="verify_user_sas_emoji_help_text">Zweryfikuj użytkownika poprzez potwierdzenie unikalnego ciągu emoji, w tym samym porządku na jego ekranie.</string>
     <string name="verify_user_sas_emoji_security_tip">Dla najlepszego bezpieczeństwa, użyj innych zaufanych form komunikacji lub zrób to osobiście.</string>
     <string name="verification_green_shield">Patrz na zieloną tarczę, aby upewnić się czy użytkownik jest zaufany. Zaufaj wszystkim użytkownikom w pokoju, aby upewnić się, że pokój jest bezpieczny.</string>
-
     <string name="verification_conclusion_not_secure">Nie jest bezpieczny</string>
     <string name="verification_conclusion_compromised">Jeden z poniższych mogł zostać narażony:
 \n
@@ -1929,12 +1585,10 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \n- Serwer domowy użytkownika, z którym jest on połączony
 \n- Połączenie z Internetem Twoje lub innych użytkowników
 \n- Urządzenie Twoje lub innych użytkowników</string>
-
     <string name="sent_a_video">Wideo.</string>
     <string name="sent_an_image">Zdjęcie.</string>
     <string name="sent_an_audio_file">Dźwięk</string>
     <string name="sent_a_file">Plik</string>
-
     <string name="verification_request_waiting">Oczekiwanie…</string>
     <string name="verification_request_other_cancelled">%s anulowana</string>
     <string name="verification_request_you_cancelled">Anulowałeś(-łaś)</string>
@@ -1942,25 +1596,17 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="verification_request_you_accepted">Zaakceptowałeś(-łaś)</string>
     <string name="verification_sent">Żądanie weryfikacji wysłane</string>
     <string name="verification_request">Żądanie weryfikacji</string>
-
-
     <string name="verification_verify_device">Zweryfikuj tą sesję</string>
     <string name="verification_verify_device_manually">Zweryfikuj ręcznie</string>
-
     <string name="you">Ty</string>
-
     <string name="verification_scan_notice">Zeskanuj kod z urządzenia innego użytkownika aby bezpiecznie zweryfikować siebie nawzajem</string>
     <string name="verification_scan_their_code">Zeskanuj ich kod</string>
     <string name="verification_scan_emoji_title">Nie można zeskanować</string>
     <string name="verification_scan_emoji_subtitle">Jeżeli nie jesteś z tą osobą, zamiast tego porównaj emoji</string>
-
     <string name="verification_no_scan_emoji_title">Zweryfikuj porównując emoji</string>
-
     <string name="verify_by_emoji_title">Zweryfikuj za pomocą Emoji</string>
     <string name="verify_by_emoji_description">Jeżeli nie możesz zeskanować kodu powyżej, zweryfikuj porównując krótki, unikalny ciąg emoji.</string>
-
     <string name="a13n_qr_code_description">Obraz kodu QR</string>
-
     <string name="verification_verify_user">Zweryfikuj %s</string>
     <string name="verification_verified_user">Zweryfikowano %s</string>
     <string name="verification_request_waiting_for">Oczekiwanie na %s…</string>
@@ -1974,57 +1620,41 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <plurals name="room_profile_section_more_member_list">
         <item quantity="one">Jedna osoba</item>
         <item quantity="few">%1$d osób</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <string name="room_profile_leaving_room">Opuszczanie pokoju…</string>
-
     <string name="room_member_power_level_admins">Administratorzy</string>
     <string name="room_member_power_level_moderators">Moderatorzy</string>
     <string name="room_member_power_level_custom">Niestandardowy</string>
     <string name="room_member_power_level_invites">Zaproszenia</string>
     <string name="room_member_power_level_users">Użytkownicy</string>
-
     <string name="room_member_power_level_admin_in">Administrator w %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderator w %1$s</string>
     <string name="room_member_power_level_custom_in">Niestandardowy (%1$d) w %2$s</string>
-
     <string name="room_member_jump_to_read_receipt">Przeskocz do znacznika odczytania</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element nie obsługuje wydarzeń typu \'%1$s\'</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element nie obsługuje wiadomości typu \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element napotkał problem przy wyświetlaniu zawartości wydarzenia z ID \'%1$s\'</string>
-
     <string name="unignore">Nie ignoruj</string>
-
     <string name="verify_cannot_cross_sign">Sesja nie jest w stanie podzielić się weryfikacją z innymi sesjami.
 \nWeryfikacja zostanie zapisana lokalnie i udostępniona w przyszłych wersjach aplikacji.</string>
-
     <string name="room_list_sharing_header_recent_rooms">Ostatnie pokoje</string>
     <string name="room_list_sharing_header_other_rooms">Inne pokoje</string>
-
     <string name="command_description_rainbow">Wysyła wiadomość w odcieniach tęczy</string>
     <string name="command_description_rainbow_emote">Wysyła emoji w odcieniach tęczy</string>
-
     <string name="settings_category_timeline">Oś czasu</string>
-
     <string name="settings_category_composer">Edycja wiadomości</string>
-
     <string name="room_settings_enable_encryption_warning">Odkąd zostanie włączone, szyfrowanie nie może zostać wyłączone.</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Aktywować szyfrowanie\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Odkąd zostanie włączone, szyfrowanie w pokoju nie może zostać wyłączone. Wiadomości wysłane w zaszyfrowanym pokoju nie są widzane przez serwer, a jedynie przez uczestników w pokoju.
 \nAktywowanie szyfrowania może uniemożliwić wielu botom i mostom prawidłowe działanie.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Aktywuj szyfrowanie</string>
-
     <string name="verification_request_notice">Aby być bezpiecznym, zweryfikuj %s poprzez sprawdzenie jednorazowego kodu.</string>
     <string name="verification_request_start_notice">Aby być bezpiecznym, zrób to osobiście lub użyj innej metody komunikacji.</string>
-
     <string name="verification_emoji_notice">Porównaj unikalny ciąg emoji, upewniając się, że pojawiają się w identycznym porządku.</string>
     <string name="verification_code_notice">Porównaj kod wyświetlany na ekranie innego użytkownika.</string>
     <string name="verification_conclusion_ok_notice">Wiadomości z użytkownikiem są szyfrowane end-to-end i nie mogą zostać odczytane przez osoby trzecie.</string>
     <string name="verification_conclusion_ok_self_notice">Nowa sesja została zweryfikowana. Posiadasz dostęp do zaszyfrowanych wiadomości, a inni użytkownicy będą ją widzieć jako zaufaną.</string>
-
-
     <string name="encryption_information_cross_signing_state">Podpis krzyżowy</string>
     <string name="encryption_information_dg_xsigning_complete">Podpis krzyżowy jest aktywowany.
 \nKlucze Prywatne znajdują się na urządzeniu.</string>
@@ -2034,108 +1664,81 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="encryption_information_dg_xsigning_not_trusted">Podpis krzyżowy jest aktywowany.
 \nKlucze nie są zaufane</string>
     <string name="encryption_information_dg_xsigning_disabled">Podpis krzyżowy nie jest aktywowany</string>
-
-
     <string name="settings_active_sessions_list">Aktywne Sesje</string>
     <string name="settings_active_sessions_show_all">Pokaż wszystkie Sesje</string>
     <string name="settings_active_sessions_manage">Zarządzaj Sesjami</string>
     <string name="settings_active_sessions_signout_device">Wyloguj z tej sesji</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Brak dostępnej informacji o kryptografii</string>
-
     <string name="settings_active_sessions_verified_device_desc">Ta sesja jest zaufana dla bezpiecznej wymiany wiadomości, ponieważ ją zweryfikowałeś(-łaś):</string>
     <string name="settings_active_sessions_unverified_device_desc">Zweryfikuj tą sesję aby oznaczyć ją jako zaufaną i przyznać jej dostęp do zaszyfrowanych wiadomości. Jeżeli nie logowałeś(-łaś) się do tej sesji, twoje konto mogło zostać naruszone:</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d aktywna sesja</item>
         <item quantity="few">%d aktywnych sesji</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Zweryfikuj tą sesję</string>
     <string name="crosssigning_other_user_not_trust">Inni użytkownicy mogą jemu nie ufać</string>
     <string name="complete_security">Całkowite Bezpieczeństwo</string>
-
     <string name="verification_open_other_to_verify">Otwórz obecną sesję i użyj jej do zweryfikowania obecnej, przyznając jej dostęp do zaszyfrowanych wiadomości.</string>
-
-
     <string name="verification_profile_verify">Zweryfkuj</string>
     <string name="verification_profile_verified">Zweryfikowano</string>
     <string name="verification_profile_warning">Ostrzeżenie</string>
-
     <string name="room_member_profile_failed_to_get_devices">Uzyskanie sesji nie powiodło się</string>
     <string name="room_member_profile_sessions_section_title">Sesje</string>
     <string name="trusted">Zaufany</string>
     <string name="not_trusted">Niezaufany</string>
-
     <string name="verification_profile_device_verified_because">Sesja jest zaufana dla bezpiecznej wymiany wiadomości ponieważ %1$s (%2$s) zweryfikował(-a) ją:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) zalogował(-a) się używając nowej sesji:</string>
     <string name="verification_profile_device_untrust_info">Dopóki użytkownik ufa tej sesji, wiadomości wysłane do oraz od niej będą oznaczone ostrzeżeniami. Ewentualnie, możesz zweryfikować je ręcznie.</string>
-
-
     <string name="initialize_cross_signing">Inicjalizacja podpisu krzyżowego</string>
     <string name="reset_cross_signing">Zresetuj Klucze</string>
-
     <string name="a11y_qr_code_for_verification">Kod QR</string>
-
     <string name="qr_code_scanned_by_other_yes">Tak</string>
     <string name="qr_code_scanned_by_other_no">Nie</string>
-
     <string name="settings_dev_tools">Narzędzia programistyczne</string>
     <string name="settings_account_data">Dane konta</string>
     <plurals name="poll_info">
         <item quantity="one">%d głos</item>
         <item quantity="few">%d głosów</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <plurals name="poll_info_final">
         <item quantity="one">%d głos - wyniki końcowe</item>
         <item quantity="few">%d głosów - wyniki końcowe</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
     <string name="poll_item_selected_aria">Wybrana Opcja</string>
     <string name="command_description_poll">Tworzy prostą ankietę</string>
     <string name="verification_cannot_access_other_session">Nie masz dostępu do instniejącej sesji\?</string>
     <string name="verification_use_passphrase">Użyj klucza odzyskiwania lub hasła</string>
-
     <string name="new_signin">Nowa rejestracja</string>
-
     <string name="enter_secret_storage_invalid">Nie można odnaleźć tajemnej przestrzeni w pamięci</string>
     <string name="enter_secret_storage_passphrase">Wprowadź hasło tajemnej przestrzeni</string>
     <string name="enter_secret_storage_passphrase_warning">Ostrzeżenie:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Powinieneś(-nnaś) uzyskać dostęp do tajnej przestrzeni jedynie z zaufanego urządzenia</string>
-
     <string name="message_action_item_redact">Usuń…</string>
     <string name="share_confirm_room">Czy chcesz wysłać załącznik do %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Wyślij obraz w oryginalnym rozmiarze</item>
         <item quantity="few">Wyślij obrazy w oryginalnym rozmiarze</item>
-        <item quantity="many" />
+        <item quantity="many"/>
     </plurals>
-
     <string name="delete_event_dialog_title">Potwierdź Usunięcie</string>
     <string name="delete_event_dialog_content">Jesteś pewny(-na), że chcesz usunąć to wydarzenie\? Jeżeli usuniesz nazwę pokoju lub zmienisz temat, wciąż będzie możliwe cofnięcie zmiany.</string>
     <string name="delete_event_dialog_reason_checkbox">Podaj przyczynę</string>
     <string name="delete_event_dialog_reason_hint">Przyczyna reakcji</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Wydarzenie usunięte przez użytkownika, przyczyna: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Wydarzenie moderowane przez administratora pokoju, przyczyna: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Klucze są już aktualne!</string>
-
     <string name="review">Sprawdź</string>
     <string name="decline">Zrezygnuj</string>
-
     <string name="sas_error_m_key_mismatch">Niezgodność klucza</string>
     <string name="sas_error_m_user_error">Niezgodność użytkowników</string>
     <string name="identity_server_not_defined">Nie używasz Serwera Tożsamości</string>
     <string name="identity_server_not_defined_for_password_reset">Nie skonfigurowano serwera toższamości, który jest wymagany do resetowania hasła.</string>
-
     <string name="error_user_already_logged_in">Wygląda na to, że próbujesz podłączyć się do innego serwera domowego. Czy chcesz się wylogować\?</string>
-
     <string name="send_you_invite">Przysyła zaproszenie</string>
     <string name="invited_by">Zaproszono przez %s</string>
-
     <string name="room_list_catchup_empty_body">Nie masz więcej nieprzeczytanych wiadomości</string>
     <string name="room_list_catchup_welcome_title">Witaj w domu!</string>
     <string name="title_activity_emoji_reaction_picker">Reakcje</string>
@@ -2146,39 +1749,44 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="event_redacted_by_admin_reason">Zdarzenie moderowane przez administratora pokoju</string>
     <string name="create_room_directory_title">Katalog Pokoi</string>
     <string name="quick_reactions">Szybkie Reakcje</string>
-
     <string name="settings_general_title">Ogólne</string>
     <string name="settings_push_rules">Zasady push</string>
     <string name="settings_push_gateway_no_pushers">Brak zarejestrowanych bramek push</string>
-
     <string name="send_file_step_encrypting_thumbnail">Szyfrowanie miniatury…</string>
     <string name="room_filtering_footer_title">Nie możesz czegoś odnaleźć\?</string>
     <string name="room_filtering_footer_create_new_room">Utwórz nowy pokój</string>
     <string name="room_filtering_footer_open_room_directory">Otwórz katalog pokoi</string>
-
     <string name="room_directory_search_hint">Nazwa lub ID (#przykład:matrix.org)</string>
-
     <string name="identity_server">Serwer toższamości</string>
     <string name="disconnect_identity_server">Odłącz od serwera tożsamości</string>
     <string name="add_identity_server">Skonfiguruj serwer tożsamości</string>
     <string name="change_identity_server">Zmień serwer tożsamości</string>
     <string name="attachment_type_camera">Aparat</string>
     <string name="no_network_indicator">Obecnie nie ma połączenia z siecią</string>
-
     <string name="message_ignore_user">Zablokuj użytkownika</string>
-
     <string name="send_suggestion">Złóż sugestię</string>
     <string name="settings_developer_mode_summary">Tryb programisty aktywuje ukryte funkcje i może również spowodować, że aplikacja będzie mniej stabilna. Tylko dla programistów!</string>
     <string name="room_profile_not_encrypted_subtitle">Wiadomości w tym pokoju nie są szyfrowane end-to-end.</string>
     <string name="room_profile_section_more_uploads">Przesłane pliki</string>
     <string name="settings_key_requests">Prośby o klucze</string>
-
     <string name="e2e_use_keybackup">Odblokuj historię zaszyfrowanych wiadomości</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="refresh">Odśwież</string>
-
     <string name="verify_new_session_notice">Użyj tej sesji do weryfikacji nowej, nadając jej dostęp do zaszyfrowanych wiadomości.</string>
     <string name="verify_new_session_was_not_me">To nie ja</string>
-</resources>
+    <string name="dismiss">Zamknij</string>
+    <string name="pause_video">Wstrzymaj</string>
+    <string name="play_video">Odtwórz</string>
+    <string name="no_permissions_to_start_webrtc_call">Nie posiadasz wymaganych uprawnień do rozpoczęcia połaczenia w tym pokoju</string>
+    <string name="call_notification_answer">Odbierz</string>
+    <string name="failed_to_remove_widget">Usuwanie widżetu nie powiodło się</string>
+    <string name="failed_to_add_widget">Dodawanie widżetu nie powiodło się</string>
+    <string name="cannot_call_yourself_with_invite">Nie można rozpocząć połączenia z samym sobą, poczekaj aż inni zaakceptują zaproszenie</string>
+    <string name="cannot_call_yourself">Nie można rozpocząć połączenia z samym sobą</string>
+    <string name="audio_meeting">Rozpocznij połączenie głosowe</string>
+    <string name="video_meeting">Rozpocznij połączenie wideo</string>
+    <string name="conference_call_in_progress">Połączenie grupowe już trwa!</string>
+    <string name="no_permissions_to_start_conf_call">Nie posiadasz wymaganych uprawnień aby rozpocząć połączenie grupowe w tym pokoju</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Nie posiadasz wymaganych uprawnień do rozpoczęcia połaczenia</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Nie posiadasz wymaganych uprawnień aby rozpocząć połączenie grupowe</string>
+</resources>
\ No newline at end of file

From f82ee5efddd3cbecc197b42dfdbd3e51cb463a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Tue, 13 Oct 2020 05:01:17 +0000
Subject: [PATCH 261/278] Translated using Weblate (Estonian)

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
---
 .../src/main/res/values-et/strings.xml        | 64 +++++++------------
 1 file changed, 24 insertions(+), 40 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
index 2fbe263464..3c24ed8c2f 100644
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-et/strings.xml
@@ -1,9 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s saatis pildi.</string>
     <string name="summary_user_sent_sticker">%1$s saatis kleepsu.</string>
-
     <string name="notice_room_invite_no_invitee">Kasutaja %s kutse</string>
     <string name="notice_room_invite">%1$s kutsus kasutajat %2$s</string>
     <string name="notice_room_invite_you">%1$s kutsus sind</string>
@@ -30,11 +29,9 @@
     <string name="notice_room_visibility_unknown">teadmata (%s).</string>
     <string name="notice_end_to_end">%1$s lülitas sisse läbiva krüptimise (%2$s)</string>
     <string name="notice_room_update">%s uuendas seda jututuba.</string>
-
     <string name="notice_requested_voip_conference">%1$s saatis VoIP konverentsi kutse</string>
     <string name="notice_voip_started">VoIP-konverents algas</string>
     <string name="notice_voip_finished">VoIP-konverents lõppes</string>
-
     <string name="notice_avatar_changed_too">(samuti sai avatar muudetud)</string>
     <string name="notice_room_name_removed">%1$s eemaldas jututoa nime</string>
     <string name="notice_room_topic_removed">%1$s eemaldas jututoa teema</string>
@@ -46,37 +43,25 @@
     <string name="notice_room_third_party_invite">%1$s saatis jututoaga liitumiseks kutse kasutajale %2$s</string>
     <string name="notice_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
     <string name="notice_room_third_party_registered_invite">%1$s võttis vastu kutse %2$s nimel</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Ei õnnestu dekrüptida: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Sõnumi saatja seade ei ole selle sõnumi jaoks saatnud dekrüptimisvõtmeid.</string>
-
     <string name="could_not_redact">Ei saanud muuta sõnumit</string>
     <string name="unable_to_send_message">Sõnumi saatmine ei õnnestunud</string>
-
     <string name="message_failed_to_upload">Faili üles laadimine ei õnnestunud</string>
-
     <string name="network_error">Võrguühenduse viga</string>
     <string name="matrix_error">Matrix\'i viga</string>
-
     <string name="room_error_join_failed_empty_room">Hetkel ei ole võimalik uuesti liituda tühja jututoaga.</string>
-
     <string name="encrypted_message">Krüptitud sõnum</string>
-
     <string name="medium_email">E-posti aadress</string>
     <string name="medium_phone_number">Telefoninumber</string>
-
     <string name="room_displayname_invite_from">Kutse kasutajalt %s</string>
     <string name="room_displayname_room_invite">Kutse jututuppa</string>
-
     <string name="room_displayname_two_members">%1$s ja %2$s</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s ja üks muu</item>
         <item quantity="other">%1$s ja %2$d muud</item>
     </plurals>
-
     <string name="room_displayname_empty_room">Tühi jututuba</string>
-
     <string name="initial_sync_start_importing_account">Alglaadimine:
 \nImpordin kontot…</string>
     <string name="initial_sync_start_importing_account_crypto">Alglaadimine:
@@ -93,10 +78,8 @@
 \nImpordin kogukondi</string>
     <string name="initial_sync_start_importing_account_data">Alglaadimine:
 \nImpordin kontoandmeid</string>
-
     <string name="event_status_sending_message">Saadan sõnumit…</string>
     <string name="clear_timeline_send_queue">Tühjenda saatmisjärjekord</string>
-
     <string name="notice_room_invite_no_invitee_with_reason">Kasutaja %1$s kutse. Põhjus: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s kutsus kasutajat %2$s. Põhjus: %3$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s kutsus sind. Põhjus: %2$s</string>
@@ -108,34 +91,25 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s tühistas kasutajale %2$s saadetud kutse jututoaga liitumiseks. Põhjus: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s võttis vastu kutse %2$s jututoaga liitumiseks. Põhjus: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s võttis tagasi kasutajale %2$s saadetud kutse. Põhjus: %3$s</string>
-
     <string name="notice_end_to_end_ok">%1$s lülitas sisse läbiva krüptimise.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s lülitas sisse läbiva krüptimise (tundmatu algoritm %2$s).</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s lisas %2$s selle jututoa aadressiks.</item>
         <item quantity="other">%1$s lisas %2$s selle jututoa aadressideks.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s eemaldas %2$s kui selle jututoa aadressi.</item>
         <item quantity="other">%1$s eemaldas %2$s selle jututoa aadresside hulgast.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s lisas %2$s ja eemaldas %3$s selle jututoa aadresside loendist.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s seadistas selle jututoa põhiaadressiks %2$s.</string>
     <string name="notice_room_canonical_alias_unset">%1$s eemaldas selle jututoa põhiaadressi.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
     <string name="notice_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
-
     <string name="key_verification_request_fallback_message">%s soovib verifitseerida sinu võtmeid, kuid sinu kasutatav klient ei oska vestluse-sisest verifitseerimist teha. Sa pead kasutama traditsioonilist verifitseerimislahendust.</string>
-
     <string name="notice_room_created">Kasutaja %1$s lõi jututoa</string>
     <string name="summary_you_sent_image">Sina saatsid pildi.</string>
     <string name="summary_you_sent_sticker">Sina saatsid kleepsu.</string>
-
     <string name="notice_room_invite_no_invitee_by_you">Sinu kutse</string>
     <string name="notice_room_created_by_you">Sa lõid jututoa</string>
     <string name="notice_room_invite_by_you">Sina kutsusid kasutajat %1$s</string>
@@ -165,7 +139,6 @@
     <string name="notice_made_future_room_visibility_by_you">Sa seadistasid, et tulevane jututoa ajalugu on nähtav kasutajale %1$s</string>
     <string name="notice_end_to_end_by_you">Sa lülitasid sisse läbiva krüptimise (%1$s)</string>
     <string name="notice_room_update_by_you">Sa uuendasid seda jututuba.</string>
-
     <string name="notice_requested_voip_conference_by_you">Sa algatasid VoIP rühmakõne</string>
     <string name="notice_room_name_removed_by_you">Sa eemaldasid jututoa nime</string>
     <string name="notice_room_topic_removed_by_you">Sa eemaldasid jututoa teema</string>
@@ -175,24 +148,20 @@
     <string name="notice_room_third_party_invite_by_you">Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
     <string name="notice_room_third_party_registered_invite_by_you">Sina võtsid vastu kutse %1$s nimel</string>
-
     <string name="notice_widget_added">%1$s lisas %2$s vidina</string>
     <string name="notice_widget_added_by_you">Sina lisasid %1$s vidina</string>
     <string name="notice_widget_removed">%1$s eemaldas %2$s vidina</string>
     <string name="notice_widget_removed_by_you">Sina eemdaldasid %1$s vidina</string>
     <string name="notice_widget_modified">%1$s muutis %2$s vidinat</string>
     <string name="notice_widget_modified_by_you">Sa muutsid %1$s vidinat</string>
-
     <string name="power_level_admin">Peakasutaja</string>
     <string name="power_level_moderator">Moderaator</string>
     <string name="power_level_default">Tavakasutaja</string>
     <string name="power_level_custom">Kohandatud kasutajaõigused (%1$s)</string>
     <string name="power_level_custom_no_value">Kohandatud õigused</string>
-
     <string name="notice_power_level_changed_by_you">Sina muutsid kasutaja %1$s õigusi.</string>
     <string name="notice_power_level_changed">%1$s muutis kasutaja %2$s õigusi.</string>
     <string name="notice_power_level_diff">%1$s õiguste muutus %2$s -&gt; %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Sinu kutse. Põhjus %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Sina kutsusid kasutajat %1$s. Põhjus: %1$s</string>
     <string name="notice_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
@@ -207,26 +176,41 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s. Põhjus: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Sina võtsid vastu kutse %1$s nimel. Põhjus: %2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Sina võtsid tagasi kasutaja %1$s kutse. Põhjus: %2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Sina lisasid %1$s selle jututoa aadressiks.</item>
         <item quantity="other">Sina lisasid %1$s selle jututoa aadressideks.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Sina eemaldasid %1$s, kui selle jututoa aadressi.</item>
         <item quantity="other">Sina eemaldasid %1$s selle jututoa aadresside hulgast.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">Sina lisasid %1$s selle jututoa aadressiks ning eemaldasid %2$s aadresside hulgast.</string>
-
     <string name="notice_room_canonical_alias_set_by_you">Sina seadistasid selle jututoa põhiaadressiks %1$s.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Sina eemaldasid selle jututoa põhiaadressi.</string>
-
     <string name="notice_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
-
     <string name="notice_end_to_end_ok_by_you">Sa lülitasid sisse läbiva krüptimise.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Sa lülitasid sisse läbiva krüptimise (kasutusel on tundmatu algoritm %1$s).</string>
-
-</resources>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Sina seadistasid, et külalised ei või selle jututoaga liituda.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s seadistas, et külalised ei või selle jututoaga liituda.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Sina lubasid külalistel selle jututoaga liituda.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s lubas külalistel selle jututoaga liituda.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s lahkus jututoast. Põhjus: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s liitus jututoaga. Põhjus: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Sina võtsid tagasi jututoaga liitumise kutse kasutajalt %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Sina kutsusid kasutajat %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s kutsus kasutajat %2$s</string>
+    <string name="notice_direct_room_update_by_you">Sa uuendasid seda jututuba.</string>
+    <string name="notice_direct_room_update">%s uuendas seda jututuba.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Sina seadistasid, et tulevased jututoa sõnumid on nähtavad kasutajale %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s seadistas, et tulevased jututoa sõnumid on nähtavad kasutajale %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Sina lahkusid jututoast</string>
+    <string name="notice_direct_room_leave">%1$s lahkus jututoast</string>
+    <string name="notice_direct_room_join_by_you">Sina liitusid</string>
+    <string name="notice_direct_room_join">%1$s liitus</string>
+    <string name="notice_direct_room_created_by_you">Sina alustasid vestlust</string>
+    <string name="notice_direct_room_created">%1$s alustas vestlust</string>
+</resources>
\ No newline at end of file

From ba3500baf65dfed4928c3c2b3e01d6a691cea24f Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Wed, 14 Oct 2020 13:26:02 +0000
Subject: [PATCH 262/278] Translated using Weblate (Chinese (Simplified))

Currently translated at 97.8% (186 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/zh_Hans/
---
 .../src/main/res/values-zh-rCN/strings.xml    | 61 ++++++-------------
 1 file changed, 20 insertions(+), 41 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
index 60322821d4..496bbe6bf8 100644
--- a/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-zh-rCN/strings.xml
@@ -1,7 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_user_sent_image">%1$s 发送了一张图片。</string>
-
     <string name="notice_room_invite_no_invitee">%s 的邀请</string>
     <string name="notice_room_invite">%1$s 邀请了 %2$s</string>
     <string name="notice_room_invite_you">%1$s 邀请了您</string>
@@ -27,42 +26,30 @@
     <string name="notice_room_visibility_world_readable">任何人。</string>
     <string name="notice_room_visibility_unknown">未知（%s）。</string>
     <string name="notice_end_to_end">%1$s 开启了端到端加密（%2$s）</string>
-
     <string name="notice_requested_voip_conference">%1$s 请求了一次 VoIP 会议</string>
     <string name="notice_voip_started">VoIP 会议已开始</string>
     <string name="notice_voip_finished">VoIP 会议已结束</string>
-
     <string name="notice_avatar_changed_too">（头像也被更改）</string>
     <string name="notice_room_name_removed">%1$s 移除了聊天室名称</string>
     <string name="notice_room_topic_removed">%1$s 移除了聊天室主题</string>
     <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
-
     <string name="unable_to_send_message">无法发送消息</string>
-
     <string name="message_failed_to_upload">上传图像失败</string>
-
     <string name="network_error">网络错误</string>
     <string name="matrix_error">Matrix 错误</string>
-
     <string name="room_error_join_failed_empty_room">目前无法重新加入一个空的聊天室。</string>
-
     <string name="encrypted_message">已加密消息</string>
-
     <string name="medium_email">电子邮箱地址</string>
     <string name="medium_phone_number">手机号码</string>
-
     <string name="notice_room_withdraw">%1$s 撤回了对 %2$s 的邀请</string>
     <string name="notice_made_future_room_visibility">%1$s 让未来的聊天室历史记录对 %2$s 可见</string>
     <string name="notice_profile_change_redacted">%1$s 更新了他的个人档案 %2$s</string>
     <string name="notice_room_third_party_invite">%1$s 向 %2$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite">%1$s 接受了 %2$s 的邀请</string>
-
     <string name="could_not_redact">无法撤回</string>
-
     <string name="summary_message">%1$s：%2$s</string>
     <string name="summary_user_sent_sticker">%1$s 发送了一张贴纸。</string>
-
     <string name="room_displayname_empty_room">空聊天室</string>
     <string name="room_displayname_invite_from">来自 %s 的邀请</string>
     <string name="room_displayname_room_invite">聊天室邀请</string>
@@ -70,7 +57,6 @@
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="other">%1$s 与其他 %2$d 位</item>
     </plurals>
-
     <string name="notice_event_redacted">消息已被移除</string>
     <string name="notice_event_redacted_by">消息已被 %1$s 移除</string>
     <string name="notice_event_redacted_with_reason">消息已被移除 [原因: %1$s]</string>
@@ -91,14 +77,10 @@
 \n正在导入社区</string>
     <string name="initial_sync_start_importing_account_data">初始化同步：
 \n正在导入账号数据</string>
-
     <string name="notice_room_update">%s 升级了此聊天室。</string>
-
     <string name="event_status_sending_message">正在发送消息…</string>
     <string name="clear_timeline_send_queue">清除正在发送队列</string>
-
     <string name="notice_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 加入聊天室的邀请</string>
-
     <string name="notice_room_invite_no_invitee_with_reason">%1$s 的邀请。理由：%2$s</string>
     <string name="notice_room_invite_with_reason">%1$s 邀请了 %2$s。理由：%3$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s 邀请了您。理由：%2$s</string>
@@ -112,32 +94,23 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s 撤销了 %2$s 加入聊天室的邀請。理由：%3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s 接受 %2$s 的邀請。理由：%3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s 撤回了对 %2$s 的邀请。理由：%3$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="other">%1$s 新增了 %2$s 为此聊天室的地址。</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="other">%1$s 移除了此聊天室的 %3$s 地址。</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s 为此聊天室新增了 %2$s 并移除 %3$s 地址。</string>
-
     <string name="notice_room_canonical_alias_set">%1$s 将此聊天室的主地址设为了 %2$s。</string>
     <string name="notice_room_canonical_alias_unset">%1$s 为此聊天室移除了主地址。</string>
-
     <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入聊天室。</string>
-
     <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的演算法 %2$s）。</string>
-
     <string name="key_verification_request_fallback_message">%s 正在请求验证您的密钥，但您的客户端不支援聊天中密钥验证。 您将必须使用旧版的密钥验证来验证金钥。</string>
-
     <string name="notice_room_created">%1$s 创建了这个聊天室</string>
     <string name="summary_you_sent_image">您发送了一张图片。</string>
     <string name="summary_you_sent_sticker">您发送了一张贴纸。</string>
-
     <string name="notice_room_invite_no_invitee_by_you">您的邀请</string>
     <string name="notice_room_created_by_you">您创建了这个聊天室</string>
     <string name="notice_room_invite_by_you">您邀请了 %1$s</string>
@@ -165,7 +138,6 @@
     <string name="notice_made_future_room_visibility_by_you">您已让未来的聊天室记录对 %1$s 可见</string>
     <string name="notice_end_to_end_by_you">您开启了端到端加密（%1$s）</string>
     <string name="notice_room_update_by_you">您升级了此聊天室。</string>
-
     <string name="notice_requested_voip_conference_by_you">您请求了 VoIP 会议</string>
     <string name="notice_room_name_removed_by_you">您移除了聊天室名称</string>
     <string name="notice_room_topic_removed_by_you">您移除了聊天室主题</string>
@@ -175,24 +147,20 @@
     <string name="notice_room_third_party_invite_by_you">您向 %1$s 发送了加入聊天室的邀请</string>
     <string name="notice_room_third_party_revoked_invite_by_you">您已撤回了对 %1$s 加入聊天室的邀请</string>
     <string name="notice_room_third_party_registered_invite_by_you">您接受了 %1$s 的邀请</string>
-
     <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
     <string name="notice_widget_added_by_you">您添加了 %1$s 小部件</string>
     <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
     <string name="notice_widget_removed_by_you">您移除了 %1$s 小部件</string>
     <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
     <string name="notice_widget_modified_by_you">您修改了 %1$s 小部件</string>
-
     <string name="power_level_admin">管理员</string>
     <string name="power_level_moderator">审核员</string>
     <string name="power_level_default">默认</string>
     <string name="power_level_custom">自定义（%1$d）</string>
     <string name="power_level_custom_no_value">自定义</string>
-
     <string name="notice_power_level_changed_by_you">您更改了%1$s 的权力等级。</string>
     <string name="notice_power_level_changed">%1$s 更改了 %2$s 的权力等级。</string>
     <string name="notice_power_level_diff">%1$s 从 %2$s 到 %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">您的邀请。理由：%1$s</string>
     <string name="notice_room_invite_with_reason_by_you">您邀请了 %1$s。理由：%2$s</string>
     <string name="notice_room_join_with_reason_by_you">您加入了聊天室。理由：%1$s</string>
@@ -205,24 +173,35 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">您撤销了 %1$s 加入聊天室的邀请。理由：%2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">您接受了 %1$s 的邀请。理由：%2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">您撤回了 %1$s 的邀请。理由：%2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="other">您新增了 %1$s 为此聊天室的地址。</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="other">您移除了此聊天室的 %2$s 地址。</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">您为此聊天室新增了 %1$s 并移除了 %2$s 地址。</string>
-
     <string name="notice_room_canonical_alias_set_by_you">您将此聊天室的主地址设为了 %1$s。</string>
     <string name="notice_room_canonical_alias_unset_by_you">您移除了此聊天室的主地址。</string>
-
     <string name="notice_room_guest_access_can_join_by_you">您已允许访客加入聊天室。</string>
     <string name="notice_room_guest_access_forbidden_by_you">您已禁止访客加入聊天室。</string>
-
     <string name="notice_end_to_end_ok_by_you">您已开启端到端加密。</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">您已开启端到端加密（无法识别的算法 %1$s）。</string>
-
-</resources>
+    <string name="notice_direct_room_leave_with_reason_by_you">您已离开。理由：%1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s 已离开。理由：%2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">您已加入。理由：%1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s 已加入。理由：%2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">您撤回了对 %1$s 的邀请</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s 撤回了对 %2$s 的邀请</string>
+    <string name="notice_direct_room_third_party_invite_by_you">您邀请了 %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s 邀请了 %2$s</string>
+    <string name="notice_direct_room_update_by_you">您在此处升级。</string>
+    <string name="notice_direct_room_update">%s 在此处升级。</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">您使未来的消息对 %2$s 可见</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s 使未来的消息对 %2$s 可见</string>
+    <string name="notice_direct_room_leave_by_you">您离开了聊天室</string>
+    <string name="notice_direct_room_leave">%1$s 离开了聊天室</string>
+    <string name="notice_direct_room_join_by_you">您已加入</string>
+    <string name="notice_direct_room_join">%1$s 已加入</string>
+    <string name="notice_direct_room_created_by_you">您创建了讨论</string>
+    <string name="notice_direct_room_created">%1$s 创建了讨论</string>
+</resources>
\ No newline at end of file

From 5cb46dba6c7bf2e4907c39a7c23d987b261d9143 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Tue, 13 Oct 2020 14:29:26 +0000
Subject: [PATCH 263/278] Translated using Weblate (Russian)

Currently translated at 98.9% (188 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/ru/
---
 .../src/main/res/values-ru/strings.xml        | 71 ++++++-------------
 1 file changed, 23 insertions(+), 48 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-ru/strings.xml b/matrix-sdk-android/src/main/res/values-ru/strings.xml
index a4d752782e..97643a34fe 100644
--- a/matrix-sdk-android/src/main/res/values-ru/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-ru/strings.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s отправил(а) изображение.</string>
-
     <string name="notice_room_invite_no_invitee">%s приглашение</string>
     <string name="notice_room_invite">%1$s пригласил(а) %2$s</string>
     <string name="notice_room_invite_you">%1$s пригласил(а) вас</string>
@@ -31,67 +29,49 @@
     <string name="notice_room_visibility_world_readable">всем.</string>
     <string name="notice_room_visibility_unknown">неизвестно (%s).</string>
     <string name="notice_end_to_end">%1$s включил(а) сквозное шифрование (%2$s)</string>
-
     <string name="notice_requested_voip_conference">%1$s запросил(а) VoIP конференцию</string>
     <string name="notice_voip_started">VoIP-конференция начата</string>
     <string name="notice_voip_finished">VoIP-конференция завершена</string>
-
     <string name="notice_avatar_changed_too">(аватар также был изменен)</string>
     <string name="notice_room_name_removed">%1$s удалил(а) название комнаты</string>
     <string name="notice_room_topic_removed">%1$s удалил(а) тему комнаты</string>
     <string name="notice_profile_change_redacted">%1$s обновил(а) свой профиль %2$s</string>
     <string name="notice_room_third_party_invite">%1$s отправил(а) приглашение %2$s присоединиться к комнате</string>
     <string name="notice_room_third_party_registered_invite">%1$s принял(а) приглашение от %2$s</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Невозможно расшифровать: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Устройство отправителя не предоставило нам ключ для расшифровки этого сообщения.</string>
-
     <!-- Room Screen -->
     <string name="could_not_redact">Не удалось изменить</string>
     <string name="unable_to_send_message">Не удалось отправить сообщение</string>
-
     <string name="message_failed_to_upload">Не удалось загрузить изображение</string>
-
     <!-- general errors -->
     <string name="network_error">Сетевая ошибка</string>
     <string name="matrix_error">Ошибка Matrix</string>
-
     <!-- Home Screen -->
-
     <!-- Last seen time -->
-
     <!-- call events -->
-
     <!-- room error messages -->
     <string name="room_error_join_failed_empty_room">В настоящее время невозможно вновь присоединиться к пустой комнате.</string>
-
     <string name="encrypted_message">Зашифрованное сообщение</string>
-
     <!-- medium friendly name -->
     <string name="medium_email">Адрес электронной почты</string>
     <string name="medium_phone_number">Номер телефона</string>
-
     <string name="summary_user_sent_sticker">%1$s отправил стикер.</string>
-
     <!-- Room display name -->
     <string name="room_displayname_invite_from">Приглашение от %s</string>
     <string name="room_displayname_room_invite">Приглашение в комнату</string>
     <string name="room_displayname_two_members">%1$s и %2$s</string>
     <string name="room_displayname_empty_room">Пустая комната</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s и 1 другой</item>
         <item quantity="few">%1$s и %2$d другие</item>
         <item quantity="many">%1$s и %2$d других</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
-
     <string name="notice_event_redacted">Сообщение удалено</string>
     <string name="notice_event_redacted_by">%1$s удалил(а) сообщение</string>
     <string name="notice_event_redacted_with_reason">Сообщение удалено [причина: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">%1$s удалил(а) сообщение [причина: %2$s]</string>
-
     <string name="initial_sync_start_importing_account">Начальная синхронизация:
 \nИмпорт учетной записи…</string>
     <string name="initial_sync_start_importing_account_crypto">Начальная синхронизация:
@@ -108,12 +88,9 @@
 \nИмпорт сообществ</string>
     <string name="initial_sync_start_importing_account_data">Начальная синхронизация:
 \nИмпорт данных учетной записи</string>
-
     <string name="notice_room_update">%s обновил эту комнату.</string>
-
     <string name="event_status_sending_message">Отправка сообщения…</string>
     <string name="clear_timeline_send_queue">Очистить очередь отправки</string>
-
     <string name="notice_room_third_party_revoked_invite">%1$s отозвал приглашение %2$s присоединиться к комнате</string>
     <string name="notice_room_invite_no_invitee_with_reason">Приглашение %1$s. Причина: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s приглашен %2$s. Причина: %3$s</string>
@@ -128,36 +105,27 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s отозвал приглашение %2$s присоединиться к комнате. Причина: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s принял приглашение для %2$s. Причина: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s отозвал приглашение %2$s. Причина: %3$s</string>
-
     <string name="notice_room_created">%1$s создал(а) комнату</string>
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s добавил(а) %2$s в качестве адреса для этой комнаты.</item>
         <item quantity="few">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
         <item quantity="many">%1$s добавил(а) %2$s в качестве адресов для этой комнаты.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s удалил(а) адрес %2$s для комнаты.</item>
         <item quantity="few">%1$s удалил(а) адреса %2$s для комнаты.</item>
         <item quantity="many">%1$s удалил(а) адреса %2$s для комнаты.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s добавил(а) адреса %2$s и удалил(а) %3$s для комнаты.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s сделал(а) %2$s главным адресом комнаты.</string>
     <string name="notice_room_canonical_alias_unset">%1$s удалил(а) главный адрес комнаты.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s разрешил(а) гостям входить в комнату.</string>
     <string name="notice_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
-
     <string name="notice_end_to_end_ok">%1$s включил(а) сквозное шифрование.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s включил(а) сквозное шифрование (неизвестный алгоритм %2$s).</string>
-
     <string name="key_verification_request_fallback_message">%s запрашивает подтверждение вашего ключа, но ваш клиент не поддерживает подтверждение в чате. Используйте устаревшую проверку для сверки ключей.</string>
-
     <string name="summary_you_sent_image">Вы отправили изображение.</string>
     <string name="summary_you_sent_sticker">Вы отправили стикер.</string>
-
     <string name="notice_room_invite_no_invitee_by_you">Ваше приглашение</string>
     <string name="notice_room_created_by_you">Вы создали комнату</string>
     <string name="notice_room_invite_by_you">Вы пригласили %1$s</string>
@@ -181,7 +149,6 @@
     <string name="notice_made_future_room_visibility_by_you">Вы сделали будущую историю комнаты видимой для %1$s</string>
     <string name="notice_end_to_end_by_you">Вы включили сквозное шифрование (%1$s)</string>
     <string name="notice_room_update_by_you">Вы обновили эту комнату.</string>
-
     <string name="notice_requested_voip_conference_by_you">Вы начали групповой звонок</string>
     <string name="notice_room_name_removed_by_you">Вы удалили название комнаты</string>
     <string name="notice_room_topic_removed_by_you">Вы удалили тему комнаты</string>
@@ -189,24 +156,20 @@
     <string name="notice_room_third_party_invite_by_you">Вы отправили %1$s приглашение в эту комнату</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Вы отозвали у %1$s приглашение в эту комнату</string>
     <string name="notice_room_third_party_registered_invite_by_you">Вы приняли приглашение для %1$s</string>
-
     <string name="notice_widget_added">%1$s добавил(а) виджет %2$s</string>
     <string name="notice_widget_added_by_you">Вы добавили виджет %1$s</string>
     <string name="notice_widget_removed">%1$s удалил(а) виджет %2$s</string>
     <string name="notice_widget_removed_by_you">Вы удалили виджет %1$s</string>
     <string name="notice_widget_modified">%1$s изменил(а) виджет %2$s</string>
     <string name="notice_widget_modified_by_you">Вы изменили виджет %1$s</string>
-
     <string name="power_level_admin">Администратор</string>
     <string name="power_level_moderator">Модератор</string>
     <string name="power_level_default">По умолчанию</string>
     <string name="power_level_custom">Пользовательский (%1$d)</string>
     <string name="power_level_custom_no_value">Пользовательский</string>
-
     <string name="notice_power_level_changed_by_you">Вы изменили уровни доступа %1$s.</string>
     <string name="notice_power_level_changed">%1$s изменил(а) уровни доступа %2$s.</string>
     <string name="notice_power_level_diff">%1$s с %2$s на %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Ваше приглашение. Причина: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Вы пригласили %1$s. Причина: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">Вы вошли в комнату. Причина: %1$s</string>
@@ -219,35 +182,47 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Вы отозвали у %1$s приглашение в эту комнату. Причина: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Вы приняли приглашение для %1$s. Причина: %2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Вы отозвали приглашение %1$s. Причина: %2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Вы добавили адрес %1$s для этой комнаты.</item>
         <item quantity="few">Вы добавили %1$s в качестве адресов для этой комнаты.</item>
         <item quantity="many">Вы добавили %1$s в качестве адресов для этой комнаты.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Вы удалили адрес этой комнаты: %1$s.</item>
         <item quantity="few">Вы удалили адреса этой комнаты: %1$s.</item>
         <item quantity="many">Вы удалили адреса этой комнаты: %1$s.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">Вы добавили адреса %1$s и удалили %2$s для этой комнаты.</string>
-
     <string name="notice_room_canonical_alias_set_by_you">Вы задали главный адрес этой комнаты %1$s.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Вы удалили главный адрес этой комнаты.</string>
-
     <string name="notice_room_guest_access_can_join_by_you">Вы разрешили гостям входить в комнату.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Вы запретили гостям входить в комнату.</string>
-
     <string name="notice_end_to_end_ok_by_you">Вы включили сквозное шифрование.</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Вы включили сквозное шифрование (неизвестный алгоритм %1$s).</string>
-
     <string name="notice_room_avatar_changed">%1$s изменил(а) аватар комнаты</string>
     <string name="notice_room_avatar_changed_by_you">Вы изменили аватар комнаты</string>
     <string name="notice_call_candidates">%s отправил(а) данные для начала звонка.</string>
     <string name="notice_call_candidates_by_you">Вы отправили данные для начала звонка.</string>
     <string name="notice_room_avatar_removed">%1$s удалил(а) аватар комнаты</string>
     <string name="notice_room_avatar_removed_by_you">Вы удалили аватар комнаты</string>
-
-</resources>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Вы запретили гостям входить в комнату.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s запретил(а) гостям входить в комнату.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Вы разрешили гостям присоединяться сюда.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s разрешил(а) гостям присоединиться сюда.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Вы вышли. Причина: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s вышел(-ла). Причина: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Вы вошли. Причина: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s вошел(-ла). Причина: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Вы отозвали приглашение %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s отозвал(а) приглашение %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Вы пригласили %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s пригласил(а) %2$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Вы сделали будущие сообщения видимыми для %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s сделал(а) будущие сообщения видимыми для %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Вы покинули комнату</string>
+    <string name="notice_direct_room_leave">%1$s покинул(а) комнату</string>
+    <string name="notice_direct_room_join_by_you">Вы вошли</string>
+    <string name="notice_direct_room_join">%1$s вошел(ла)</string>
+    <string name="notice_direct_room_created_by_you">Вы создали обсуждение</string>
+    <string name="notice_direct_room_created">%1$s создал(а) обсуждение</string>
+</resources>
\ No newline at end of file

From 72a7bf9e2388e24439a5812cfa80e62367feaab4 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Wed, 14 Oct 2020 18:18:34 +0000
Subject: [PATCH 264/278] Translated using Weblate (Swedish)

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sv/
---
 .../src/main/res/values-sv/strings.xml        | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-sv/strings.xml b/matrix-sdk-android/src/main/res/values-sv/strings.xml
index 8f8ba5e306..25e51b69e5 100644
--- a/matrix-sdk-android/src/main/res/values-sv/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sv/strings.xml
@@ -1,11 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s skickade en bild.</string>
     <string name="summary_you_sent_image">Du skickade en bild.</string>
     <string name="summary_user_sent_sticker">%1$s skickade en dekal.</string>
     <string name="summary_you_sent_sticker">Du skickade en dekal.</string>
-
     <string name="notice_room_invite_no_invitee">Inbjudan från %s</string>
     <string name="notice_room_invite_no_invitee_by_you">Inbjudan från dig</string>
     <string name="notice_room_created">%1$s skapade rummet</string>
@@ -62,12 +61,10 @@
     <string name="notice_end_to_end_by_you">Du aktiverade totalsträckskryptering (%1$s)</string>
     <string name="notice_room_update">%s uppgraderade det här rummet.</string>
     <string name="notice_room_update_by_you">Du uppgraderade det här rummet.</string>
-
     <string name="notice_requested_voip_conference">%1$s begärde ett VoIP-gruppsamtal</string>
     <string name="notice_requested_voip_conference_by_you">Du begärde ett VoIP-gruppsamtal</string>
     <string name="notice_voip_started">VoIP-gruppsamtal startat</string>
     <string name="notice_voip_finished">VoIP-gruppsamtal avslutat</string>
-
     <string name="notice_avatar_changed_too">(avataren blev även bytt)</string>
     <string name="notice_room_name_removed">%1$s tog bort rummets namn</string>
     <string name="notice_room_name_removed_by_you">Du tog bort rummets namn</string>
@@ -87,54 +84,39 @@
     <string name="notice_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s att gå med i rummet</string>
     <string name="notice_room_third_party_registered_invite">%1$s accepterade inbjudan för %2$s</string>
     <string name="notice_room_third_party_registered_invite_by_you">Du accepterade inbjudan för %1$s</string>
-
     <string name="notice_widget_added">%1$s lade till %2$s-widget</string>
     <string name="notice_widget_added_by_you">Du lade till %1$s-widget</string>
     <string name="notice_widget_removed">%1$s tog bort %2$s-widget</string>
     <string name="notice_widget_removed_by_you">Du tog bort %1$s-widget</string>
     <string name="notice_widget_modified">%1$s modifierade %2$s-widget</string>
     <string name="notice_widget_modified_by_you">Du modifierade %1$s-widget</string>
-
     <string name="power_level_admin">Admin</string>
     <string name="power_level_moderator">Moderator</string>
     <string name="power_level_default">Standard</string>
     <string name="power_level_custom">Anpassad (%1$d)</string>
     <string name="power_level_custom_no_value">Anpassad</string>
-
     <string name="notice_power_level_changed_by_you">Du ändrade behörighetsnivå för %1$s.</string>
     <string name="notice_power_level_changed">%1$s ändrade behörighetsnivå för %2$s.</string>
     <string name="notice_power_level_diff">%1$s från %2$s till %3$s</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Kan inte avkryptera: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Avsändarens enhet har inte gett oss nycklarna för det här meddelandet.</string>
-
     <string name="could_not_redact">Kunde inte dölja</string>
     <string name="unable_to_send_message">Kunde inte skicka meddelandet</string>
-
     <string name="message_failed_to_upload">Misslyckades att ladda upp bilden</string>
-
     <string name="network_error">Nätverksfel</string>
     <string name="matrix_error">Matrixfel</string>
-
     <string name="room_error_join_failed_empty_room">Det går för närvarande inte att gå med i ett tomt rum igen.</string>
-
     <string name="encrypted_message">Krypterat meddelande</string>
-
     <string name="medium_email">E-postadress</string>
     <string name="medium_phone_number">Telefonnummer</string>
-
     <string name="room_displayname_invite_from">Inbjudan från %s</string>
     <string name="room_displayname_room_invite">Rumsinbjudan</string>
-
     <string name="room_displayname_two_members">%1$s och %2$s</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s och en till</item>
         <item quantity="other">%1$s och %2$d till</item>
     </plurals>
-
     <string name="room_displayname_empty_room">Tomt rum</string>
-
     <string name="initial_sync_start_importing_account">Inledande synk:
 \nImporterar konto…</string>
     <string name="initial_sync_start_importing_account_crypto">Inledande synk:
@@ -151,10 +133,8 @@
 \nImporterar gemenskaper</string>
     <string name="initial_sync_start_importing_account_data">Inledande synk:
 \nImporterar kontodata</string>
-
     <string name="event_status_sending_message">Skickar meddelande…</string>
     <string name="clear_timeline_send_queue">Rensa sändningskö</string>
-
     <string name="notice_room_invite_no_invitee_with_reason">Inbjudan från %1$s. Anledning: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Inbjudan från dig. Anledning: %1$s</string>
     <string name="notice_room_invite_with_reason">%1$s bjöd in %2$s. Anledning: %3$s</string>
@@ -180,45 +160,57 @@
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Du accepterade inbjudan för %1$s. Anledning: %2$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s drog tillbaka inbjudan för %2$s. Anledning: %3$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Du drog tillbaka inbjudan för %1$s. Anledning: %2$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s lade till %2$s som en adress för det här rummet.</item>
         <item quantity="other">%1$s lade till %2$s som adresser för det här rummet.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Du lade till %1$s som en adress för det här rummet.</item>
         <item quantity="other">Du lade till %1$s som adresser för det här rummet.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s tog bort %2$s som en adress för det här rummet.</item>
         <item quantity="other">%1$s tog bort %2$s som adresser för det här rummet.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Du tog bort %1$s som en adress för det här rummet.</item>
         <item quantity="other">Du tog bort %2$s som adresser för det här rummet.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s lade till %2$s och tog bort %3$s som adresser för det här rummet.</string>
     <string name="notice_room_aliases_added_and_removed_by_you">Du lade till %1$s och tog bort %2$s som adresser för det här rummet.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s satta huvudadressen för det här rummet till %2$s.</string>
     <string name="notice_room_canonical_alias_set_by_you">Du satta huvudadressen för det här rummet till %1$s.</string>
     <string name="notice_room_canonical_alias_unset">%1$s tog bort huvudadressen för det här rummet.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Du tog bort huvudadressen för det här rummet.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s tillät gäster att gå med i rummet.</string>
     <string name="notice_room_guest_access_can_join_by_you">Du tillät gäster att gå med i rummet.</string>
     <string name="notice_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
-
     <string name="notice_end_to_end_ok">%1$s aktiverade totalsträckskryptering.</string>
     <string name="notice_end_to_end_ok_by_you">Du aktiverade totalsträckskryptering.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s aktiverade totalsträckskryptering (okänd algoritm %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Du aktiverade totalsträckskryptering (okänd algoritm %1$s).</string>
-
     <string name="key_verification_request_fallback_message">%s begär att verifiera din nyckel, men din klient stöder inte nyckelverifiering i chatten. Du behöver använda legacynyckelverifiering för att verifiera nycklar.</string>
-
-</resources>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Du hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s hindrade gäster från att gå med i rummet.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Du tillät gäster att gå med här.</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s tillät gäster att gå med här.</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Du lämnade. Anledning: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s Lämnade. Anledning: %2$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Du gick med. Anledning: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s gick med. Anledning: %2$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Du drog tillbaka inbjudan för %1$s</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s drog tillbaka inbjudan för %2$s</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Du bjöd in %1$s</string>
+    <string name="notice_direct_room_third_party_invite">%1$s bjöd in %2$s</string>
+    <string name="notice_direct_room_update_by_you">Du uppgraderade här.</string>
+    <string name="notice_direct_room_update">%s uppgraderade här.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Du gjorde framtida meddelanden synliga för %1$s</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s gjorde framtida meddelanden synliga för %2$s</string>
+    <string name="notice_direct_room_leave_by_you">Du lämnade rummet</string>
+    <string name="notice_direct_room_leave">%1$s lämnade rummet</string>
+    <string name="notice_direct_room_join_by_you">Du gick med</string>
+    <string name="notice_direct_room_join">%1$s gick med</string>
+    <string name="notice_direct_room_created_by_you">Du skapade diskussionen</string>
+    <string name="notice_direct_room_created">%1$s skapade diskussionen</string>
+</resources>
\ No newline at end of file

From 821b9dc187cb9ed20a73b5bd72ddacb201c4e9e0 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 16 Oct 2020 08:00:21 +0000
Subject: [PATCH 265/278] Translated using Weblate (Italian)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
---
 vector/src/main/res/values-it/strings.xml | 639 ++++------------------
 1 file changed, 95 insertions(+), 544 deletions(-)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 9852e714a1..b1ff89ccef 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1,18 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
-
     <string name="resources_language">it</string>
     <string name="resources_country_code">IT</string>
-
     <!-- titles -->
     <string name="title_activity_home">Messaggi</string>
     <string name="title_activity_room">Stanza</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="title_activity_member_details">Dettagli sui membri</string>
     <string name="title_activity_historical">Cronologia</string>
-
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Annulla</string>
@@ -46,7 +43,6 @@
     <string name="or">o</string>
     <string name="invite">Invita</string>
     <string name="offline">Disconnesso</string>
-
     <!-- actions -->
     <string name="action_sign_out">Disconnetti</string>
     <string name="action_voice_call">Chiamata audio</string>
@@ -59,27 +55,22 @@
     <string name="action_close">Chiudi</string>
     <string name="copied_to_clipboard">Copiato negli appunti</string>
     <string name="disable">Disabilita</string>
-
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Conferma</string>
     <string name="dialog_title_warning">Attenzione</string>
-
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_favourites">Preferiti</string>
     <string name="bottom_action_people">Chat dirette</string>
     <string name="bottom_action_rooms">Stanze</string>
-
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Cerca</string>
     <string name="home_filter_placeholder_favorites">Cerca tra i preferiti</string>
     <string name="home_filter_placeholder_people">Cerca tra le chat dirette</string>
     <string name="home_filter_placeholder_rooms">Cerca tra le stanze</string>
-
     <!-- Home fragment -->
     <string name="invitations_header">Inviti</string>
     <string name="low_priority_header">Bassa priorità</string>
-
     <!-- People fragment -->
     <string name="direct_chats_header">Conversazioni</string>
     <string name="local_address_book_header">Rubrica locale</string>
@@ -88,17 +79,15 @@
     <string name="no_conversation_placeholder">Nessuna conversazione</string>
     <string name="no_contact_access_placeholder">Element non ha avuto l\'autorizzazione ad accedere alla tua Rubrica locale</string>
     <string name="no_result_placeholder">Nessun risultato</string>
-
     <!-- Rooms fragment -->
     <string name="rooms_header">Stanze</string>
     <string name="rooms_directory_header">Elenco stanze</string>
     <string name="no_room_placeholder">Nessuna stanza</string>
     <string name="no_public_room_placeholder">Nessuna stanza pubblica disponibile</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 utente</item>
+        <item quantity="one">%d utente</item>
         <item quantity="other">%d utenti</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">Invia i registri</string>
     <string name="send_bug_report_include_crash_logs">Invia i registri di crash</string>
     <string name="send_bug_report_include_screenshot">Invia schermata</string>
@@ -108,14 +97,11 @@
     <string name="send_bug_report_logs_description">Per permettere una diagnosi del problema, oltre alla segnalazione errore verranno inviati anche i registri di Element. Rapporto, registri e schermata non saranno resi pubblici. Tuttavia, se preferisci inviare solamente la segnalazione, deseleziona:</string>
     <string name="send_bug_report_alert_message">Sembra tu stia scuotendo il dispositivo con rabbia. Vuoi segnalare un errore\?</string>
     <string name="send_bug_report_app_crashed">L\'ultima volta l\'applicazione è andata in crash. Vuoi inviare una segnalazione\?</string>
-
     <string name="send_bug_report_sent">La segnalazione errore è stata spedita</string>
     <string name="send_bug_report_failed">L\'invio della segnalazione errore è fallito (%s)</string>
     <string name="send_bug_report_progress">Avanzamento (%s%%)</string>
-
     <string name="send_files_in">Invia file in</string>
     <string name="read_receipt">Leggi</string>
-
     <string name="join_room">Entra</string>
     <string name="username">Nome utente</string>
     <string name="create_account">Crea account</string>
@@ -124,18 +110,14 @@
     <string name="hs_url">URL dell\'Home Server</string>
     <string name="identity_url">URL dell\'Identity Server</string>
     <string name="search">Cerca</string>
-
     <string name="start_new_chat">Avvia una nuova chat diretta</string>
     <string name="start_voice_call">Avvia chiamata audio</string>
     <string name="start_video_call">Avvia chiamata video</string>
-
     <string name="option_send_files">Invia file</string>
     <string name="option_take_photo_video">Fai una foto o un video</string>
-
     <string name="call_notification_answer">Accetta</string>
     <string name="call_notification_reject">Rifiuta</string>
     <string name="call_notification_hangup">Riaggancia</string>
-
     <!-- Authentication -->
     <string name="auth_login">Accedi</string>
     <string name="auth_register">Crea account</string>
@@ -168,7 +150,9 @@
     <string name="auth_forgot_password">Hai dimenticato la password\?</string>
     <string name="auth_use_server_options">Usa opzioni server personalizzate (avanzate)</string>
     <string name="auth_email_validation_message">Per favore controlla la tua email per proseguire la registrazione</string>
-    <string name="auth_threepid_warning_message">La registrazione con email e numero di telefono in una volta sola non è ancora supportata. Sarà utilizzato solo il numero di telefono. Potrai aggiungere l\'indirizzo email al tuo profilo dalle impostazioni.</string>
+    <string name="auth_threepid_warning_message">La registrazione con email e numero di telefono in una volta sola non è ancora supportata. Sarà utilizzato solo il numero di telefono.
+\n
+\nPotrai aggiungere l\'indirizzo email al tuo profilo dalle impostazioni.</string>
     <string name="auth_recaptcha_message">Questo Home Server vorrebbe assicurarsi che tu non sia un robot</string>
     <string name="auth_username_in_use">Nome utente già in uso</string>
     <string name="auth_home_server">Home Server:</string>
@@ -182,7 +166,6 @@
     <string name="auth_reset_password_success_message">La tua password è stata reimpostata. 
 \n 
 \nSei stato disconnesso da tutte le sessioni e non riceverai più alcuna notifica. Per ripristinare le notifiche, riconnettiti su ciascun dispositivo.</string>
-
     <!-- Login Screen -->
     <string name="login_error_must_start_http">L\'URL deve iniziare con http[s]://</string>
     <string name="login_error_network_error">Impossibile accedere: errore di rete</string>
@@ -191,7 +174,6 @@
     <string name="login_error_unable_register">Impossibile registrarsi</string>
     <string name="login_error_unable_register_mail_ownership">Impossibile registrarsi: difetto proprietà dell\'email</string>
     <string name="login_error_invalid_home_server">Inserisci un URL valido</string>
-
     <string name="login_error_forbidden">Nome utente/password non corretto</string>
     <string name="login_error_unknown_token">Il Token di accesso specificato non è stato riconosciuto</string>
     <string name="login_error_bad_json">JSON malformato</string>
@@ -199,35 +181,27 @@
     <string name="login_error_limit_exceeded">Sono state inviate troppe richieste</string>
     <string name="login_error_user_in_use">Questo nome utente è già in uso</string>
     <string name="login_error_login_email_not_yet">Il link nella mail non è ancora stato cliccato</string>
-
     <!-- crypto warnings -->
-
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Elenco ricevute lette</string>
-
     <!-- accounts list Screen -->
-
     <!-- image size selection -->
     <string name="compression_options">Invia come </string>
     <string name="compression_opt_list_original">Originario</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Medio</string>
     <string name="compression_opt_list_small">Piccolo</string>
-
     <!-- media upload / download messages -->
     <string name="attachment_cancel_download">"Annullare il download?</string>
     <string name="attachment_cancel_upload">Annullare l\'upload?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-
     <!-- room creation dialog Screen -->
     <string name="yesterday">Ieri</string>
     <string name="today">Oggi</string>
-
     <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nome stanza</string>
     <string name="room_info_room_topic">Argomento stanza</string>
-
     <!-- call string -->
     <string name="call_connected">Chiamata in corso</string>
     <string name="call_connecting">Chiamata in connessione…</string>
@@ -237,16 +211,13 @@
     <string name="incoming_video_call">Chiamata video in arrivo</string>
     <string name="incoming_voice_call">Chiamata audio in arrivo</string>
     <string name="call_in_progress">Chiamata in corso…</string>
-
     <string name="call_error_user_not_responding">Ricezione fallita da parte del destinatario.</string>
     <string name="call_error_ice_failed">La connessione al supporto multimediale è fallita</string>
     <string name="call_error_camera_init_failed">Impossibile avviare la fotocamera</string>
     <string name="call_error_answered_elsewhere">chiamata risposta altrove</string>
-
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Fai una foto o un video</string>
     <string name="media_picker_cannot_record_video">Impossibile registrare video</string>
-
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informazione</string>
     <string name="permissions_rationale_msg_storage">Element deve essere autorizzato ad accedere alla tua Galleria di foto e video per poter inviare e salvare allegati.
@@ -267,25 +238,20 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element può usare tua Rubrica locale per trovare altri utenti Matrix grazie alle loro email e numeri di telefono.
 \n
 \nTi sta bene comunicare i dati di tutti i tuoi contatti per questo scopo\?</string>
-
     <string name="permissions_action_not_performed_missing_permissions">Purtroppo l\'azione non è stata eseguita poiché mancano i permessi</string>
-
     <!-- medias slider string -->
     <string name="media_slider_saved">Salvato</string>
     <string name="media_slider_saved_message">Salvare nei download?</string>
     <string name="yes">SÌ</string>
     <string name="no">NO</string>
     <string name="_continue">Continua</string>
-
     <!-- Actions -->
     <string name="remove">Rimuovi</string>
     <string name="join">Unisciti</string>
     <string name="preview">Anteprima</string>
     <string name="reject">Rifiuta</string>
-
     <!-- Room -->
     <string name="room_jump_to_first_unread">Vai al primo messaggio non letto.</string>
-
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">Sei stato invitato ad entrare in questa stanza da %s</string>
     <string name="room_preview_unlinked_email_warning">Questo invito è stato spedito a %s, che non è associato a questo account.
@@ -293,27 +259,22 @@
     <string name="room_preview_try_join_an_unknown_room">Stai provando ad accedere a %s. Desideri entrare per partecipare alla discussione?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una stanza</string>
     <string name="room_preview_room_interactions_disabled">Questa è l\'anteprima della stanza. Le interazioni sono disabilitate.</string>
-
     <!-- Chat creation -->
     <string name="room_creation_title">Nuova chat</string>
     <string name="room_creation_add_member">Aggiungi utente</string>
     <string name="room_title_one_member">1 utente</string>
-
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Esci dalla stanza</string>
     <string name="room_participants_leave_prompt_msg">Sei sicuro di voler uscire dalla stanza?</string>
     <string name="room_participants_remove_prompt_msg">Sei sicuro di voler rimuovere %s da questa chat?</string>
     <string name="room_participants_create">Crea</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Inattivo</string>
-
     <string name="room_participants_header_admin_tools">STRUMENTI ADMIN</string>
     <string name="room_participants_header_call">CHIAMATA</string>
     <string name="room_participants_header_direct_chats">CHAT DIRETTE</string>
     <string name="room_participants_header_devices">SESSIONI</string>
-
     <string name="room_participants_action_invite">Invita</string>
     <string name="room_participants_action_leave">Esci da questa stanza</string>
     <string name="room_participants_action_remove">Butta fuori da questa stanza</string>
@@ -329,19 +290,15 @@
     <string name="room_participants_action_devices_list">Mostra l\'elenco delle sessioni</string>
     <string name="room_participants_power_level_prompt">La nomina non potrà essere annullata perché darai a questo utente i tuoi stessi poteri.
 \nSicuro di voler procedere\?</string>
-
     <string name="room_participants_invite_prompt_msg">Sicuro di voler invitare %s\?</string>
-
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Invita tramite ID utente </u></string>
     <string name="people_search_local_contacts">CONTATTI LOCALI (%d)</string>
     <string name="people_search_user_directory">ELENCO UTENTI (%s)</string>
     <string name="people_search_filter_text">Solo utenti Matrix</string>
-
     <string name="people_search_invite_by_id_dialog_title">Invita tramite ID utente</string>
     <string name="people_search_invite_by_id_dialog_description">Per favore inserisci uno o più indirizzi email o ID utente</string>
     <string name="people_search_invite_by_id_dialog_hint">Email o ID utente</string>
-
     <!--  Chat -->
     <string name="room_menu_search">Cerca</string>
     <string name="room_one_user_is_typing">%s sta scrivendo…</string>
@@ -358,7 +315,6 @@
     <string name="room_delete_unsent_messages">Elimina i messaggi non inviati</string>
     <string name="room_message_file_not_found">File non trovato</string>
     <string name="room_do_not_have_permission_to_post">Non hai il permesso di pubblicare in questa stanza</string>
-
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Fidati</string>
     <string name="ssl_do_not_trust">Non fidarti</string>
@@ -371,7 +327,6 @@
     <string name="ssl_unexpected_existing_expl">Il certificato è diverso da quello precedentemente contrassegnato sul tuo telefono come \"affidabile\". Questa cosa è MOLTO INSOLITA. Si raccomanda di NON ACCETTARE questo nuovo certificato.</string>
     <string name="ssl_expected_existing_expl">Il certificato del server è cambiato: quello precedente era stato contrassegnato come affidabile ma quello attuale no. Può darsi che il certificato precedente sia scaduto e sia stato semplicemente sostituito con uno nuovo. Contatta l\'amministratore del server per verificare l\'impronta digitale in uso.</string>
     <string name="ssl_only_accept">Contrassegna il certificato come affidabile solo se l\'mpronta digitale comunicata dall\'amministratore del server corrisponde a quella qua sopra.</string>
-
     <!-- Room Details -->
     <string name="room_details_title">Dettagli stanza</string>
     <string name="room_details_people">Utenti</string>
@@ -380,7 +335,6 @@
     <string name="malformed_id">ID malformato. Dovrebbe essere un indirizzo email o un ID utente come \'@localpart:domain\'</string>
     <string name="room_details_people_invited_group_name">INVITATI</string>
     <string name="room_details_people_present_group_name">MEMBRI</string>
-
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivo per cui segnali questo contenuto</string>
     <string name="room_event_action_report_prompt_ignore_user">Desideri nascondere tutti i messaggi di questo utente\? 
@@ -388,7 +342,6 @@
 \nTieni presente che questa azione riavvierà l\'app e ciò potrebbe richiedere molto tempo.</string>
     <string name="room_event_action_cancel_upload">Annulla l\'upload</string>
     <string name="room_event_action_cancel_download">Annulla il download</string>
-
     <!-- Search -->
     <string name="search_hint">Cerca</string>
     <string name="search_members_hint">Cerca tra i membri della stanza</string>
@@ -397,7 +350,6 @@
     <string name="tab_title_search_messages">MESSAGGI</string>
     <string name="tab_title_search_people">UTENTI</string>
     <string name="tab_title_search_files">FILE</string>
-
     <!-- Room recents -->
     <string name="room_recents_join">ENTRA</string>
     <string name="room_recents_directory">ELENCO</string>
@@ -410,18 +362,15 @@
     <string name="room_recents_join_room">Entra nella stanza</string>
     <string name="room_recents_join_room_title">Entra in una stanza</string>
     <string name="room_recents_join_room_prompt">Digita l\'ID stanza o il suo nome</string>
-
     <!-- Directory -->
     <string name="directory_search_results_title">Esplora l\'elenco</string>
     <string name="directory_searching_title">Ricerca negli elenchi…</string>
-
     <!-- home room settings -->
     <string name="room_settings_favourite">Preferito</string>
     <string name="room_settings_de_prioritize">Bassa priorità</string>
     <string name="room_settings_direct_chat">Chat diretta</string>
     <string name="room_settings_leave_conversation">Esci dalla conversazione</string>
     <string name="room_settings_forget">Dimentica</string>
-
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Messaggi</string>
     <string name="room_sliding_menu_settings">Impostazioni</string>
@@ -430,9 +379,7 @@
     <string name="room_sliding_menu_third_party_notices">Avvisi di terze parti</string>
     <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Politica sulla privacy</string>
-
     <!-- Vector Settings -->
-
     <string name="settings_profile_picture">Immagine del profilo</string>
     <string name="settings_display_name">Nome visualizzato</string>
     <string name="settings_email_address">Email</string>
@@ -441,23 +388,19 @@
     <string name="settings_add_phone_number">Aggiungi numero di telefono</string>
     <string name="settings_app_info_link_summary">Mostra le informazioni dell\'App nelle Impostazioni di sistema.</string>
     <string name="settings_app_info_link_title">Informazioni sull\'App</string>
-
     <string name="settings_enable_all_notif">Abilita le notifiche per questo account</string>
     <string name="settings_enable_this_device">Attiva le notifiche per questa sessione</string>
     <string name="settings_turn_screen_on">Accendi lo schermo per 3 secondi alla notifica</string>
-
     <string name="settings_messages_in_one_to_one">Messaggi nelle chat dirette</string>
     <string name="settings_messages_in_group_chat">Messaggi nelle chat di gruppo</string>
     <string name="settings_invited_to_room">Invito ad entrare in una stanza</string>
     <string name="settings_call_invitations">Invito ad una chiamata</string>
     <string name="settings_messages_sent_by_bot">Messaggi inviati da bot</string>
-
     <string name="settings_start_on_boot">Esegui all\'avvio</string>
     <string name="settings_background_sync">Sincronizzazione in background</string>
     <string name="settings_enable_background_sync">Abilita la sincronizzazione in background</string>
     <string name="settings_set_sync_timeout">La richiesta di sincronizzazione sta impiegando troppo tempo</string>
     <string name="settings_set_sync_delay">Ritardo tra ogni sincronizzazione</string>
-
     <string name="settings_version">Versione</string>
     <string name="settings_olm_version">Versione olm</string>
     <string name="settings_app_term_conditions">Termini e condizioni</string>
@@ -467,7 +410,6 @@
     <string name="settings_clear_cache">Svuota la cache</string>
     <string name="settings_clear_media_cache">Svuota la cache dei file multimediali</string>
     <string name="settings_keep_media">Conserva i file multimediali</string>
-
     <string name="settings_user_settings">Impostazioni utente</string>
     <string name="settings_notifications">Notifiche</string>
     <string name="settings_ignored_users">Utenti ignorati</string>
@@ -484,7 +426,6 @@
     <string name="settings_devices_list">Sessioni</string>
     <string name="settings_always_show_timestamps">Mostra data e ora di tutti i messaggi</string>
     <string name="settings_data_save_mode">Modalità risparmio dati</string>
-
     <string name="devices_details_dialog_title">Informazioni sulla sessione</string>
     <string name="devices_details_id_title">ID</string>
     <string name="devices_details_name_title">Nome pubblico</string>
@@ -495,22 +436,18 @@
     <string name="devices_delete_dialog_title">Autenticazione</string>
     <string name="devices_delete_pswd">Password:</string>
     <string name="devices_delete_submit_button_label">Invia</string>
-
     <string name="settings_logged_in">Autenticato come</string>
     <string name="settings_home_server">Home Server</string>
     <string name="settings_identity_server">Server identità</string>
-
     <string name="settings_user_interface">Interfaccia utente</string>
     <string name="settings_interface_language">Lingua</string>
     <string name="settings_select_language">Scegli una lingua</string>
-
     <string name="account_email_validation_title">In attesa di verifica</string>
     <string name="account_email_validation_message">Controlla la tua email e clicca sul link che ti è stato spedito. Fatto questo, clicca su Continua.</string>
     <string name="account_email_validation_error">Impossibile verificare l\'indirizzo email. Controlla la tua email e clicca sul link che ti è stato spedito. Fatto questo, clicca su Continua.</string>
     <string name="account_email_already_used_error">Questo indirizzo email è già in uso.</string>
     <string name="account_email_not_found_error">Questo indirizzo email non è stato trovato.</string>
     <string name="account_phone_number_already_used_error">Questo numero di telefono è già in uso.</string>
-
     <string name="settings_change_password">Cambia la password</string>
     <string name="settings_old_password">Password attuale</string>
     <string name="settings_new_password">Nuova password</string>
@@ -520,13 +457,9 @@
     <string name="settings_unignore_user">Mostrare tutti i messaggi di %s\?
 \n
 \nTieni presente che questa azione riavvierà l\'app e ciò potrebbe richiedere molto tempo.</string>
-
     <string name="settings_delete_notification_targets_confirmation">Sicuro di voler rimuovere questo target di notifica?</string>
-
     <string name="settings_delete_threepid_confirmation">Sicuro di voler rimuovere %1$s %2$s?</string>
-
     <string name="settings_select_country">Scegli un paese</string>
-
     <string name="settings_phone_number_country_label">Paese</string>
     <string name="settings_phone_number_country_error">Per favore scegli un paese</string>
     <string name="settings_phone_number_label">Numero di telefono</string>
@@ -536,27 +469,22 @@
     <string name="settings_phone_number_verification_error_empty_code">Inserisci un codice di attivazione</string>
     <string name="settings_phone_number_verification_error">Errore durante la convalida del numero di telefono</string>
     <string name="settings_phone_number_code">Codice</string>
-
     <!-- medias saving settings -->
     <string name="media_saving_period_3_days">3 giorni</string>
     <string name="media_saving_period_1_week">1 settimana</string>
     <string name="media_saving_period_1_month">1 mese</string>
     <string name="media_saving_period_forever">Per sempre</string>
-
     <!-- Room Settings -->
-
     <!-- room global settings-->
     <string name="room_settings_room_photo">Icona della stanza</string>
     <string name="room_settings_room_name">Nome della stanza</string>
     <string name="room_settings_topic">Argomento</string>
     <string name="room_settings_room_tag">Etichetta</string>
     <string name="room_settings_tag_pref_dialog_title">Etichetta come:</string>
-
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Preferito</string>
     <string name="room_settings_tag_pref_entry_low_priority">Bassa priorità</string>
     <string name="room_settings_tag_pref_entry_none">Nessuna etichetta</string>
-
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Accesso e visibilità</string>
     <string name="room_settings_directory_visibility">Mostra questa stanza nell\'elenco delle stanze pubbliche</string>
@@ -564,22 +492,18 @@
     <string name="room_settings_room_read_history_rules_pref_title">Accesso alla Timeline</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Chi può leggere la Timeline\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Chi può entrare in questa stanza?</string>
-
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Chiunque</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Solo i membri (dal momento in cui questa opzione è stata selezionata)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Solo i membri (dal momento in cui vengono invitati)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Solo i membri (dal momento in cui entrano nella stanza)</string>
-
     <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Una stanza deve avere un indirizzo per poter essere linkata.</string>
     <string name="room_settings_room_access_entry_only_invited">Solo le persone che sono state invitate</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Chiunque conosca il link della stanza, eccetto gli ospiti</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Chiunque conosca il link della stanza, compresi gli ospiti</string>
-
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Utenti bannati</string>
-
     <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avanzate</string>
     <string name="room_settings_room_internal_id">ID interno della stanza</string>
@@ -591,35 +515,27 @@
     <string name="room_settings_labs_end_to_end_warnings">Devi disconnetterti per abilitare la crittografia.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Cripta solo per le sessioni verificate</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Non inviare mai da questa sessione messaggi cifrati verso sessioni in questa stanza non verificate.</string>
-
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Questa stanza non ha indirizzi locali</string>
     <string name="room_settings_addresses_add_new_address">Nuovo indirizzo stanza (es. #foo:matrix.org)</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Il formato del nome della stanza non è corretto</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' non è un formato valido per un nome di stanza</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Non avrai un indirizzo principale specifico per questa stanza.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Avvisi per l\'indirizzo principale</string>
-
     <string name="room_settings_set_main_address">Imposta come indirizzo principale</string>
     <string name="room_settings_unset_main_address">Non usare più come indirizzo principale</string>
     <string name="room_settings_copy_room_id">Copia ID stanza</string>
     <string name="room_settings_copy_room_address">Copia indirizzo stanza</string>
-
     <string name="room_settings_addresses_e2e_enabled">Crittografia abilitata in questa stanza.</string>
     <string name="room_settings_addresses_e2e_disabled">Crittografia disabilitata in questa stanza.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Abilita crittografia\n(attenzione: non può più essere disabilitata!)</string>
-
     <!-- Directory -->
     <string name="directory_title">Elenco</string>
     <string name="settings_theme">Tema</string>
-
     <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s stava cercando di caricare un punto specifico tra i messaggi passati di questa stanza, ma non l\'ha trovato.</string>
-
     <!-- encryption dialog -->
     <string name="encryption_information_title">Informazioni sulla crittografia E2E</string>
-
     <string name="encryption_information_device_info">Informazioni sull\'evento</string>
     <string name="encryption_information_user_id">ID utente</string>
     <string name="encryption_information_curve25519_identity_key">Chiave identità Curve25519</string>
@@ -627,7 +543,6 @@
     <string name="encryption_information_algorithm">Algoritmo</string>
     <string name="encryption_information_session_id">ID sessione</string>
     <string name="encryption_information_decryption_error">Errore di decriptazione</string>
-
     <string name="encryption_information_sender_device_information">Informazioni sessione del mittente</string>
     <string name="encryption_information_device_name">Nome pubblico</string>
     <string name="encryption_information_name">Nome pubblico</string>
@@ -635,7 +550,6 @@
     <string name="encryption_information_device_key">Chiave sessione</string>
     <string name="encryption_information_verification">Verifica</string>
     <string name="encryption_information_ed25519_fingerprint">Impronta digitale Ed25519</string>
-
     <string name="encryption_export_e2e_room_keys">Esporta le chiavi di crittografia delle stanze</string>
     <string name="encryption_export_room_keys">Esporta le chiavi delle stanze</string>
     <string name="encryption_export_room_keys_summary">Esporta le chiavi in un file locale</string>
@@ -645,31 +559,25 @@
     <string name="encryption_export_saved_as">Le chiavi di crittografia della stanza sono state salvate su \'%s\'.
 \n
 \nAttenzione: se si disinstalla quest\'applicazione il file, viene eliminato.</string>
-
     <string name="encryption_import_e2e_room_keys">Importa le chiavi di crittografia della stanza</string>
     <string name="encryption_import_room_keys">Importa le chiavi della stanza</string>
     <string name="encryption_import_room_keys_summary">Importa le chiavi da un file locale</string>
     <string name="encryption_import_import">Importa</string>
     <string name="encryption_never_send_to_unverified_devices_title">Cripta solo per le sessioni verificate</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Non inviare mai da questa sessione messaggi cifrati verso sessioni non verificate.</string>
-
     <string name="encryption_information_not_verified">NON verificato</string>
     <string name="encryption_information_verified">Verificato</string>
     <string name="encryption_information_blocked">Metti in lista nera</string>
-
     <string name="encryption_information_unknown_device">sessione sconosciuta</string>
     <string name="encryption_information_none">niente</string>
-
     <string name="encryption_information_verify">Conferma</string>
     <string name="encryption_information_unverify">Rimuovi la conferma</string>
     <string name="encryption_information_block">Lista nera</string>
     <string name="encryption_information_unblock">Togli dalla lista nera</string>
-
     <string name="encryption_information_verify_device">Verifica la sessione</string>
     <string name="encryption_information_verify_device_warning">Conferma confrontando la seguente con le impostazioni utente della tua altra sessione:</string>
     <string name="encryption_information_verify_device_warning2">Se non corrispondono, la sicurezza delle tue comunicazioni potrebbe essere compromessa.</string>
     <string name="encryption_information_verify_key_match">Ho verificato che le chiavi corrispondono</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">La stanza contiene sessioni sconosciute</string>
     <string name="unknown_devices_alert_message">Questa stanza contiene sessioni sconosciute che non sono state verificate. 
@@ -677,7 +585,6 @@
 \nTi consigliamo di verificare ogni sessione prima di continuare, ma se lo preferisci, è comunque possibile inviare il messaggio anche senza la verifica. 
 \n 
 \nSessioni sconosciute:</string>
-
     <!-- directory activity  -->
     <string name="select_room_directory">Scegli un elenco di stanze</string>
     <string name="directory_server_fail_to_retrieve_server">Il server potrebbe essere non disponibile o sovraccarico</string>
@@ -685,10 +592,8 @@
     <string name="directory_server_placeholder">URL dell\'Home Server</string>
     <string name="directory_server_all_rooms_on_server">Tutte le stanze sull\'Home Server %s</string>
     <string name="directory_server_native_rooms">Tutte le stanze native %s</string>
-
     <!-- historical -->
     <string name="historical_placeholder">Cerca tra i messaggi passati</string>
-
     <!-- text size selection -->
     <string name="font_size">Grandezza font</string>
     <string name="tiny">Minuscolo</string>
@@ -701,14 +606,12 @@
     <string name="light_theme">Tema Chiaro</string>
     <string name="dark_theme">Tema Scuro</string>
     <string name="black_them">Tema Nero</string>
-
     <string name="notification_sync_in_progress">Sincronizzazione…</string>
     <string name="settings_notification_ringtone">Suono delle notifiche</string>
     <string name="settings_12_24_timestamps">Mostra gli orari in formato 12 ore</string>
     <string name="widget_no_power_to_manage">Devi avere il permesso per poter gestire i widget in questa stanza</string>
     <string name="settings_labs_create_conference_with_jitsi">Avvia una conferenza usando Jitsi</string>
     <string name="widget_delete_message_confirmation">Vuoi davvero eliminare questo widget dalla stanza\?</string>
-
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Impossibile creare il widget.</string>
     <string name="widget_integration_failed_to_send_request">L\'invio della richiesta è fallito.</string>
@@ -719,61 +622,46 @@
     <string name="room_add_matrix_apps">Aggiungi un Widget</string>
     <string name="option_take_photo">Fai una foto</string>
     <string name="option_take_video">Fai un video</string>
-
     <string name="settings_containing_my_display_name">Messaggi contenenti il nome mostrato</string>
     <string name="settings_containing_my_user_name">Messaggi contenenti il nome utente</string>
-
     <string name="notification_silent_notifications">Notifiche silenziose</string>
-
     <string name="notification_noisy_notifications">Notifiche audio</string>
     <string name="notification_listening_for_events">Rilevazione eventi</string>
     <string name="title_activity_bug_report">Segnalazione errore</string>
-
     <string name="call">Chiama</string>
     <string name="encrypted_message">Messaggio criptato</string>
-
     <string name="title_activity_group_details">Dettagli sulla comunità</string>
-
     <string name="loading">Caricamento…</string>
-
     <string name="action_exit">Esci</string>
     <string name="actions">Azioni</string>
     <string name="bottom_action_groups">Comunità</string>
-
     <string name="home_filter_placeholder_groups">Cerca tra le e comunità</string>
-
     <string name="groups_invite_header">Invita</string>
     <string name="groups_header">Comunità</string>
     <string name="no_group_placeholder">Nessun gruppo</string>
-
     <string name="send_bug_report_rage_shake">Per segnalare un errore agita il dispositivo con rabbia</string>
-
     <string name="start_new_chat_prompt_msg">Sicuro di voler avviare una nuova chat con %s\?</string>
     <string name="start_voice_call_prompt_msg">Sicuro di voler fare una chiamata audio\?</string>
     <string name="start_video_call_prompt_msg">Sicuro di voler fare una chiamata video\?</string>
-
     <string name="groups_list">Elenco gruppi</string>
-
     <string name="list_members">Elenco dei membri</string>
     <string name="open_chat_header">Apri descrizione</string>
     <string name="room_sync_in_progress">Sincronizzazione…</string>
     <plurals name="room_header_active_members_count">
-        <item quantity="one">1 utente attivo</item>
+        <item quantity="one">%d utente attivo</item>
         <item quantity="other">%d utenti attivi</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="one">1 utente</item>
+        <item quantity="one">%d utente</item>
         <item quantity="other">%d utenti</item>
     </plurals>
     <string name="room_participants_ban_prompt_msg">Bandire l\'utente lo espellerà dalla stanza e gli impedirà di rientrare.</string>
-
     <plurals name="room_new_messages_notification">
-        <item quantity="one">1 nuovo messaggio</item>
+        <item quantity="one">%d nuovo messaggio</item>
         <item quantity="other">%d nuovi messaggi</item>
     </plurals>
-
     <plurals name="directory_search_rooms">
-        <item quantity="one">1 stanza</item>
+        <item quantity="one">%d stanza</item>
         <item quantity="other">%d stanze</item>
     </plurals>
     <plurals name="directory_search_rooms_for">
@@ -784,101 +672,81 @@
     <string name="room_settings_all_messages">Tutti i messaggi</string>
     <string name="room_settings_mention_only">Solo le citazioni</string>
     <string name="room_settings_mute">Silenzioso</string>
-    <string name="room_settings_add_homescreen_shortcut">Aggiungi scorciatoia sulla schermata iniziale</string>
-
+    <string name="room_settings_add_homescreen_shortcut">Aggiungi alla schermata iniziale</string>
     <string name="settings_inline_url_preview">Anteprima degli URL</string>
     <string name="settings_vibrate_on_mention">Vibra quando menzionano un utente</string>
-
     <string name="settings_analytics">Statistiche</string>
-
     <string name="room_settings_room_notifications_title">Notifiche</string>
     <string name="room_settings_add_new_group">Nuovo ID della comunità (es. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">L\'ID comunità non è valido</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' non è un ID comunità valido</string>
-
-
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">1 messaggio notificato non letto</item>
+        <item quantity="one">%d messaggio notificato non letto</item>
         <item quantity="other">%d messaggi notificati non letti</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">1 messaggio notificato non letto</item>
+        <item quantity="one">%d messaggio notificato non letto</item>
         <item quantity="other">%d messaggi notificati non letti</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
-        <item quantity="one">1 stanza</item>
+        <item quantity="one">%d stanza</item>
         <item quantity="other">%d stanze</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s in %2$s</string>
-
     <string name="widget_creation_failure">La creazione del widget è fallita</string>
     <plurals name="active_widgets">
-        <item quantity="one">1 widget attivo</item>
+        <item quantity="one">%d widget attivo</item>
         <item quantity="other">%d widget attivi</item>
     </plurals>
-
     <!-- Widget Integration Manager -->
     <string name="widget_integration_room_not_visible">La stanza %s non è visibile.</string>
     <string name="settings_labs_native_camera">Usa la fotocamera di sistema</string>
-
     <!-- share keys -->
     <string name="you_added_a_new_device">Hai aggiunto una nuova sessione \'%s\' che sta richiedendo le chiavi crittografiche.</string>
     <string name="your_unverified_device_requesting">La tua sessione non verificata \'%s\' sta chiedendo le chiavi crittografiche.</string>
     <string name="start_verification">Avvia la verifica</string>
     <string name="share_without_verifying">Condividi senza verificare</string>
     <string name="ignore_request">Ignora la richiesta</string>
-
     <!-- conference call -->
     <string name="conference_call_warning_title">Attenzione!</string>
     <string name="conference_call_warning_message">Le conferenze sono in fase di sviluppo e potrebbero non essere affidabili.</string>
-
     <!-- slash commands -->
     <string name="command_error">Errore di comando</string>
     <string name="unrecognized_command">Comando non riconosciuto: %s</string>
-
     <!-- notification statuses -->
     <string name="notification_off">Spento</string>
     <string name="notification_noisy">Rumoroso</string>
-
     <string name="create">Crea</string>
     <string name="create_community">Crea una comunità</string>
     <string name="community_name">Nome della comunità</string>
     <string name="community_name_hint">Esempio</string>
     <string name="community_id">ID comunità</string>
     <string name="community_id_hint">esempio</string>
-
     <!-- group details -->
     <string name="group_details_home">Home</string>
     <string name="group_details_rooms">Stanze</string>
     <string name="no_users_placeholder">Nessun utente</string>
-
     <string name="rooms">Stanze</string>
     <string name="joined">Si è unito</string>
     <string name="invited">Invitato</string>
     <string name="filter_group_members">Cerca tra i membri del gruppo</string>
     <string name="filter_group_rooms">Cerca tra le stanze del gruppo</string>
-
     <string name="group_no_long_description">L\'amministratore non ha fornito una descrizione estesa di questa comunità.</string>
-
     <string name="has_been_kicked">%2$s ti ha buttato fuori da %1$s</string>
     <string name="has_been_banned">%2$s ti ha bannato da %1$s</string>
     <string name="reason_colon">Motivo: %1$s</string>
     <string name="rejoin">Rientra</string>
     <string name="forget_room">Dimentica la stanza</string>
-
     <string name="avatar">Avatar</string>
-
     <string name="settings_flair">Predisposizione</string>
-
     <string name="room_settings_no_flair">Questa stanza non mostra predisposizione per alcuna comunità</string>
     <string name="widget_integration_positive_power_level">Il livello di potere deve essere un intero positivo.</string>
     <string name="notice_avatar">Avatar di avviso</string>
     <string name="receipt_avatar">Avatar di ricezione</string>
     <plurals name="membership_changes">
-        <item quantity="one">1 cambio d\'appartenenza</item>
+        <item quantity="one">%d cambio d\'appartenenza</item>
         <item quantity="other">%d cambi d\'appartenenza</item>
     </plurals>
-
     <string name="settings_notification_privacy">Privacy delle notifiche</string>
     <string name="settings_notification_privacy_normal">Normale</string>
     <string name="settings_notification_privacy_reduced">Privacy ridotta</string>
@@ -888,32 +756,25 @@
     <string name="settings_notification_privacy_secure_message_content">• Il contenuto del messaggio di una notifica è <b>emesso direttamente dall\'Home Server Matrix</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• Le notifiche contengono <b>metadati e contenuto del messaggio</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• Le notifiche <b>non mostreranno il contenuto del messaggio</b></string>
-
     <string name="startup_notification_privacy_title">Privacy delle notifiche</string>
     <string name="startup_notification_privacy_message">Element può esser sempre attivo in background in modo da gestire le tue notifiche in modo costante e sicuro. Ciò può influire sulla durata della batteria.</string>
     <string name="startup_notification_privacy_button_grant">Concedi l\'autorizzazione</string>
     <string name="startup_notification_privacy_button_other">Scegli un\'altra opzione</string>
-
     <string name="title_activity_choose_sticker">Invia uno sticker</string>
-
     <string name="option_send_sticker">Invia sticker</string>
     <string name="no_sticker_application_dialog_content">Non ci sono pacchetti di sticker attivi. 
 \n 
 \nVuoi aggiungerne qualcuno\?</string>
-
     <string name="settings_deactivate_account_section">Disattiva l\'account</string>
     <string name="settings_deactivate_my_account">Disattiva il mio account</string>
-
     <string name="settings_opt_in_of_analytics">Invia le statistiche di utilizzo</string>
     <string name="settings_opt_in_of_analytics_summary">Element raccoglie statistiche anonime per permettere il miglioramento dell\'applicazione.</string>
     <string name="settings_opt_in_of_analytics_prompt">Attiva le statistiche per aiutare a migliorare Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sì, voglio aiutare!</string>
-
     <string name="widget_integration_missing_parameter">Manca un parametro indispensabile.</string>
     <string name="widget_integration_invalid_parameter">Uno dei parametri non è valido.</string>
     <string name="dialog_user_consent_content">Per continuare ad usare l\'Home Server %1$s devi leggerne e accettarne i termini di servizio.</string>
     <string name="dialog_user_consent_submit">Leggi ora</string>
-
     <string name="deactivate_account_title">Disattiva l\'account</string>
     <string name="deactivate_account_content">Ciò renderà il tuo account inutilizzabile per l\'eternità. Non potrai più accederci e nessuno potrà ri-registrare lo stesso ID utente. Il tuo account uscirà da tutte le stanze in cui si trova attualmente e di dettagli del tuo account saranno rimossi dall\'Identity Server. <b>Questa azione è irreversibile</b>. 
 \n
@@ -923,38 +784,26 @@
     <string name="deactivate_account_delete_checkbox">Per favore dimenticate tutti i messaggi che ho inviato fino al momento della disattivazione del mio account (Attenzione: in questo modo i nuovi utenti potrebbero vedere delle conversazioni incomplete)</string>
     <string name="deactivate_account_prompt_password">Per continuare, inserisci la tua password:</string>
     <string name="deactivate_account_submit">Disattiva l\'account</string>
-
     <string name="dialog_title_third_party_licences">Licenze di terze parti</string>
-
     <string name="download">Scarica</string>
     <string name="speak">Parla</string>
     <string name="clear">Svuota</string>
     <string name="e2e_re_request_encryption_key">Richiedi di nuovo le chiavi di crittografia dalle tue altre sessioni.</string>
-
     <string name="e2e_re_request_encryption_key_sent">La richiesta della chiave è stata inviata.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Richiesta inviata</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Avvia Element su un altro dispositivo che possa decifrare il messaggio, in modo che possa inviare le chiavi a questa sessione.</string>
-
     <string name="lock_screen_hint">Digita qui…</string>
-
     <string name="option_send_voice">Invia messaggio vocale</string>
-
     <string name="go_on_with">prosegui con…</string>
     <string name="error_no_external_application_found">Spiacenti, ma non è stata trovata alcuna applicazione esterna per completare l\'azione.</string>
-
     <string name="settings_labs_enable_send_voice">Invia messaggi vocali</string>
-
     <string name="group_details_people">Persone</string>
     <string name="error_empty_field_your_password">Per favore, inserisci la tua password.</string>
-
     <string name="send_bug_report_description_in_english">Se possibile, scrivi in inglese, grazie.</string>
     <string name="room_message_placeholder_reply_to_encrypted">Invia risposta criptata…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Risposta non criptata…</string>
     <string name="settings_preview_media_before_sending">Mostra file multimediale prima dell\'invio</string>
-
     <string name="settings_without_flair">Al momento non fai parte di alcuna comunità.</string>
-
     <string name="settings_labs_keyboard_options_to_send_message">Usa il tasto invio per spedire i messaggi</string>
     <string name="command_description_emote">Mostra l\'azione</string>
     <string name="command_description_ban_user">Banna utente con l\'ID specificato</string>
@@ -969,97 +818,77 @@
     <string name="command_description_nick">Cambia il tuo nome visualizzato</string>
     <string name="command_description_markdown">Markdown attivo / spento</string>
     <string name="command_description_clear_scalar_token">Per correggere la gestione dei widget</string>
-
     <string name="room_tombstone_versioned_description">Questa stanza è stata sostituita da un\'altra e non è più attiva</string>
     <string name="room_tombstone_continuation_link">La conversazione continua qui</string>
     <string name="room_tombstone_continuation_description">Questa stanza contiene una conversazione cominciata altrove</string>
     <string name="room_tombstone_predecessor_link">Clicca qui per vedere i messaggi precedenti</string>
-
     <string name="missing_permissions_error">Non hai permessi sufficienti per effettuare questa azione.</string>
     <plurals name="format_time_s">
-        <item quantity="one">1s</item>
+        <item quantity="one">%ds</item>
         <item quantity="other">%ds</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">1m</item>
+        <item quantity="one">%dm</item>
         <item quantity="other">%dm</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">1o</item>
-        <item quantity="other">%do</item>
+        <item quantity="one">%dh</item>
+        <item quantity="other">%dh</item>
     </plurals>
     <plurals name="format_time_d">
-        <item quantity="one">1g</item>
-        <item quantity="other">%dg</item>
+        <item quantity="one">%dd</item>
+        <item quantity="other">%dd</item>
     </plurals>
-
     <string name="room_participants_now">%1$s ora</string>
     <string name="room_participants_ago">%1$s %2$s fa</string>
-
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s e %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <plurals name="room_details_selected">
-        <item quantity="one">1 selezionato</item>
+        <item quantity="one">%d selezionato</item>
         <item quantity="other">%d selezionati</item>
     </plurals>
     <plurals name="group_members">
-        <item quantity="one">1 membro</item>
-        <item quantity="other">%d membri</item>
+        <item quantity="one">%d utente</item>
+        <item quantity="other">%d utenti</item>
     </plurals>
-
     <plurals name="group_rooms">
-        <item quantity="one">1 stanza</item>
+        <item quantity="one">%d stanza</item>
         <item quantity="other">%d stanze</item>
     </plurals>
     <string name="system_alerts_header">Avvisi di sistema</string>
-
     <string name="resource_limit_exceeded_title">Limite di risorse superato</string>
     <string name="resource_limit_contact_action">Contatta l\'amministratore</string>
-
     <string name="resource_limit_contact_admin">contatta l\'amministratore del servizio</string>
-
     <string name="resource_limit_soft_default">L\'Home Server ha superato uno dei limiti delle risorse, pertanto <b>alcuni utenti non potranno accedere</b>.</string>
     <string name="resource_limit_hard_default">L\'Home Server ha superato uno dei limiti delle risorse.</string>
-
     <string name="resource_limit_soft_mau"> L\'Home Server ha raggiunto il limite mensile di utenti attivi, pertanto <b>alcuni utenti non potranno accedere</b>.</string>
     <string name="resource_limit_hard_mau">L\'Home Server ha raggiunto il limite mensile di utenti attivi.</string>
-
     <string name="resource_limit_soft_contact">Per favore %s per aumentare questo limite.</string>
     <string name="resource_limit_hard_contact">Per favore %s per continuare ad usare questo servizio.</string>
-
     <string name="dialog_title_error">Errore</string>
-
     <string name="settings_lazy_loading_description">Aumenta la performance caricando i dati dei membri della stanza solo quando questi si fan vedere.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Il tuo Home Server non supporta ancora il caricamento differito dei membri delle stanze. Prova più avanti.</string>
-
     <string name="unknown_error">Spiacente, si è verificato un errore</string>
-
     <string name="settings_lazy_loading_title">Caricamento differito dei membri della stanza</string>
     <string name="status_theme">Tema Status.im</string>
-
     <string name="room_sliding_menu_version_x">Versione %s</string>
     <string name="encryption_export_notice">Crea una password per mettere al sicuro le chiavi esportate. La stessa password dovrà essere usata per poter importare le chiavi.</string>
     <string name="passphrase_create_passphrase">Crea una password</string>
     <string name="passphrase_passphrase_does_not_match">Le password devono corrispondere</string>
     <string name="merged_events_expand">espandi</string>
     <string name="merged_events_collapse">riduci</string>
-
     <string name="settings_info_area_show">Mostra l\'area informazioni</string>
     <string name="show_info_area_always">Sempre</string>
     <string name="show_info_area_messages_and_errors">Per messaggi ed errori</string>
     <string name="show_info_area_only_errors">Solo per gli errori</string>
-
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
-
     <string name="call_anyway">Chiama comunque</string>
     <string name="room_participants_action_kick">Butta fuori</string>
     <string name="reason_hint">Motivo</string>
-
     <string name="settings_inline_url_preview_summary">Se il tuo Home Server supporta questa funzione, all\'interno delle chat verrà visualizzata un\'anteprima dei link postati.</string>
     <string name="settings_send_typing_notifs">Invia notifiche di digitazione</string>
     <string name="settings_send_typing_notifs_summary">Fai sapere agli altri utenti che stai scrivendo.</string>
@@ -1074,20 +903,15 @@
     <string name="settings_password">Password</string>
     <string name="settings_labs_native_camera_summary">Avvia la fotocamera di sistema invece della fotocamera di Element.</string>
     <string name="settings_labs_enable_send_voice_summary">Questa opzione richiede un\'applicazione di terze parti per registrare i messaggi.</string>
-
     <string name="command_problem_with_parameters">Il comando \"%s\" necessita di più parametri, oppure alcuni parametri non sono corretti.</string>
     <string name="markdown_has_been_enabled">Markdown è stato abilitato.</string>
     <string name="markdown_has_been_disabled">Markdown è stato disabilitato.</string>
-
     <string name="settings_call_category">Chiamate</string>
     <string name="settings_call_ringtone_use_app_ringtone">Usa la suoneria predefinita di Element per le chiamate in arrivo</string>
     <string name="settings_call_ringtone_title">Suoneria delle chiamate in arrivo</string>
     <string name="settings_call_ringtone_dialog_title">Scegli la suoneria per le chiamate:</string>
-
     <string name="accept">Accetta</string>
-
     <string name="auth_accept_policies">Per favore, leggi e accetta i termini di servizio di questo Home Server:</string>
-
     <string name="settings_notification_troubleshoot">Diagnostica delle notifiche</string>
     <string name="settings_troubleshoot_diagnostic">Diagnosi</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Esegui i test</string>
@@ -1095,56 +919,47 @@
     <string name="settings_troubleshoot_diagnostic_success_status">La diagnostica di base risponde correttamente. Se continui a non ricevere notifiche, invia una segnalazione errore per aiutarci a indagare.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Uno o più test hanno fallito, prova le soluzioni suggerite.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Uno o più test hanno fallito, per favore invia un rapporto di errore per aiutarci a indagare.</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">Impostazioni di sistema.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Le notifiche sono abilitate nelle Impostazioni di sistema.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Le notifiche sono disabilitate nelle Impostazioni di sistema.
 \nControlla le Impostazioni di sistema.</string>
     <string name="open_settings">Apri le Impostazioni</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Impostazioni account.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Le notifiche sono abilitate per il tuo account.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Le notifiche sono disabilitate per il tuo account.
 \nControlla le impostazioni dell\'account.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Abilita</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Impostazioni sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Le notifiche sono attive per questa sessione.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Le notifiche non sono attive per questa sessione. 
 \nControlla le impostazioni di Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Abilita</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Esegui un controllo dei servizi</string>
     <string name="settings_troubleshoot_test_play_services_success">L\'APK Google Play Services è disponibile e aggiornato.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services per consegnare i messaggi a comparsa, ma sembra non sia stato configurato correttamente:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Correggi i Play Services</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Token di Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">Token FCM recuperato con successo:
-%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed">Il recupero del Token FCM: %1$s è fallito</string>
-
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_fcm_failed">Recupero fallito del token FCM:
+\n%1$s</string>
     <string name="settings_troubleshoot_test_token_registration_title">Registrazione Token</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM registrato con successo sull\'Home Server.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">E\'fallita la registrazione del Token FCM sull\'Home Server:
 \n %1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Servizio di notifiche</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Servizio di notifiche in esecuzione.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Servizio di notifiche non in esecuzione.
 \nProva a riavviare l\'applicazione.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Avvia il servizio</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">Auto riavvio del servizio di notifiche</string>
     <string name="settings_troubleshoot_test_service_restart_success">Il servizio è stato chiuso e si è riavviato automaticamente.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">L\'avvio del servizio è fallito</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Esegui all\'avvio</string>
     <string name="settings_troubleshoot_test_service_boot_success">Il servizio inizierà quando il dispositivo sarà riavviato.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">Il servizio non partirà al riavvio del dispositivo. Non riceverai notifiche finché Element non verrà aperto almeno una volta.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Abilita l\'esecuzione all\'avvio</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Verifica se Element sia stato configurato per funzionare in modo limitato quando lavora in background</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Element non funziona senza alcuna restrizione anche quando è eseguito in background. Questo test andrebbe eseguito usando dati mobili (non WIFI).
 \n%1$s</string>
@@ -1152,33 +967,24 @@
 \nIl funzionamento dell\'App, quando è eseguita in background, è stato fortemente limitato e ciò potrebbe influenzare la ricezione delle notifiche.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Non limitare</string>
-
     <string name="settings_troubleshoot_test_battery_title">Ottimizzazione della batteria</string>
     <string name="settings_troubleshoot_test_battery_success">Element non è influenzato dall\'ottimizzazione della batteria.</string>
     <string name="settings_troubleshoot_test_battery_failed">Se si lascia un dispositivo scollegato, fermo e con lo schermo spento, dopo un certo tempo questo entra in modalità Doze. Ciò impedisce alle App di accedere alla rete e ritarda le attività, le sincronizzazioni e la ricezione dei normali allarmi.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Ignora l\'ottimizzazione</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">Connessione in background</string>
     <string name="startup_notification_fdroid_battery_optim_message">Per poter ricevere le notifiche in tempo reale, Element deve potersi sempre connettere. Anche quando funziona in background.
 \nNella schermata successiva ti verrà chiesto di consentire a Element di funzionare anche quando è in background, accetta per favore.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Concedi il permesso</string>
-
     <string name="account_email_error">Si è verificato un errore durante la verifica dell\'indirizzo email.</string>
-
     <string name="account_phone_number_error">Si è verificato un errore durante la verifica del numero di telefono.</string>
     <string name="account_additional_info">Ulteriori informazioni: %s</string>
-
     <string name="no_valid_google_play_services_apk">Non è stato trovato nessun APK Google Play Services valido. Le notifiche non funzioneranno correttamente.</string>
-
     <string name="video_call_in_progress">Chiamata video in corso…</string>
-
     <string name="title_activity_keys_backup_setup">Backup delle chiavi</string>
     <string name="title_activity_keys_backup_restore">Usa il Backup delle chiavi</string>
     <string name="keys_backup_is_not_finished_please_wait">Il Backup delle chiavi non è concluso, attendere prego…</string>
-
     <string name="skip">Salta</string>
     <string name="done">Fatto</string>
-
     <string name="settings_notification_advanced">Impostazioni di notifica avanzate</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Se ti disconnetti adesso perderai i tuoi messaggi cifrati</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Il Backup delle chiavi è in corso. Se ti disconnetti adesso perderai i tuoi messaggi cifrati.</string>
@@ -1189,23 +995,19 @@
     <string name="are_you_sure">Sei sicuro\?</string>
     <string name="backup">Backup</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Perderai l\'accesso ai tuoi messaggi cifrati a meno che tu non faccia il Backup delle chiavi prima di disconnetterti.</string>
-
     <string name="stay">Rimani</string>
     <string name="abort">Interrompi</string>
     <string name="ignore">Ignora</string>
-
     <string name="action_sign_out_confirmation_simple">Sei sicuro di volerti disconnettere\?</string>
     <string name="auth_login_sso">Accedi con single sign-on</string>
     <string name="login_error_unknown_host">Questo URL è irraggiungibile. Per favore controllalo</string>
-    <string name="login_error_ssl_handshake">"Il tuo dispositivo usa  un protocollo di sicurezza TLS obsoleto e vulnerabile agli attacchi. Per la tua sicurezza, ti viene impedito di connetterti"</string>
+    <string name="login_error_ssl_handshake">Il tuo dispositivo usa un protocollo di sicurezza TLS obsoleto e vulnerabile agli attacchi. Per la tua sicurezza, ti viene impedito di connetterti</string>
     <string name="settings_notification_by_event">Importanza delle notifiche in base al tipo</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">Impostazioni personalizzate.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Nota che alcuni tipi di messaggio sono impostati come silenziosi (ossia generano notifiche senza suono).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Alcune notifiche sono disattivate nelle tue impostazioni personalizzate.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Il caricamento delle regole personalizzate è fallito, riprova.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Controlla le Impostazioni</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
 \nQuesto errore non dipende da Element. Secondo Google dipende dal fatto che questo dispositivo ha troppe App registrate con FCM. L\'errore si verifica solo in casi in cui ci sia un numero estremo di app, quindi non dovrebbe affliggere l\'utente medio.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s] 
@@ -1213,34 +1015,25 @@
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
 \nQuesto errore non dipende da Element. Non c\'è alcun account Google nel telefono. Apri il gestore di account ed aggiungi un account Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Aggiungi account</string>
-
     <string name="settings_noisy_notifications_preferences">Configura le notifiche rumorose</string>
     <string name="settings_call_notifications_preferences">Configura le notifiche di chiamata</string>
     <string name="settings_silent_notifications_preferences">Configura le notifiche silenziose</string>
     <string name="settings_system_preferences_summary">Scegli il colore del LED, la vibrazione, il suono…</string>
-
-
     <string name="settings_cryptography_manage_keys">Gestione chiavi crittografiche</string>
     <string name="settings_send_message_with_enter">Invia il messaggio col tasto Invio</string>
     <string name="settings_send_message_with_enter_summary">Il tasto Invio della tastiera, invece di andare a capo invierà il messaggio</string>
-
     <string name="settings_data_save_mode_summary">La modalità risparmio dati applica un filtro specifico che esclude gli aggiornamenti di presenza e le notifiche di scrittura.</string>
-
     <string name="settings_change_password_submit">Aggiorna la password</string>
     <string name="settings_fail_to_update_password_invalid_current_password">La password non è valida</string>
     <string name="passwords_do_not_match">Le password non corrispondono</string>
-
     <string name="encryption_message_recovery">Ripristino dei messaggi cifrati</string>
     <string name="encryption_settings_manage_message_recovery_summary">Gestisci il Backup delle chiavi</string>
-
     <string name="notification_silent">Silenzioso</string>
     <string name="error_empty_field_enter_user_name">Inserisci un nome utente.</string>
     <string name="passphrase_empty_error_message">Inserisci una password</string>
     <string name="passphrase_passphrase_too_weak">La password è troppo debole</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Cancella la password se vuoi che Element generi un codice di recupero.</string>
     <string name="keys_backup_no_session_error">Non c\'è alcuna sessione Matrix disponibile</string>
-
     <string name="keys_backup_setup_step1_title">Non perdere mai i messaggi cifrati</string>
     <string name="keys_backup_setup_step1_description">I messaggi nelle stanze cifrate sono protetti con crittografia E2E. Solo tu e il/i destinatario/i avete le chiavi crittografiche per leggere questi messaggi. 
 \n 
@@ -1248,7 +1041,6 @@
     <string name="keys_backup_setup">Inizia ad usare il Backup delle chiavi crittografiche</string>
     <string name="keys_backup_setup_step1_advanced">(Avanzato)</string>
     <string name="keys_backup_setup_step1_manual_export">Esporta manualmente le chiavi crittografiche</string>
-
     <string name="keys_backup_setup_step2_text_title">Proteggi il tuo backup con una password.</string>
     <string name="keys_backup_setup_step2_text_description">Una copia cifrata delle tue chiavi crittografiche sarà salvata sul tuo Home Server. Proteggi il tuo Backup con una password per tenerlo al sicuro. 
 \n 
@@ -1270,7 +1062,6 @@
     <string name="recovery_key_export_saved_as_warning">Il codice di recupero è stato salvato in \'%s\'. 
 \n 
 \nAttenzione: se l\'applicazione su cui è salvato venisse disinstallata, il codice di recupero verrà perso.</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Si prega di farne una copia</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Condividi il codice di recupero con…</string>
     <string name="keys_backup_setup_step3_generating_key_status">Generazione del codice di recupero usando la password. Questo processo può durare alcuni secondi.</string>
@@ -1278,25 +1069,18 @@
     <string name="unexpected_error">Errore inatteso</string>
     <string name="keys_backup_setup_backup_started_title">Backup avviato</string>
     <string name="keys_backup_setup_backup_started_message">Il tuo Home Server sta facendo il Backup delle tue chiavi crittografiche in background. Il primo Backup può impiegare diversi minuti.</string>
-
-
     <string name="keys_backup_setup_skip_title">Sei sicuro\?</string>
     <string name="keys_backup_setup_skip_msg">Se ti disconnetti o perdessi questo dispositivo potresti perdere l\'accesso ai tuoi messaggi.</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">Verifica versione backup…</string>
     <string name="keys_backup_restore_with_passphrase">Usa la tua password di recupero per sbloccare i messaggi cifrati</string>
     <string name="keys_backup_restore_use_recovery_key">usa il tuo codice di recupero</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Se non conosci la tua password di recupero, puoi %s.</string>
-
     <string name="keys_backup_restore_with_recovery_key">Usa il tuo codice di recupero per sbloccare la Timeline dei messaggi cifrati</string>
     <string name="keys_backup_restore_key_enter_hint">Inserisci codice di recupero</string>
-
     <string name="keys_backup_restore_setup_recovery_key">Ripristino messaggio</string>
-
     <string name="keys_backup_restore_with_key_helper">Hai perso il codice di recupero\? Nelle Impostazioni puoi crearne uno nuovo.</string>
     <string name="keys_backup_passphrase_error_decrypt">Impossibile decifrare il backup con questa password: verifica che la password di recupero inserita sia corretta.</string>
     <string name="network_error_please_check_and_retry">Errore di rete: controlla la tua connessione e riprova.</string>
-
     <string name="keys_backup_restoring_waiting_message">Ripristino Backup:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Codice di recupero in elaborazione…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Download chiavi…</string>
@@ -1304,7 +1088,6 @@
     <string name="keys_backup_unlock_button">Sblocca Timeline</string>
     <string name="keys_backup_recovery_code_empty_error_message">Inserisci un codice di recupero</string>
     <string name="keys_backup_recovery_code_error_decrypt">Impossibile decifrare il backup con questo codice di recupero: verifica di avere inserito il codice di recupero corretto.</string>
-
     <string name="keys_backup_restore_success_title">Backup ripristinato %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Ripristinato un Backup con %d chiave.</item>
@@ -1314,18 +1097,13 @@
         <item quantity="one">%d nuova chiave è stata aggiunta a questa sessione.</item>
         <item quantity="other">%d nuove chiavi sono state aggiunte a questa sessione.</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">Rilevazione ultima versione codici di recupero fallita (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">La cifratura della sessione non è stata attivata</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">Ripristina da backup</string>
     <string name="keys_backup_settings_delete_backup_button">Elimina backup</string>
-
     <string name="keys_backup_settings_status_ok">Il backup delle chiavi è stato impostato correttamente per questa sessione.</string>
     <string name="keys_backup_settings_status_ko">Il backup delle chiavi non è attivo su questa sessione.</string>
     <string name="keys_backup_settings_status_not_setup">Questa sessione non sta facendo il backup delle chiavi.</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">Il backup ha una firma da una sessione sconosciuta con ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Il backup ha una firma valida da questa sessione.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Il backup ha una firma valida dalla sessione verificata %s.</string>
@@ -1333,14 +1111,11 @@
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Il backup ha una firma non valida dalla sessione verificata %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Il backup ha una firma non valida dalla sessione non verificata %s</string>
     <string name="keys_backup_get_trust_error">Impossibile ottenere info di fiducia per il backup (%s).</string>
-
     <string name="keys_backup_settings_untrusted_backup">Per usare il backup delle chiavi crittografiche su questa sessione, devi accedervi con la password o con il codice di recupero.</string>
     <string name="keys_backup_settings_deleting_backup">Eliminazione backup…</string>
     <string name="keys_backup_settings_delete_backup_error">Eliminazione backup fallita (%s)</string>
-
     <string name="keys_backup_settings_delete_confirm_title">Elimina backup</string>
     <string name="keys_backup_settings_delete_confirm_message">Eliminare il Backup delle chiavi crittografiche dall\'Home Server\? Non potrai più usare il codice di recupero per leggere i messaggi cifrati.</string>
-
     <string name="new_recovery_method_popup_title">Nuovo Backup delle chiavi</string>
     <string name="new_recovery_method_popup_description">È stato rilevato un nuovo Backup delle chiavi crittografiche. 
 \n 
@@ -1348,31 +1123,24 @@
     <string name="new_recovery_method_popup_was_me">Sono stato io</string>
     <string name="keys_backup_banner_setup_line1">Non perdere mai i messaggi cifrati</string>
     <string name="keys_backup_banner_setup_line2">Inizia ad usare il Backup delle chiavi</string>
-
     <string name="keys_backup_banner_recover_line1">Non perdere mai i messaggi cifrati</string>
     <string name="keys_backup_banner_recover_line2">Usa il Backup delle chiavi</string>
-
     <string name="keys_backup_banner_update_line1">Nuove chiavi per messaggi sicuri</string>
     <string name="keys_backup_banner_update_line2">Gestisci nel Backup delle chiavi</string>
-
     <string name="keys_backup_banner_in_progress">Backup chiavi in corso…</string>
-
     <string name="keys_backup_info_keys_all_backup_up">Il Backup delle chiavi è stato eseguito</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Backup di %d chiave…</item>
         <item quantity="other">Backup di %d chiavi…</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">Versione</string>
     <string name="keys_backup_info_title_algorithm">Algoritmo</string>
     <string name="keys_backup_info_title_signature">Firma</string>
-
     <string name="autodiscover_invalid_response">Risposta Home Server non valida</string>
     <string name="autodiscover_well_known_autofill_dialog_title">Opzioni autocompletamento server</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element ha rilevato una configurazione server personalizzata per il tuo dominio userId \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Usa configurazione</string>
-
     <string name="notification_sync_init">Inizializzazione del servizio</string>
     <string name="settings_media">Multimedia</string>
     <string name="settings_default_compression">Compressione predefinita</string>
@@ -1380,29 +1148,24 @@
     <string name="settings_default_media_source">Sorgente multimediale predefinita</string>
     <string name="media_source_choose">Scegli</string>
     <string name="settings_play_shutter_sound">Riproduci il suono dell\'otturatore</string>
-
     <string name="action_mark_room_read">Segna come letto</string>
     <string name="settings_notification_privacy_no_background_sync">L\'app <b>non</b> ha bisogno di connettersi in background all\'Home Server. Ciò dovrebbe ridurre il consumo della batteria</string>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: 1 messaggio</item>
+        <item quantity="one">%1$s: %2$d messaggio</item>
         <item quantity="other">%1$s: %2$d messaggi</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d notifica</item>
         <item quantity="other">%d notifiche</item>
     </plurals>
-
     <string name="notification_unknown_new_event">Nuovo evento</string>
     <string name="notification_unknown_room_name">Stanza</string>
     <string name="notification_new_messages">Nuovi messaggi</string>
     <string name="notification_new_invitation">Nuovo invito</string>
     <string name="notification_sender_me">Io</string>
     <string name="notification_inline_reply_failed">** Invio fallito - per favore apri la stanza</string>
-
     <string name="error_jitsi_not_supported_on_old_device">Purtroppo i vecchi dispositivi (quelli con Android precedenti al 5.0) non supportano le conferenze con Jitsi</string>
-
     <string name="title_activity_verify_device">Verifica sessione</string>
-
     <string name="encryption_information_unknown_ip">IP sconosciuto</string>
     <string name="you_added_a_new_device_with_info">Una nuova sessione sta chiedendo le chiavi crittografiche. Nome sessione: %1$s 
 \nUltimo accesso: %2$s 
@@ -1411,45 +1174,36 @@
 \nNome sessione: %1$s 
 \nUltimo accesso: %2$s 
 \nSe non hai effettuato l\'accesso da un\'altra sessione, ignora questa richiesta.</string>
-
     <string name="start_verification_short_label">Verifica</string>
     <string name="share_without_verifying_short_label">Condividi</string>
     <string name="key_share_request">Richiesta condivisione chiavi crittografiche</string>
     <string name="ignore_request_short_label">Ignora</string>
-
     <string name="sas_verify_title">Verifica confrontando una breve stringa.</string>
     <string name="sas_security_advise">Per la massima sicurezza, consigliamo di farlo di persona o di utilizzare un altro metodo di comunicazione fidato.</string>
     <string name="sas_verify_start_button_title">Inizia la verifica</string>
     <string name="sas_incoming_request_title">Richiesta di verifica in arrivo</string>
     <string name="sas_incoming_request_description">Verifica questa sessione per segnarla come fidata. Verificare le sessioni dei partner ti dà una maggiore tranquillità quando usi messaggi cifrati end-to-end.</string>
     <string name="sas_incoming_request_description_2">Verificare questa sessione la segnerà come fidata e segnerà anche la tua sessione come fidata per il tuo partner.</string>
-
     <string name="sas_emoji_description">Verifica questa sessione confermando che le seguenti emoji appaiono sullo schermo del partner</string>
     <string name="sas_decimal_description">Verifica questa sessione confermando che i seguenti numeri appaiono sullo schermo del partner</string>
-
     <string name="sas_incoming_verification_request_dialog">Hai ricevuto una richiesta di verifica.</string>
     <string name="sas_view_request_action">Vedi la richiesta</string>
     <string name="sas_waiting_for_partner">In attesa che il partner confermi…</string>
-
     <string name="sas_verified">Verificato!</string>
     <string name="sas_verified_successful">Hai verificato correttamente questa sessione.</string>
     <string name="sas_verified_successful_description">I messaggi sicuri con questo utente sono cifrati end-to-end e impossibili da leggere da parte di terze parti.</string>
     <string name="sas_got_it">Capito</string>
-
     <string name="sas_verifying_keys">Non compare nulla\? Non tutti i client supportano già la verifica interattiva. Usa la verifica classica.</string>
     <string name="sas_legacy_verification_button_title">Usa la verifica classica.</string>
-
     <string name="sas_verification_request_notification_channel_title">Verifica chiave</string>
     <string name="sas_cancelled_dialog_title">Richiesta annullata</string>
     <string name="sas_cancelled_by_other">L\'altra parte ha annullato la verifica.
 \n%s</string>
     <string name="sas_cancelled_by_me">La verifica è annullata.
 \nMotivo: %s</string>
-
     <string name="sas_verification_request_notification_channel">Verifica sessione interattiva</string>
     <string name="sas_incoming_request_notif_title">Richiesta di verifica</string>
     <string name="sas_incoming_request_notif_content">%s vuole verificare la tua sessione</string>
-
     <string name="sas_error_m_user">L\'utente ha annullato la verifica</string>
     <string name="sas_error_m_timeout">Il processo di verifica è scaduto</string>
     <string name="sas_error_m_unknown_transaction">La sessione non sa della transazione</string>
@@ -1461,23 +1215,18 @@
     <string name="sas_error_m_key_mismatch">Le chiavi non corrispondono</string>
     <string name="sas_error_m_user_error">Utente non corrispondente</string>
     <string name="sas_error_unknown">Errore sconosciuto</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Esiste già un backup sul tuo Home Server</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Sembra tu abbia già impostato il backup delle chiavi crittografiche da un\'altra sessione. Vuoi sostituirlo con il backup che stai creando\?</string>
     <string name="keys_backup_setup_override_replace">Sostituisci</string>
     <string name="keys_backup_setup_override_stop">Ferma</string>
-
     <string name="keys_backup_settings_checking_backup_state">Controllo stato del backup</string>
     <string name="invalid_or_expired_credentials">Sei stato disconnesso a causa di credenziali non valide o scadute.</string>
-
     <string name="edit">Modifica</string>
     <string name="reply">Rispondi</string>
-
     <string name="global_retry">Riprova</string>
     <string name="room_list_empty">Entra in una stanza per iniziare a usare l\'app.</string>
     <string name="send_you_invite">Ti ha inviato un invito</string>
     <string name="invited_by">Invitato da %s</string>
-
     <string name="room_list_catchup_empty_body">Non hai più messaggi non letti</string>
     <string name="room_list_catchup_welcome_title">Benvenuti a casa!</string>
     <string name="room_list_catchup_welcome_body">Recupera i messaggi non letti qui</string>
@@ -1485,19 +1234,15 @@
     <string name="room_list_people_empty_body">Le tue conversazioni dirette verranno mostrate qui</string>
     <string name="room_list_rooms_empty_title">Stanze</string>
     <string name="room_list_rooms_empty_body">Le tue stanze verranno mostrate qui</string>
-
     <string name="title_activity_emoji_reaction_picker">Reazioni</string>
     <string name="reactions_agree">D\'accordo</string>
     <string name="reactions_like">Piace</string>
     <string name="message_add_reaction">Aggiungi reazione</string>
     <string name="message_view_reaction">Vedi le reazioni</string>
     <string name="reactions">Reazioni</string>
-
     <string name="event_redacted_by_user_reason">Evento eliminato dall\'utente</string>
     <string name="event_redacted_by_admin_reason">Evento moderato da un admin della stanza</string>
     <string name="last_edited_info_message">Ultima modifica di %1$s il %2$s</string>
-
-
     <string name="malformed_message">Evento malformato, impossibile visualizzarlo</string>
     <string name="create_new_room">Crea nuova stanza</string>
     <string name="error_no_network">Nessuna rete. Controlla la tua connessione internet.</string>
@@ -1505,13 +1250,10 @@
     <string name="change_room_directory_network">Cambia rete</string>
     <string name="please_wait">Attendere prego…</string>
     <string name="group_all_communities">Tutte le comunità</string>
-
     <string name="room_preview_no_preview">Anteprima non disponibile per questa stanza</string>
     <string name="room_preview_world_readable_room_not_supported_yet">L\'anteprima di stanze leggibili da tutti non è ancora supportata in Element</string>
-
     <string name="fab_menu_create_room">Stanze</string>
     <string name="fab_menu_create_chat">Messaggi diretti</string>
-
     <string name="create_room_title">Nuova stanza</string>
     <string name="create_room_action_create">CREA</string>
     <string name="create_room_name_hint">Nome stanza</string>
@@ -1519,18 +1261,13 @@
     <string name="create_room_public_description">Tutti potranno entrare in questa stanza</string>
     <string name="create_room_directory_title">Elenco stanze</string>
     <string name="create_room_directory_description">Pubblica questa stanza nell\'elenco stanze</string>
-
     <string name="keys_backup_unable_to_get_trust_info">Si è verificato un errore nell\'ottenere informazioni sulla fiducia</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Si è verificato un errore nell\'ottenere i dati dal Backup delle chiavi</string>
-
     <string name="import_e2e_keys_from_file">Importa le chiavi di crittografia dal file \"%1$s\".</string>
-
     <string name="settings_sdk_version">Versione SDK Matrix</string>
     <string name="settings_other_third_party_notices">Altre note di terze parti</string>
     <string name="navigate_to_room_when_already_in_the_room">Stai già visualizzando questa stanza!</string>
-
     <string name="quick_reactions">Reazioni rapide</string>
-
     <string name="settings_general_title">Generali</string>
     <string name="settings_preferences">Preferenze</string>
     <string name="settings_security_and_privacy">Sicurezza e privacy</string>
@@ -1538,102 +1275,75 @@
     <string name="settings_push_rules">Regole di push</string>
     <string name="settings_push_rules_no_rules">Nessuna regola di push definita</string>
     <string name="settings_push_gateway_no_pushers">Nessun gateway di push registrato</string>
-
     <string name="push_gateway_item_app_id">id_app:</string>
     <string name="push_gateway_item_push_key">chiave_push:</string>
     <string name="push_gateway_item_app_display_name">nome_visualizzato_app:</string>
     <string name="push_gateway_item_device_name">nome_sessione:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Formato:</string>
-
     <string name="preference_voice_and_video">Audio e Video</string>
     <string name="preference_root_help_about">Aiuto e informazioni</string>
-
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registra token</string>
-
     <string name="send_suggestion">Suggerisci qualcosa</string>
     <string name="send_suggestion_content">Scrivi qua sotto il tuo suggerimento.</string>
     <string name="send_suggestion_report_placeholder">Descrivi qui il tuo suggerimento</string>
     <string name="send_suggestion_sent">Grazie, il suggerimento è stato inviato correttamente</string>
     <string name="send_suggestion_failed">L\'invio del suggerimento è fallito (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">Mostra gli eventi nascosti nella Timeline</string>
-
     <string name="room_list_catchup_empty_title">Non hai nulla di nuovo da vedere!</string>
     <string name="bottom_action_people_x">Messaggi diretti</string>
-
     <string name="send_file_step_idle">In attesa…</string>
     <string name="send_file_step_encrypting_thumbnail">Criptazione miniatura…</string>
     <string name="send_file_step_sending_thumbnail">Invio miniatura (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Criptazione file…</string>
     <string name="send_file_step_sending_file">Invio file (%1$s / %2$s)</string>
-
     <string name="downloading_file">Scaricamento file %1$s…</string>
     <string name="downloaded_file">Il file %1$s è stato scaricato!</string>
-
     <string name="edited_suffix">(modificato)</string>
-
-
     <string name="message_edits">Modifiche messaggio</string>
     <string name="no_message_edits_found">Nessuna modifica trovata</string>
-
     <string name="room_filtering_filter_hint">Filtra conversazioni…</string>
     <string name="room_filtering_footer_title">Non trovi quello che cerchi\?</string>
     <string name="room_filtering_footer_create_new_room">Crea un nuova stanza</string>
     <string name="room_filtering_footer_create_new_direct_message">Invia un nuovo messaggio diretto</string>
     <string name="room_filtering_footer_open_room_directory">Vedi l\'elenco delle stanze</string>
-
     <string name="room_directory_search_hint">Nome o ID stanza (#esempio:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Attiva swipe per rispondere nella timeline</string>
-
     <string name="link_copied_to_clipboard">Collegamento copiato negli appunti</string>
-
     <string name="settings_integration_manager">Gestore dell\'integrazione</string>
-
     <string name="integration_manager_not_configured">Non è stato configurato nessun Integration Manager.</string>
     <string name="add_by_matrix_id">Aggiungi per ID utente</string>
     <string name="creating_direct_room">Creare una stanza …</string>
     <string name="direct_room_no_known_users">Nessun risultato trovato. Usa \"Aggiungi per ID utente\" per cercare sul server.</string>
     <string name="direct_room_start_search">Inizia a digitare per ottenere risultati</string>
     <string name="direct_room_filter_hint">Cerca per nome o ID utente …</string>
-
     <string name="joining_room">Sto entrando nella stanza …</string>
-
     <string name="message_view_edit_history">Visualizza Modifica Timeline</string>
-
     <string name="review">Leggi</string>
     <string name="decline">Rifiuta</string>
-
     <string name="widget_integration_review_terms">Per continuare devi accettare i termini di servizio.</string>
-
     <string name="terms_of_service">Termini di servizio</string>
     <string name="review_terms">Leggi i termini di servizio</string>
     <string name="terms_description_for_identity_server">Fatti trovare dagli altri utenti</string>
     <string name="terms_description_for_integration_manager">Usa bot, bridge, widget e pacchetti di sticker</string>
-
     <string name="read_at">Leggi su</string>
-
     <string name="none">Nessuno</string>
     <string name="revoke">Revoca</string>
     <string name="disconnect">Disconnetti</string>
     <string name="people_no_identity_server">Non è stato configurato alcun Identity Server.</string>
-
     <string name="call_failed_no_ice_title">Chiamata fallita a causa di un\'errata configurazione del server</string>
     <string name="call_failed_no_ice_description">Chiedi all\'amministratore del tuo Home Server (%1$s) di configurare un server TURN affinché le chiamate funzionino in modo affidabile. 
 \n 
 \nOppure puoi provare ad usare il server pubblico su %2$s, ma non sarà altrettanto affidabile e potrà vedere il tuo indirizzo IP. Puoi configurare tutto questo nelle Impostazioni.</string>
     <string name="call_failed_no_ice_use_alt">Prova ad usare %s</string>
     <string name="call_failed_dont_ask_again">Non chiedermelo più</string>
-
     <string name="auth_add_email_message_2">Imposta un\'email per il ripristino dell\'account in caso di problemi e, se vuoi, anche per farti trovare da chi conosce quell\'indirizzo email.</string>
     <string name="auth_add_phone_message_2">Aggiungi un numero di telefono se vuoi farti trovare da chi lo conosce.</string>
     <string name="auth_add_email_phone_message_2">Imposta un\'email per il ripristino dell\'account in caso di problemi. Email e telefono potranno essere usati anche per farti trovare dagli altri utenti.</string>
     <string name="auth_add_email_and_phone_message_2">Imposta un\'email per il ripristino dell\'account in caso di problemi. Email e numero di telefono potranno essere usati, se lo vorrai, anche per permettere a chi li conosce di trovarti.</string>
     <string name="login_error_homeserver_not_found">Non è stato trovato alcun Home Server seguendo questo URL. Per favore, controllalo</string>
     <string name="settings_call_ringtone_use_default_stun">Permetti chiamate dal Server di appoggio</string>
-    <string name="settings_call_ringtone_use_default_stun_sum">"Se il tuo Home Server non ne ha un proprio Server d\'appoggio verrà usato %s  (il Server d\'appoggio verrà a conoscenza del tuo indirizzo IP durante le chiamate)"</string>
+    <string name="settings_call_ringtone_use_default_stun_sum">Se il tuo Home Server non ne ha un proprio Server d\'appoggio verrà usato %s (il Server d\'appoggio verrà a conoscenza del tuo indirizzo IP durante le chiamate)</string>
     <string name="invite_no_identity_server_error">Per poterlo fare, aggiungi un Identity Server nelle Impostazioni.</string>
     <string name="settings_background_fdroid_sync_mode">Modalità sync in background</string>
     <string name="settings_background_fdroid_sync_mode_battery">Ottimizzato per la batteria</string>
@@ -1645,8 +1355,6 @@
     <string name="settings_background_fdroid_sync_mode_disabled">Nessuna sincronizzazione in background</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Quando l\'App è in background non ti verranno notificati i messaggi in arrivo.</string>
     <string name="settings_background_sync_update_error">L\'aggiornamento delle impostazioni è fallito.</string>
-
-
     <string name="settings_set_workmanager_delay">Intervallo preferito tra le sincronizzazioni</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nLa sincronizzazione può essere ritardata a seconda delle risorse (batteria) o dello stato del dispositivo (sospensione).</string>
@@ -1656,9 +1364,7 @@
     <string name="device_name_warning">Il nome pubblico di una sessione è visibile alle persone con cui comunichi</string>
     <string name="identity_server_not_defined">Non stai usando alcun Identity Server</string>
     <string name="identity_server_not_defined_for_password_reset">Nessun Identity Server configurato. E\' necessario per poter ripristinare la tua password.</string>
-
     <string name="error_user_already_logged_in">Pare che tu stia provando a connetterti ad un altro homeserver. Vuoi disconnetterti da qui\?</string>
-
     <string name="identity_server">Identity Server</string>
     <string name="disconnect_identity_server">Disconnetti Identity Server</string>
     <string name="add_identity_server">Configura Identity Server</string>
@@ -1672,28 +1378,20 @@
     <string name="settings_discovery_msisdn_title">Numeri di telefono visibili pubblicamente</string>
     <string name="settings_discovery_confirm_mail">Abbiamo inviato un\'email di conferma a %s, controlla l\'email e clicca sul link di conferma</string>
     <string name="settings_discovery_mail_pending">In attesa</string>
-
     <string name="settings_discovery_enter_identity_server">Inserisci un URL di server di identità</string>
     <string name="settings_discovery_bad_identity_server">Impossibile connettersi all\'Identity Server</string>
     <string name="settings_discovery_please_enter_server">Inserisci l\'URL dell\'Identity Server</string>
     <string name="settings_discovery_no_terms_title">L\'Identity Server non ha reso noti i propri termini di servizio</string>
     <string name="settings_discovery_no_terms">L\'Identity Server che hai scelto non ha freso noti i propri termini di servizio. Continua solo se ti fidi</string>
     <string name="settings_text_message_sent">È stato inviato un messaggio a %s. Inserisci il codice di verifica che contiene.</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">In questo momento stai condividendo i tuoi indirizzi email o numeri di telefono sull\'Identity Server %1$s. Dovrai riconnetterti a %2$s per interromperne la condivisione.</string>
     <string name="settings_agree_to_terms">Accetta i termini di servizio dell\'Identity Server (%s) per permettere ad altri utenti di trovarti tramite la tua email o numero di telefono.</string>
     <string name="resources_script">Latn</string>
-
     <string name="labs_allow_extended_logging">Attiva i log dettagliati.</string>
     <string name="labs_allow_extended_logging_summary">I log dettagliati aiuteranno gli sviluppatori fornendo loro molte più informazioni nelle segnalazioni che invii scuotendo il dispositivo. Anche se attivi i log dettagliati, Element non registra mai i contenuti dei messaggi o altri dati personali.</string>
-
-
     <string name="error_terms_not_accepted">Riprova dopo avere accettato i termini di servizio del tuo Home Server.</string>
-
     <string name="error_network_timeout">Sembra che il server stia impiegando troppo tempo a rispondere. Ciò può essere causato da una cattiva connessione o da un errore del server. Riprova fra qualche minuto.</string>
-
     <string name="send_attachment">Invia allegato</string>
-
     <string name="a11y_open_drawer">Apri il pannello di navigazione</string>
     <string name="a11y_create_menu_open">Apri il menu \"Crea nuova stanza\"</string>
     <string name="a11y_create_menu_close">Chiudi il menu di \"Crea nuova stanza\"…</string>
@@ -1703,17 +1401,14 @@
     <string name="a11y_show_password">Mostra password</string>
     <string name="a11y_hide_password">Nascondi password</string>
     <string name="a11y_jump_to_bottom">Salta in fondo</string>
-
     <string name="three_users_read">%1$s, %2$s e %3$s hanno letto</string>
     <string name="two_users_read">%1$s e %2$s hanno letto</string>
     <string name="one_user_read">%s ha letto</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">1 utente ha letto</item>
+        <item quantity="one">%d utente ha letto</item>
         <item quantity="other">%d utenti hanno letto</item>
     </plurals>
-
     <string name="error_file_too_big">Il file \'%1$s\' (%2$s) è troppo grande da inviare. Il limite è %3$s.</string>
-
     <string name="error_attachment">Si è verificato un errore ricevendo l\'allegato.</string>
     <string name="attachment_type_file">File</string>
     <string name="attachment_type_contact">Contatto</string>
@@ -1722,7 +1417,6 @@
     <string name="attachment_type_gallery">Galleria</string>
     <string name="attachment_type_sticker">Adesivo</string>
     <string name="error_handling_incoming_share">Errore nella gestione dei dati condivisi</string>
-
     <string name="report_content_spam">È spam</string>
     <string name="report_content_inappropriate">È inappropriato</string>
     <string name="report_content_custom">Segnalazione personalizzata…</string>
@@ -1730,31 +1424,25 @@
     <string name="report_content_custom_hint">Motivo della segnalazione</string>
     <string name="report_content_custom_submit">SEGNALA</string>
     <string name="block_user">IGNORA UTENTE</string>
-
     <string name="content_reported_title">Contenuto segnalato</string>
-    <string name="content_reported_content">Questo contenuto è stato segnalato.
-\n
-\nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
+    <string name="content_reported_content">Questo contenuto è stato segnalato. 
+\n 
+\nSe non vuoi più vedere contenuti da questo utente, puoi ignorarlo per nascondere i suoi messaggi.</string>
     <string name="content_reported_as_spam_title">Segnalato come spam</string>
-    <string name="content_reported_as_spam_content">Questo contenuto è stato segnalato come spam.
-\n
-\nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
+    <string name="content_reported_as_spam_content">Questo contenuto è stato segnalato come spam. 
+\n 
+\nSe non vuoi più vedere contenuti da questo utente, puoi ignorarlo per nascondere i suoi messaggi.</string>
     <string name="content_reported_as_inappropriate_title">Segnalato come inappropriato</string>
-    <string name="content_reported_as_inappropriate_content">Questo contenuto è stato segnalato come inappropriato.
-\n
-\nSe non vuoi più vedere contenuti da questo utente, puoi bloccarlo per nascondere i suoi messaggi</string>
-
+    <string name="content_reported_as_inappropriate_content">Questo contenuto è stato segnalato come inappropriato. 
+\n 
+\nSe non vuoi più vedere contenuti da questo utente, puoi ignorarlo per nascondere i suoi messaggi.</string>
     <string name="permissions_rationale_msg_keys_backup_export">Element richiede l\'autorizzazione per salvare le tue chiavi crittografiche sul disco.
 \n 
 \nPermetti l\'accesso nel prossimo pop-up per poter esportare le chiavi manualmente.</string>
-
     <string name="no_network_indicator">In questo momento non c\'è nessuna connessione di rete</string>
-
     <string name="settings_add_3pid_confirm_password_title">Conferma la tua password</string>
     <string name="settings_add_3pid_flow_not_supported">Non puoi farlo da Element mobile</string>
     <string name="settings_add_3pid_authentication_needed">E\'necessaria l\'autenticazione</string>
-
-
     <string name="settings_integrations">Integrazioni</string>
     <string name="settings_integrations_summary">Usa un Integration Manager per gestire bot, bridge, widget e pacchetti di sticker.
 \nGli Integration Manager possono ricevere dati di configurazione, modificare widget, mandare inviti alle stanze e modificare permessi a tuo nome.</string>
@@ -1769,25 +1457,20 @@
     <string name="room_widget_reload">Ricarica widget</string>
     <string name="room_widget_open_in_browser">Apri nel browser</string>
     <string name="room_widget_revoke_access">Revoca l\'accesso per me</string>
-
     <string name="room_widget_permission_display_name">Il tuo nome visualizzato</string>
     <string name="room_widget_permission_avatar_url">L\'URL del tuo avatar</string>
     <string name="room_widget_permission_user_id">Il tuo ID utente</string>
     <string name="room_widget_permission_theme">Il tuo tema</string>
     <string name="room_widget_permission_widget_id">ID widget</string>
     <string name="room_widget_permission_room_id">ID stanza</string>
-
-
     <string name="room_widget_resource_permission_title">Questo widget vuole usare le seguenti risorse:</string>
     <string name="room_widget_resource_grant_permission">Permetti</string>
     <string name="room_widget_resource_decline_permission">Blocca tutto</string>
     <string name="room_widget_webview_access_camera">Usare la fotocamera</string>
     <string name="room_widget_webview_access_microphone">Usa il microfono</string>
     <string name="room_widget_webview_read_protected_media">Leggi media protetti da DRM</string>
-
     <string name="login_error_no_homeserver_found">Questo non è un indirizzo di server Matrix valido</string>
     <string name="message_ignore_user">Ignora utente</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">Tutti i messaggi (rumoroso)</string>
     <string name="room_list_quick_actions_notifications_all">Tutti i messaggi</string>
     <string name="room_list_quick_actions_notifications_mentions">Solo citazioni</string>
@@ -1798,22 +1481,16 @@
     <string name="command_description_spoiler">Invia il messaggio come spoiler</string>
     <string name="spoiler">Spoiler</string>
     <string name="reaction_search_type_hint">Digita parole chiave per trovare una reazione.</string>
-
     <string name="no_ignored_users">Non stai ignorando alcun utente</string>
-
     <string name="help_long_click_on_room_for_more_options">Tieni premuto su una stanza per altre opzioni</string>
-
-
     <string name="room_join_rules_public">%1$s ha reso pubblica la stanza a chiunque conosca il collegamento.</string>
     <string name="room_join_rules_invite">%1$s ha reso la stanza solo ad invito.</string>
     <string name="timeline_unread_messages">Messaggi non letti</string>
-
     <string name="login_splash_title">È la tua conversazione. Tienitela.</string>
     <string name="login_splash_text1">Chatta con persone direttamente o in gruppi</string>
     <string name="login_splash_text2">Tieni private le conversazioni con la cifratura</string>
     <string name="login_splash_text3">Estendi e personalizza la tua esperienza</string>
     <string name="login_splash_submit">Inizia</string>
-
     <string name="login_server_title">Seleziona un server</string>
     <string name="login_server_text">Proprio come le email, gli account hanno una sola origine, ma puoi parlare con chiunque</string>
     <string name="login_server_matrix_org_text">Unisciti a milioni gratuitamente sul server pubblico più grande</string>
@@ -1821,7 +1498,6 @@
     <string name="login_server_modular_learn_more">Maggiori info</string>
     <string name="login_server_other_title">Altro</string>
     <string name="login_server_other_text">Impostazioni personalizzate ed avanzate</string>
-
     <string name="login_continue">Continua</string>
     <string name="login_connect_to">Connetti a %1$s</string>
     <string name="login_connect_to_modular">Connetti a Element Matrix Services</string>
@@ -1830,13 +1506,11 @@
     <string name="login_signup">Registrati</string>
     <string name="login_signin">Accedi</string>
     <string name="login_signin_sso">Continua con SSO</string>
-
     <string name="login_server_url_form_modular_hint">Indirizzo Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Indirizzo</string>
     <string name="login_server_url_form_modular_text">Hosting premium per organizzazioni</string>
     <string name="login_server_url_form_modular_notice">Inserisci l\'indirizzo del Element Modular o del server che vuoi usare</string>
     <string name="login_server_url_form_other_notice">Inserisci l\'indirizzo di un server o di un Element a cui vuoi connetterti</string>
-
     <string name="login_sso_error_message">Si è verificato un errore caricando la pagina: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">L\'applicazione non riesce ad accedere a questo homeserver. L\'homeserver supporta i seguenti tipi di accesso: %1$s.
 \n
@@ -1845,58 +1519,46 @@
     <string name="login_registration_not_supported">L\'applicazione non riesce a creare un account su questo homeserver.
 \n
 \nVuoi registrarti usando un client web\?</string>
-
     <string name="login_login_with_email_error">Questa email non è associata ad alcun account.</string>
-
     <string name="login_reset_password_on">Reimposta password su %1$s</string>
     <string name="login_reset_password_notice">Verrà inviata un\'email di verifica nella tua posta per confermare l\'impostazione della nuova password.</string>
     <string name="login_reset_password_submit">Avanti</string>
     <string name="login_reset_password_email_hint">Email</string>
     <string name="login_reset_password_password_hint">Nuova password</string>
-
     <string name="login_reset_password_warning_title">Attenzione!</string>
     <string name="login_reset_password_warning_content">Cambiare la password reimposterà qualunque chiave di cifratura end-to-end su tutte le tue sessioni, rendendo illeggibile la cronologia delle chat criptate. Imposta il Backup Chiavi o esporta le tue chiavi della stanza da un\'altra sessione prima di reimpostare la password.</string>
     <string name="login_reset_password_warning_submit">Continua</string>
-
     <string name="login_reset_password_error_not_found">Questa email non è collegata ad alcun account</string>
-
     <string name="login_reset_password_mail_confirmation_title">Controlla la tua posta</string>
     <string name="login_reset_password_mail_confirmation_notice">Un\'email di verifica è stata inviata a %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Tocca il collegamento per confermare la tua nuova password. Una volta seguito il collegamento contenuto, clicca sotto.</string>
     <string name="login_reset_password_mail_confirmation_submit">Ho verificato il mio indirizzo email</string>
-
     <string name="login_reset_password_success_title">Successo!</string>
     <string name="login_reset_password_success_notice">La tua password è stata reimpostata.</string>
     <string name="login_reset_password_success_notice_2">Sei stato disconnesso da tutte le sessioni e non riceverai più notifiche push. Per riattivare le notifiche, riaccedi su ogni dispositivo.</string>
     <string name="login_reset_password_success_submit">Torna all\'accesso</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Attenzione</string>
     <string name="login_reset_password_cancel_confirmation_content">La tua password non è ancora cambiata.
 \n
 \nFermare il processo di cambio password\?</string>
-
     <string name="login_set_email_title">Imposta indirizzo email</string>
     <string name="login_set_email_notice">Imposta un\'email per recuperare il tuo account. Più tardi potrai permettere facoltativamente alle persone che conosci di trovarti tramite la tua email.</string>
     <string name="login_set_email_mandatory_hint">Email</string>
     <string name="login_set_email_optional_hint">Email (facoltativa)</string>
     <string name="login_set_email_submit">Avanti</string>
-
     <string name="login_set_msisdn_title">Imposta numero di telefono</string>
     <string name="login_set_msisdn_notice">Imposta un numero di telefono per permettere facoltativamente alle persone che conosci di trovarti.</string>
     <string name="login_set_msisdn_notice2">Si prega di usare il formato internazionale.</string>
     <string name="login_set_msisdn_mandatory_hint">Numero di telefono</string>
     <string name="login_set_msisdn_optional_hint">Numero di telefono (facoltativo)</string>
     <string name="login_set_msisdn_submit">Avanti</string>
-
     <string name="login_msisdn_confirm_title">Conferma numero di telefono</string>
     <string name="login_msisdn_confirm_notice">Abbiamo inviato un codice a %1$s. Inseriscilo sotto per verificare che sei tu.</string>
     <string name="login_msisdn_confirm_hint">Inserisci codice</string>
     <string name="login_msisdn_confirm_send_again">Invia di nuovo</string>
     <string name="login_msisdn_confirm_submit">Avanti</string>
-
     <string name="login_msisdn_error_not_international">I numeri di telefono internazionali devono iniziare con \'+\'</string>
     <string name="login_msisdn_error_other">Il numero di telefono non sembra valido. Ricontrollalo</string>
-
     <string name="login_signup_to">Registrati su %1$s</string>
     <string name="login_signin_username_hint">Nome utente o email</string>
     <string name="login_signup_password_hint">Password</string>
@@ -1906,27 +1568,22 @@
     <string name="login_signup_cancel_confirmation_content">Il tuo account non è ancora stato creato.
 \n
 \nFermare il processo di registrazione\?</string>
-
     <string name="login_a11y_choose_matrix_org">Seleziona matrix.org</string>
     <string name="login_a11y_choose_modular">Seleziona Element Matrix Services</string>
     <string name="login_a11y_choose_other">Seleziona un server personalizzato</string>
     <string name="login_a11y_captcha_container">Completa la verifica Captcha</string>
     <string name="login_terms_title">Accetta le condizioni per continuare</string>
-
     <string name="login_wait_for_email_title">Controlla la tua email</string>
     <string name="login_wait_for_email_notice">Abbiamo inviato un\'email a %1$s.
 \nClicca il collegamento contenuto per continuare la creazione dell\'account.</string>
     <string name="login_validation_code_is_not_correct">Il codice inserito non è corretto. Ricontrollalo.</string>
     <string name="login_error_outdated_homeserver_title">Homeserver obsoleto</string>
     <string name="login_error_outdated_homeserver_content">Questo homerserver è di una versione troppo vecchia per connettersi. Chiedi all\'amministratore dell\'homeserver di aggiornarlo.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Sono state inviate troppe richieste. Puoi riprovare in %1$d secondo…</item>
         <item quantity="other">Sono state inviate troppe richieste. Puoi riprovare in %1$d secondi…</item>
     </plurals>
-
     <string name="seen_by">Visto da</string>
-
     <string name="signed_out_title">Sei disconnesso</string>
     <string name="signed_out_notice">Può essere dovuto a vari motivi: 
 \n 
@@ -1936,7 +1593,6 @@
 \n 
 \n• L\'amministratore del server ha bloccato il tuo accesso per motivi di sicurezza.</string>
     <string name="signed_out_submit">Accedi di nuovo</string>
-
     <string name="soft_logout_title">Sei disconnesso</string>
     <string name="soft_logout_signin_title">Accedi</string>
     <string name="soft_logout_signin_notice">L\'amministratore dell\'homeserver (%1$s) ti ha disconnesso dall\'account %2$s (%3$s).</string>
@@ -1948,7 +1604,6 @@
 \n
 \nEliminali se hai finito di usare questo dispositivo, o se vuoi accedere ad un altro account.</string>
     <string name="soft_logout_clear_data_submit">Elimina tutti i dati</string>
-
     <string name="soft_logout_clear_data_dialog_title">Elimina i dati</string>
     <string name="soft_logout_clear_data_dialog_content">Eliminare tutti i dati attualmente presenti in questo dispositivo\?
 \nRiaccedi per avere accesso ai dati dell\'account e ai messaggi.</string>
@@ -1956,12 +1611,9 @@
     <string name="soft_logout_clear_data_dialog_submit">Elimina i dati</string>
     <string name="soft_logout_sso_not_same_user_error">La sessione attuale è per l\'utente %1$s e hai fornito le credenziali per l\'utente %2$s. Ciò non è supportato da Element.
 \nPrima elimina i dati, poi accedi di nuovo con un altro account.</string>
-
     <string name="permalink_malformed">Il tuo collegamento matrix.to non è corretto</string>
     <string name="bug_report_error_too_short">La descrizione è troppo breve</string>
-
     <string name="notification_initial_sync">Sync iniziale…</string>
-
     <string name="settings_show_devices_list">Vedi tutte le mie sessioni</string>
     <string name="settings_advanced_settings">Impostazioni avanzate</string>
     <string name="settings_developer_mode">Modalità sviluppatore</string>
@@ -1973,25 +1625,19 @@
     <string name="settings">Impostazioni</string>
     <string name="devices_current_device">Sessione attuale</string>
     <string name="devices_other_devices">Altre sessioni</string>
-
     <string name="autocomplete_limited_results">Mostrati solo i primi risultati, digita più lettere…</string>
-
     <string name="settings_developer_mode_fail_fast_title">Crash facile</string>
     <string name="settings_developer_mode_fail_fast_summary">Element potrebbe crashare più spesso quando si verifica un errore imprevisto</string>
     <string name="command_description_shrug">Antepone ¯\\_(ツ)_/¯ ad un messaggio testuale</string>
-
     <string name="create_room_encryption_title">Attiva la cifratura</string>
     <string name="create_room_encryption_description">Una volta attivata, la cifratura non può essere disattivata.</string>
-
     <string name="login_error_threepid_denied">Il dominio della tua email non è autorizzato alla registrazione in questo server</string>
-
     <string name="verification_conclusion_warning">Accesso non fidato</string>
     <string name="verification_sas_match">Corrispondono</string>
     <string name="verification_sas_do_not_match">Non corrispondono</string>
     <string name="verify_user_sas_emoji_help_text">Verifica questo utente confermando che le seguenti emoji appaiono sul suo schermo, nello stesso ordine.</string>
     <string name="verify_user_sas_emoji_security_tip">Per la massima sicurezza, usate un\'altra via di comunicazione fidata o fatelo di persona.</string>
     <string name="verification_green_shield">Cerca lo scudo verde per garantire la fiducia dell\'utente. Fidati di tutti gli utenti in una stanza per garantire che essa sia sicura.</string>
-
     <string name="verification_conclusion_not_secure">Non sicuro</string>
     <string name="verification_conclusion_compromised">Uno dei seguenti potrebbe essere compromesso:
 \n
@@ -1999,12 +1645,10 @@
 \n - L\'homeserver al quale è connesso l\'utente che stai verificando
 \n - La tua connessione internet o quella dell\'altro utente
 \n - Il tuo dispositivo o quello dell\'altro utente</string>
-
     <string name="sent_a_video">Video.</string>
     <string name="sent_an_image">Immagine.</string>
     <string name="sent_an_audio_file">Audio</string>
     <string name="sent_a_file">File</string>
-
     <string name="verification_request_waiting">In attesa…</string>
     <string name="verification_request_other_cancelled">%s ha annullato</string>
     <string name="verification_request_you_cancelled">Hai annullato</string>
@@ -2012,25 +1656,17 @@
     <string name="verification_request_you_accepted">Hai accettato</string>
     <string name="verification_sent">Verifica inviata</string>
     <string name="verification_request">Richiesta di verifica</string>
-
-
     <string name="verification_verify_device">Verifica questa sessione</string>
     <string name="verification_verify_device_manually">Verifica manualmente</string>
-
     <string name="you">Tu</string>
-
     <string name="verification_scan_notice">Scansiona il codice con il dispositivo dell\'altro utente per verificarvi a vicenda</string>
     <string name="verification_scan_their_code">Scansiona il suo codice</string>
     <string name="verification_scan_emoji_title">Impossibile scansionare</string>
     <string name="verification_scan_emoji_subtitle">Se non siete di persona, confrontate invece le emoji</string>
-
     <string name="verification_no_scan_emoji_title">Verifica confrontando le emoji</string>
-
     <string name="verify_by_emoji_title">Verifica via emoji</string>
     <string name="verify_by_emoji_description">Se non potete scansionare il codice sopra, verificate confrontando una breve selezione univoca di emoji.</string>
-
     <string name="a13n_qr_code_description">Immagine codice QR</string>
-
     <string name="verification_verify_user">Verifica %s</string>
     <string name="verification_verified_user">%s verificato</string>
     <string name="verification_request_waiting_for">In attesa di %s…</string>
@@ -2053,54 +1689,38 @@
     <string name="room_profile_section_more_uploads">File caricati</string>
     <string name="room_profile_section_more_leave">Lascia stanza</string>
     <string name="room_profile_leaving_room">Uscita dalla stanza…</string>
-
     <string name="room_member_power_level_admins">Amministratori</string>
     <string name="room_member_power_level_moderators">Moderatori</string>
     <string name="room_member_power_level_custom">Personalizzato</string>
     <string name="room_member_power_level_invites">Inviti</string>
     <string name="room_member_power_level_users">Utenti</string>
-
     <string name="room_member_power_level_admin_in">Amministratore in %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderatore in %1$s</string>
     <string name="room_member_power_level_custom_in">Personalizzato (%1$d) in %2$s</string>
-
     <string name="room_member_jump_to_read_receipt">Vai alla ricevuta di lettura</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element non gestisce eventi del tipo \'%1$s\'</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element non gestisce messaggi del tipo \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element ha riscontrato un errore con il rendering del contenuto dell\'evento con id \'%1$s\'</string>
-
     <string name="unignore">Non ignorare</string>
-
     <string name="verify_cannot_cross_sign">Questa sessione non riesce a condividere questa verifica con le tue altre sessioni.
 \nLa verifica sarà salvata in locale e condivisa in una versione futura dell\'app.</string>
-
     <string name="room_list_sharing_header_recent_rooms">Stanze recenti</string>
     <string name="room_list_sharing_header_other_rooms">Altre stanze</string>
-
     <string name="command_description_rainbow">Invia il messaggio in questione colorato ad arcobaleno</string>
     <string name="command_description_rainbow_emote">Invia l\'emoticon in questione colorata ad arcobaleno</string>
-
     <string name="settings_category_timeline">Cronologia</string>
-
     <string name="settings_category_composer">Editor messaggi</string>
-
     <string name="room_settings_enable_encryption">Attiva cifratura end-to-end</string>
     <string name="room_settings_enable_encryption_warning">Una volta attivata, la cifratura non può essere disattivata.</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Attivare la cifratura\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Una volta attivata, la cifratura di una stanza non può essere disattivata. I messaggi inviati in una stanza cifrata non possono essere visti dal server, solo dai partecipanti della stanza. L\'attivazione della cifratura può impedire il funzionamento di molti bot e bridge.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Attiva cifratura</string>
-
     <string name="verification_request_notice">Per sicurezza, verifica %s controllando un codice univoco.</string>
     <string name="verification_request_start_notice">Per sicurezza, fatelo di persona o usate un\'altra via di comunicazione.</string>
-
     <string name="verification_emoji_notice">Confronta le emoji, assicurandoti che appaiono nello stesso ordine.</string>
     <string name="verification_code_notice">Confronta il codice con quello mostrato nello schermo dell\'altro utente.</string>
     <string name="verification_conclusion_ok_notice">I messaggi con questo utente sono cifrati end-to-end e non possono essere letti da terze parti.</string>
     <string name="verification_conclusion_ok_self_notice">La tua nuova sessione ora è verificata. Ha accesso ai messaggi cifrati e gli altri utenti la vedranno come fidata.</string>
-
-
     <string name="encryption_information_cross_signing_state">Firma incrociata</string>
     <string name="encryption_information_dg_xsigning_complete">La firma incrociata è attiva
 \nChiavi private nel dispositivo.</string>
@@ -2110,53 +1730,37 @@
     <string name="encryption_information_dg_xsigning_not_trusted">La firma incrociata è attiva.
 \nLe chiavi non sono fidate</string>
     <string name="encryption_information_dg_xsigning_disabled">La firma incrociata non è attiva</string>
-
-
     <string name="settings_active_sessions_list">Sessioni attive</string>
     <string name="settings_active_sessions_show_all">Mostra tutte le sessioni</string>
     <string name="settings_active_sessions_manage">Gestisci sessioni</string>
     <string name="settings_active_sessions_signout_device">Disconnetti questa sessione</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Nessuna informazione crittografica disponibile</string>
-
     <string name="settings_active_sessions_verified_device_desc">Questa sessione è fidata per i messaggi sicuri perché l\'hai verificata:</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifica questa sessione per segnarla come fidata e darle l\'accesso ai messaggi cifrati. Se non hai fatto l\'accesso a questa sessione il tuo account potrebbe essere compromesso:</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d sessione attiva</item>
         <item quantity="other">%d sessioni attive</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Verifica questo accesso</string>
     <string name="crosssigning_other_user_not_trust">Gli altri utenti potrebbero non fidarsi</string>
     <string name="complete_security">Completa la sicurezza</string>
-
     <string name="verification_open_other_to_verify">Usa una sessione esistente per verificare questa, dandole l\'accesso ai messaggi cifrati.</string>
-
-
     <string name="verification_profile_verify">Verifica</string>
     <string name="verification_profile_verified">Verificato</string>
     <string name="verification_profile_warning">Attenzione</string>
-
     <string name="room_member_profile_failed_to_get_devices">Rilevazione sessioni fallita</string>
     <string name="room_member_profile_sessions_section_title">Sessioni</string>
     <string name="trusted">Fidato</string>
     <string name="not_trusted">Non fidato</string>
-
     <string name="verification_profile_device_verified_because">Questa sessione è fidata per i messaggi sicuri perché %1$s (%2$s) l\'ha verificata:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) ha fatto l\'accesso con una nuova sessione:</string>
     <string name="verification_profile_device_untrust_info">Finché questo utente non si fida di questa sessione, i messaggi inviati da e verso di essa sono etichettati con avvisi. In alternativa, puoi verificarlo manualmente.</string>
-
-
     <string name="initialize_cross_signing">Inizializza la firma incrociata</string>
     <string name="reset_cross_signing">Reimposta chiavi</string>
-
     <string name="a11y_qr_code_for_verification">Codice QR</string>
-
     <string name="qr_code_scanned_by_other_notice">Quasi fatto! %s sta mostrando lo stesso scudo\?</string>
     <string name="qr_code_scanned_by_other_yes">Sì</string>
     <string name="qr_code_scanned_by_other_no">No</string>
-
     <string name="no_connectivity_to_the_server_indicator">La connessione al server è stata persa</string>
     <string name="login_signup_username_hint">Nome utente</string>
     <string name="settings_dev_tools">Strumenti Svil</string>
@@ -2173,49 +1777,36 @@
     <string name="command_description_poll">Crea un semplice sondaggio</string>
     <string name="verification_cannot_access_other_session">Usa una password o chiave di recupero</string>
     <string name="verification_use_passphrase">Se non puoi accedere a una sessione esistente</string>
-
     <string name="new_signin">Nuovo accesso</string>
-
     <string name="enter_secret_storage_invalid">Impossibile trovare segreti nell\'archivio</string>
     <string name="enter_secret_storage_passphrase">Inserisci la password dell\'archivio segreto</string>
     <string name="enter_secret_storage_passphrase_warning">Attenzione:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Dovresti accedere all\'archivio segreto solo da un dispositivo fidato</string>
-
     <string name="message_action_item_redact">Rimuovi…</string>
     <string name="share_confirm_room">Vuoi inviare questo allegato a %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Invia immagine nella dimensione originale</item>
         <item quantity="other">Invia immagini nella dimensione originale</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Conferma rimozione</string>
     <string name="delete_event_dialog_content">Sei sicuro di volere rimuovere (eliminare) questo evento\? Nota che se elimini il nome della stanza o cambi l\'argomento, ciò potrebbe annullare la modifica.</string>
     <string name="delete_event_dialog_reason_checkbox">Includi un motivo</string>
     <string name="delete_event_dialog_reason_hint">Motivo della revisione</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Evento eliminato da un utente, motivo: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Evento moderato da un admin della stanza, motivo: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Le chiavi sono già aggiornate!</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="settings_key_requests">Richieste di chiavi</string>
-
     <string name="e2e_use_keybackup">Sblocca la cronologia dei messaggi cifrati</string>
-
     <string name="refresh">Ricarica</string>
-
     <string name="new_session">Nuovo accesso. Eri tu\?</string>
     <string name="new_session_review">Tocca per controllare e verificare</string>
     <string name="verify_new_session_notice">Usa questa sessione per verificare quella nuova, dandole l\'accesso ai messaggi cifrati.</string>
     <string name="verify_new_session_was_not_me">Non ero io</string>
     <string name="verify_new_session_compromized">Il tuo account potrebbe essere compromesso</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">Se annulli, non potrai leggere i messaggi cifrati su questo dispositivo e altri utenti non si fideranno di esso</string>
     <string name="verify_cancel_self_verification_from_trusted">Se annulli, non potrai leggere i messaggi cifrati sul tuo nuovo dispositivo e altri utenti non si fideranno di esso</string>
     <string name="verify_cancel_other">Non verificherai %1$s (%2$s) se annulli adesso. Ricomincia nel suo profilo utente.</string>
-
     <string name="verify_not_me_self_verification">Uno dei seguenti potrebbe essere compromesso:
 \n
 \n- La tua password
@@ -2224,35 +1815,25 @@
 \n- La connessione internet usata da uno dei dispositivi
 \n
 \nTi consigliamo di cambiare immediatamente la password e le chiavi di recupero nelle impostazioni.</string>
-
     <string name="verify_cancelled_notice">Verifica i tuoi dispositivi dalle impostazioni.</string>
     <string name="verification_cancelled">Verifica annullata</string>
-
     <string name="recovery_passphrase">Password di ripristino</string>
     <string name="message_key">chiave dei messaggi</string>
     <string name="account_password">password dell\'account</string>
-
     <string name="set_recovery_passphrase">Imposta una %s</string>
     <string name="generate_message_key">Genera una chiave dei messaggi</string>
-
     <string name="confirm_recovery_passphrase">Conferma la %s</string>
-
     <string name="enter_account_password">Inserisci la tua %s per continuare.</string>
-
     <string name="bootstrap_info_text">Proteggi e sblocca i messaggi cifrati e fidati con una %s.</string>
     <string name="bootstrap_info_confirm_text">Inserisci la tua %s di nuovo per confermarla.</string>
     <string name="bootstrap_dont_reuse_pwd">Non riutilizzare la tua password dell\'account.</string>
-
-
     <string name="bootstrap_loading_text">Potrebbe impiegarci qualche secondo, porta pazienza.</string>
     <string name="bootstrap_loading_title">Inizializzazione del ripristino.</string>
     <string name="your_recovery_key">La tua chiave di recupero</string>
     <string name="bootstrap_finish_title">Hai finito!</string>
     <string name="keep_it_safe">Tienila al sicuro</string>
     <string name="finish">Fine</string>
-
     <string name="bootstrap_save_key_description">Usa questa %1$s come una rete di salvataggio in caso ti dimentichi la tua %2$s.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Pubblicazione delle chiavi di identità create</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Generazione della chiave sicura dalla password</string>
     <string name="bootstrap_crosssigning_progress_default_key">Definizione della chiave predefinita SSSS</string>
@@ -2260,37 +1841,26 @@
     <string name="bootstrap_crosssigning_progress_save_usk">Sincronizzazione della chiave utente</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Sincronizzazione della chiave di auto-firma</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Inizializzazione del backup chiavi</string>
-
-
     <string name="bootstrap_cross_signing_success">La tua %2$s e la %1$s sono ora impostate.
 \n
 \nTienile al sicuro! Ti serviranno per sbloccare i messaggi cifrati e informazioni sicure se perdi tutte le tue sessioni attive.</string>
-
     <string name="bootstrap_crosssigning_print_it">Stampala e conservala in un posto sicuro</string>
     <string name="bootstrap_crosssigning_save_usb">Salvala in una penna USB o disco di backup</string>
     <string name="bootstrap_crosssigning_save_cloud">Copiala nella tua archiviazione online</string>
-
     <string name="auth_flow_not_supported">Non puoi farlo da mobile</string>
-
     <string name="bootstrap_skip_text">Impostare una password dei messaggi ti consente di proteggere e sbloccare i messaggi cifrati e di fidarti.
 \n
 \nSe non vuoi impostare una password dei messaggi, genera una chiave dei messaggi.</string>
     <string name="bootstrap_skip_text_no_gen_key">Impostare una password di ripristino ti consente di proteggere e sbloccare i messaggi cifrati e di fidarti.</string>
-
-
     <string name="encryption_enabled">Cifratura attiva</string>
     <string name="encryption_enabled_tile_description">I messaggi in questa stanza sono cifrati end-to-end. Maggiori info e verifica degli utenti nel loro profilo.</string>
     <string name="encryption_not_enabled">Cifratura non attiva</string>
     <string name="encryption_unknown_algorithm_tile_description">La cifratura usata da questa stanza non è supportata</string>
-
     <string name="room_created_summary_item">%s ha creato e configurato la stanza.</string>
-
     <string name="qr_code_scanned_self_verif_notice">Quasi fatto! L\'altro dispositivo sta mostrando lo stesso scudo\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Quasi fatto! In attesa della conferma…</string>
     <string name="qr_code_scanned_verif_waiting">In attesa di %s…</string>
-
     <string name="error_failed_to_import_keys">Importazione chiavi fallita</string>
-
     <string name="settings_notification_configuration">Configurazione delle notifiche</string>
     <string name="settings_messages_at_room">Messaggi contenenti @room</string>
     <string name="settings_messages_in_e2e_one_to_one">Messaggi cifrati in conversazioni private</string>
@@ -2298,24 +1868,17 @@
     <string name="settings_when_rooms_are_upgraded">Quando le stanze vengono aggiornate</string>
     <string name="settings_troubleshoot_title">Risoluzione problemi</string>
     <string name="settings_notification_advanced_summary">Imposta l\'importanza della notifica per evento</string>
-
     <string name="command_description_plain">Invia un messaggio come testo semplice, senza interpretarlo come markdown</string>
-
     <string name="auth_invalid_login_param_space_in_password">Nome utente e/o password errati. La password inserita inizia o termina con spazi, controllala.</string>
-
     <string name="room_message_placeholder">Messaggio…</string>
-
     <string name="upgrade_security">Aggiornamento cifratura disponibile</string>
     <string name="security_prompt_text">Verifica te stesso e gli altri per tenere al sicuro le chat</string>
-
     <string name="bootstrap_enter_recovery">Inserisci la tua %s per continuare</string>
     <string name="use_file">Usa file</string>
-
     <string name="enter_backup_passphrase">Inserisci la %s</string>
     <string name="backup_recovery_passphrase">Password di ripristino</string>
     <string name="bootstrap_invalid_recovery_key">Non è una chiave di ripristino valida</string>
     <string name="recovery_key_empty_error_message">Inserisci una chiave di ripristino</string>
-
     <string name="bootstrap_progress_checking_backup">Controllo della chiave di backup</string>
     <string name="bootstrap_progress_checking_backup_with_info">Controllo della chiave di backup (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Rilevazione chiave di curva ellittica</string>
@@ -2324,19 +1887,15 @@
     <string name="bootstrap_progress_generating_ssss_recovery">Generazione chiave SSSS dalla chiave di ripristino</string>
     <string name="bootstrap_progress_storing_in_sss">Memorizzazione segreto della chiave in SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_enter_backup_password">Inserisci la password del backup chiavi per continuare.</string>
     <string name="bootstrap_migration_use_recovery_key">usare la chiave di ripristino del backup chiavi</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Non conosci la password del backup chiavi, puoi %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Chiave di ripristino del backup chiavi</string>
-
     <string name="settings_security_prevent_screenshots_title">Impedisci la cattura di schermate dell\'app</string>
     <string name="settings_security_prevent_screenshots_summary">Attivandolo verrà aggiunto FLAG_SECURE a tutte le Activity. Riavvia l\'applicazione per applicare le modifiche.</string>
-
     <string name="media_file_added_to_gallery">File multimediale aggiunto alla galleria</string>
     <string name="error_adding_media_file_to_gallery">Impossibile aggiungere il file multimediale alla galleria</string>
     <string name="change_password_summary">Imposta una nuova password dell\'account…</string>
-
     <string name="use_other_session_content_description">Usa l\'ultima versione di Element sui tuoi altri dispositivi, Element Web, Element Desktop, Element iOS, Element per Android o un altro client Matrix che supporti la firma incrociata</string>
     <string name="app_desktop_web">Element Web
 \nElement Desktop</string>
@@ -2351,30 +1910,25 @@
     <string name="enter_secret_storage_input_key">Seleziona la tua chiave di recupero, oppure inseriscila a mano digitandola o incollando dagli appunti</string>
     <string name="keys_backup_recovery_key_error_decrypt">Impossibile decifrare il backup con questa chiave di recupero: verifica di avere inserito la chiave giusta.</string>
     <string name="failed_to_access_secure_storage">Accesso all\'archivio sicuro fallito</string>
-
     <string name="unencrypted">Non cifrato</string>
     <string name="encrypted_unverified">Cifrato da un dispositivo non verificato</string>
     <string name="review_logins">Controlla dove hai fatto l\'accesso</string>
     <string name="verify_other_sessions">Verifica tutte le tue sessioni per assicurarti che il tuo account e i messaggi siano protetti</string>
     <string name="verify_this_session">Verifica il nuovo accesso entrando nel tuo account: %1$s</string>
-
     <string name="cross_signing_verify_by_text">Verifica manualmente con testo</string>
     <string name="crosssigning_verify_session">Verifica accesso</string>
     <string name="cross_signing_verify_by_emoji">Verifica interattivamente con emoji</string>
     <string name="confirm_your_identity">Conferma la tua identità verificando questo accesso da una delle tua altre sessioni, dandole l\'accesso ai messaggi cifrati.</string>
     <string name="mark_as_verified">Segna come fidato</string>
-
     <string name="error_empty_field_choose_user_name">Scegli un nome utente.</string>
     <string name="error_empty_field_choose_password">Scegli una password.</string>
     <string name="external_link_confirmation_title">Verifica questo collegamento</string>
     <string name="external_link_confirmation_message">Il collegamento %1$s ti sta portando ad un altro sito: %2$s.
 \n
 \nSei sicuro di volere continuare\?</string>
-
     <string name="create_room_dm_failure">Impossibile creare il messaggio diretto. Controlla gli utenti che vuoi invitare e riprova.</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="add_members_to_room">Aggiungi membri</string>
     <string name="invite_users_to_room_action_invite">INVITA</string>
     <string name="inviting_users_to_room">Invito utenti…</string>
@@ -2386,19 +1940,16 @@
         <item quantity="other">Inviti spediti a %1$s e ad altri %2$d</item>
     </plurals>
     <string name="invite_users_to_room_failure">Impossibile invitare gli utenti. Controlla gli utenti che vuoi invitare e riprova.</string>
-
     <string name="event_redacted">Messaggio eliminato</string>
     <string name="settings_show_redacted">Mostra messaggi rimossi</string>
     <string name="settings_show_redacted_summary">Mostra un segnaposto per i messaggi rimossi</string>
     <string name="settings_discovery_confirm_mail_not_clicked">Ti abbiamo inviato un\'email di conferma a %s, prima controlla la tua posta e clicca sul link di conferma</string>
     <string name="settings_text_message_sent_wrong_code">Il codice di verifica non è corretto.</string>
-
     <string name="uploads_media_title">MEDIA</string>
     <string name="uploads_media_no_result">Non ci sono file multimediali in questa stanza</string>
     <string name="uploads_files_title">FILE</string>
     <string name="uploads_files_subtitle">%1$s alle %2$s</string>
     <string name="uploads_files_no_result">Non ci sono file in questa stanza</string>
-
     <string name="login_connect_using_matrix_id_notice">In alternativa, se hai già un account e conosci il tuo identificativo e password di Matrix, puoi usare questo metodo:</string>
     <string name="login_connect_using_matrix_id_submit">Accedi con il mio identificativo di Matrix</string>
     <string name="login_signin_matrix_id_title">Accedi</string>
@@ -2406,13 +1957,10 @@
     <string name="login_signin_matrix_id_hint">Identificativo utente</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Non è un identificativo valido. Formato previsto: \'@utente:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Impossibile trovare un homeserver valido. Controlla il tuo identificativo</string>
-
     <string name="no_connectivity_to_the_server_indicator_airplane">Modalità aereo attiva</string>
-
     <string name="choose_locale_current_locale_title">Lingua attuale</string>
     <string name="choose_locale_other_locales_title">Altre lingue disponibili</string>
     <string name="choose_locale_loading_locales">Caricamento lingue disponibili…</string>
-
     <string name="open_terms_of">Apri condizioni di %s</string>
     <string name="disconnect_identity_server_dialog_content">Disconnettere dal server di identitià %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Questo server di identità è obsoleto. Element supporta solo API V2.</string>
@@ -2422,26 +1970,20 @@
     <string name="identity_server_error_bulk_sha256_not_supported">Per la tua privacy, Element supporta solo l\'invio di email utente e numeri di telefono in formato hash.</string>
     <string name="identity_server_error_binding_error">L\'associamento è fallito.</string>
     <string name="identity_server_error_no_current_binding_error">Non c\'è alcun associamento attuale con questo identificativo.</string>
-
     <string name="identity_server_set_default_notice">Il tuo homeserver (%1$s) propone di usare %2$s come tuo server di identità</string>
     <string name="identity_server_set_default_submit">Usa %1$s</string>
     <string name="identity_server_set_alternative_notice">In alternativa, puoi inserire un qualsiasi altro URL di server di identità</string>
     <string name="identity_server_set_alternative_notice_no_default">Inserisci l\'URL di un server di identità</string>
     <string name="identity_server_set_alternative_submit">Invia</string>
-
     <string name="play_video">Riproduci</string>
     <string name="pause_video">Pausa</string>
     <string name="dismiss">Annulla</string>
-
-
     <string name="action_copy">Copia</string>
     <string name="dialog_title_success">Completato</string>
-
     <string name="bottom_action_notification">Notifiche</string>
     <string name="call_failed_no_connection">Telefonata di Element fallita</string>
     <string name="call_failed_no_connection_description">Connessione in tempo reale fallita.
 \nChiedi all\'amministratore del tuo homeserver di configurare un server TURN per fare funzionare le chiamate.</string>
-
     <string name="call_select_sound_device">Seleziona dispositivo audio</string>
     <string name="sound_device_phone">Telefono</string>
     <string name="sound_device_speaker">Altoparlante</string>
@@ -2452,18 +1994,14 @@
     <string name="call_camera_back">Posteriore</string>
     <string name="call_format_turn_hd_off">Disattiva l\'HD</string>
     <string name="call_format_turn_hd_on">Attiva l\'HD</string>
-
     <string name="login_error_ssl_peer_unverified">Errore SSL: l\'identità del peer non è stata verificata.</string>
     <string name="login_error_ssl_other">Errore SSL.</string>
     <string name="active_call_with_duration">Telefonata attiva (%s)</string>
     <string name="return_to_call">Torna alla telefonata</string>
-
     <string name="room_participants_action_cancel_invite">Annulla invito</string>
     <string name="room_participants_power_level_demote_warning_title">Vuoi declassarti\?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Non potrai annullare questa modifica dato che ti stai declassando, se sei l\'ultimo utente privilegiato nella stanza sarà impossibile ottenere di nuovo i privilegi.</string>
     <string name="room_participants_power_level_demote">Declassa</string>
-
-
     <string name="room_participants_action_ignore_title">Ignora utente</string>
     <string name="room_participants_action_ignore_prompt_msg">Ignorando questo utente verranno rimossi i suoi messaggi dalle stanze che condividete.
 \n
@@ -2481,7 +2019,6 @@
     <string name="room_participants_ban_reason">Motivo del ban</string>
     <string name="room_participants_unban_title">Togli il ban dell\'utente</string>
     <string name="room_participants_unban_prompt_msg">Togliere il ban dell\'utente gli permetterà di rientrare nella stanza.</string>
-
     <string name="settings_secure_backup_section_title">Backup Sicuro</string>
     <string name="settings_secure_backup_manage">Gestisci</string>
     <string name="settings_secure_backup_setup">Imposta il Backup Sicuro</string>
@@ -2490,53 +2027,37 @@
     <string name="settings_secure_backup_section_info">Proteggiti contro la perdita dell\'accesso ai messaggi e dati cifrati facendo un backup delle chiavi crittografiche sul tuo server.</string>
     <string name="reset_secure_backup_title">Genera una nuova chiave di sicurezza o imposta una nuova frase di sicurezza per il backup esistente.</string>
     <string name="reset_secure_backup_warning">Ciò sostituirà la tua attuale chiave o frase.</string>
-
     <string name="disabled_integration_dialog_title">Le integrazioni sono disattivate</string>
     <string name="disabled_integration_dialog_content">Attiva \'Permetti integrazioni\' nelle impostazioni per continuare.</string>
-
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d utente bandito</item>
         <item quantity="other">%d utenti banditi</item>
     </plurals>
-
     <string name="encryption_exported_successfully">Chiavi esportate correttamente</string>
-
     <string name="active_widget_view_action">VEDI</string>
     <string name="active_widgets_title">Widget attivi</string>
-
-
     <string name="recovery_key_export_saved">La chiave di recupero è stata salvata.</string>
-
     <string name="secure_backup_banner_setup_line1">Backup Sicuro</string>
     <string name="secure_backup_banner_setup_line2">Proteggiti dalla perdita dei messaggi e dati crittografati</string>
-
     <string name="secure_backup_setup">Imposta il Backup Sicuro</string>
-
     <string name="labs_show_unread_notifications_as_tab">Aggiungi una scheda dedicata per le notifiche non lette nella schermata principale.</string>
-
     <string name="room_list_quick_actions_favorite_add">Aggiungi ai preferiti</string>
     <string name="room_list_quick_actions_favorite_remove">Rimuovi dai preferiti</string>
     <string name="notice_member_no_changes_by_you">Non hai fatto modifiche</string>
     <string name="room_join_rules_public_by_you">Hai reso pubblica la stanza a chiunque conosca il link.</string>
     <string name="room_join_rules_invite_by_you">Hai reso la stanza solo su invito.</string>
     <string name="login_server_url_form_common_notice">Inserisci l\'indirizzo del server che vuoi usare</string>
-
     <string name="login_signin_matrix_id_password_notice">Se non sai la tua password, torna indietro per reimpostarla.</string>
     <string name="send_a_sticker">Adesivo</string>
-
     <string name="room_profile_section_admin">Azioni amministratore</string>
     <string name="room_member_power_level_default_in">Predefinito in %1$s</string>
     <string name="settings_hs_admin_e2e_disabled">L\'amministratore del server ha disattivato la crittografia end-to-end in modo predefinito nelle stanze private e nei messaggi diretti.</string>
     <string name="bootstrap_info_text_2">Inserisci una frase di sicurezza che conosci solo tu, usata per proteggere i segreti nel tuo server.</string>
-
     <string name="bootstrap_cancel_text">Se annulli ora, potresti perdere i messaggi e dati cifrati se perdi l\'accesso ai tuoi login.
 \n
 \nPuoi anche configurare il backup sicuro e gestire le tue chiavi nelle impostazioni.</string>
-
     <string name="room_created_summary_item_by_you">Hai creato e configurato la stanza.</string>
-
     <string name="auth_invalid_login_deactivated_account">Questo account è stato disattivato.</string>
-
     <string name="setup_cross_signing">Attiva la firma incrociata</string>
     <string name="error_saving_media_file">Impossibile salvare il file multimediale</string>
     <string name="power_level_edit_title">Imposta ruolo</string>
@@ -2546,9 +2067,7 @@
     <string name="a11y_unmute_microphone">Accendi il microfono</string>
     <string name="a11y_stop_camera">Ferma la fotocamera</string>
     <string name="a11y_start_camera">Avvia la fotocamera</string>
-
     <string name="settings_setup_secure_backup">Imposta il Backup Sicuro</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">Backup sicuro</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">Proteggiti contro la perdita dell\'accesso ai messaggi e dati cifrati facendo un backup delle chiavi crittografiche sul tuo server.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Configura</string>
@@ -2556,22 +2075,17 @@
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Genera una chiave di sicurezza da conservare in qualche posto sicuro, come un gestore di password o una cassaforte.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Usa una frase di sicurezza</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Inserisci una frase segreta che conosci solo tu e genera una chiave per backup.</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">Salva la chiave di sicurezza</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Conserva la chiave di sicurezza in qualche posto sicuro, come un gestore di password o una cassaforte.</string>
-
     <string name="set_a_security_phrase_title">Imposta una frase di sicurezza</string>
     <string name="set_a_security_phrase_notice">Inserisci una frase di sicurezza che conosci solo tu, usata per proteggere i segreti nel tuo server.</string>
     <string name="set_a_security_phrase_hint">Frase di sicurezza</string>
     <string name="set_a_security_phrase_again_notice">Inserisci la frase di sicurezza di nuovo per confermarla.</string>
-
     <string name="save_your_security_key_title">Salva la chiave di sicurezza</string>
     <string name="save_your_security_key_notice">Conserva la chiave di sicurezza in qualche posto sicuro, come un gestore di password o una cassaforte.</string>
-
     <string name="room_settings_name_hint">Nome stanza</string>
     <string name="room_settings_topic_hint">Argomento</string>
     <string name="room_settings_save_success">Hai cambiato le impostazioni della stanza correttamente</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">Non puoi accedere a questo messaggio</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">In attesa del messaggio, potrebbe volerci un po\'</string>
     <string name="crypto_utd">Impossibile decifrare</string>
@@ -2580,17 +2094,12 @@
     <string name="crypto_error_withheld_unverified">Non puoi accedere a questo messaggio perché la tua sessione non è fidata dal mittente</string>
     <string name="crypto_error_withheld_generic">Non puoi accedere a questo messaggio perché il mittente non ha inviato le chiavi di proposito</string>
     <string name="notice_crypto_unable_to_decrypt_merged">In attesa della cronologia di crittografia</string>
-
     <string name="element_disclaimer_title">Riot ora si chiama Element!</string>
     <string name="element_disclaimer_content">Siamo entusiasti di annunciare che abbiamo cambiato nome! La tua app è aggiornata e hai fatto l\'accesso al tuo account.</string>
     <string name="element_disclaimer_negative_button">CAPITO</string>
     <string name="element_disclaimer_positive_button">MAGGIORI INFO</string>
-
     <string name="element_login_splash_brand">element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Salva chiave di ripristino in</string>
-
     <string name="add_from_phone_book">Aggiungi dalla mia rubrica</string>
     <string name="empty_phone_book">La tua rubrica è vuota</string>
     <string name="phone_book_title">Rubrica</string>
@@ -2598,13 +2107,10 @@
     <string name="loading_contact_book">Rilevazione dei tuoi contatti…</string>
     <string name="empty_contact_book">Il tuo elenco di contatti è vuoto</string>
     <string name="contacts_book_title">Elenco contatti</string>
-
     <string name="three_pid_revoke_invite_dialog_title">Revoca invito</string>
     <string name="three_pid_revoke_invite_dialog_content">Revocare l\'invito a %1$s\?</string>
-
     <string name="member_banned_by">Bandito da %1$s</string>
     <string name="failed_to_unban">Rimozione ban fallita</string>
-
     <string name="alert_push_are_disabled_title">Le notifiche push sono disattivate</string>
     <string name="alert_push_are_disabled_description">Verifica le tue impostazioni per attivare le notifiche push</string>
     <string name="create_pin_title">Scegli un PIN di sicurezza</string>
@@ -2633,13 +2139,11 @@
         <item quantity="one">%1$d/%2$d chiave importata correttamente.</item>
         <item quantity="other">%1$d/%2$d chiavi importate correttamente.</item>
     </plurals>
-
     <string name="room_manage_integrations">Gestisci integrazioni</string>
     <string name="room_no_active_widgets">Nessun widget attivo</string>
     <string name="create_room_federation_error">La stanza è stata creata, ma alcuni inviti non sono stati spediti per il seguente motivo:
 \n
 \n%s</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="one">%1$s, %2$s e %3$d altro hanno letto</item>
         <item quantity="other">%1$s, %2$s e altri %3$d hanno letto</item>
@@ -2657,15 +2161,12 @@
     <string name="settings_phone_numbers">Numeri di telefono</string>
     <string name="settings_remove_three_pid_confirmation_content">Rimuovere %s\?</string>
     <string name="error_threepid_auth_failed">Assicurati di avere cliccato il link nell\'email che ti abbiamo inviato.</string>
-
     <string name="settings_emails_and_phone_numbers_title">Email e numeri di telefono</string>
     <string name="settings_emails_and_phone_numbers_summary">Gestisci le email e i numeri di telefono collegati al tuo account Matrix</string>
-
     <string name="settings_text_message_sent_hint">Codice</string>
     <string name="login_msisdn_notice">Si prega di usare il formato internazionale (il numero deve iniziare con \'+\')</string>
     <string name="confirm_your_identity_quad_s">Conferma la tua identità verificando questo accesso, dandogli l\'accesso ai messaggi cifrati.</string>
     <string name="error_sso_flow_not_supported_yet">Spiacente, questa operazione non è ancora possibile per gli account connessi tramite Single Sign-On.</string>
-
     <string name="error_opening_banned_room">Impossibile aprire una stanza dove sei stato bandito.</string>
     <string name="room_error_not_found">Impossibile trovare questa stanza. Assicurati che esista.</string>
     <string name="no_permissions_to_start_webrtc_call">Non hai il permesso di avviare una chiamata in questa stanza</string>
@@ -2673,17 +2174,67 @@
         <item quantity="one">%d secondo</item>
         <item quantity="other">%d secondi</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events">Mostra eventi di stato dei membri della stanza</string>
     <string name="settings_show_room_member_state_events_summary">Includi eventi di invito/entrata/uscita/kick/ban e modifiche di avatar/nome.</string>
     <string name="sent_a_poll">Sondaggio</string>
     <string name="sent_a_bot_buttons">Pulsanti bot</string>
     <string name="sent_a_reaction">Reagito con: %s</string>
     <string name="sent_verification_conclusion">Conclusione della verifica</string>
-
     <string name="delete_account_data_warning">Eliminare i dati dell\'account di tipo %1$s\?
 \n
 \nUsalo con attenzione, può avere comportamenti imprevisti.</string>
-
     <string name="universal_link_malformed">Il collegamento non è corretto</string>
-</resources>
+    <string name="settings_security_pin_code_notifications_summary_off">Mostra solo il numero di messaggi non letti in una semplice notifica.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Mostra dettagli come il nome delle stanze e il contenuto dei messaggi.</string>
+    <string name="settings_security_pin_code_notifications_title">Mostra il contenuto nelle notifiche</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">Il codice PIN è l\'unico modo per sbloccare Element.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Attiva la biometria specifica del dispositivo, come impronte e riconoscimento facciale.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Attiva la biometria</string>
+    <string name="settings_security_application_protection_screen_title">Configura protezione</string>
+    <string name="settings_security_application_protection_summary">Proteggi l\'accesso usando un PIN e la biometria.</string>
+    <string name="settings_security_application_protection_title">Proteggi accesso</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Mostra il dispositivo con cui puoi verificare ora</item>
+        <item quantity="other">Mostra %d dispositivi con cui puoi verificare ora</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">Ricomincerai senza cronologia, messaggi, dispositivi o utenti fidati</string>
+    <string name="secure_backup_reset_if_you_reset_all">Se reimposti tutto</string>
+    <string name="secure_backup_reset_all_no_other_devices">Fallo solo se non hai altri dispositivi con cui verificare questo.</string>
+    <string name="secure_backup_reset_all">Reimposta tutto</string>
+    <string name="bad_passphrase_key_reset_all_action">Dimenticato o perso tutte le opzioni di recupero\? Reimposta tutto</string>
+    <string name="direct_room_created_summary_item_by_you">Sei entrato.</string>
+    <string name="direct_room_encryption_enabled_tile_description">I messaggi in questa stanza sono cifrati end-to-end.</string>
+    <string name="direct_room_profile_section_more_leave">Esci</string>
+    <string name="direct_room_profile_section_more_settings">Impostazioni</string>
+    <string name="direct_room_profile_encrypted_subtitle">I messaggi qui sono cifrati end-to-end. 
+\n 
+\nI tuoi messaggi sono protetti con lucchetti e solo tu e il destinatario avete le chiavi univoche per sbloccarli.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">I messaggi qui non sono cifrati end-to-end.</string>
+    <string name="login_error_outdated_homeserver_warning_content">L\'homeserver gira su una versione vecchia. Chiedi al tuo amministratore di aggiornare. Puoi continuare, ma alcune funzionalità potrebbero non funzionare correttamente.</string>
+    <string name="direct_room_join_rules_invite_by_you">L\'hai resa solo su invito.</string>
+    <string name="direct_room_join_rules_invite">%1$s l\'ha resa solo su invito.</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Mostra la cronologia completa nelle stanze cifrate</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s e %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s in %2$s e %3$s</string>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d invito</item>
+        <item quantity="other">%d inviti</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">La notifica è stata cliccata!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Clicca la notifica. Se non la vedi, controlla le impostazioni di sistema.</string>
+    <string name="settings_troubleshoot_test_notification_title">Visualizzazione notifica</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Stai vedendo la notifica! Cliccami!</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Ricezione push fallita. La soluzione può essere di reinstallare l\'applicazione.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">L\'applicazione sta ricevendo il PUSH</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Prova push</string>
+    <string name="search_is_not_supported_in_e2e_room">La ricerca in stanze cifrate non è ancora supportata.</string>
+    <string name="search_banned_user_hint">Filtra utenti banditi</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Non hai il permesso di avviare una chiamata</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Non hai il permesso di avviare una chiamata di gruppo</string>
+    <string name="reset">Reimposta</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">Il codice PIN è richiesto ogni volta che apri Element.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">È necessario il codice PIN dopo 2 minuti di inattività con Element.</string>
+    <string name="settings_security_pin_code_grace_period_title">Richiedi il PIN dopo 2 minuti</string>
+    <string name="direct_room_created_summary_item">%s è entrato.</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">L\'applicazione è in attesa del PUSH</string>
+</resources>
\ No newline at end of file

From 021c23cd19a6b35485d51e358584cdfa189488c7 Mon Sep 17 00:00:00 2001
From: Marcelo Filho <marceloaof@protonmail.com>
Date: Tue, 13 Oct 2020 16:53:56 +0000
Subject: [PATCH 266/278] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
---
 vector/src/main/res/values-pt-rBR/strings.xml | 582 +++---------------
 1 file changed, 71 insertions(+), 511 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 97da7a8a82..c50be8c20f 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1,21 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">pt</string>
     <string name="resources_country_code">BR</string>
-
     <!-- titles -->
     <string name="title_activity_home">Mensagens</string>
     <string name="title_activity_room">Sala</string>
     <string name="title_activity_settings">Configurações</string>
     <string name="title_activity_member_details">Detalhes do participante</string>
     <string name="title_activity_historical">Histórico</string>
-
     <string name="call_notification_answer">Aceitar</string>
     <string name="call_notification_reject">Recusar</string>
     <string name="call_notification_hangup">Encerrar</string>
-
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Cancelar</string>
@@ -48,7 +45,6 @@
     <string name="send_anyway">Enviar mesmo assim</string>
     <string name="or">ou</string>
     <string name="invite">Convidar</string>
-
     <!-- actions -->
     <string name="action_sign_out">Sair</string>
     <string name="action_voice_call">Chamada de voz</string>
@@ -61,27 +57,22 @@
     <string name="action_close">Fechar</string>
     <string name="copied_to_clipboard">Copiado para a área de transferência</string>
     <string name="disable">Desativar</string>
-
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Confirmação</string>
     <string name="dialog_title_warning">Atenção</string>
-
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Início</string>
     <string name="bottom_action_favourites">Favoritos</string>
     <string name="bottom_action_people">Pessoas</string>
     <string name="bottom_action_rooms">Salas</string>
-
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Filtrar nomes de salas</string>
     <string name="home_filter_placeholder_favorites">Filtrar favoritos</string>
     <string name="home_filter_placeholder_people">Filtrar pessoas</string>
     <string name="home_filter_placeholder_rooms">Filtrar nomes de salas</string>
-
     <!-- Home fragment -->
     <string name="invitations_header">Convites</string>
     <string name="low_priority_header">Baixa prioridade</string>
-
     <!-- People fragment -->
     <string name="direct_chats_header">Conversas</string>
     <string name="local_address_book_header">Agenda de endereços local</string>
@@ -89,7 +80,6 @@
     <string name="no_conversation_placeholder">Nenhuma conversa</string>
     <string name="no_contact_access_placeholder">Você não permitiu que o Element acesse seus contatos locais</string>
     <string name="no_result_placeholder">Nenhum resultado</string>
-
     <!-- Rooms fragment -->
     <string name="rooms_header">Salas</string>
     <string name="rooms_directory_header">Lista de salas</string>
@@ -99,7 +89,6 @@
         <item quantity="one">%d usuário</item>
         <item quantity="other">%d usuários</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">Enviar registros</string>
     <string name="send_bug_report_include_crash_logs">Enviar registros da falha</string>
     <string name="send_bug_report_include_screenshot">Enviar recorte de tela</string>
@@ -112,10 +101,8 @@
     <string name="send_bug_report_failed">Falha ao enviar o relatório de erro (%s)</string>
     <string name="send_bug_report_progress">Andamento (%s%%)</string>
     <string name="send_bug_report_app_crashed">O aplicativo encerrou inesperadamente da última vez. Gostaria de abrir a tela de relatórios de erros\?</string>
-
     <string name="send_files_in">Enviar para</string>
     <string name="read_receipt">Leitura:</string>
-
     <string name="join_room">Entrar na sala</string>
     <string name="username">Nome de usuário</string>
     <string name="create_account">Criar conta</string>
@@ -124,14 +111,11 @@
     <string name="hs_url">Endereço do servidor principal</string>
     <string name="identity_url">Endereço do servidor de identidade</string>
     <string name="search">Pesquisar</string>
-
     <string name="start_new_chat">Iniciar nova conversa</string>
     <string name="start_voice_call">Iniciar chamada de voz</string>
     <string name="start_video_call">Iniciar chamada de vídeo</string>
-
     <string name="option_send_files">Enviar arquivos</string>
     <string name="option_take_photo_video">Tirar uma foto ou gravar vídeo</string>
-
     <!-- Authentication -->
     <string name="auth_login">Entrar</string>
     <string name="auth_register">Criar conta</string>
@@ -180,7 +164,6 @@
     <string name="auth_reset_password_success_message">Sua senha foi alterada.
 \n
 \nVocê foi desconectado de todas as sessões e não receberá mais notificações. Para reativar as notificações, faça login novamente em cada aparelho.</string>
-
     <!-- Login Screen -->
     <string name="login_error_must_start_http">O endereço precisa começar com http[s]://</string>
     <string name="login_error_network_error">Não foi possível fazer login: erro de rede</string>
@@ -189,7 +172,6 @@
     <string name="login_error_unable_register">Não foi possível criar conta</string>
     <string name="login_error_unable_register_mail_ownership">Não foi possível criar conta: falha na verificação de posse do e-mail</string>
     <string name="login_error_invalid_home_server">Por favor, digite um endereço válido</string>
-
     <string name="login_error_forbidden">Nome de usuário ou senha inválido</string>
     <string name="login_error_unknown_token">O token de acesso especificado não foi reconhecido</string>
     <string name="login_error_bad_json">JSON mal formatado</string>
@@ -197,54 +179,43 @@
     <string name="login_error_limit_exceeded">Muitas solicitações foram enviadas</string>
     <string name="login_error_user_in_use">Este nome de usuário já está em uso</string>
     <string name="login_error_login_email_not_yet">O link no e-mail ainda não foi clicado</string>
-
     <!-- crypto warnings -->
-
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lista de confirmações de leitura</string>
-
     <!-- accounts list Screen -->
-
     <!-- image size selection -->
     <string name="compression_options">Enviar como </string>
     <string name="compression_opt_list_original">Original</string>
     <string name="compression_opt_list_large">Grande</string>
     <string name="compression_opt_list_medium">Médio</string>
     <string name="compression_opt_list_small">Pequeno</string>
-
     <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Cancelar o download?</string>
     <string name="attachment_cancel_upload">Cancelar o envio\?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
-
     <!-- room creation dialog Screen -->
     <string name="yesterday">Ontem</string>
     <string name="today">Hoje</string>
-
     <!-- room info dialog Screen -->
     <string name="room_info_room_name">Nome da sala</string>
     <string name="room_info_room_topic">Descrição da sala</string>
-
     <!-- call string -->
     <string name="call_connected">Chamada aceita</string>
-    <string name="call_connecting">Chamando…</string>
+    <string name="call_connecting">Iniciando chamada…</string>
     <string name="call_ended">Chamada encerrada</string>
     <string name="call_ring">Chamando…</string>
     <string name="incoming_call">Recebendo chamada</string>
     <string name="incoming_video_call">Recebendo chamada de vídeo</string>
     <string name="incoming_voice_call">Recebendo chamada de voz</string>
     <string name="call_in_progress">Chamada em andamento…</string>
-
     <string name="call_error_user_not_responding">A pessoa não atendeu a chamada.</string>
     <string name="call_error_ice_failed">A conexão à mídia falhou</string>
     <string name="call_error_camera_init_failed">Não foi possível iniciar a câmera</string>
     <string name="call_error_answered_elsewhere">chamada atendida em outro lugar</string>
-
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tirar uma foto ou gravar vídeo</string>
     <string name="media_picker_cannot_record_video">Não é possível gravar vídeo</string>
-
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Informação</string>
     <string name="permissions_rationale_msg_storage">Element precisa de permissão para acessar sua galeria de fotos e vídeos para enviar e salvar anexos.
@@ -265,25 +236,20 @@
     <string name="permissions_msg_contacts_warning_other_androids">Element precisa de permissão para acessar os seus contatos para poder encontrar outros usuários a partir de seus e-mails e números de telefone.
 \n
 \nVocê concorda em usar a sua lista de contatos para esse propósito\?</string>
-
     <string name="permissions_action_not_performed_missing_permissions">Desculpe. A ação não foi realizada, por falta de permissão</string>
-
     <!-- medias slider string -->
     <string name="media_slider_saved">Salvo</string>
     <string name="media_slider_saved_message">Salvar nos downloads?</string>
     <string name="yes">SIM</string>
     <string name="no">NÃO</string>
     <string name="_continue">Continuar</string>
-
     <!-- Actions -->
     <string name="remove">Apagar</string>
     <string name="join">Entrar</string>
     <string name="preview">Visualizar</string>
     <string name="reject">Recusar</string>
-
     <!-- Room -->
     <string name="room_jump_to_first_unread">Ir para a primeira mensagem não lida.</string>
-
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">Você foi convidada(o) a entrar nesta sala por %s</string>
     <string name="room_preview_unlinked_email_warning">Este convite foi enviado a %s, que não está associado com esta conta.
@@ -291,27 +257,22 @@
     <string name="room_preview_try_join_an_unknown_room">Você está tentando acessar %s. Quer entrar na sala para poder participar da conversa?</string>
     <string name="room_preview_try_join_an_unknown_room_default">uma sala</string>
     <string name="room_preview_room_interactions_disabled">Esta é uma pré-visualização desta sala. Interações com esta sala estão desativadas.</string>
-
     <!-- Chat creation -->
     <string name="room_creation_title">Nova conversa</string>
     <string name="room_creation_add_member">Adicionar uma pessoa</string>
     <string name="room_title_one_member">1 participante</string>
-
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Sair da sala</string>
     <string name="room_participants_leave_prompt_msg">Tem certeza de que deseja sair da sala\?</string>
     <string name="room_participants_remove_prompt_msg">Deseja remover %s desta conversa\?</string>
     <string name="room_participants_create">Criar</string>
-
     <string name="room_participants_online">Online</string>
     <string name="room_participants_offline">Offline</string>
     <string name="room_participants_idle">Ocioso</string>
-
     <string name="room_participants_header_admin_tools">FERRAMENTAS DE ADMINISTRAÇÃO</string>
     <string name="room_participants_header_call">CHAMADA</string>
     <string name="room_participants_header_direct_chats">Conversas</string>
     <string name="room_participants_header_devices">SESSÕES</string>
-
     <string name="room_participants_action_invite">Convidar</string>
     <string name="room_participants_action_leave">Sair da sala</string>
     <string name="room_participants_action_remove">Remover desta sala</string>
@@ -327,18 +288,14 @@
     <string name="room_participants_action_devices_list">Mostrar lista de sessões</string>
     <string name="room_participants_power_level_prompt">Você não poderá desfazer esta alteração, já que você está promovendo este usuário para ter o mesmo nível de permissões que você.
 \nTem certeza\?</string>
-
     <string name="room_participants_invite_prompt_msg">"Você tem certeza que quer convidar %s para esta conversa?"</string>
-
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Convidar por ID</u></string>
     <string name="people_search_local_contacts">CONTATOS LOCAIS (%d)</string>
     <string name="people_search_filter_text">Apenas usuários Matrix</string>
-
     <string name="people_search_invite_by_id_dialog_title">Convidar pessoa por sua ID</string>
     <string name="people_search_invite_by_id_dialog_description">Por favor, digite um ou mais endereços de e-mail ou ID Matrix</string>
     <string name="people_search_invite_by_id_dialog_hint">E-mail ou ID Matrix</string>
-
     <!--  Chat -->
     <string name="room_menu_search">Pesquisar</string>
     <string name="room_one_user_is_typing">%s está digitando…</string>
@@ -355,7 +312,6 @@
     <string name="room_delete_unsent_messages">Apagar mensagens não enviadas</string>
     <string name="room_message_file_not_found">Arquivo não encontrado</string>
     <string name="room_do_not_have_permission_to_post">Você não tem permissão para digitar nesta sala</string>
-
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Confiar</string>
     <string name="ssl_do_not_trust">Não confiar</string>
@@ -368,7 +324,6 @@
     <string name="ssl_unexpected_existing_expl">Você tinha um certificado confiável para o seu telefone, mas ele mudou. Isso é ALTAMENTE INCOMUM. É recomendável que você NÃO ACEITE este novo certificado.</string>
     <string name="ssl_expected_existing_expl">O certificado foi alterado de um anteriormente confiável para um que não é confiável. O servidor pode ter renovado seu certificado. Entre em contato com o administrador do servidor para obter a impressão digital esperada.</string>
     <string name="ssl_only_accept">Apenas aceite o certificado se o administrador do servidor publicou uma impressão digital que é idêntica a que está acima.</string>
-
     <!-- Room Details -->
     <string name="room_details_title">Detalhes da sala</string>
     <string name="room_details_people">Pessoas</string>
@@ -377,7 +332,6 @@
     <string name="malformed_id">ID mal formatado. Precisa ser um endereço de e-mail ou um ID Matrix, como \'@participantelocal:dominio\'</string>
     <string name="room_details_people_invited_group_name">CONVIDADOS</string>
     <string name="room_details_people_present_group_name">ENTRARAM</string>
-
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Motivo de denunciar este conteúdo</string>
     <string name="room_event_action_report_prompt_ignore_user">Deseja ocultar todas as mensagens deste usuário\?
@@ -385,7 +339,6 @@
 \nEsta ação irá reiniciar o aplicativo e poderá demorar um pouco.</string>
     <string name="room_event_action_cancel_upload">Cancelar envio</string>
     <string name="room_event_action_cancel_download">Cancelar download</string>
-
     <!-- Search -->
     <string name="search_hint">Pesquisar</string>
     <string name="search_members_hint">Pesquisar participantes da sala</string>
@@ -394,7 +347,6 @@
     <string name="tab_title_search_messages">MENSAGENS</string>
     <string name="tab_title_search_people">PESSOAS</string>
     <string name="tab_title_search_files">ARQUIVOS</string>
-
     <!-- Room recents -->
     <string name="room_recents_join">ENTRAR</string>
     <string name="room_recents_directory">LISTA PÚBLICA</string>
@@ -407,18 +359,15 @@
     <string name="room_recents_join_room">Entrar na sala</string>
     <string name="room_recents_join_room_title">Entrar em uma sala</string>
     <string name="room_recents_join_room_prompt">Digite o ide ou o apelido de uma sala</string>
-
     <!-- Directory -->
     <string name="directory_search_results_title">Pesquisar na lista pública</string>
     <string name="directory_searching_title">Buscando no diretório…</string>
-
     <!-- home room settings -->
     <string name="room_settings_favourite">Favoritar</string>
     <string name="room_settings_de_prioritize">Despriorizar</string>
     <string name="room_settings_direct_chat">Conversa direta</string>
     <string name="room_settings_leave_conversation">Sair da conversa</string>
     <string name="room_settings_forget">Esquecer</string>
-
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Mensagens</string>
     <string name="room_sliding_menu_settings">Configurações</string>
@@ -427,9 +376,7 @@
     <string name="room_sliding_menu_third_party_notices">Licenças de terceiros</string>
     <string name="room_sliding_menu_copyright">Direito autoral</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidade</string>
-
     <!-- Vector Settings -->
-
     <string name="settings_profile_picture">Foto de perfil</string>
     <string name="settings_display_name">Nome e sobrenome</string>
     <string name="settings_email_address">E-mail</string>
@@ -438,22 +385,18 @@
     <string name="settings_add_phone_number">Adicionar número de telefone</string>
     <string name="settings_app_info_link_summary">Mostrar informações do aplicativo nas configurações do sistema.</string>
     <string name="settings_app_info_link_title">Informações sobre o aplicativo</string>
-
     <string name="settings_enable_all_notif">Receba notificações de novas mensagens</string>
     <string name="settings_enable_this_device">Ativar notificações nesta sessão</string>
     <string name="settings_turn_screen_on">Acender a tela por 3 segundos</string>
-
     <string name="settings_messages_in_one_to_one">Mensagens em conversas individuais</string>
     <string name="settings_messages_in_group_chat">Mensagens em salas</string>
     <string name="settings_invited_to_room">Quando eu for convidada(o) a uma sala</string>
     <string name="settings_call_invitations">Recebendo chamada</string>
     <string name="settings_messages_sent_by_bot">Mensagens enviadas por bots</string>
-
     <string name="settings_background_sync">Sincronização em segundo plano</string>
     <string name="settings_enable_background_sync">Ativar a sincronização em segundo plano</string>
     <string name="settings_set_sync_timeout">Tempo expirado na solicitação de sincronização</string>
     <string name="settings_set_sync_delay">Demora entre cada solicitação</string>
-
     <string name="settings_version">Versão</string>
     <string name="settings_olm_version">Versão do olm</string>
     <string name="settings_app_term_conditions">Termos e condições</string>
@@ -462,8 +405,6 @@
     <string name="settings_privacy_policy">Política de privacidade</string>
     <string name="settings_clear_cache">Limpar cache e recarregar</string>
     <!--string name="settings_room_privacy_label">Privacidade</string-->
-
-
     <string name="settings_user_settings">Configurações de usuário</string>
     <string name="settings_notifications">Notificações</string>
     <string name="settings_ignored_users">Usuários bloqueados</string>
@@ -488,19 +429,15 @@
     <string name="devices_delete_dialog_title">Autenticação</string>
     <string name="devices_delete_pswd">Senha:</string>
     <string name="devices_delete_submit_button_label">Enviar</string>
-
     <string name="settings_logged_in">Conectado como</string>
     <string name="settings_home_server">Servidor Principal (Home Server)</string>
     <string name="settings_identity_server">Servidor de identidade</string>
-
     <string name="account_email_validation_title">Confirmação pendente</string>
     <string name="account_email_validation_message">Por favor, verifique o seu e-mail e clique no link que está lá. Feito isso, clique em continuar.</string>
     <string name="account_email_validation_error">Não não foi possível confirmar o seu endereço de e-mail. Por favor, verifique o seu e-mail e clique no link que ele contém. Feito isso, clique em continuar.</string>
-
     <string name="account_email_already_used_error">Este endereço de e-mail já está em uso.</string>
     <string name="account_email_not_found_error">Este endereço de e-mail não foi encontrado.</string>
     <string name="account_phone_number_already_used_error">Este número de telefone já está em uso.</string>
-
     <string name="settings_change_password">Alterar senha</string>
     <string name="settings_old_password">Senha atual</string>
     <string name="settings_new_password">Nova senha</string>
@@ -510,13 +447,9 @@
     <string name="settings_unignore_user">Mostrar todas as mensagens de %s\?
 \n
 \nNote que esta ação irá reiniciar o aplicativo e pode levar algum tempo.</string>
-
     <string name="settings_delete_notification_targets_confirmation">Deseja deixar de notificar este aparelho\?</string>
-
     <string name="settings_delete_threepid_confirmation">Deseja remover o %1$s %2$s\?</string>
-
     <string name="settings_select_country">Escolha um país</string>
-
     <string name="settings_phone_number_country_label">País</string>
     <string name="settings_phone_number_country_error">Por favor, escolha um país</string>
     <string name="settings_phone_number_label">Número de telefone</string>
@@ -526,21 +459,17 @@
     <string name="settings_phone_number_verification_error_empty_code">Digite o código de ativação</string>
     <string name="settings_phone_number_verification_error">Erro ao validar o seu número de telefone</string>
     <string name="settings_phone_number_code">Código</string>
-
     <!-- Room Settings -->
-
     <!-- room global settings-->
     <string name="room_settings_room_photo">Foto da sala</string>
     <string name="room_settings_room_name">Nome da sala</string>
     <string name="room_settings_topic">Descrição</string>
     <string name="room_settings_room_tag">Etiqueta da sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
-
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favoritar</string>
     <string name="room_settings_tag_pref_entry_low_priority">Baixa prioridade</string>
     <string name="room_settings_tag_pref_entry_none">Nenhuma</string>
-
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Acesso e visibilidade</string>
     <string name="room_settings_directory_visibility">Exibir esta sala na lista pública de salas</string>
@@ -548,22 +477,18 @@
     <string name="room_settings_room_read_history_rules_pref_title">Legibilidade do histórico da sala</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Quem pode ler o histórico de mensagens?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Quem pode acessar esta sala?</string>
-
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Qualquer pessoa</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Apenas participantes (a partir do momento em que esta opção foi escolhida)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Apenas participantes (desde que foram convidados)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Apenas participantes (desde que entraram na sala)</string>
-
     <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Para fazer um link para uma sala, ela precisa ter um endereço.</string>
     <string name="room_settings_room_access_entry_only_invited">Apenas as pessoas que foram convidadas</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Qualquer pessoa que saiba o link da sala, exceto visitantes</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Qualquer pessoa que saiba o link da sala, incluindo visitantes</string>
-
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Usuários banidos</string>
-
     <!-- advanced -->
     <string name="room_settings_category_advanced_title">Avançado</string>
     <string name="room_settings_room_internal_id">ID interno desta sala</string>
@@ -575,36 +500,27 @@
     <string name="room_settings_labs_end_to_end_warnings">Você precisa desconectar para poder ativar a criptografia.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Criptografar apenas para sessões confirmadas</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Nunca enviar mensagens criptografadas para sessões não confirmadas nesta sala, a partir desta sessão.</string>
-
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Esta sala não tem endereços locais</string>
     <string name="room_settings_addresses_add_new_address">Novo endereço (p.ex: #foo:matrix.org")</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato inválido de alias</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' não é um formato válido para um alias</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Você não terá endereço principal especificado para esta sala.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Alertas do endereço principal</string>
-
     <string name="room_settings_set_main_address">Definir como Endereço Principal</string>
     <string name="room_settings_unset_main_address">Retirar este endereço como principal</string>
     <string name="room_settings_copy_room_id">Copiar o ID desta sala</string>
     <string name="room_settings_copy_room_address">Copiar o endereço desta sala</string>
-
     <string name="room_settings_addresses_e2e_enabled">A criptografia está ativada nesta sala.</string>
     <string name="room_settings_addresses_e2e_disabled">A criptografia está desativada nesta sala.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Ativar criptografia·
 \n(atenção: não é possível desativar depois!)</string>
-
     <!-- Directory -->
     <string name="directory_title">Diretório</string>
-
     <!-- matrix error -->
     <string name="failed_to_load_timeline_position">%s tentou carregar um trecho específico da conversa desta sala, mas não conseguiu.</string>
-
-
     <!-- encryption dialog -->
     <string name="encryption_information_title">Informação sobre a criptografia de ponta a ponta</string>
-
     <string name="encryption_information_device_info">Informação do evento</string>
     <string name="encryption_information_user_id">ID de usuária/o</string>
     <string name="encryption_information_curve25519_identity_key">Chave de identidade curve25519</string>
@@ -612,7 +528,6 @@
     <string name="encryption_information_algorithm">Algoritmo</string>
     <string name="encryption_information_session_id">ID de Sessão</string>
     <string name="encryption_information_decryption_error">Erro de descriptografia</string>
-
     <string name="encryption_information_sender_device_information">Informação sobre a sessão do remetente</string>
     <string name="encryption_information_device_name">Nome público do aparelho</string>
     <string name="encryption_information_name">Nome</string>
@@ -620,7 +535,6 @@
     <string name="encryption_information_device_key">Chave da sessão</string>
     <string name="encryption_information_verification">Confirmação</string>
     <string name="encryption_information_ed25519_fingerprint">Impressão digital ed25519</string>
-
     <string name="encryption_export_e2e_room_keys">Exportar chaves de sala E2E</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>
     <string name="encryption_export_room_keys_summary">Exportar as chaves para um arquivo local</string>
@@ -630,31 +544,25 @@
     <string name="encryption_export_saved_as">As chaves de sala E2E foram salvas em \'%s\'
 
 Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</string>
-
     <string name="encryption_import_e2e_room_keys">Importar chaves de sala E2E</string>
     <string name="encryption_import_room_keys">Importar chaves de sala</string>
     <string name="encryption_import_room_keys_summary">Importar as chaves de um arquivo local</string>
     <string name="encryption_import_import">Importar</string>
     <string name="encryption_never_send_to_unverified_devices_title">Criptografar apenas para sessões confirmadas</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Nunca enviar mensagens criptografadas para sessões não confirmadas, a partir desta sessão.</string>
-
     <string name="encryption_information_not_verified">Não confirmado</string>
     <string name="encryption_information_verified">Confirmado</string>
     <string name="encryption_information_blocked">Na lista negra</string>
-
     <string name="encryption_information_unknown_device">sessão desconhecida</string>
     <string name="encryption_information_none">nenhuma</string>
-
     <string name="encryption_information_verify">Confirmar</string>
     <string name="encryption_information_unverify">Marcar como não confirmado</string>
     <string name="encryption_information_block">Colocar na lista negra</string>
     <string name="encryption_information_unblock">Retirar da lista negra</string>
-
     <string name="encryption_information_verify_device">Confirmar sessão</string>
     <string name="encryption_information_verify_device_warning">Compare as seguintes informações com aquelas na sessão do outro usuário e confirme:</string>
     <string name="encryption_information_verify_device_warning2">Se não corresponderem, a segurança da sua comunicação pode estar comprometida.</string>
     <string name="encryption_information_verify_key_match">Eu confirmo que as chaves são iguais</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Esta sala contém sessões desconhecidas</string>
     <string name="unknown_devices_alert_message">Esta sala contém sessões desconhecidas que não foram confirmadas.
@@ -662,7 +570,6 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
 \nRecomendamos que você faça o processo de confirmação para cada sessão desconhecida antes de continuar, mas você pode reenviar a mensagem sem confirmar os aparelhos, se preferir.
 \n
 \nSessões desconhecidas nesta sala:</string>
-
     <!-- directory activity  -->
     <string name="select_room_directory">Escolha uma lista pública de salas</string>
     <string name="directory_server_fail_to_retrieve_server">O servidor pode estar indisponível ou sobrecarregado</string>
@@ -670,31 +577,24 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="directory_server_placeholder">Endereço do servidor principal</string>
     <string name="directory_server_all_rooms_on_server">Todas as salas com o servidor %s</string>
     <string name="directory_server_native_rooms">Todas as salas nativas em %s</string>
-
     <!-- historical -->
     <string name="historical_placeholder">Pesquisar no histórico</string>
     <string name="offline">Desconectado</string>
-
     <string name="user_directory_header">Lista de usuários</string>
     <string name="people_search_user_directory">LISTA DE USUÁRIAS(OS) (%s)</string>
     <string name="settings_start_on_boot">Iniciar com o sistema</string>
     <string name="settings_clear_media_cache">Esvaziar o cache de mídia</string>
     <string name="settings_keep_media">Manter mídia</string>
-
     <string name="settings_always_show_timestamps">Mostrar a hora para todas as mensagens</string>
     <string name="settings_data_save_mode">Modo de economia de dados</string>
-
     <string name="settings_user_interface">Aparência</string>
     <string name="settings_interface_language">Idioma</string>
     <string name="settings_select_language">Escolha o idioma</string>
-
     <string name="media_saving_period_3_days">3 dias</string>
     <string name="media_saving_period_1_week">1 semana</string>
     <string name="media_saving_period_1_month">1 mês</string>
     <string name="media_saving_period_forever">Para sempre</string>
-
     <string name="settings_theme">Tema</string>
-
     <string name="font_size">Tamanho da fonte</string>
     <string name="tiny">Minúsculo</string>
     <string name="small">Pequeno</string>
@@ -706,67 +606,49 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="light_theme">Tema claro</string>
     <string name="dark_theme">Tema escuro</string>
     <string name="black_them">Tema preto</string>
-
     <string name="notification_sync_in_progress">Sincronizando…</string>
     <string name="notification_listening_for_events">Escutando eventos</string>
     <string name="notification_noisy_notifications">Notificações com som</string>
     <string name="notification_silent_notifications">Notificações silenciosas</string>
-
     <string name="title_activity_bug_report">Relatar um erro</string>
     <string name="title_activity_group_details">Detalhes da comunidade</string>
-
     <string name="loading">Carregando…</string>
-
     <string name="action_exit">Sair</string>
     <string name="bottom_action_groups">Comunidades</string>
-
     <string name="home_filter_placeholder_groups">Filtrar nomes de comunidades</string>
-
     <string name="groups_invite_header">Convidar</string>
     <string name="groups_header">Comunidades</string>
     <string name="no_group_placeholder">Nenhuma comunidade</string>
-
     <string name="start_new_chat_prompt_msg">Tem certeza de que deseja iniciar uma nova conversa com %s\?</string>
     <string name="start_voice_call_prompt_msg">Tem certeza de que deseja iniciar uma chamada de voz\?</string>
     <string name="start_video_call_prompt_msg">Tem certeza de que deseja iniciar uma chamada de vídeo\?</string>
-
     <string name="option_take_photo">Tirar foto</string>
     <string name="option_take_video">Gravar vídeo</string>
-
     <string name="groups_list">Lista de comunidades</string>
-
     <string name="call">Chamada de voz</string>
     <string name="room_participants_ban_prompt_msg">Banir o usuário resultará em sua remoção desta sala, impedindo-o de entrar nela novamente.</string>
-
     <string name="room_settings_all_messages_noisy">Todas as mensagens novas (com som)</string>
     <string name="room_settings_all_messages">Todas as mensagens novas</string>
     <string name="room_settings_mention_only">Apenas @menções</string>
     <string name="room_settings_mute">Silenciar</string>
-    <string name="room_settings_add_homescreen_shortcut">Adicionar atalho na tela inicial</string>
-
+    <string name="room_settings_add_homescreen_shortcut">Adicionar o Element na tela inicial</string>
     <string name="settings_notification_ringtone">Som de notificação</string>
     <string name="settings_containing_my_display_name">Mensagens que contenham o meu nome e sobrenome</string>
     <string name="settings_containing_my_user_name">Mensagens que contenham o meu nome de usuário</string>
     <string name="settings_inline_url_preview">Visualização prévia do endereço</string>
     <string name="settings_12_24_timestamps">Mostrar a hora no formato de 12 horas</string>
     <string name="settings_vibrate_on_mention">Vibrar ao mencionar um usuário</string>
-
     <string name="settings_analytics">Estatísticas de uso</string>
-
     <string name="settings_flair">Ícone</string>
-
     <string name="room_settings_room_notifications_title">Notificações</string>
     <string name="room_settings_no_flair">Esta sala não está mostrando ícones de nenhuma comunidade</string>
     <string name="room_settings_add_new_group">Nova ID da comunidade (p.ex: +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">ID de comunidade inválido</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' não é um ID de comunidade válido</string>
-
-
     <string name="widget_no_power_to_manage">Você necessita ter permissões para poder gerenciar os widgets desta sala</string>
     <string name="widget_creation_failure">A criação do widget falhou</string>
     <string name="settings_labs_create_conference_with_jitsi">Crie chamadas em grupo com jitsi</string>
     <string name="widget_delete_message_confirmation">Você tem certeza que quer apagar este widget desta sala?</string>
-
     <!-- Widget Integration Manager -->
     <string name="widget_integration_unable_to_create">Impossível criar o widget.</string>
     <string name="widget_integration_failed_to_send_request">O envio do pedido falhou.</string>
@@ -778,28 +660,22 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="widget_integration_room_not_visible">A sala %s não está visível.</string>
     <string name="room_add_matrix_apps">Adicionar aplicativos Matrix</string>
     <string name="settings_labs_native_camera">Usar a câmera nativa</string>
-
     <!-- share keys -->
     <string name="you_added_a_new_device">Você adicionou uma nova sessão \'%s\', que está solicitando as chaves de criptografia.</string>
     <string name="your_unverified_device_requesting">Sua sessão não confirmada \'%s\' está solicitando as chaves de criptografia.</string>
     <string name="start_verification">Iniciar a confirmação</string>
     <string name="share_without_verifying">Compartilhar sem confirmar</string>
     <string name="ignore_request">Ignorar a solicitação</string>
-
     <!-- conference call -->
     <string name="conference_call_warning_title">Atenção!</string>
     <string name="conference_call_warning_message">Chamadas em grupo estão em desenvolvimento, portanto podem não ser estáveis.</string>
-
     <!-- slash commands -->
     <string name="command_error">Erro de comando</string>
     <string name="unrecognized_command">Comando desconhecido: %s</string>
-
     <!-- notification statuses -->
     <string name="notification_off">Desativado</string>
     <string name="notification_noisy">Ativado com som</string>
-
     <string name="encrypted_message">Mensagem criptografada</string>
-
     <!-- groups creation -->
     <string name="create">Criar</string>
     <string name="create_community">Criar comunidade</string>
@@ -807,21 +683,17 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="community_name_hint">Exemplo</string>
     <string name="community_id">ID da comunidade</string>
     <string name="community_id_hint">exemplo</string>
-
     <!-- group details -->
     <string name="group_details_home">Início</string>
     <string name="group_details_people">Pessoas</string>
     <string name="group_details_rooms">Salas</string>
     <string name="no_users_placeholder">Sem ninguém</string>
-
     <string name="rooms">Salas</string>
     <string name="joined">Entrou</string>
     <string name="invited">em que foi convidada/o</string>
     <string name="filter_group_members">Pesquisar participantes da comunidade</string>
     <string name="filter_group_rooms">Filtrar salas da comunidade</string>
-
     <string name="group_no_long_description">O(A) administrador(a) desta comunidade não definiu uma descrição longa da mesma.</string>
-
     <string name="has_been_kicked">Você foi removido da sala %1$s por %2$s</string>
     <string name="has_been_banned">Você foi banido da sala %1$s devido à %2$s</string>
     <string name="reason_colon">Motivo: %1$s</string>
@@ -842,7 +714,6 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
         <item quantity="one">%d nova mensagem</item>
         <item quantity="other">%d novas mensagens</item>
     </plurals>
-
     <plurals name="directory_search_rooms">
         <item quantity="one">%d sala</item>
         <item quantity="other">%d salas</item>
@@ -852,92 +723,75 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
         <item quantity="other">%1$s salas encontradas para %2$s</item>
     </plurals>
     <plurals name="membership_changes">
-        <item quantity="one">1 alteração na filiação</item>
+        <item quantity="one">%d alteração na filiação</item>
         <item quantity="other">%d alterações na filiação</item>
     </plurals>
-
     <string name="list_members">Lista de participantes</string>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">%d mensagem notificada não lida</item>
-        <item quantity="other">%d mensagens notificadas não lidas</item>
+        <item quantity="one">%d mensagem não lida</item>
+        <item quantity="other">%d mensagens não lidas</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_msgs">
-        <item quantity="one">%d mensagem notificada não lida</item>
-        <item quantity="other">%d mensagens notificadas não lidas</item>
+        <item quantity="one">%d mensagem não lida</item>
+        <item quantity="other">%d mensagens não lidas</item>
     </plurals>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="one">%d sala</item>
         <item quantity="other">%d salas</item>
     </plurals>
     <string name="notification_unread_notified_messages_in_room">%1$s em %2$s</string>
-
     <plurals name="active_widgets">
         <item quantity="one">%d widget ativo</item>
         <item quantity="other">%d widgets ativos</item>
     </plurals>
-
     <!-- Widget Integration Manager -->
     <string name="receipt_avatar">Foto de perfil para a confirmação de leitura</string>
     <string name="notice_avatar">Foto de perfil para avisos</string>
     <string name="avatar">Foto de perfil</string>
-
     <string name="send_bug_report_rage_shake">Agite rapidamente para relatar um erro</string>
-
     <string name="settings_notification_privacy_normal">Normal</string>
     <string name="settings_notification_privacy_reduced">Privacidade reduzida</string>
     <string name="settings_notification_privacy_need_permission">O app necessita de permissão para rodar em segundo plano</string>
     <string name="title_activity_choose_sticker">Enviar uma figurinha</string>
-
     <string name="dialog_title_third_party_licences">Licenças de terceiros</string>
-
     <string name="download">Baixar</string>
     <string name="speak">Falar</string>
     <string name="clear">Limpar</string>
     <string name="missing_permissions_error">Devido à falta de permissões, essa ação não é possível.</string>
     <string name="system_alerts_header">Alertas do sistema</string>
-
     <string name="send_bug_report_description_in_english">Se possível, escreva a descrição em inglês, por favor.</string>
     <string name="option_send_voice">Enviar áudio</string>
-
     <string name="option_send_sticker">Enviar uma figurinha</string>
     <string name="no_sticker_application_dialog_content">No momento, você não tem nenhum pacote de figurinhas ativado.
 \n
 \nQuer adicionar alguns agora\?</string>
-
     <string name="go_on_with">continuar com…</string>
     <string name="error_no_external_application_found">Desculpe, nenhum aplicativo externo foi encontrado para concluir esta ação.</string>
-
     <string name="e2e_re_request_encryption_key">Solicitar novamente as chaves de criptografia das suas outras sessões.<u>Pedir novamente as chaves de criptografia</u> de seus outros dispositivos.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Requisição de chave enviada.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Requisição enviada</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Por favor, inicie o Element em outro aparelho que possa descriptografar a mensagem, de modo que ele possa enviar as chaves para esta sessão.</string>
-
     <plurals name="format_time_s">
-        <item quantity="one">1s</item>
+        <item quantity="one">%ds</item>
         <item quantity="other">%ds</item>
     </plurals>
     <plurals name="format_time_m">
-        <item quantity="one">1m</item>
+        <item quantity="one">%dm</item>
         <item quantity="other">%dm</item>
     </plurals>
     <plurals name="format_time_h">
-        <item quantity="one">1h</item>
+        <item quantity="one">%dh</item>
         <item quantity="other">%dh</item>
     </plurals>
     <plurals name="format_time_d">
         <item quantity="one">%d dia</item>
         <item quantity="other">%d dias</item>
     </plurals>
-
     <string name="room_participants_now">%1$s agora</string>
     <string name="room_participants_ago">há %1$s %2$s</string>
-
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s e %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="room_message_placeholder_reply_to_encrypted">Digite sua resposta criptografada…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Digite sua resposta (não criptografada)…</string>
     <plurals name="room_details_selected">
@@ -950,31 +804,23 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="settings_notification_privacy_secure_message_content">• O conteúdo das mensagens da notificação é <b>armazenado de forma segura diretamente no servidor Matrix</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• As notificações contém <b>metadados e os dados da mensagem</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• As notificações <b>não exibirão o conteúdo da mensagem</b></string>
-
     <string name="settings_preview_media_before_sending">Pré-visualizar a mídia antes de enviá-la</string>
-
     <string name="settings_deactivate_account_section">Desativar minha conta</string>
     <string name="settings_deactivate_my_account">Desativar minha conta</string>
-
     <string name="startup_notification_privacy_title">Privacidade das notificações</string>
     <string name="startup_notification_privacy_message">Element pode funcionar em segundo plano para gerenciar as suas notificações de forma segura e confidencial. Isso poderá impactar o uso da bateria.</string>
     <string name="startup_notification_privacy_button_grant">Conceder a permissão</string>
     <string name="startup_notification_privacy_button_other">Escolha outra opção</string>
-
     <string name="settings_opt_in_of_analytics">Enviar dados de uso</string>
     <string name="settings_opt_in_of_analytics_summary">Element coleta dados de uso anônimos para nos ajudar a melhorar o aplicativo.</string>
     <string name="settings_opt_in_of_analytics_prompt">Por favor, ative o envio de dados de uso para nos ajudar a melhorar o Element.</string>
     <string name="settings_opt_in_of_analytics_ok">Sim, eu quero ajudar!</string>
-
     <string name="settings_without_flair">Você não faz parte de alguma comunidade, no momento.</string>
-
     <string name="lock_screen_hint">Escreva aqui…</string>
-
     <string name="widget_integration_missing_parameter">Um parâmetro obrigatório está faltando.</string>
     <string name="widget_integration_invalid_parameter">Um parâmetro não é válido.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Use a tecla Enter do teclado para enviar a mensagem</string>
     <string name="settings_labs_enable_send_voice">Enviar mensagens de voz</string>
-
     <string name="command_description_emote">Mostra a ação</string>
     <string name="command_description_ban_user">Bane o usuário com a ID fornecida</string>
     <string name="command_description_unban_user">Remove o banimento do usuário com a ID fornecida</string>
@@ -988,19 +834,16 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="command_description_nick">Altera o seu nome e sobrenome</string>
     <string name="command_description_markdown">Ativar/Desativar a formatação de texto</string>
     <string name="command_description_clear_scalar_token">Reparar a gestão de aplicativos Matrix</string>
-
     <plurals name="group_members">
         <item quantity="one">%d participante</item>
         <item quantity="other">%d participantes</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="one">%d sala</item>
         <item quantity="other">%d salas</item>
     </plurals>
     <string name="dialog_user_consent_content">Para continuar usando o Servidor de Base %1$s, você precisa revisar e aceitar os termos e condições de uso.</string>
     <string name="dialog_user_consent_submit">Revisar agora</string>
-
     <string name="deactivate_account_title">Desativar minha conta</string>
     <string name="deactivate_account_content">Isso tornará sua conta permanentemente inutilizável. Você não conseguirá efetuar login e ninguém poderá registrar novamente o mesmo ID de usuário. Isso fará com que sua conta saia de todas as salas das quais está participando e removerá os detalhes de sua conta do servidor de identidade. <b>Esta ação é irreversível</b>.
 \n
@@ -1010,43 +853,30 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="deactivate_account_delete_checkbox">Quando minha conta for desativada, apague todas as mensagens que eu enviei (Atenção: isso fará com que futuros usuários tenham uma visão incompleta das conversas)</string>
     <string name="deactivate_account_prompt_password">Para continuar, entre com sua senha:</string>
     <string name="deactivate_account_submit">Desativar minha conta</string>
-
     <string name="error_empty_field_your_password">Por favor, digite sua senha.</string>
     <string name="room_tombstone_versioned_description">Esta sala foi substituída e não está mais ativa</string>
     <string name="room_tombstone_continuation_link">A conversa continua aqui</string>
     <string name="room_tombstone_continuation_description">Esta sala é a continuação de outra conversa</string>
     <string name="room_tombstone_predecessor_link">Clique aqui para ver as mensagens anteriores</string>
-
     <string name="resource_limit_exceeded_title">Limite de recursos excedido</string>
     <string name="resource_limit_contact_action">Entre em contato com o(a) administrador(a)</string>
-
     <string name="resource_limit_contact_admin">entre em contato com o administrador do seu serviço</string>
-
     <string name="resource_limit_soft_default">Este servidor local excedeu um dos seus limites de recursos, portanto <b>alguns usuários não conseguirão fazer login</b>.</string>
     <string name="resource_limit_hard_default">Este servidor local excedeu um de seus limites de recursos.</string>
-
     <string name="resource_limit_soft_mau"> Este homeserver atingiu o seu limite mensal de usuários ativos, portanto <b>alguns usuários não conseguirão fazer login</b>.</string>
     <string name="resource_limit_hard_mau">Este homeserver atingiu o seu limite mensal de usuários ativos.</string>
-
     <string name="resource_limit_soft_contact">Por favor, %s para que este limite seja aumentado.</string>
     <string name="resource_limit_hard_contact">Por favor, %s para seguir usando este serviço.</string>
-
     <string name="encryption_export_notice">Crie uma frase secreta para criptografar as chaves exportadas. Você precisará inserir essa frase secreta para importar chaves criptografadas.</string>
     <string name="status_theme">Tema Status.im</string>
-
     <string name="accept">Aceitar</string>
-
     <string name="dialog_title_error">Erro</string>
-
     <string name="auth_accept_policies">Por favor, revise e aceite as políticas deste servidor local:</string>
-
     <string name="settings_call_category">Chamadas</string>
     <string name="settings_call_ringtone_use_app_ringtone">Use o toque padrão do Element para chamadas recebidas</string>
     <string name="settings_call_ringtone_title">Toque de chamadas recebidas</string>
     <string name="settings_call_ringtone_dialog_title">Selecione o toque de chamadas:</string>
-
     <string name="reason_hint">Motivo</string>
-
     <string name="room_sliding_menu_version_x">Versão %s</string>
     <string name="settings_notification_troubleshoot">Resolver problemas nas notificações</string>
     <string name="settings_troubleshoot_diagnostic">Diagnóstico de resolução de problemas</string>
@@ -1055,65 +885,53 @@ Atenção: este arquivo poderá ser apagado se o aplicativo for desinstalado.</s
     <string name="settings_troubleshoot_diagnostic_success_status">O diagnóstico básico está ok. Se você ainda não recebe notificações, por favor relate um erro para nos ajudar a investigar.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Um ou mais testes falharam, tente as correções sugeridas.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Um ou mais testes falharam, por favor relate um erro para nos ajudar a investigar.</string>
-
     <string name="settings_troubleshoot_test_system_settings_title">Configurações do sistema</string>
     <string name="settings_troubleshoot_test_system_settings_success">Notificações estão ativadas nas configurações do sistema.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Notificações estão desativadas nas configurações do sistema. Por favor, revise as configurações do sistema.</string>
     <string name="open_settings">Abra as Configurações</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Configurações da conta</string>
     <string name="settings_troubleshoot_test_account_settings_success">Notificações estão ativadas para sua conta.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Notificações estão desativadas para sua conta.
 \nPor favor, revise as configurações da conta.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Ativar</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Configurações da sessão</string>
     <string name="settings_troubleshoot_test_device_settings_success">Notificações estão ativadas nesta sessão.</string>
     <string name="room_participants_action_kick">Remover da sala</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Notificações não estão ativadas nesta sessão.
 \nPor favor, revise as configurações do Element.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ativar</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Versão do Google Play Services</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK está disponível e atualizado.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element usa Google Play Services para entregar mensagens push, mas isto não parece está configurado corretamente:
 %1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Consertar Play Services</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Token do Firebase</string>
     <string name="settings_troubleshoot_test_fcm_success">Token FCM recuperado com sucesso:
 %1$s</string>
     <string name="call_anyway">Ligar mesmo assim</string>
     <string name="settings_troubleshoot_test_fcm_failed">Falha ao recuperar o token do FCM:
 %1$s</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">Registro do token do Firebase</string>
     <string name="settings_troubleshoot_test_token_registration_success">Token FCM registrado com sucesso no HomeServer.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">Falha ao registrar o token FCM no HomeServer:
 %1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Serviço de Notificações</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Serviço de Notificações está em execução.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Serviço de Notificações não está em execução.
 Tente reiniciar a aplicação.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Iniciar Serviço</string>
-
     <string name="settings_troubleshoot_test_service_restart_success">O serviço foi encerrado e reiniciado automaticamente.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Falha ao reiniciar Serviço</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Começar na inicialização</string>
     <string name="settings_troubleshoot_test_service_boot_success">O serviço iniciará quando o aparelho for reiniciado.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">O serviço não iniciará enquanto o aparelho não for reiniciado. Você não receberá notificações até que o Element for aberto ao menos uma vez.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Iniciar com o sistema</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Revisar restrições de segundo plano</string>
     <string name="settings_troubleshoot_test_battery_title">Otimização de bateria</string>
     <string name="settings_troubleshoot_test_battery_success">Element não é afetado pela Otimização de Bateria.</string>
     <string name="settings_troubleshoot_test_service_restart_title">Reinicialização Automática do Serviço de Notificações</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Desativar restrições</string>
-
     <string name="settings_troubleshoot_test_battery_quickfix">Ignorar a otimização</string>
-
     <string name="settings_inline_url_preview_summary">Prévia de links dentro do chat quando seu homeserver suporta este recurso.</string>
     <string name="settings_send_typing_notifs">Permitir que saibam quando eu estiver digitando</string>
     <string name="settings_send_typing_notifs_summary">Deixe outros usuários saberem quando você estiver digitando.</string>
@@ -1134,49 +952,36 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_send_markdown">Formatação de texto</string>
     <string name="settings_send_markdown_summary">Formatar o texto das mensagens a serem enviadas. Por exemplo: inserir asteriscos antes e depois do texto, mostrará o texto em itálico.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Conceder permissão</string>
-
     <string name="account_email_error">Ocorreu um erro ao confirmar seu endereço de e-mail.</string>
-
     <string name="settings_password">Senha</string>
     <string name="account_phone_number_error">Ocorreu um erro ao confirmar seu número de telefone.</string>
     <string name="account_additional_info">Informação adicional: %s</string>
-
     <string name="settings_labs_native_camera_summary">Inicie a câmera do sistema em vez da câmera personalizada.</string>
     <string name="settings_labs_enable_send_voice_summary">Esta opção requer um aplicativo de terceiros para gravar mensagens de voz.</string>
-
     <string name="command_problem_with_parameters">O comando \"%s\" precisa de mais parâmetros ou alguns parâmetros estão incorretos.</string>
     <string name="markdown_has_been_enabled">A formatação de texto foi ativada.</string>
     <string name="markdown_has_been_disabled">A formatação de texto foi desativada.</string>
-
     <string name="settings_lazy_loading_description">Aumente o desempenho apenas carregando os participantes da sala na primeira exibição.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Seu servidor principal ainda não suporta o carregamento Lazy de participantes da sala. Tente depois.</string>
-
     <string name="unknown_error">Desculpe, ocorreu um erro</string>
-
     <string name="merged_events_expand">expandir</string>
     <string name="merged_events_collapse">colapsar</string>
-
     <string name="settings_info_area_show">Mostrar a área de informações</string>
     <string name="show_info_area_always">Sempre</string>
     <string name="show_info_area_messages_and_errors">Para mensagens e erros</string>
     <string name="show_info_area_only_errors">Somente para erros</string>
-
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Nenhum APK do Google Play Services válido foi encontrado. Notificações podem não funcionar corretamente.</string>
-
     <string name="settings_troubleshoot_test_battery_failed">Se um usuário deixar um aparelho desconectado por um período de tempo, com a tela desligada, o aparelho entrará no modo Soneca. Isso impede que os aplicativos acessem a rede, adiando seus trabalhos, sincronizações e alarmes padrão.</string>
     <string name="passphrase_create_passphrase">Criar frase secreta</string>
     <string name="passphrase_passphrase_does_not_match">A frase secreta está errada</string>
     <string name="settings_lazy_loading_title">Carregamento Lazy dos participantes das salas</string>
-
     <string name="video_call_in_progress">Chamada de vídeo em andamento…</string>
-
     <string name="title_activity_keys_backup_setup">Backup da chave</string>
     <string name="title_activity_keys_backup_restore">Usar Backup da chave</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Backup de chaves não está concluído. Por favor, aguarde…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Você perderá suas mensagens criptografadas se sair agora</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Backup de chave em andamento. Se você sair agora, perderá o acesso às suas mensagens criptografadas.</string>
@@ -1187,28 +992,22 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="are_you_sure">Tem certeza\?</string>
     <string name="backup">Fazer o backup</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Você perderá o acesso às suas mensagens criptografadas, a menos que faça backup das suas chaves antes de sair.</string>
-
     <string name="keys_backup_info_title_signature">Assinatura</string>
-
     <string name="stay">Ficar</string>
     <string name="skip">Pular</string>
     <string name="done">Fechar</string>
     <string name="abort">Abortar</string>
-
     <string name="action_sign_out_confirmation_simple">Deseja mesmo sair\?</string>
     <string name="settings_notification_advanced">Configurar notificações</string>
     <string name="settings_notification_by_event">Configurar notificações por evento</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">Configurações personalizadas</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Observe que alguns tipos de mensagens estão configurados para serem silenciosos (produzirão uma notificação sem som).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Algumas notificações estão desativadas nas suas configurações personalizadas.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Falha ao carregar regras personalizadas, tente novamente.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Verifique as configurações</string>
-
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nEste erro está fora do controle do Element e, de acordo com o Google, esse erro indica que o aparelho tem muitos aplicativos registrados com FCM. O erro só ocorre nos casos em que há números extremos de aplicativos, portanto, isso não deve afetar o usuário comum.</string>
     <string name="ignore">Bloquear</string>
-
     <string name="auth_login_sso">Entre com o login único</string>
     <string name="login_error_unknown_host">Este endereço não está acessível. Por favor, verifique-o</string>
     <string name="login_error_ssl_handshake">Seu aparelho está usando um protocolo de segurança TLS desatualizado, vulnerável a ataques. Para sua segurança, você não poderá se conectar</string>
@@ -1218,48 +1017,36 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nEste erro está fora de controle do Element. Não há conta do Google no celular. Por favor, abra o gerenciador de contas e adicione uma conta do Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Adicionar Conta</string>
-
     <string name="settings_noisy_notifications_preferences">Configurar notificações com som</string>
     <string name="settings_call_notifications_preferences">Configurar notificações de chamada</string>
     <string name="settings_silent_notifications_preferences">Configurar notificações silenciosas</string>
     <string name="settings_system_preferences_summary">Escolha a cor do LED, vibração, som…</string>
-
-
     <string name="settings_cryptography_manage_keys">Gerenciamento de Chaves de Criptografia</string>
     <string name="settings_send_message_with_enter">Enviar mensagem com a tecla enter</string>
     <string name="resources_script">Latn</string>
-
     <string name="title_activity_verify_device">Confirmar sessão</string>
-
     <string name="none">Nenhuma</string>
     <string name="revoke">Revogar</string>
     <string name="disconnect">Desconectar</string>
     <string name="review">Revisar</string>
     <string name="decline">Recusar</string>
-
     <string name="action_mark_room_read">Marcar como lida</string>
     <string name="people_no_identity_server">Nenhum servidor de identidade está configurado.</string>
-
     <string name="call_failed_no_ice_title">A chamada falhou por conta de má configuração no servidor</string>
     <string name="play_video">Reproduzir</string>
     <string name="pause_video">Pausar</string>
     <string name="dismiss">Descartar</string>
-
-
     <string name="action_copy">Copiar</string>
     <string name="dialog_title_success">Pronto</string>
-
     <string name="bottom_action_notification">Notificações</string>
     <string name="call_failed_no_ice_description">Peça ao administrador do seu servidor principal (%1$s) que configure um servidor TURN para que as chamadas funcionem de maneira confiável.
 \n
 \nAlternativamente, você pode tentar usar o servidor público em %2$s. No entanto, ele não é tão confiável e compartilhará o seu IP com esse servidor. Você também pode configurar isso nas Configurações.</string>
     <string name="call_failed_no_ice_use_alt">Tente usar %s</string>
     <string name="call_failed_dont_ask_again">Não pergunte novamente</string>
-
     <string name="call_failed_no_connection">A chamada falhou</string>
     <string name="call_failed_no_connection_description">Falha ao estabelecer conexão em tempo real.
 \nPor favor, peça ao administrador do seu servidor para configurar um servidor TURN, de modo que as chamadas funcionem de maneira estável.</string>
-
     <string name="call_select_sound_device">Selecione a caixa de som</string>
     <string name="sound_device_phone">Celular</string>
     <string name="sound_device_speaker">Alto-falante</string>
@@ -1270,7 +1057,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="call_camera_back">Traseira</string>
     <string name="call_format_turn_hd_off">Desativar vídeo de alta definição</string>
     <string name="call_format_turn_hd_on">Ativar vídeo de alta definição</string>
-
     <string name="auth_add_email_message_2">Defina um e-mail para recuperação da conta. Posteriormente, você pode permitir que as pessoas encontrem você através dele.</string>
     <string name="auth_add_phone_message_2">Defina um número de telefone. Posteriormente, você pode permitir que as pessoas encontrem você através dele.</string>
     <string name="auth_add_email_phone_message_2">Defina um e-mail para a recuperação da conta. Posteriormente, um endereço de e-mail ou número de telefone pode ser usado para ser encontrado por outras pessoas.</string>
@@ -1283,14 +1069,11 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_call_ringtone_use_default_stun_sum">Permitir a assistência do servidor de chamadas reserva %s quando seu servidor não oferecer este serviço (seu endereço IP será transmitido quando você ligar)</string>
     <string name="active_call_with_duration">Chamada em andamento (%s)</string>
     <string name="return_to_call">Retornar à chamada</string>
-
     <string name="invite_no_identity_server_error">Adicione um servidor de identidade nas suas configurações para executar esta ação.</string>
     <string name="room_participants_action_cancel_invite">Cancelar convite</string>
     <string name="room_participants_power_level_demote_warning_title">Reduzir privilégios\?</string>
     <string name="room_participants_power_level_demote_warning_prompt">Você não poderá desfazer essa alteração, já que está reduzido seus privilégios. Se você for a última pessoa nesta sala, será impossível recuperar a permissão atual.</string>
     <string name="room_participants_power_level_demote">Reduzir privilégio</string>
-
-
     <string name="room_participants_action_ignore_title">Bloquear usuário</string>
     <string name="room_participants_action_ignore_prompt_msg">Ao bloquear este usuário, as mensagens dele serão ocultadas de você em todas as salas.
 \n
@@ -1308,12 +1091,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_participants_ban_reason">Motivo do banimento</string>
     <string name="room_participants_unban_title">Remover banimento do usuário</string>
     <string name="room_participants_unban_prompt_msg">Remover o banimento do usuário permitirá que ele entre novamente na sala.</string>
-
     <string name="settings_add_3pid_confirm_password_title">Confirme sua senha</string>
     <string name="settings_add_3pid_flow_not_supported">Não pode fazer isto pelo Element app</string>
     <string name="settings_add_3pid_authentication_needed">Autenticação exigida</string>
-
-
     <string name="settings_notification_privacy_no_background_sync">O aplicativo <b>não</b> precisa de se conectar ao servidor em segundo plano, isto deve reduzir a utilização da bateria</string>
     <string name="settings_background_fdroid_sync_mode">Sincronização em segundo plano</string>
     <string name="settings_background_fdroid_sync_mode_battery">Optimizado para bateria</string>
@@ -1325,8 +1105,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_background_fdroid_sync_mode_disabled">Sem sincronização em segundo plano</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Você não será notificado sobre mensagens recebidas quando o Element estiver em segundo plano.</string>
     <string name="settings_background_sync_update_error">Não foi possível actualizar a configuração.</string>
-
-
     <string name="settings_set_workmanager_delay">Intervalo de sincronização preferido</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nA sincronização pode ser adiada dependendo dos recursos (bateria) ou do estado do aparelho (modo de suspensão).</string>
@@ -1334,7 +1112,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_integrations_summary">Use o Gerenciador de Integrações para gerenciar bots, integrações, widgets e pacotes de figurinhas. 
 \nO Gerenciador de Integrações recebe dados de configuração e pode modificar widgets, enviar convites para salas e definir níveis de permissão em seu nome.</string>
     <string name="settings_send_message_with_enter_summary">Botão enter do teclado enviará a mensagem em vez de adicionar uma quebra de linha</string>
-
     <string name="settings_secure_backup_section_title">Backup online</string>
     <string name="settings_secure_backup_manage">Gerenciar</string>
     <string name="settings_secure_backup_setup">Configurar backup online</string>
@@ -1343,50 +1120,40 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_secure_backup_section_info">Prevenir contra a perda de acesso a mensagens e dados encriptados, guardando as chaves de encriptação no seu servidor.</string>
     <string name="reset_secure_backup_title">Gerar uma nova Chave de Segurança ou definir uma nova Frase de Segurança para o seu backup existente.</string>
     <string name="reset_secure_backup_warning">Isto irá substituir a sua Chave ou Frase actual.</string>
-
     <string name="settings_discovery_category">Encontrar</string>
     <string name="settings_discovery_manage">Gerencie suas configurações de descoberta.</string>
     <string name="settings_data_save_mode_summary">O modo de baixo uso de dados desativa a atualização de presença e a animação de que alguém está digitando.</string>
-
     <string name="settings_integration_allow">Permitir integrações</string>
     <string name="settings_integration_manager">Gerenciador de Integrações</string>
-
     <string name="disabled_integration_dialog_title">As integrações estão desativadas</string>
     <string name="disabled_integration_dialog_content">Ative \'Permitir integrações\' nas Configurações para fazer isso.</string>
-
     <string name="settings_change_password_submit">Atualizar Senha</string>
     <string name="settings_fail_to_update_password_invalid_current_password">A senha não é válida</string>
     <string name="passwords_do_not_match">As senhas não são iguais</string>
-
     <string name="settings_media">Média</string>
     <string name="settings_default_compression">Compressão predefinida</string>
     <string name="compression_opt_list_choose">Escolher</string>
     <string name="settings_default_media_source">Fonte de mídia por padrão</string>
     <string name="media_source_choose">Escolher</string>
     <string name="settings_play_shutter_sound">Tocar o som da câmera</string>
-
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d usuário banido</item>
         <item quantity="other">%d usuários banidos</item>
     </plurals>
-
     <string name="encryption_information_device_name_with_warning">O nome público (visível para as pessoas com quem você se comunica)</string>
     <string name="device_name_warning">O nome público de uma sessão é visível para as pessoas com quem você se comunica</string>
     <string name="encryption_exported_successfully">Chaves exportadas com sucesso</string>
-
     <string name="encryption_message_recovery">Recuperação de mensagens criptografadas</string>
     <string name="encryption_settings_manage_message_recovery_summary">Configurar backup das chaves</string>
-
     <string name="encryption_information_unknown_ip">IP desconhecido</string>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="one">%1$s: 1 mensagem</item>
+        <item quantity="one">%1$s: %2$d mensagem</item>
         <item quantity="other">%1$s: %2$d mensagens</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="one">%d notificação</item>
         <item quantity="other">%d notificações</item>
     </plurals>
-
     <string name="notification_unknown_new_event">Novo Evento</string>
     <string name="notification_unknown_room_name">Sala</string>
     <string name="notification_new_messages">Novas Mensagens</string>
@@ -1395,11 +1162,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="notification_inline_reply_failed">** Não foi possível enviar - por favor abra a sala</string>
     <string name="notification_ticker_text_dm">%1$s: %2$s</string>
     <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
-
     <string name="active_widget_view_action">VISTA</string>
     <string name="active_widgets_title">Widgets Ativos</string>
-
-
     <string name="room_widget_activity_title">Widget</string>
     <string name="room_widget_permission_title">Carregar widget</string>
     <string name="room_widget_permission_added_by">Widget adicionado por:</string>
@@ -1410,15 +1174,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_widget_reload">Recarregar widget</string>
     <string name="room_widget_open_in_browser">Abrir no navegador</string>
     <string name="room_widget_revoke_access">Remover para mim</string>
-
     <string name="room_widget_permission_display_name">O seu nome e sobrenome</string>
     <string name="room_widget_permission_avatar_url">Link da sua foto de perfil</string>
     <string name="room_widget_permission_user_id">Sua ID de usuário</string>
     <string name="room_widget_permission_theme">Seu tema</string>
     <string name="room_widget_permission_widget_id">ID do widget</string>
     <string name="room_widget_permission_room_id">ID da sala</string>
-
-
     <string name="error_jitsi_not_supported_on_old_device">Desculpe, as chamadas em grupo com o Jitsi não são suportadas em aparelhos antigos (com versões do Android anteriores a 5.0)</string>
     <string name="room_widget_resource_permission_title">Este wigdet deseja utilizar os seguintes recursos:</string>
     <string name="room_widget_resource_grant_permission">Permitir</string>
@@ -1426,10 +1187,8 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_widget_webview_access_camera">Usar a câmera</string>
     <string name="room_widget_webview_access_microphone">Usar o microfone</string>
     <string name="room_widget_webview_read_protected_media">Ler as mídias protegidos por DRM</string>
-
     <string name="integration_manager_not_configured">O gerenciador de integrações não está configurado.</string>
     <string name="widget_integration_review_terms">Para continuar, você precisa aceitar os termos de serviço.</string>
-
     <string name="you_added_a_new_device_with_info">Uma nova sessão está solicitando chaves de criptografia. Nome da sessão: %1$s
 \nVisto por último às: %2$s
 \nSe você não fez login em outra sessão, ignore essa solicitação.</string>
@@ -1437,20 +1196,16 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \nNome da sessão: %1$s
 \nVisto por último às: %2$s
 \nSe você não fez login em outra sessão, ignore essa solicitação.</string>
-
     <string name="start_verification_short_label">Confirmar</string>
     <string name="share_without_verifying_short_label">Compartilhar</string>
     <string name="key_share_request">Pedido de compartilhamento das Chaves</string>
     <string name="ignore_request_short_label">Ignorar</string>
-
     <string name="notification_silent">Ativado</string>
     <string name="error_empty_field_enter_user_name">Digite o nome de usuário.</string>
     <string name="passphrase_empty_error_message">Digite a sua frase secreta</string>
     <string name="passphrase_passphrase_too_weak">A frase secreta é muito fraca</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Por favor, apague a frase secreta se desejar que o Element gere uma chave de recuperação.</string>
     <string name="keys_backup_no_session_error">Nenhuma sessão Matrix disponível</string>
-
     <string name="keys_backup_setup_step1_title">Nunca perca mensagens criptografadas</string>
     <string name="keys_backup_setup_step1_description">As mensagens em salas criptografadas são protegidas com a criptografia de ponta a ponta. Somente você e o(s) destinatário(s) têm as chaves para ler essas mensagens. 
 \n 
@@ -1458,7 +1213,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_setup">Comece a fazer o backup de chave</string>
     <string name="keys_backup_setup_step1_advanced">(Avançado)</string>
     <string name="keys_backup_setup_step1_manual_export">Exportar as chaves manualmente</string>
-
     <string name="keys_backup_setup_step2_text_title">Proteja seu backup com uma frase secreta.</string>
     <string name="keys_backup_setup_step2_text_description">Armazenaremos uma cópia criptografada de suas chaves em nosso servidor. Proteja seu backup com uma frase secreta para mantê-lo seguro. 
 \n 
@@ -1481,12 +1235,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n
 \nAtenção: este arquivo pode ser removido se o aplicativo for desinstalado.</string>
     <string name="recovery_key_export_saved">A chave de recuperação foi guardada.</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Já existe um backup no seu servidor</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Parece que você já configurou um backup de chaves em outra sessão. Deseja substituí-lo por um novo backup\?</string>
     <string name="keys_backup_setup_override_replace">Substituir</string>
     <string name="keys_backup_setup_override_stop">Parar</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Faça uma cópia</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Compartilhar chave de recuperação com…</string>
     <string name="keys_backup_setup_step3_generating_key_status">Gerando Chave de Recuperação usando a frase secreta, este processo pode levar alguns segundos.</string>
@@ -1494,25 +1246,18 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="unexpected_error">Erro inesperado</string>
     <string name="keys_backup_setup_backup_started_title">Começando o backup</string>
     <string name="keys_backup_setup_backup_started_message">O backup de suas chaves está sendo feito. O primeiro backup pode demorar vários minutos.</string>
-
-
     <string name="keys_backup_setup_skip_title">Você tem certeza\?</string>
     <string name="keys_backup_setup_skip_msg">Você pode perder o acesso às suas mensagens se você sair do Element ou perder este aparelho.</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">Obtendo a versão do backup…</string>
     <string name="keys_backup_restore_with_passphrase">Use sua frase secreta de recuperação para desbloquear seu histórico de mensagens seguras</string>
     <string name="keys_backup_restore_use_recovery_key">use sua chave de recuperação</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Não sabe sua frase secreta de recuperação, você pode %s.</string>
-
     <string name="keys_backup_restore_with_recovery_key">Use a sua Chave de Recuperação para desbloquear o seu histórico de mensagens criptografadas</string>
     <string name="keys_backup_restore_key_enter_hint">Digite a chave de recuperação</string>
-
     <string name="keys_backup_restore_setup_recovery_key">Recuperação de Mensagem</string>
-
     <string name="keys_backup_restore_with_key_helper">Perdeu sua chave de recuperação\? Você pode configurar uma nova nas configurações.</string>
     <string name="keys_backup_passphrase_error_decrypt">O backup não pôde ser descriptografado com essa frase secreta: verifique se você digitou corretamente a frase secreta de recuperação.</string>
     <string name="network_error_please_check_and_retry">Erro de rede: verifique a sua conexão e tente de novo, por favor.</string>
-
     <string name="keys_backup_restoring_waiting_message">Restaurando o backup:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Processando a chave de recuperação…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Baixando as chaves…</string>
@@ -1520,7 +1265,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_unlock_button">Desbloquear Histórico</string>
     <string name="keys_backup_recovery_code_empty_error_message">Digite uma chave de recuperação</string>
     <string name="keys_backup_recovery_code_error_decrypt">O backup não pôde ser descriptografado com essa chave de recuperação: verifique se você digitou a chave de recuperação correta.</string>
-
     <string name="keys_backup_restore_success_title">Backup restaurado %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">O backup restaurou %d chave.</item>
@@ -1530,18 +1274,13 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
         <item quantity="one">%d nova chave foi adicionada a esta sessão.</item>
         <item quantity="other">%d novas chaves foram adicionadas a esta sessão.</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">Não foi possível obter a versão mais recente das chaves de recuperação (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">A sessão criptografada não está activa</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">Restaurar do backup</string>
     <string name="keys_backup_settings_delete_backup_button">Remover backup</string>
-
     <string name="keys_backup_settings_status_ok">O backup da chave foi configurado corretamente para esta sessão.</string>
     <string name="keys_backup_settings_status_ko">O backup da chave não está configurado nesta sessão.</string>
     <string name="keys_backup_settings_status_not_setup">O backup das suas chaves não está sendo feito nesta sessão.</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">O backup tem uma assinatura de uma sessão desconhecida com ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">O backup tem uma assinatura válida desta sessão.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">O backup tem uma assinatura válida da sessão confirmada %s.</string>
@@ -1549,44 +1288,32 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="keys_backup_settings_invalid_signature_from_verified_device">O backup tem uma assinatura inválida da sessão confirmada %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">O backup tem uma assinatura inválida da sessão não confirmada %s</string>
     <string name="keys_backup_get_trust_error">Não foi possível saber se o backup é confiável (%s).</string>
-
     <string name="keys_backup_settings_untrusted_backup">Para usar o Backup de Chaves nesta sessão, restaure com a sua frase secreta ou chave de recuperação agora.</string>
     <string name="keys_backup_settings_deleting_backup">Removendo o backup…</string>
     <string name="keys_backup_settings_delete_backup_error">Não foi possível remover o backup (%s)</string>
-
     <string name="keys_backup_settings_checking_backup_state">Verificando a situação do backup</string>
     <string name="keys_backup_settings_delete_confirm_title">Remover backup</string>
     <string name="keys_backup_settings_delete_confirm_message">Excluir as chaves de criptografia do servidor\? Você não será mais capaz de usar a sua chave de recuperação para ler o histórico de mensagens criptografadas.</string>
-
     <string name="new_recovery_method_popup_title">Novo backup de chave</string>
     <string name="new_recovery_method_popup_description">Foi detectado um novo backup de chave. 
 \n 
 \nSe você não definiu o novo método de recuperação, um invasor pode estar tentando acessar sua conta. Altere a senha da sua conta e defina um novo método de recuperação imediatamente nas Configurações.</string>
     <string name="new_recovery_method_popup_was_me">Foi eu</string>
-
     <string name="keys_backup_banner_setup_line1">Nunca perca mensagens criptografadas</string>
     <string name="keys_backup_banner_setup_line2">Comece a fazer o backup da chave</string>
-
     <string name="secure_backup_banner_setup_line1">Backup online</string>
     <string name="secure_backup_banner_setup_line2">Proteja-se contra a perda de acesso a mensagens e dados criptografados</string>
-
     <string name="keys_backup_banner_recover_line1">Nunca perca mensagens criptografadas</string>
     <string name="keys_backup_banner_recover_line2">Fazer o backup da chave</string>
-
     <string name="keys_backup_banner_update_line1">Novas chaves de mensagens seguras</string>
     <string name="keys_backup_banner_update_line2">Configurar o backup das chaves</string>
-
     <string name="keys_backup_banner_in_progress">Fazendo backup das chaves. Isso pode demorar vários minutos…</string>
-
-
     <string name="secure_backup_setup">Configurar o backup online</string>
-
     <string name="keys_backup_info_keys_all_backup_up">O backup de todas as chaves foi concluído</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Fazendo o backup de %d chave…</item>
         <item quantity="other">Fazendo o backup de %d chaves…</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">Versão</string>
     <string name="keys_backup_info_title_algorithm">Algoritmo</string>
     <string name="autodiscover_invalid_response">Resposta de descoberta inválida no servidor local</string>
@@ -1594,42 +1321,33 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="autodiscover_well_known_autofill_dialog_message">Element detectou uma configuração personalizada do servidor para a sua ID de usuário \"%1$s\":
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Usar a Configuração</string>
-
     <string name="invalid_or_expired_credentials">Você foi desligado devido as credenciais inválidas ou caducadas.</string>
-
     <string name="sas_verify_title">Confirmar comparando um texto curto.</string>
     <string name="sas_security_advise">Para máxima segurança, recomendamos que você faça isso pessoalmente ou use outro meio de comunicação confiável.</string>
     <string name="sas_verify_start_button_title">Iniciar a confirmação</string>
     <string name="sas_incoming_request_title">Recebendo solicitação de confirmação</string>
     <string name="sas_incoming_request_description">Confirme se esta sessão é sua. Confirmar sessões fornece segurança adicional, ao usar mensagens criptografadas de ponta a ponta.</string>
     <string name="sas_incoming_request_description_2">Ao confirmar se esta sessão é sua, você também a tornará confirmada para o seu contato.</string>
-
     <string name="sas_emoji_description">Confirme esta sessão, comparando os emojis a seguir que serão exibidos para você e seu contato</string>
     <string name="sas_decimal_description">Confirme esta sessão, comparando os números a seguir que serão exibidos para você e seu contato</string>
-
     <string name="sas_incoming_verification_request_dialog">Você recebeu uma solicitação de confirmação.</string>
     <string name="sas_view_request_action">Ver pedido</string>
     <string name="sas_waiting_for_partner">Aguardando seu contato confirmar…</string>
-
     <string name="sas_verified">Confirmado!</string>
     <string name="sas_verified_successful">Você confirmou essa sessão com êxito.</string>
     <string name="sas_verified_successful_description">As mensagens com este usuário estão criptografadas de ponta a ponta e não podem ser lidas por terceiros.</string>
     <string name="sas_got_it">Ok, entendi</string>
-
     <string name="sas_verifying_keys">Não aparece nada\? Nem todos os clientes suportam a confirmação interativa. Use a confirmação tradicional.</string>
     <string name="sas_legacy_verification_button_title">Use a confirmação tradicional.</string>
-
     <string name="sas_verification_request_notification_channel_title">Verificação da chave</string>
     <string name="sas_cancelled_dialog_title">Pedido Cancelado</string>
     <string name="sas_cancelled_by_other">Seu contato cancelou a confirmação.
 \n%s</string>
     <string name="sas_cancelled_by_me">A confirmação foi cancelada.
 \nMotivo: %s</string>
-
     <string name="sas_verification_request_notification_channel">Confirmação interativa da sessão</string>
     <string name="sas_incoming_request_notif_title">Solicitação de confirmação</string>
     <string name="sas_incoming_request_notif_content">%s quer confirmar a sua sessão</string>
-
     <string name="sas_error_m_user">O contato cancelou a confirmação</string>
     <string name="sas_error_m_timeout">O tempo de confirmação expirou</string>
     <string name="sas_error_m_unknown_transaction">A sessão não sabe sobre essa transação</string>
@@ -1641,20 +1359,15 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="sas_error_m_key_mismatch">Chave incorreta</string>
     <string name="sas_error_m_user_error">Contato não corresponde</string>
     <string name="sas_error_unknown">Erro Desconhecido</string>
-
     <string name="identity_server_not_defined">Você não está usando algum servidor de identidade</string>
     <string name="identity_server_not_defined_for_password_reset">Nenhum servidor de identidade está configurado. É necessário usar um para redefinir sua senha.</string>
-
     <string name="error_user_already_logged_in">Parece que você está tentando se conectar com outro servidor local. Deseja sair\?</string>
-
     <string name="edit">Editar</string>
     <string name="reply">Responder</string>
-
     <string name="global_retry">Tentar novamente</string>
     <string name="room_list_empty">Conecta-se a uma sala para começar a usar o aplicativo.</string>
     <string name="send_you_invite">Enviou um convite</string>
     <string name="invited_by">Convidado por %s</string>
-
     <string name="room_list_catchup_empty_title">Tudo em dia!</string>
     <string name="room_list_catchup_empty_body">Você não tem mais mensagens não lidas</string>
     <string name="room_list_catchup_welcome_title">Boas-vindas!</string>
@@ -1663,22 +1376,18 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_list_people_empty_body">Suas conversas serão exibidas aqui</string>
     <string name="room_list_rooms_empty_title">Salas</string>
     <string name="room_list_rooms_empty_body">Seus salas serão exibidas aqui</string>
-
     <string name="title_activity_emoji_reaction_picker">Reações</string>
     <string name="reactions_agree">Concordo</string>
     <string name="reactions_like">Curtir</string>
     <string name="message_add_reaction">Adicionar reação</string>
     <string name="message_view_reaction">Veja as reações</string>
     <string name="reactions">Reações</string>
-
     <string name="event_redacted">Mensagem apagada</string>
     <string name="settings_show_redacted">Mostrar mensagens apagadas</string>
     <string name="settings_show_redacted_summary">Mostrar um espaço reservado para mensagens apagadas</string>
     <string name="event_redacted_by_user_reason">Evento apagado pelo usuário</string>
     <string name="event_redacted_by_admin_reason">Evento moderado pelo administrador da sala</string>
     <string name="last_edited_info_message">Última edição por %1$s em %2$s</string>
-
-
     <string name="malformed_message">Evento malformado, não pode ser exibido</string>
     <string name="create_new_room">Criar Nova Sala</string>
     <string name="error_no_network">Sem rede. Por favor, verifique sua conexão de internet.</string>
@@ -1686,13 +1395,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="change_room_directory_network">Alterar a rede</string>
     <string name="please_wait">Por favor, aguarde…</string>
     <string name="group_all_communities">Todas as comunidades</string>
-
     <string name="room_preview_no_preview">Esta sala não pode ser visualizada</string>
     <string name="room_preview_world_readable_room_not_supported_yet">A visualização da sala global ainda não é suportada por Element</string>
-
     <string name="fab_menu_create_room">Salas</string>
     <string name="fab_menu_create_chat">Conversas</string>
-
     <string name="create_room_title">Nova Sala</string>
     <string name="create_room_action_create">CRIAR</string>
     <string name="create_room_name_hint">Nome da sala</string>
@@ -1700,18 +1406,13 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="create_room_public_description">Qualquer pessoa poderá entrar nesta sala</string>
     <string name="create_room_directory_title">Lista de Salas</string>
     <string name="create_room_directory_description">Publicar esta sala na lista das salas</string>
-
     <string name="keys_backup_unable_to_get_trust_info">Ocorreu um erro ao receber informações de confiança</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Ocorreu um erro ao obter dados de backup de chaves</string>
-
     <string name="import_e2e_keys_from_file">Importar as chaves de arquivo \"%1$s\".</string>
-
     <string name="settings_sdk_version">Versão do SDK da Matrix</string>
     <string name="settings_other_third_party_notices">Outras licenças de terceiros</string>
     <string name="navigate_to_room_when_already_in_the_room">Você já está vendo esta sala!</string>
-
     <string name="quick_reactions">Reações rápidas</string>
-
     <string name="settings_general_title">Geral</string>
     <string name="settings_preferences">Preferências</string>
     <string name="settings_security_and_privacy">Segurança e Privacidade</string>
@@ -1719,75 +1420,53 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_push_rules">Regras do Push</string>
     <string name="settings_push_rules_no_rules">Nenhuma regra Push definida</string>
     <string name="settings_push_gateway_no_pushers">Nenhuma entrada Push registrada</string>
-
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">chave_push:</string>
     <string name="push_gateway_item_app_display_name">nome_da_ tela_ do_app:</string>
     <string name="push_gateway_item_device_name">nome_da_sessão:</string>
     <string name="push_gateway_item_url">Link:</string>
     <string name="push_gateway_item_format">Formato:</string>
-
     <string name="preference_voice_and_video">Voz e vídeo</string>
     <string name="preference_root_help_about">Ajuda e Sobre</string>
-
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrar token</string>
-
     <string name="send_suggestion">Faça uma sugestão</string>
     <string name="send_suggestion_content">Por favor, escreva sua sugestão abaixo.</string>
     <string name="send_suggestion_report_placeholder">Descreva aqui sua sugestão</string>
     <string name="send_suggestion_sent">Obrigado, a sugestão foi enviada com êxito</string>
     <string name="send_suggestion_failed">A sugestão não foi enviada (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">Mostrar eventos ocultos nas conversas</string>
-
     <string name="bottom_action_people_x">Conversas</string>
-
     <string name="send_file_step_idle">Aguardando…</string>
     <string name="send_file_step_encrypting_thumbnail">Criptografando imagem miniatura…</string>
     <string name="send_file_step_sending_thumbnail">Enviando imagem miniatura (%1$s / %2$s)</string>
     <string name="send_file_step_encrypting_file">Criptografando arquivo…</string>
     <string name="send_file_step_sending_file">Enviando arquivo (%1$s / %2$s)</string>
-
     <string name="downloading_file">Baixando arquivo %1$s…</string>
     <string name="downloaded_file">O arquivo %1$s foi baixado!</string>
-
     <string name="edited_suffix">(editado)</string>
-
     <string name="message_edits">Edições na mensagem</string>
     <string name="no_message_edits_found">Nenhuma edição encontrada</string>
-
     <string name="room_filtering_filter_hint">Filtrar conversas…</string>
     <string name="room_filtering_footer_title">Não consegue encontrar o que você está procurando\?</string>
     <string name="room_filtering_footer_create_new_room">Criar uma sala nova</string>
     <string name="room_filtering_footer_create_new_direct_message">Enviar nova mensagem</string>
     <string name="room_filtering_footer_open_room_directory">Veja lista das salas</string>
-
     <string name="room_directory_search_hint">Nome ou ID (#example:matrix.org)</string>
-
     <string name="labs_swipe_to_reply_in_timeline">Ativar o recurso de deslizar para responder nas conversas</string>
     <string name="labs_show_unread_notifications_as_tab">Adicione uma aba dedicada para notificações não lidas na tela principal.</string>
-
     <string name="link_copied_to_clipboard">Link copiado para a memória</string>
-
     <string name="add_by_matrix_id">Adicionar por ID do Matrix</string>
     <string name="creating_direct_room">Criando a sala…</string>
     <string name="direct_room_no_known_users">Nenhum resultado encontrado, use adicionar por ID do Matrix para pesquisar no servidor.</string>
     <string name="direct_room_start_search">Comece a digitar para obter resultados</string>
     <string name="direct_room_filter_hint">Filtrar por nome do usuário ou ID…</string>
-
     <string name="joining_room">Entrando na sala…</string>
-
     <string name="message_view_edit_history">Veja Histórico das Edições</string>
-
     <string name="terms_of_service">Termos de serviço</string>
     <string name="review_terms">Revisar termos</string>
     <string name="terms_description_for_identity_server">Seja descoberto por outros</string>
     <string name="terms_description_for_integration_manager">Use bots, integrações, widgets e pacotes de figurinhas</string>
-
     <string name="read_at">Leia em</string>
-
-
     <string name="identity_server">Servidor de identidade</string>
     <string name="disconnect_identity_server">Desconectar servidor de identidade</string>
     <string name="add_identity_server">Configurar servidor de identidade</string>
@@ -1802,7 +1481,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_discovery_confirm_mail">Enviamos um e-mail de confirmação para %s, verifique seu e-mail e clique no link de confirmação</string>
     <string name="settings_discovery_confirm_mail_not_clicked">Enviamos um e-mail de confirmação para %s. Por favor, verifique seu e-mail e clique no link de confirmação</string>
     <string name="settings_discovery_mail_pending">Aguardando</string>
-
     <string name="settings_discovery_enter_identity_server">Digite o endereço de um servidor de identidade</string>
     <string name="settings_discovery_bad_identity_server">Não foi possível conectar-se ao servidor de identidade</string>
     <string name="settings_discovery_please_enter_server">Digite o endereço do servidor de identidade</string>
@@ -1810,20 +1488,13 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_discovery_no_terms">O servidor de identidade que você escolheu não possui termos de serviço. Continue apenas se você confiar no proprietário do servidor</string>
     <string name="settings_text_message_sent">Uma mensagem de texto foi enviada para %s. Por favor, digite o código de confirmação que ela contém.</string>
     <string name="settings_text_message_sent_wrong_code">O código de confirmação não está correto.</string>
-
     <string name="settings_discovery_disconnect_with_bound_pid">Atualmente, você está compartilhando endereços de e-mail ou números de telefone no servidor de identidade %1$s. Você precisará reconectar-se a %2$s para parar de compartilhá-los.</string>
     <string name="settings_agree_to_terms">Concorde com os Termos de Serviço do servidor de identidade (%s), para que você possa ser descoberto por endereço de e-mail ou por número de telefone.</string>
-
     <string name="labs_allow_extended_logging">Ativar registros detalhados</string>
     <string name="labs_allow_extended_logging_summary">Os registros detalhados ajudarão os desenvolvedores, ao fornecerem mais registros quando você usar sacudir o aparelho. Mesmo quando ativado, o aplicativo não registra o conteúdo da mensagem ou qualquer outro dado privado.</string>
-
-
     <string name="error_terms_not_accepted">Por favor, tente novamente quando tiver aceitado os termos e condições de seu servidor.</string>
-
     <string name="error_network_timeout">Parece que o servidor está demorando muito para responder, isto pode ser causado ou por má conectividade ou por um erro com o servidor. Por favor, tente novamente daqui a pouco.</string>
-
     <string name="send_attachment">Enviar anexo</string>
-
     <string name="a11y_open_drawer">Abra a gaveta de navegação</string>
     <string name="a11y_create_menu_open">Abra o menu de criar a sala</string>
     <string name="a11y_create_menu_close">Fecha o menu de criar a sala…</string>
@@ -1833,17 +1504,14 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="a11y_show_password">Mostrar senha</string>
     <string name="a11y_hide_password">Esconder senha</string>
     <string name="a11y_jump_to_bottom">Saltar para parte inferior</string>
-
     <string name="three_users_read">%1$s, %2$s e %3$s leu</string>
     <string name="two_users_read">%1$s e %2$s lê</string>
     <string name="one_user_read">%s lê</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">1 usuário leu</item>
+        <item quantity="one">%d usuário leu</item>
         <item quantity="other">%d usuários leram</item>
     </plurals>
-
     <string name="error_file_too_big">O arquivo \'%1$s\' (%2$s) é muito grande para ser carregado. O limite é de %3$s.</string>
-
     <string name="error_attachment">Ocorreu um erro durante a recuperação do anexo.</string>
     <string name="attachment_type_file">Arquivo</string>
     <string name="attachment_type_contact">Contato</string>
@@ -1852,13 +1520,11 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="attachment_type_gallery">Galeria</string>
     <string name="attachment_type_sticker">Figurinha</string>
     <string name="error_handling_incoming_share">Não conseguia lidar com dados compartilhados</string>
-
     <string name="uploads_media_title">MÍDIA</string>
     <string name="uploads_media_no_result">Nenhuma mídia nesta sala</string>
     <string name="uploads_files_title">ARQUIVOS</string>
     <string name="uploads_files_subtitle">%1$s em %2$s</string>
     <string name="uploads_files_no_result">Nenhum arquivo nesta sala</string>
-
     <string name="report_content_spam">É spam</string>
     <string name="report_content_inappropriate">É inapropriado</string>
     <string name="report_content_custom">Relatório personalizado…</string>
@@ -1866,28 +1532,23 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="report_content_custom_hint">Motivo para denúnciar este conteúdo</string>
     <string name="report_content_custom_submit">RELATÓRIO</string>
     <string name="block_user">BLOQUEAR USUÁRIO</string>
-
     <string name="content_reported_title">Conteúdo relatado</string>
-    <string name="content_reported_content">Este conteúdo foi relatado.
+    <string name="content_reported_content">Este conteúdo foi reportado.
 \n
-\nSe você não quiser ver mais conteúdo deste usuário, você pode bloqueá-lo para esconder suas mensagens</string>
+\nSe você não quiser ver mais mensagens deste usuário, você pode bloqueá-lo para esconder suas mensagens.</string>
     <string name="content_reported_as_spam_title">Denunciado como spam</string>
     <string name="content_reported_as_spam_content">Este conteúdo foi reportado como spam.
 \n
-\nSe você não quiser ver mais conteúdo deste usuário, você pode bloqueá-lo para esconder suas mensagens</string>
+\nSe você não quiser ver mais mensagens deste usuário, você pode bloqueá-lo para esconder suas mensagens.</string>
     <string name="content_reported_as_inappropriate_title">Denunciado como inadequado</string>
     <string name="content_reported_as_inappropriate_content">Este conteúdo foi relatado como inadequado.
 \n
-\nSe você não quiser ver mais conteúdo deste usuário, você pode bloqueá-lo para esconder suas mensagens</string>
-
+\nSe você não quiser ver mais mensagens deste usuário, você pode bloqueá-lo para esconder suas mensagens.</string>
     <string name="permissions_rationale_msg_keys_backup_export">Element precisa de permissão para salvar suas chaves E2E no aparelho.
 \n
 \nPermita o acesso na próxima janela para poder exportar suas chaves manualmente.</string>
-
     <string name="no_network_indicator">Não há conexão de rede no momento</string>
-
     <string name="message_ignore_user">Bloquear usuário</string>
-
     <string name="room_list_quick_actions_notifications_all_noisy">Todas as mensagens novas (com som)</string>
     <string name="room_list_quick_actions_notifications_all">Todas as mensagens novas</string>
     <string name="room_list_quick_actions_notifications_mentions">Apenas @menções</string>
@@ -1901,24 +1562,18 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="command_description_spoiler">Envia esta mensagem como um spoiler</string>
     <string name="spoiler">Estraga-Surpresa</string>
     <string name="reaction_search_type_hint">Digite palavras-chave para encontrar uma reação.</string>
-
     <string name="no_ignored_users">Nenhum usuário bloqueado</string>
-
     <string name="help_long_click_on_room_for_more_options">Clique longo sobre uma sala para ver mais opções</string>
-
-
     <string name="room_join_rules_public">%1$s tornou a sala pública para quem conhece o link.</string>
     <string name="room_join_rules_public_by_you">Você tornou a sala pública para quem conhece o link.</string>
     <string name="room_join_rules_invite">%1$s tornou a sala acessível somente com convite.</string>
     <string name="room_join_rules_invite_by_you">Você tornou a sala acessível somente com convite.</string>
     <string name="timeline_unread_messages">Mensagens não lidas</string>
-
     <string name="login_splash_title">É a sua conversa. Vira um admin.</string>
     <string name="login_splash_text1">Converse com as pessoas diretamente ou em comunidades</string>
     <string name="login_splash_text2">Manter conversas privadas com criptografia</string>
     <string name="login_splash_text3">Amplie e personalize sua experiência</string>
     <string name="login_splash_submit">Comece agora</string>
-
     <string name="login_server_title">Selecione um servidor</string>
     <string name="login_server_text">Assim como o e-mail, as contas têm uma casa, embora você possa falar com qualquer pessoa</string>
     <string name="login_server_matrix_org_text">Junte-se gratuitamente aos milhões no maior servidor público</string>
@@ -1926,7 +1581,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_server_modular_learn_more">Saiba mais</string>
     <string name="login_server_other_title">Outros</string>
     <string name="login_server_other_text">Configurações avançadas e preferências</string>
-
     <string name="login_continue">Continuar</string>
     <string name="login_connect_to">Conecte-se a %1$s</string>
     <string name="login_connect_to_modular">Conecte-se aos serviços de Element no Matrix</string>
@@ -1935,14 +1589,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_signup">Cadastre-se</string>
     <string name="login_signin">Entrar</string>
     <string name="login_signin_sso">Continuar com ID único</string>
-
     <string name="login_server_url_form_modular_hint">Endereço de serviço Element no Matrix</string>
     <string name="login_server_url_form_other_hint">Endereço</string>
     <string name="login_server_url_form_modular_text">Hospedagem Premium para organizações</string>
     <string name="login_server_url_form_modular_notice">Digite o endereço de Element Modular ou Servidor que você deseja usar</string>
     <string name="login_server_url_form_other_notice">Digite o endereço do Servidor ou o servidor do Element que você quer entrar</string>
     <string name="login_server_url_form_common_notice">Digite o endereço do servidor que você deseja usar</string>
-
     <string name="login_sso_error_message">Ocorreu um erro ao carregar a página: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">O aplicativo não pode entrar neste servidor. O servidor suporta os seguintes tipos de login: %1$s.
 \n
@@ -1951,58 +1603,46 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_registration_not_supported">O aplicativo não pode criar uma conta neste servidor.
 \n
 \nDeseja criar uma conta no servidor usando o Element Web\?</string>
-
     <string name="login_login_with_email_error">Este e-mail não está associado a nenhuma conta.</string>
-
     <string name="login_reset_password_on">Redefinir senha em %1$s</string>
     <string name="login_reset_password_notice">Um e-mail de confirmação será enviado para sua caixa de entrada, para você confirmar a definição de sua nova senha.</string>
     <string name="login_reset_password_submit">Próximo</string>
     <string name="login_reset_password_email_hint">E-mail</string>
     <string name="login_reset_password_password_hint">Nova senha</string>
-
     <string name="login_reset_password_warning_title">Atenção!</string>
     <string name="login_reset_password_warning_content">Alterar a sua senha redefinirá todas as chaves de criptografia de ponta a ponta existentes em todas as suas sessões, tornando o histórico de mensagens criptografadas ilegível. Faça um backup das suas chaves, ou exporte as chaves de outra sessão antes de alterar a sua senha.</string>
     <string name="login_reset_password_warning_submit">Continuar</string>
-
     <string name="login_reset_password_error_not_found">Este e-mail não está associado a nenhuma conta</string>
-
     <string name="login_reset_password_mail_confirmation_title">Verifique sua caixa de entrada no e-mail</string>
     <string name="login_reset_password_mail_confirmation_notice">Um e-mail de confirmação foi enviado para %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Toque no link para confirmar sua nova senha. Uma vez que você tenha clicado o link que ele contém, clique abaixo.</string>
     <string name="login_reset_password_mail_confirmation_submit">Verifiquei meu endereço de e-mail</string>
-
     <string name="login_reset_password_success_title">Parabéns!</string>
     <string name="login_reset_password_success_notice">Sua senha foi alterada.</string>
     <string name="login_reset_password_success_notice_2">Você foi desconectado de todas as sessões e não receberá mais notificações pop-up. Para reativar as notificações, faça o login novamente em cada aparelho.</string>
     <string name="login_reset_password_success_submit">Voltar para Entrar</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Atenção</string>
     <string name="login_reset_password_cancel_confirmation_content">Sua senha ainda não foi alterada.
 \n
 \nInterromper a alteração de senha\?</string>
-
     <string name="login_set_email_title">Defina um endereço de e-mail</string>
     <string name="login_set_email_notice">Defina um e-mail para recuperar sua conta. Mais tarde, você pode, opcionalmente, permitir que as pessoas que você conhece o descubram por seu e-mail.</string>
     <string name="login_set_email_mandatory_hint">E-mail</string>
     <string name="login_set_email_optional_hint">E-mail (opcional)</string>
     <string name="login_set_email_submit">Próximo</string>
-
     <string name="login_set_msisdn_title">Defina número de telefone</string>
     <string name="login_set_msisdn_notice">Defina um número de telefone para, opcionalmente, permitir que as pessoas que você conhece o encontram.</string>
     <string name="login_set_msisdn_notice2">Por favor, use o formato internacional.</string>
     <string name="login_set_msisdn_mandatory_hint">Número de telefone</string>
     <string name="login_set_msisdn_optional_hint">Número de telefone (opcional)</string>
     <string name="login_set_msisdn_submit">Próximo</string>
-
     <string name="login_msisdn_confirm_title">Confirme o número de telefone</string>
     <string name="login_msisdn_confirm_notice">Acabamos de enviar um código para %1$s. Digite-o abaixo para confirmar se é você.</string>
     <string name="login_msisdn_confirm_hint">Digite o código</string>
     <string name="login_msisdn_confirm_send_again">Enviar novamente</string>
     <string name="login_msisdn_confirm_submit">Próximo</string>
-
     <string name="login_msisdn_error_not_international">Os números de telefone internacionais devem começar com \'+\'</string>
     <string name="login_msisdn_error_other">O número de telefone parece inválido. Favor verificá-lo</string>
-
     <string name="login_signup_to">Registar em %1$s</string>
     <string name="login_signin_username_hint">Nome de usuário ou e-mail</string>
     <string name="login_signup_username_hint">Nome de usuário</string>
@@ -2014,25 +1654,21 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n
 \n
 \nParar o processo de registro\?</string>
-
     <string name="login_a11y_choose_matrix_org">Selecione matrix.org</string>
     <string name="login_a11y_choose_modular">Selecione Element nos Serviços de Matrix</string>
     <string name="login_a11y_choose_other">Selecione um servidor personalizado</string>
     <string name="login_a11y_captcha_container">Por favor, realize o desafio de Captcha</string>
     <string name="login_terms_title">Aceitar termos para continuar</string>
-
     <string name="login_wait_for_email_title">Por favor, verifique seu e-mail</string>
     <string name="login_wait_for_email_notice">Acabamos de enviar um e-mail para %1$s.
 \nPor favor, clique no link que ele contém para continuar a criação da conta.</string>
     <string name="login_validation_code_is_not_correct">O código digitado não está correto. Por favor, verifique-o.</string>
     <string name="login_error_outdated_homeserver_title">Servidor desatualizado</string>
     <string name="login_error_outdated_homeserver_content">Este servidor tem uma versão muito antiga que não é compatível com nosso servidor. Peça ao administrador para fazer atualização.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundo…</item>
         <item quantity="other">Recebemos demasiado pedidos. Você pode tentar novamente em %1$d segundos…</item>
     </plurals>
-
     <string name="login_connect_using_matrix_id_notice">Alternativamente, se você já tem uma conta e conhece a sua ID de usuário na Matrix e a senha, você pode usar este método:</string>
     <string name="login_connect_using_matrix_id_submit">Entre com ID do Matrix</string>
     <string name="login_signin_matrix_id_title">Entre com ID do Matrix</string>
@@ -2041,9 +1677,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="login_signin_matrix_id_password_notice">Se você não souber sua senha, volte para redefinir-a.</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Este não é um identificador de usuário válido. Formato esperado: \'@user:homeserver.org\'</string>
     <string name="autodiscover_well_known_error">Incapaz de encontrar um servidor válido. Por favor, verifique seu identificador</string>
-
     <string name="seen_by">Lida por</string>
-
     <string name="signed_out_title">Você está desconectada/o</string>
     <string name="signed_out_notice">Isso pode ser devido à vários motivos:
 \n
@@ -2053,7 +1687,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n
 \n• O administrador do seu servidor invalidou seu acesso por motivos de segurança.</string>
     <string name="signed_out_submit">Entrar novamente</string>
-
     <string name="soft_logout_title">Você está desconectada/o</string>
     <string name="soft_logout_signin_title">Entrar</string>
     <string name="soft_logout_signin_notice">Administrador do seu servidor (%1$s) invalidou seu acesso %2$s (%3$s).</string>
@@ -2065,7 +1698,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n
 \nApague-os quando não usar mais este aparelho, ou se quiser entrar em outra conta.</string>
     <string name="soft_logout_clear_data_submit">Limpar todos os dados</string>
-
     <string name="soft_logout_clear_data_dialog_title">Limpar dados</string>
     <string name="soft_logout_clear_data_dialog_content">Limpar todos os dados atualmente armazenados neste aparelho\?
 \nEntre novamente para acessar os dados e mensagens da sua conta.</string>
@@ -2074,12 +1706,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="soft_logout_sso_not_same_user_error">A sessão atual é para o usuário %1$s e você fornece credenciais para o usuário %2$s. Isto não é suportado por Element.
 \n
 \nPor favor, primeiro limpe os dados, depois faça o login novamente em outra conta.</string>
-
     <string name="permalink_malformed">Seu link do matrix.to foi malformado</string>
     <string name="bug_report_error_too_short">A descrição é curta demais</string>
-
     <string name="notification_initial_sync">Sincronia Inicial…</string>
-
     <string name="settings_show_devices_list">Veja todas as minhas sessões</string>
     <string name="settings_advanced_settings">Configurações avançadas</string>
     <string name="settings_developer_mode">Modo desenvolvedor</string>
@@ -2091,26 +1720,19 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings">Configurações</string>
     <string name="devices_current_device">Sessão atual</string>
     <string name="devices_other_devices">Outras sessões</string>
-
     <string name="autocomplete_limited_results">Mostrando apenas os primeiros resultados, digite mais letras…</string>
-
     <string name="settings_developer_mode_fail_fast_title">Relatar imediatamente as falhas</string>
     <string name="settings_developer_mode_fail_fast_summary">Element poderá quebrar com mais frequência quando ocorrer um erro inesperado</string>
-
     <string name="command_description_shrug">Adiciona ¯\\_(ツ)_/¯ a uma mensagem de texto</string>
-
     <string name="create_room_encryption_title">Ativar criptografia</string>
     <string name="create_room_encryption_description">Uma vez ativada, a criptografia não poderá ser desativada.</string>
-
     <string name="login_error_threepid_denied">Seu domínio de e-mail não está permitido a se registrar neste servidor</string>
-
     <string name="verification_conclusion_warning">Entrada não confiável</string>
     <string name="verification_sas_match">Correspondem</string>
     <string name="verification_sas_do_not_match">Não correspondem</string>
     <string name="verify_user_sas_emoji_help_text">Confirme este usuário, comparando os emojis a seguir que serão exibidos na tela dele, na mesma ordem.</string>
     <string name="verify_user_sas_emoji_security_tip">Para maior segurança, use outro meio de comunicação confiável ou faça isso pessoalmente.</string>
     <string name="verification_green_shield">Procure o escudo verde para garantir que um usuário seja confiável. Confie em todos os usuários numa sala para garantir que a sala é segura.</string>
-
     <string name="verification_conclusion_not_secure">Não seguro</string>
     <string name="verification_conclusion_compromised">Um dos seguintes casos pode estar comprometido:
 \n
@@ -2118,13 +1740,11 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n·- O servidor do usuário que você está verificando
 \n·- A sua, ou a conexão de outros usuários à internet
 \n·- O seu, ou o aparelho dos outros usuários</string>
-
     <string name="sent_a_video">Vídeo.</string>
     <string name="sent_an_image">Imagem.</string>
     <string name="sent_an_audio_file">Áudio</string>
     <string name="sent_a_file">Arquivo</string>
     <string name="send_a_sticker">Figurinha</string>
-
     <string name="verification_request_waiting">Aguardando…</string>
     <string name="verification_request_other_cancelled">%s cancelado</string>
     <string name="verification_request_you_cancelled">Você cancelou</string>
@@ -2134,21 +1754,15 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="verification_request">Solicitação de confirmação</string>
     <string name="verification_verify_device">Confirmar esta sessão</string>
     <string name="verification_verify_device_manually">Confirmar manualmente</string>
-
     <string name="you">Você</string>
-
     <string name="verification_scan_notice">Escaneie o código com a câmera do aparelho do outro usuário para confirmar a segurança entre vocês</string>
     <string name="verification_scan_their_code">Escanea o código do seu contato</string>
     <string name="verification_scan_emoji_title">Não pode escanear</string>
     <string name="verification_scan_emoji_subtitle">Se você não está presente, alternativamente compare emoji</string>
-
     <string name="verification_no_scan_emoji_title">Confirmar comparando emojis</string>
-
     <string name="verify_by_emoji_title">Confirmar por emojis</string>
     <string name="verify_by_emoji_description">Se você não consegue escanear o código acima, confirme via comparação de emojis.</string>
-
     <string name="a13n_qr_code_description">Imagem em código QR</string>
-
     <string name="verification_verify_user">Confirmar %s</string>
     <string name="verification_verified_user">Confirmou %s</string>
     <string name="verification_request_waiting_for">Aguardando por %s…</string>
@@ -2172,54 +1786,39 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="room_profile_section_more_uploads">Mídia e arquivos</string>
     <string name="room_profile_section_more_leave">Sair da sala</string>
     <string name="room_profile_leaving_room">Deixando a sala…</string>
-
     <string name="room_member_power_level_admins">Administradores</string>
     <string name="room_member_power_level_moderators">Moderadores</string>
     <string name="room_member_power_level_custom">Personalizado</string>
     <string name="room_member_power_level_invites">Convites</string>
     <string name="room_member_power_level_users">Usuários</string>
-
     <string name="room_member_power_level_admin_in">Administrador em %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderador em %1$s</string>
     <string name="room_member_power_level_default_in">Padrão em %1$s</string>
     <string name="room_member_power_level_custom_in">Personalizado (%1$d) em %2$s</string>
-
     <string name="room_member_jump_to_read_receipt">Ir para a confirmação de leitura</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element não lida com eventos do tipo \'%1$s\'</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element não lida com mensagens do tipo \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element encontrou um problema ao render o conteúdo de um evento com \'%1$s\' ID</string>
-
     <string name="unignore">Desbloquear</string>
-
     <string name="verify_cannot_cross_sign">Esta sessão não pode compartilhar essa confirmação com suas outras sessões.
 \nA confirmação será salvada localmente e será compartilhada em uma versão futura do aplicativo.</string>
-
     <string name="room_list_sharing_header_recent_rooms">Salas recentes</string>
     <string name="room_list_sharing_header_other_rooms">Outras salas</string>
-
     <string name="command_description_rainbow">Envia a mensagem colorida como arco-íris</string>
     <string name="command_description_rainbow_emote">Envia o emoji colorido como um arco-íris</string>
-
     <string name="settings_category_timeline">Conversas</string>
-
     <string name="settings_category_composer">Campo de texto</string>
-
     <string name="room_settings_enable_encryption">Ativar a criptografia de ponta a ponta</string>
     <string name="room_settings_enable_encryption_warning">Uma vez ativada, a criptografia não poderá ser desativada.</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Ativar criptografia\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Uma vez ativada, a criptografia de uma sala não pode ser desativada. As mensagens enviadas em uma sala criptografada não podem ser lidas pelo servidor, apenas pelos participantes desta sala. A ativação da criptografia pode impedir que muitos bots e integrações funcionem corretamente.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Ativar criptografia</string>
-
     <string name="verification_request_notice">Para ficar seguro, confirme %s comparando um código único.</string>
     <string name="verification_request_start_notice">Para sua segurança, faça isso pessoalmente ou use outra forma confiável de comunicação.</string>
-
     <string name="verification_emoji_notice">Compare os emoji únicos, assegurando que eles apareçam na mesma ordem.</string>
     <string name="verification_code_notice">Compare o código com o exibido na tela do outro usuário.</string>
     <string name="verification_conclusion_ok_notice">As mensagens com este usuário estão criptografadas de ponta a ponta e não podem ser lidas por terceiros.</string>
     <string name="verification_conclusion_ok_self_notice">Sua nova sessão agora está confirmada. Ela tem acesso às suas mensagens criptografadas, e outros usuários a verão como confirmada.</string>
-
     <string name="encryption_information_cross_signing_state">Autoverificação</string>
     <string name="encryption_information_dg_xsigning_complete">A autoverificação está ativada
 \nChaves privadas estão no aparelho.</string>
@@ -2229,56 +1828,40 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="encryption_information_dg_xsigning_not_trusted">A autoverificação está ativada.
 \nAs chaves não são confiáveis</string>
     <string name="encryption_information_dg_xsigning_disabled">A autoverificação não está ativada</string>
-
     <string name="settings_hs_admin_e2e_disabled">O administrador do servidor desativou a criptografia de ponta a ponta por padrão em salas privadas e em conversas.</string>
     <string name="settings_active_sessions_list">Sessões ativas</string>
     <string name="settings_active_sessions_show_all">Veja todas as sessões</string>
     <string name="settings_active_sessions_manage">Gerenciar sessões</string>
     <string name="settings_active_sessions_signout_device">Sair desta sessão</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Não há informações criptográficas disponíveis</string>
-
     <string name="settings_active_sessions_verified_device_desc">Esta sessão é confiável para o envio de mensagens seguras porque você a confirmou:</string>
     <string name="settings_active_sessions_unverified_device_desc">Confirme esta sessão para conceder para ela o acesso a mensagens criptografadas. Se você não entrou nesta sessão, sua conta pode estar comprometida:</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d sessão ativa</item>
         <item quantity="other">%d sessões ativas</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Confirmar este acesso</string>
     <string name="crosssigning_other_user_not_trust">Outros usuários podem não confiar nela</string>
     <string name="complete_security">Segurança completa</string>
-
     <string name="verification_open_other_to_verify">Use uma sessão existente para confirmar a nova sessão, dando a ela acesso às mensagens criptografadas.</string>
-
-
     <string name="verification_profile_verify">Confirmar</string>
     <string name="verification_profile_verified">Confirmado</string>
     <string name="verification_profile_warning">Atenção</string>
-
     <string name="room_member_profile_failed_to_get_devices">Falha em obter sessões</string>
     <string name="room_member_profile_sessions_section_title">Sessões</string>
     <string name="trusted">Confiável</string>
     <string name="not_trusted">Não confiável</string>
-
     <string name="verification_profile_device_verified_because">Esta sessão está confirmada para trocar mensagens seguras porque %1$s (%2$s) a confirmou:</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) entrou usando uma nova sessão:</string>
     <string name="verification_profile_device_untrust_info">Até que este usuário confirme esta sessão, as mensagens enviadas de e para ela são etiquetadas com avisos. Alternativamente, é possível confirmar a sessão manualmente.</string>
-
-
     <string name="initialize_cross_signing">Ativar a autoverificação</string>
     <string name="reset_cross_signing">Reiniciar Chaves</string>
-
     <string name="a11y_qr_code_for_verification">Código QR</string>
-
     <string name="qr_code_scanned_by_other_notice">Quase lá! Este escudo também aparece para %s\?</string>
     <string name="qr_code_scanned_by_other_yes">Sim</string>
     <string name="qr_code_scanned_by_other_no">Não</string>
-
     <string name="no_connectivity_to_the_server_indicator">A conexão com o servidor foi perdida</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">O modo de Avião está ativo</string>
-
     <string name="settings_dev_tools">Ferramentas do Desenvolvedor</string>
     <string name="settings_account_data">Dados da Conta</string>
     <plurals name="poll_info">
@@ -2293,49 +1876,36 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="command_description_poll">Cria uma pesquisa simples</string>
     <string name="verification_cannot_access_other_session">Use a Chave ou a Frase Secreta de Recuperação</string>
     <string name="verification_use_passphrase">Se você não pode entrar numa sessão existente</string>
-
     <string name="new_signin">Entrar de Novo</string>
-
     <string name="enter_secret_storage_invalid">Não é possível encontrar segredos no armazenamento</string>
     <string name="enter_secret_storage_passphrase">Digite a frase secreta de armazenamento</string>
     <string name="enter_secret_storage_passphrase_warning">Atenção:</string>
     <string name="enter_secret_storage_passphrase_warning_text">Você só deveria entrar no armazenamento secreto a partir de um aparelho confiável</string>
-
     <string name="message_action_item_redact">Apagar</string>
     <string name="share_confirm_room">Deseja enviar este anexo para %1$s\?</string>
     <plurals name="send_images_with_original_size">
         <item quantity="one">Enviar imagem no tamanho original</item>
         <item quantity="other">Enviar imagens no tamanho original</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Confirmar a exclusão</string>
     <string name="delete_event_dialog_content">Tem certeza de que deseja apagar este evento\? Observe que, se você apagar a alteração do nome ou descrição de uma sala, isso reverterá a alteração.</string>
     <string name="delete_event_dialog_reason_checkbox">Incluir o motivo</string>
     <string name="delete_event_dialog_reason_hint">Motivo da edição</string>
-
     <string name="event_redacted_by_user_reason_with_reason">Evento apagado pelo usuário, motivo: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Evento moderado pelo administrador da sala, motivo: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">As chaves já estão atualizadas!</string>
-
     <string name="login_default_session_public_name">Element para Android</string>
-
     <string name="settings_key_requests">A chave pede</string>
-
     <string name="e2e_use_keybackup">Desbloquear histórico de mensagens criptografadas</string>
-
     <string name="refresh">Recarregar</string>
-
     <string name="new_session">Novo login. Foi você\?</string>
     <string name="new_session_review">Toque para revisar e confirmar</string>
     <string name="verify_new_session_notice">Use esta sessão para confirmar a sua nova sessão, dando a ela acesso às mensagens criptografadas.</string>
     <string name="verify_new_session_was_not_me">Não foi eu</string>
     <string name="verify_new_session_compromized">Sua conta pode estar comprometida</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">Se você cancelar, não será capaz de ler mensagens criptografadas neste aparelho, e outros usuários não confiarão nele</string>
     <string name="verify_cancel_self_verification_from_trusted">Se você cancelar, você não poderá ler mensagens criptografadas em seu novo aparelho, e outros usuários não confiarão nele</string>
     <string name="verify_cancel_other">Você não confirmará %1$s (%2$s) se cancelar agora. Precisará começar novamente no perfil dele.</string>
-
     <string name="verify_not_me_self_verification">Um dos seguintes casos pode estar comprometido:
 \n
 \n- Sua senha
@@ -2344,36 +1914,26 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
 \n- A conexão à internet de qualquer um dos aparelhos que você está usando
 \n
 \nRecomendamos que você altere imediatamente a sua senha e a chave de recuperação em Configurações.</string>
-
     <string name="verify_cancelled_notice">Confirme seus aparelhos em Configurações.</string>
     <string name="verification_cancelled">Confirmação cancelada</string>
-
     <string name="recovery_passphrase">Digite a frase secreta de recuperação</string>
     <string name="message_key">Chave da Mensagem</string>
     <string name="account_password">Senha da Conta</string>
-
     <string name="set_recovery_passphrase">Definir o %s</string>
     <string name="generate_message_key">Gerar uma Chave de Mensagem</string>
-
     <string name="confirm_recovery_passphrase">Confirme %s</string>
-
     <string name="enter_account_password">Digite sua %s para continuar.</string>
-
     <string name="bootstrap_info_text">Proteja e desbloqueie mensagens criptografadas e confia com um %s.</string>
     <string name="bootstrap_info_confirm_text">Digite novamente seu %s para confirmar.</string>
     <string name="bootstrap_dont_reuse_pwd">Não use a senha da sua conta.</string>
-
     <string name="bootstrap_info_text_2">Digite uma frase de segurança que só você conheça, usada para proteger os segredos em seu servidor.</string>
-
     <string name="bootstrap_loading_text">Isto pode levar vários segundos, seja paciente.</string>
     <string name="bootstrap_loading_title">Criação de recuperação.</string>
     <string name="your_recovery_key">Sua chave de recuperação</string>
     <string name="bootstrap_finish_title">Tudo pronto!</string>
     <string name="keep_it_safe">Guarde num local seguro</string>
     <string name="finish">Encerrar</string>
-
     <string name="bootstrap_save_key_description">Use isto %1$s como uma rede de segurança caso você esqueça sua %2$s.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Publicando as chaves de identidade criadas</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Gerando uma chave segura a partir de uma frase secreta</string>
     <string name="bootstrap_crosssigning_progress_default_key">Definindo a chave padrão SSSS</string>
@@ -2381,28 +1941,20 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_crosssigning_progress_save_usk">Sincronização da chave do Usuário</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Sincronizando a chave de Auto-Assinatura</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Criando o backup da chave</string>
-
-
     <string name="bootstrap_cross_signing_success">Suas %2$s &amp; %1$s estão agora definidas.
 \n
 \nSalva arquivos em local seguro! Você precisará deles para desbloquear mensagens criptografadas e proteger informações se perder todas as suas sessões ativas.</string>
-
     <string name="bootstrap_crosssigning_print_it">Imprime e armazena em local seguro</string>
     <string name="bootstrap_crosssigning_save_usb">Salve isto em uma chave USB ou unidade de backup</string>
     <string name="bootstrap_crosssigning_save_cloud">Copia para sua nuvem pessoal</string>
-
     <string name="auth_flow_not_supported">Você não pode fazer isso por celular</string>
-
     <string name="encryption_enabled">Criptografia ativada</string>
     <string name="encryption_not_enabled">Criptografia desativada</string>
     <string name="qr_code_scanned_verif_waiting">Aguardando por %s…</string>
-
     <string name="settings_notification_configuration">Configuração de notificações</string>
     <string name="settings_troubleshoot_title">Solução de problemas</string>
     <string name="room_message_placeholder">Digite uma mensagem…</string>
-
     <string name="use_file">Use Arquivo</string>
-
     <string name="enter_backup_passphrase">Digite %s</string>
     <string name="backup_recovery_passphrase">Frase Secreta de Recuperação</string>
     <string name="bootstrap_progress_checking_backup">Verificando o backup de chave</string>
@@ -2413,36 +1965,27 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_cancel_text">Se você cancelar agora, poderá perder mensagens e dados criptografados para sempre se esquecer suas credenciais. 
 \n 
 \nVocê também pode configurar o Backup online e gerenciar suas chaves em Configurações.</string>
-
     <string name="encryption_enabled_tile_description">As mensagens nesta sala estão criptografadas de ponta a ponta. Confirme os usuários em seus perfis.</string>
     <string name="encryption_unknown_algorithm_tile_description">A criptografia usada por esta sala não é suportada</string>
-
     <string name="room_created_summary_item">%s criou e configurou a sala.</string>
     <string name="room_created_summary_item_by_you">Você criou e configurou a sala.</string>
-
     <string name="qr_code_scanned_self_verif_notice">Quase lá! O outro aparelho está mostrando o mesmo escudo\?</string>
     <string name="qr_code_scanned_verif_waiting_notice">Quase lá! Aguardando confirmação…</string>
     <string name="error_failed_to_import_keys">Falha na importação de chaves</string>
-
     <string name="settings_messages_at_room">Mensagens contendo @room</string>
     <string name="settings_messages_in_e2e_one_to_one">Mensagens criptografadas em conversas individuais</string>
     <string name="settings_messages_in_e2e_group_chat">Mensagens criptografadas em salas</string>
     <string name="settings_when_rooms_are_upgraded">Quando a versão da sala é atualizada</string>
     <string name="settings_notification_advanced_summary">Ajustar as notificações por evento</string>
-
     <string name="command_description_plain">Envia uma mensagem como texto simples, sem formatar o texto</string>
-
     <string name="auth_invalid_login_param_space_in_password">Nome de usuário e/ou senha incorretos. A senha digitada começa ou termina com espaços, favor verificá-la.</string>
     <string name="auth_invalid_login_deactivated_account">Esta conta foi desativada.</string>
-
     <string name="upgrade_security">Atualização de criptografia disponível</string>
     <string name="setup_cross_signing">Ativar a autoverificação</string>
     <string name="security_prompt_text">Verifique-se e os outros para manter suas conversas seguras</string>
-
     <string name="bootstrap_enter_recovery">Digite sua %s para continuar</string>
     <string name="bootstrap_invalid_recovery_key">Não é uma chave de recuperação válida</string>
     <string name="recovery_key_empty_error_message">Digite uma chave de recuperação</string>
-
     <string name="bootstrap_progress_checking_backup_with_info">Verificando o backup da chave (%s)</string>
     <string name="bootstrap_progress_compute_curve_key">Obtendo a chave da curva</string>
     <string name="bootstrap_progress_generating_ssss">Gerando a chave SSSS a partir de uma frase secreta</string>
@@ -2450,20 +1993,16 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bootstrap_progress_generating_ssss_recovery">Gerando a chave SSSS a partir da chave de recuperação</string>
     <string name="bootstrap_progress_storing_in_sss">Armazenando backup secreto de chave em SSSS</string>
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
-
     <string name="bootstrap_migration_enter_backup_password">Digite sua Frase Secreta de Chave do Backup para continuar.</string>
     <string name="bootstrap_migration_use_recovery_key">use sua chave de recuperação da Chave do Backup</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Se não se lembrar de sua Frase Secreta do backup de chave, você pode %s.</string>
     <string name="bootstrap_migration_backup_recovery_key">Chave de recuperação do backup de chave</string>
-
     <string name="settings_security_prevent_screenshots_title">Impedir a captura de tela do aplicativo</string>
     <string name="settings_security_prevent_screenshots_summary">Ativando esta opção acrescenta FLAG_SECURE a todas as atividades. Reinicie o aplicativo para que a alteração tenha efeito.</string>
-
     <string name="media_file_added_to_gallery">Arquivo de mídia adicionado à Galeria</string>
     <string name="error_adding_media_file_to_gallery">Não foi possível adicionar o arquivo de mídia à Galeria</string>
     <string name="error_saving_media_file">Não foi possível salvar o arquivo de mídia</string>
     <string name="change_password_summary">Definir uma nova senha da conta…</string>
-
     <string name="use_other_session_content_description">Use o Element mais recente em seus outros aparelhos: Element Web, Element para Computador, Element para iOS, Element para Android, ou outro cliente Matrix capaz de fazer autoverificação</string>
     <string name="app_desktop_web">Element Web
 \nElement para Computador</string>
@@ -2478,28 +2017,23 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="enter_secret_storage_input_key">Selecione sua Chave de Recuperação, ou insira manualmente digitando-a ou colando-a da sua área de transferência</string>
     <string name="keys_backup_recovery_key_error_decrypt">O backup não pôde ser descriptografado com essa Chave de Recuperação: verifique se você digitou corretamente a Chave de Recuperação.</string>
     <string name="failed_to_access_secure_storage">Falha ao acessar o armazenamento seguro</string>
-
     <string name="unencrypted">Não criptografado</string>
     <string name="encrypted_unverified">Criptografado por um aparelho não confirmado</string>
     <string name="review_logins">Revisar onde você está logado</string>
     <string name="verify_other_sessions">Verifique todas as suas sessões para garantir que sua conta e mensagens estão seguras</string>
     <string name="verify_this_session">Verifique o novo login acessando sua conta: %1$s</string>
-
     <string name="cross_signing_verify_by_text">Confirmação manual por texto</string>
     <string name="crosssigning_verify_session">Confirmar o login</string>
     <string name="cross_signing_verify_by_emoji">Confirme interativamente por emojis</string>
     <string name="confirm_your_identity">Confirme sua identidade verificando este login a partir de uma de suas outras sessões, concedendo-lhe acesso às mensagens criptografadas.</string>
     <string name="mark_as_verified">Marcar como Confiável</string>
-
     <string name="error_empty_field_choose_user_name">Escolha um nome de usuário.</string>
     <string name="error_empty_field_choose_password">Escolha uma senha.</string>
     <string name="external_link_confirmation_title">Verificar este link</string>
     <string name="external_link_confirmation_message">O link %1$s redirecionará você para outro site: %2$s.
 \n
 \nDeseja continuar\?</string>
-
     <string name="create_room_dm_failure">Não foi possível criar sua DM. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
-
     <string name="add_members_to_room">Adicionar participantes</string>
     <string name="invite_users_to_room_action_invite">CONVITE</string>
     <string name="inviting_users_to_room">Convidando os usuários…</string>
@@ -2511,11 +2045,9 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
         <item quantity="other">Convites enviados para %1$s e %2$s e mais</item>
     </plurals>
     <string name="invite_users_to_room_failure">Não foi possível convidar os usuários. Por favor, verifique os usuários que você deseja convidar e tente novamente.</string>
-
     <string name="choose_locale_current_locale_title">Idioma atual</string>
     <string name="choose_locale_other_locales_title">Outros idiomas disponíveis</string>
     <string name="choose_locale_loading_locales">Carregando os idiomas disponíveis…</string>
-
     <string name="open_terms_of">Abra termos de %s</string>
     <string name="disconnect_identity_server_dialog_content">Desconectar-se do servidor de identidade %s\?</string>
     <string name="identity_server_error_outdated_identity_server">Este servidor de identidade está desatualizado. Element suporta apenas API V2.</string>
@@ -2525,7 +2057,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="identity_server_error_bulk_sha256_not_supported">Pela sua privacidade, Element apenas suporta o envio dos e-mails e números de telefone de usuários em hash.</string>
     <string name="identity_server_error_binding_error">A associação falhou.</string>
     <string name="identity_server_error_no_current_binding_error">Não há nenhuma associação atual com este identificador.</string>
-
     <string name="identity_server_set_default_notice">Seu servidor doméstico (%1$s) propõe o uso de %2$s para seu servidor de identidade</string>
     <string name="identity_server_set_default_submit">Use %1$s</string>
     <string name="identity_server_set_alternative_notice">Como alternativa, você pode digitar o endereço de outro servidor de identidade</string>
@@ -2538,9 +2069,7 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="a11y_unmute_microphone">Ativar o microfone</string>
     <string name="a11y_stop_camera">Desligue a câmera</string>
     <string name="a11y_start_camera">Ativar a câmera</string>
-
     <string name="settings_setup_secure_backup">Configure o backup online</string>
-
     <string name="bottom_sheet_setup_secure_backup_title">Backup online</string>
     <string name="bottom_sheet_setup_secure_backup_subtitle">Previna-se contra perda de acesso a mensagens e dados criptografados, fazendo backup das chaves de criptografia no seu servidor.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Configure</string>
@@ -2548,22 +2077,17 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Gere uma chave de segurança para armazenar num local seguro, como um gerenciador de senhas ou um cofre.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Use uma Frase de Segurança</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Digite uma frase secreta que só você conhece, e gere uma chave para backup.</string>
-
     <string name="bottom_sheet_save_your_recovery_key_title">Salve sua Chave de Segurança</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Armazene sua Chave de Segurança num local seguro, como um gerenciador de senhas ou um cofre.</string>
-
     <string name="set_a_security_phrase_title">Defina uma Frase de Segurança</string>
     <string name="set_a_security_phrase_notice">Digite uma frase de segurança que só você conheça, usada para proteger os segredos no seu servidor.</string>
     <string name="set_a_security_phrase_hint">Frase de Segurança</string>
     <string name="set_a_security_phrase_again_notice">Digite sua Frase de Segurança novamente para confirmá-la.</string>
-
     <string name="save_your_security_key_title">Salve sua Chave de Segurança</string>
     <string name="save_your_security_key_notice">Armazene sua Chave de Segurança num local seguro, como um gerenciador de senhas ou um cofre.</string>
-
     <string name="room_settings_name_hint">Nome da sala</string>
     <string name="room_settings_topic_hint">Descrição</string>
     <string name="room_settings_save_success">Você alterou as configurações da sala com êxito</string>
-
     <string name="notice_crypto_unable_to_decrypt_final">Você não pode acessar esta mensagem</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Aguardando esta mensagem. Pode demorar um pouco</string>
     <string name="crypto_utd">Não é possível decifrar</string>
@@ -2572,17 +2096,12 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="crypto_error_withheld_unverified">Você não pode acessar esta mensagem porque a sessão não foi definida como confiável pelo remetente</string>
     <string name="crypto_error_withheld_generic">Você não pode acessar esta mensagem porque o remetente intencionalmente não enviou as chaves</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Aguardando o histórico de criptografia</string>
-
     <string name="element_disclaimer_title">Riot agora é Element!</string>
     <string name="element_disclaimer_content">Estamos felizes em anunciar que mudamos de nome! Seu aplicativo está atualizado e você está conectado à sua conta.</string>
     <string name="element_disclaimer_negative_button">OK, ENTENDI</string>
     <string name="element_disclaimer_positive_button">APRENDA MAIS</string>
-
     <string name="element_login_splash_brand">Element</string>
-
-
     <string name="save_recovery_key_chooser_hint">Salvar chave de recuperação em</string>
-
     <string name="add_from_phone_book">Adicionar da minha lista de contatos</string>
     <string name="empty_phone_book">Sua lista de contatos está vazia</string>
     <string name="phone_book_title">Lista de Contatos</string>
@@ -2590,13 +2109,10 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="loading_contact_book">Extraindo seus contatos…</string>
     <string name="empty_contact_book">Sua lista de contatos está vazia</string>
     <string name="contacts_book_title">Lista de contatos</string>
-
     <string name="three_pid_revoke_invite_dialog_title">Revogar o convite</string>
     <string name="three_pid_revoke_invite_dialog_content">Revogar o convite para %1$s\?</string>
-
     <string name="member_banned_by">Banido por %1$s</string>
     <string name="failed_to_unban">Não foi possível remover o banimento do usuário</string>
-
     <string name="alert_push_are_disabled_title">As notificações Push estão desativadas</string>
     <string name="alert_push_are_disabled_description">Revise suas configurações para permitir notificações Push</string>
     <string name="create_pin_title">Escolha um PIN de segurança</string>
@@ -2625,13 +2141,11 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
         <item quantity="one">%1$d/%2$d chave importada com êxito.</item>
         <item quantity="other">%1$d/%2$d chaves importadas com êxito.</item>
     </plurals>
-
     <string name="room_manage_integrations">Gerenciar integrações</string>
     <string name="room_no_active_widgets">Nenhum widget ativo</string>
     <string name="create_room_federation_error">A sala foi criada, mas alguns convites não foram enviados pelo seguinte motivo:
 \n
 \n%s</string>
-
     <plurals name="two_and_some_others_read">
         <item quantity="one">%1$s, %2$s e %3$d outro leu</item>
         <item quantity="other">%1$s, %2$s e %3$d outros leram</item>
@@ -2649,22 +2163,18 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="settings_phone_numbers">Números de telefone</string>
     <string name="settings_remove_three_pid_confirmation_content">Remover %s\?</string>
     <string name="error_threepid_auth_failed">Certifique-se de ter clicado no link do e-mail que enviamos para você.</string>
-
     <plurals name="seconds">
         <item quantity="one">%d segundo</item>
         <item quantity="other">%d segundos</item>
     </plurals>
-
     <string name="settings_show_room_member_state_events_summary">Mostrar quando alguém for convidado/entrar/sair/banido e mostrar alterações de foto de perfil e de nome e sobrenome.</string>
     <string name="settings_emails_and_phone_numbers_title">E-mails e números de telefone</string>
     <string name="settings_emails_and_phone_numbers_summary">Editar e-mails e números de telefone vinculados à sua conta Matrix</string>
-
     <string name="settings_text_message_sent_hint">Código</string>
     <string name="login_msisdn_notice">Por favor, use o formato internacional (o número de telefone precisa começar com \'+\')</string>
     <string name="confirm_your_identity_quad_s">Confirme sua identidade verificando este login, concedendo a ele acesso a mensagens criptografadas.</string>
     <string name="error_opening_banned_room">Não é possível carregar uma sala da qual você foi banido.</string>
     <string name="room_error_not_found">Não foi possível encontrar esta sala. Certifique-se de que ela existe.</string>
-
     <string name="universal_link_malformed">O link não está correto</string>
     <string name="auth_msisdn_already_defined">Este número de telefone já foi adicionado.</string>
     <string name="settings_show_room_member_state_events">Mostrar eventos de status dos integrantes da sala</string>
@@ -2672,11 +2182,61 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="sent_a_bot_buttons">Botões do bot</string>
     <string name="sent_a_reaction">Reagiu com: %s</string>
     <string name="sent_verification_conclusion">Confirmação concluída</string>
-
     <string name="delete_account_data_warning">Remover os dados de %1$s desta conta\?
 \n
 \nProssiga com cuidado, pois não há como reverter esta escolha.</string>
-
     <string name="error_sso_flow_not_supported_yet">Desculpe, esta funcionalidade ainda não está disponível para contas conectadas via acesso único.</string>
-
-</resources>
+    <string name="settings_security_pin_code_grace_period_summary_off">O código PIN é solicitado todas as vezes que você abre o Element.</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">O código PIN é solicitado após 2 minutos sem usar o Element.</string>
+    <string name="settings_security_pin_code_grace_period_title">Solicitar o PIN depois de 2 minutos</string>
+    <string name="settings_security_pin_code_notifications_summary_off">Exibir apenas o número de mensagens não lidas em uma notificação.</string>
+    <string name="settings_security_pin_code_notifications_summary_on">Exibir o nome das salas e o conteúdo das mensagens.</string>
+    <string name="settings_security_pin_code_notifications_title">Exibir o conteúdo das mensagens nas notificações</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_off">O código PIN é a única maneira de desbloquear o Element.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Ativa a biometria específica do dispositivo, como impressões digitais e reconhecimento de rosto.</string>
+    <string name="settings_security_pin_code_use_biometrics_title">Ativar a biometria</string>
+    <string name="settings_security_application_protection_screen_title">Configurar a proteção</string>
+    <string name="settings_security_application_protection_summary">Proteger o acesso usando PIN e biometria.</string>
+    <string name="settings_security_application_protection_title">Acesso restrito</string>
+    <plurals name="secure_backup_reset_devices_you_can_verify">
+        <item quantity="one">Exibir o aparelho com o qual você pode se verificar</item>
+        <item quantity="other">Exibir %d aparelhos com os quais você pode se verificar</item>
+    </plurals>
+    <string name="secure_backup_reset_no_history">Você não terá mais o histórico de mensagens, aparelhos confiáveis e contatos confirmados</string>
+    <string name="secure_backup_reset_if_you_reset_all">Se você redefinir tudo</string>
+    <string name="secure_backup_reset_all_no_other_devices">Apenas faça isso se você não tiver outro aparelho para confirmar este aparelho.</string>
+    <string name="secure_backup_reset_all">Redefinir tudo</string>
+    <string name="bad_passphrase_key_reset_all_action">Esqueceu as senhas ou perdeu todas as opções de recuperação\? Redefina tudo</string>
+    <string name="direct_room_created_summary_item_by_you">Você entrou.</string>
+    <string name="direct_room_encryption_enabled_tile_description">As mensagens nesta sala estão criptografadas de ponta a ponta.</string>
+    <string name="direct_room_profile_section_more_leave">Sair</string>
+    <string name="direct_room_profile_section_more_settings">Configurações</string>
+    <string name="direct_room_profile_encrypted_subtitle">As mensagens nesta conversa estão criptografadas de ponta a ponta.
+\n
+\nSuas mensagens estão protegidas, pois só você e seu contato têm as chaves únicas para desbloqueá-las.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">As mensagens nesta sala não estão criptografadas de ponta a ponta.</string>
+    <string name="login_error_outdated_homeserver_warning_content">Este servidor local está executando uma versão antiga do Element. Peça ao administrador do servidor para atualizá-lo. Você pode prosseguir, mas alguns recursos poderão não funcionar corretamente.</string>
+    <string name="settings_labs_show_complete_history_in_encrypted_room">Exibir histórico completo em salas criptografadas</string>
+    <string name="notification_unread_notified_messages_and_invitation">%1$s e %2$s</string>
+    <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s em %2$s e %3$s</string>
+    <string name="settings_troubleshoot_test_notification_notification_clicked">Você clicou na notificação!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Clique na notificação, por favor. Se você não receber uma notificação, verifique as configurações do seu aparelho.</string>
+    <string name="settings_troubleshoot_test_notification_title">Exibição de notificações</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Você está vendo a notificação! Clique aqui!</string>
+    <string name="settings_troubleshoot_test_push_loop_failed">Houve uma falha ao receber a notificação. Reinstalar o aplicativo pode ser a solução.</string>
+    <string name="settings_troubleshoot_test_push_loop_success">O aplicativo está recebendo a notificação</string>
+    <string name="settings_troubleshoot_test_push_loop_waiting_for_push">O aplicativo está aguardando a notificação</string>
+    <string name="search_is_not_supported_in_e2e_room">Ainda não é possível buscar mensagens em salas criptografadas.</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Você não tem permissão para iniciar uma chamada</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Você não tem permissão para iniciar uma chamada em grupo</string>
+    <string name="reset">Redefinir</string>
+    <string name="direct_room_join_rules_invite">%1$s tornou a sala acessível somente com convite.</string>
+    <string name="direct_room_join_rules_invite_by_you">Você definiu que a sala só receberá integrantes com convite.</string>
+    <string name="direct_room_created_summary_item">%s entrou.</string>
+    <string name="search_banned_user_hint">Buscar usuários banidos</string>
+    <string name="settings_troubleshoot_test_push_loop_title">Testar o recebimento de notificações</string>
+    <plurals name="notification_invitations">
+        <item quantity="one">%d convite</item>
+        <item quantity="other">%d convites</item>
+    </plurals>
+</resources>
\ No newline at end of file

From 003bffe463244bd923eec3460f7bad3947773752 Mon Sep 17 00:00:00 2001
From: Samu Voutilainen <smar@smar.fi>
Date: Fri, 16 Oct 2020 04:41:17 +0000
Subject: [PATCH 267/278] Translated using Weblate (Finnish)

Currently translated at 80.3% (1541 of 1918 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
---
 vector/src/main/res/values-fi/strings.xml | 544 +++-------------------
 1 file changed, 72 insertions(+), 472 deletions(-)

diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 07a5d3f84a..3a2e76e8da 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1,17 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resources_language">fi</string>
     <string name="resources_country_code">FI</string>
-
     <!-- titles -->
     <string name="title_activity_home">Viestit</string>
     <string name="title_activity_room">Huone</string>
     <string name="title_activity_settings">Asetukset</string>
     <string name="title_activity_member_details">Jäsenen tiedot</string>
     <string name="title_activity_historical">Historiallinen</string>
-
     <!-- button names -->
     <string name="ok">OK</string>
     <string name="cancel">Peruuta</string>
@@ -19,7 +17,8 @@
     <string name="leave">Poistu</string>
     <string name="send">Lähetä</string>
     <string name="resend">Lähetä uudelleen</string>
-    <string name="redact">Poista</string> <!-- ??? -->
+    <string name="redact">Poista</string>
+    <!-- ??? -->
     <string name="quote">Lainaa</string>
     <string name="share">Jaa</string>
     <string name="later">Myöhemmin</string>
@@ -27,7 +26,6 @@
     <string name="permalink">Pysyvä linkki</string>
     <string name="view_source">Lähdekoodi</string>
     <string name="view_decrypted_source">Näytä salaamaton lähde</string>
-
     <!-- verb or noun? -->
     <!-- uh oh -->
     <string name="delete">Poista</string>
@@ -47,7 +45,6 @@
     <string name="send_anyway">Lähetä silti</string>
     <string name="or">tai</string>
     <string name="invite">Kutsu</string>
-
     <!-- actions -->
     <string name="action_sign_out">Kirjaudu ulos</string>
     <string name="action_voice_call">Äänipuhelu</string>
@@ -60,27 +57,22 @@
     <string name="action_close">Sulje</string>
     <string name="copied_to_clipboard">Kopioitu leikepöydälle</string>
     <string name="disable">Poista käytöstä</string>
-
     <!-- dialog titles -->
     <string name="dialog_title_confirmation">Vahvistus</string>
     <string name="dialog_title_warning">Varoitus</string>
-
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Koti</string>
     <string name="bottom_action_favourites">Suosikit</string>
     <string name="bottom_action_people">Ihmiset</string>
     <string name="bottom_action_rooms">Huoneet</string>
-
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Suodata huoneista</string>
     <string name="home_filter_placeholder_favorites">Suodata suosikeista</string>
     <string name="home_filter_placeholder_people">Suodata henkilöistä</string>
     <string name="home_filter_placeholder_rooms">Suodata huoneista</string>
-
     <!-- Home fragment -->
     <string name="invitations_header">Kutsut</string>
     <string name="low_priority_header">Matala prioriteetti</string>
-
     <!-- People fragment -->
     <string name="direct_chats_header">Keskustelut</string>
     <string name="local_address_book_header">Paikalliset yhteystiedot</string>
@@ -88,17 +80,15 @@
     <string name="no_conversation_placeholder">Ei keskusteluita</string>
     <string name="no_contact_access_placeholder">Et ole sallinut Elementille pääsyä paikallisiin yhteystietoihisi</string>
     <string name="no_result_placeholder">Ei tuloksia</string>
-
     <!-- Rooms fragment -->
     <string name="rooms_header">Huoneet</string>
     <string name="rooms_directory_header">Huoneluettelo</string>
     <string name="no_room_placeholder">Ei huoneita</string>
     <string name="no_public_room_placeholder">Ei julkisia huoneita saatavilla</string>
     <plurals name="public_room_nb_users">
-        <item quantity="one">1 käyttäjä</item>
+        <item quantity="one">yksi käyttäjä</item>
         <item quantity="other">%d käyttäjää</item>
     </plurals>
-
     <string name="send_bug_report_include_logs">Lähetä lokit</string>
     <string name="send_bug_report_include_crash_logs">Lähetä kaatumislokit</string>
     <string name="send_bug_report_include_screenshot">Lähetä näytönkaappauskuva</string>
@@ -111,31 +101,25 @@
     <string name="send_bug_report_failed">Virheraporttia ei voitu lähettää (%s)</string>
     <string name="send_bug_report_progress">Lähetetään (%s%%)</string>
     <string name="send_bug_report_app_crashed">Sovellus kaatui viime kerralla. Haluatko tehdä kaatumisesta virheilmoituksen\?</string>
-
     <string name="send_files_in">Lähetä</string>
     <string name="read_receipt">Luettu</string>
-
     <string name="join_room">Liity huoneeseen</string>
     <string name="username">Käyttäjätunnus</string>
     <string name="create_account">Luo tili</string>
     <string name="login">Kirjaudu sisään</string>
     <string name="logout">Kirjaudu ulos</string>
     <string name="hs_url">Kotipalvelimen URL-osoite</string>
-    <string name="identity_url">Identiteettipalvelimen URL-osoite</string> <!-- ??? -->
-    <string name="search">Etsi</string>
-
+    <string name="identity_url">Identiteettipalvelimen URL-osoite</string>
+    <!-- ??? -->
+    <string name="search">Etsi</string>
     <!-- ??? -->
-
     <!-- what is the typical chat lingo in Finnish? -->
     <string name="start_new_chat">Aloita uusi keskustelu</string>
     <string name="start_voice_call">Aloita puhelu</string>
     <string name="start_video_call">Aloita videopuhelu</string>
-
     <!-- same as above -->
-
     <string name="option_send_files">Lähetä tiedostoja</string>
     <string name="option_take_photo_video">Ota kuva tai video</string>
-
     <!-- Authentication -->
     <string name="auth_login">Kirjaudu sisään</string>
     <string name="auth_register">Luo tili</string>
@@ -172,15 +156,16 @@
     <string name="auth_recaptcha_message">Varmista ettet ole robotti</string>
     <string name="auth_username_in_use">Käyttäjätunnus on jo käytössä</string>
     <string name="auth_home_server">Kotipalvelin:</string>
-    <string name="auth_identity_server">Identiteettipalvelin:</string> <!-- ??? -->
+    <string name="auth_identity_server">Identiteettipalvelin:</string>
+    <!-- ??? -->
     <string name="auth_reset_password_next_step_button">Olen varmistanut sähköpostiosoitteeni</string>
     <string name="auth_reset_password_message">Palauttaaksesi salasanasi, anna tiliisi liitetty sähköpostiosoite:</string>
     <string name="auth_reset_password_missing_email">Anna tiliisi liitetty sähköpostiosoite.</string>
     <string name="auth_reset_password_missing_password">Anna uusi salasana.</string>
-    <string name="auth_reset_password_email_validation_message">Osoitteeseen %s on lähetetty sähköposti. Kun olet avannut siinä olevan linkin, paina alla olevaa nappia.</string> <!-- ???? -->
+    <string name="auth_reset_password_email_validation_message">Osoitteeseen %s on lähetetty sähköposti. Kun olet avannut siinä olevan linkin, paina alla olevaa nappia.</string>
+    <!-- ???? -->
     <string name="auth_reset_password_error_unauthorized">Sähköpostiosoitteesi vahvistaminen epäonnistui. Varmista, että klikkasit sähköpostissa olevaa linkkiä</string>
     <string name="auth_reset_password_success_message">Salasanasi on vaihdettu.\n\nSinut on kirjauduttu ulos kaikista laitteistasi, etkä enää saa viesti-ilmoituksia. Ottaaksesi käyttöön ilmoitukset uudelleen, kirjaudu sisään uudelleen kaikilla laitteillasi.</string>
-
     <!-- Login Screen -->
     <string name="login_error_must_start_http">URL-osoitteen on alettava seuraavasti: http[s]://</string>
     <string name="login_error_network_error">Kirjautuminen epäonnistui: Verkkovirhe</string>
@@ -190,43 +175,35 @@
     <string name="login_error_unable_register_mail_ownership">Rekisteröityminen epäonnistui: sähköpostin varmistaminen epäonnistui</string>
     <!-- ??? -->
     <string name="login_error_invalid_home_server">Syötäthän toimivan osoitteen</string>
-
     <string name="login_error_forbidden">Väärä käyttäjätunnus tai salasana</string>
     <string name="login_error_unknown_token">Annettua tunnistetta ei hyväksytty</string>
     <string name="login_error_bad_json">Epämuotoinen JSON</string>
     <string name="login_error_not_json">Ei sisällä kelvollista JSON:ia</string>
     <string name="login_error_limit_exceeded">Liian monta pyyntöä</string>
     <string name="login_error_user_in_use">Käyttäjänimi on jo käytössä</string>
-    <string name="login_error_login_email_not_yet">Sähköpostiisi lähetetty linkki, jota ei ole vielä klikattu</string> <!-- ??? -->
-
+    <string name="login_error_login_email_not_yet">Sähköpostiisi lähetetty linkki, jota ei ole vielä klikattu</string>
+    <!-- ??? -->
     <!-- crypto warnings -->
-
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lukukuittaukset</string>
-
     <!-- accounts list Screen -->
-
     <!-- image size selection -->
     <string name="compression_options">Valitse koko</string>
     <string name="compression_opt_list_original">Alkuperäinen</string>
     <string name="compression_opt_list_large">Iso</string>
     <string name="compression_opt_list_medium">Keskikokoinen</string>
     <string name="compression_opt_list_small">Pieni</string>
-
     <!-- media upload / download messages -->
     <string name="attachment_cancel_download">Peru lataus?</string>
     <string name="attachment_cancel_upload">Peru lähetys?</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$d min %2$d s</string>
-
     <!-- room creation dialog Screen -->
     <string name="yesterday">Eilen</string>
     <string name="today">Tänään</string>
-
     <!-- room info dialog Screen -->
     <string name="room_info_room_name">Huoneen nimi</string>
     <string name="room_info_room_topic">Huoneen aihe</string>
-
     <!-- call string -->
     <string name="call_connected">Yhdistetty</string>
     <string name="call_connecting">Yhdistetään…</string>
@@ -236,19 +213,17 @@
     <string name="incoming_video_call">Saapuva videopuhelu</string>
     <string name="incoming_voice_call">Saapuva puhelu</string>
     <string name="call_in_progress">Puhelu käynnissä…</string>
-
-    <string name="call_error_user_not_responding">Toinen puoli ei vastannut.</string> <!-- ??? -->
+    <string name="call_error_user_not_responding">Toinen puoli ei vastannut.</string>
+    <!-- ??? -->
     <string name="call_error_ice_failed">Mediayhteys epäonnistui</string>
     <string name="call_error_camera_init_failed">Kameran alustus epäonnistui</string>
     <string name="call_error_answered_elsewhere">puheluun vastattiin muualta</string>
-
     <!-- ??? this entire section -->
-
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Ota kuva tai video"</string>
     <!-- ??? -->
-    <string name="media_picker_cannot_record_video">Videointi epäonnistui</string> <!-- ??? -->
-
+    <string name="media_picker_cannot_record_video">Videointi epäonnistui</string>
+    <!-- ??? -->
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Huomio</string>
     <string name="permissions_rationale_msg_storage">Element tarvitsee käyttöluvan mediagalleriaasi lähettäkseen liitteitä.\n\nSalli tiedostojen käyttö seuraavalla näytöllä liittääksesi kuvia ja muita tiedostoja viesteihin.</string>
@@ -264,55 +239,47 @@
 \n
 \nSalli mikrofonin ja kameran käyttö seuraavilla näytöillä aloittaaksesi tämän puhelun.</string>
     <string name="permissions_rationale_msg_contacts">Element voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden ja puhelinnumeroiden perusteella. Jos suostut jakamaan yhteystietosi tätä tarkoitusta varten, salli yhteystietojen käyttö seuraavassa ponnahdusikkunassa.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Element voi tarkistaa yhteystietosi löytääkseen muita Matrixin käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella.
-\nAnnatko Elementin käyttää yhteystietojasi tätä varten\?</string>
-
+    <string name="permissions_msg_contacts_warning_other_androids">Element pystyy käyttämään yhteystietojasi, etsiäkseen muita Matrix-käyttäjiä sähköpostiosoitteiden sekä puhelinnumeroiden perusteella. 
+\n
+\nSaako Element käyttää yhteystietojasi tätä varten\?</string>
     <string name="permissions_action_not_performed_missing_permissions">Toimenpide epäonnistui puuttuvien käyttölupien takia</string>
-
     <!-- medias slider string -->
     <string name="media_slider_saved">Tallennettu</string>
     <string name="media_slider_saved_message">Tallenna latauskansioon\?</string>
     <string name="yes">KYLLÄ</string>
     <string name="no">EI</string>
     <string name="_continue">Jatka</string>
-
     <!-- Actions -->
     <string name="remove">Poista</string>
     <string name="join">Liity</string>
     <string name="preview">Esikatsele</string>
     <string name="reject">Hylkää</string>
-
     <!-- Room -->
     <string name="room_jump_to_first_unread">Siirry ensimmäiseen lukemattomaan viestiin.</string>
-
     <!-- Room Preview -->
     <string name="room_preview_invitation_format">%s on kutsunut sinut huoneeseen</string>
     <string name="room_preview_unlinked_email_warning">Tämä kutsu lähetettiin osoitteeseen %s, jota ei ole liitetty tiliisi. 
 \nVoit kirjautua sisään toisella tilillä tai lisätä tämän sähköpostiosoitteen tiliisi.</string>
     <string name="room_preview_try_join_an_unknown_room">Olet avaamassa huonetta %s. Haluatko liittyä huoneeseen osallistuaksesi keskusteluun?</string>
-    <string name="room_preview_try_join_an_unknown_room_default">huone</string> <!-- ??? what is this meant to be, I suspect grammar shenanigans -->
+    <string name="room_preview_try_join_an_unknown_room_default">huone</string>
+    <!-- ??? what is this meant to be, I suspect grammar shenanigans -->
     <string name="room_preview_room_interactions_disabled">Tämä on huoneen esikatselu. Liity huoneeseen osallistuaksesi keskusteluun.</string>
-
     <!-- Chat creation -->
     <string name="room_creation_title">Uusi keskustelu</string>
     <string name="room_creation_add_member">Lisää jäsen</string>
     <string name="room_title_one_member">yksi jäsen</string>
-
     <!--  Chat participants -->
     <string name="room_participants_leave_prompt_title">Poistu huoneesta</string>
     <string name="room_participants_leave_prompt_msg">Haluatko varmasti poistua huoneesta?</string>
     <string name="room_participants_remove_prompt_msg">Haluatko varmasti poistaa käyttäjän %s tästä keskustelusta\?</string>
     <string name="room_participants_create">Luo</string>
-
     <string name="room_participants_online">kirjautuneena sisään</string>
     <string name="room_participants_offline">saavuttamattomissa</string>
     <string name="room_participants_idle">toimettomana</string>
-
     <string name="room_participants_header_admin_tools">YLLÄPITÄJÄN TYÖKALUT</string>
     <string name="room_participants_header_call">PUHELUT</string>
     <string name="room_participants_header_direct_chats">YKSITYISKESKUSTELUT</string>
     <string name="room_participants_header_devices">ISTUNNOT</string>
-
     <string name="room_participants_action_invite">Kutsu</string>
     <string name="room_participants_action_leave">Poistu huoneesta</string>
     <string name="room_participants_action_remove">Poista huoneesta</string>
@@ -327,23 +294,20 @@
     <string name="room_participants_action_mention">Mainitse</string>
     <string name="room_participants_action_devices_list">Näytä istuntolista</string>
     <string name="room_participants_power_level_prompt">Olet ylentämässä käyttäjää samalle tasolle kuin oma käyttäjätasosi. Et voi perua tätä toimintoa.\nOletko varma?</string>
-
     <string name="room_participants_invite_prompt_msg">Haluatko kutsua käyttäjän %s tähän keskusteluun\?</string>
-
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Kutsu tunnisteella</u></string>
     <string name="people_search_local_contacts">PAIKALLISET YHTEYSTIEDOT (%d)</string>
     <string name="people_search_filter_text">Vain Matrix-käyttäjät</string>
-
     <string name="people_search_invite_by_id_dialog_title">Kutsu käyttäjä tunnisteella</string>
     <string name="people_search_invite_by_id_dialog_description">Syötä yksi tai useampi sähköpostiosoite tai Matrix-tunniste</string>
     <string name="people_search_invite_by_id_dialog_hint">Sähköposti tai Matrix-tunniste</string>
-
     <!--  Chat -->
     <string name="room_menu_search">Etsi</string>
     <string name="room_one_user_is_typing">%s kirjoittaa…</string>
     <string name="room_two_users_are_typing">%1$s ja %2$s kirjoittavat…</string>
-    <string name="room_many_users_are_typing">%1$s, %2$s ja muita kirjoittaa…</string> <!-- ??? this ain't right -->
+    <string name="room_many_users_are_typing">%1$s, %2$s ja muita kirjoittaa…</string>
+    <!-- ??? this ain't right -->
     <string name="room_message_placeholder_encrypted">Lähetä salattu viesti…</string>
     <string name="room_message_placeholder_not_encrypted">Lähetä viesti (salaamaton)…</string>
     <string name="room_offline_notification">Yhteys palvelimeen katkesi.</string>
@@ -355,30 +319,28 @@
     <string name="room_delete_unsent_messages">Poista lähettämättömät viestit</string>
     <string name="room_message_file_not_found">Tiedostoa ei löydy</string>
     <string name="room_do_not_have_permission_to_post">Sinulla ei ole oikeutta lähettää viestejä tähän huoneeseen</string>
-
     <!-- unrecognized SSL certificate -->
     <string name="ssl_trust">Luota</string>
     <string name="ssl_do_not_trust">Älä luota</string>
     <string name="ssl_logout_account">Kirjaudu ulos</string>
-    <string name="ssl_remain_offline">Jätä huomiotta</string> <!-- ??? -->
+    <string name="ssl_remain_offline">Jätä huomiotta</string>
+    <!-- ??? -->
     <string name="ssl_fingerprint_hash">Sormenjälki (%s):</string>
-    <string name="ssl_could_not_verify">Palvelimen identiteettiä ei voitu vahvistaa.</string> <!-- ??? -->
+    <string name="ssl_could_not_verify">Palvelimen identiteettiä ei voitu vahvistaa.</string>
+    <!-- ??? -->
     <string name="ssl_cert_not_trust">Tämä voi tarkoittaa että joku yrittää kaapata sinun viestintääsi tai että laitteesi ei luota palvelimen varmenteeseen.</string>
     <string name="ssl_cert_new_account_expl">Jos palvelimen ylläpitäjä on ilmoittanut, että tämä on odotettua, varmista että alla oleva sormenjälki on sama kuin hänen antamansa.</string>
     <string name="ssl_unexpected_existing_expl">Sertifikaatti johon laitteesi luotti aikaisemmin on vaihtunut. Tämä on HYVIN EPÄTAVALLISTA. On suositeltavaa, että ET hyväksy tätä uutta sertifikaattia.</string>
     <string name="ssl_expected_existing_expl">Sertifikaatti on vaihtunut ennestään luotetusta ei-luotettuun. Palvelin on voinut uusia sertifikaattinsa. Kysy palvelimen ylläpitäjältä, mikä sormenjäljen pitäisi olla.</string>
     <string name="ssl_only_accept">Hyväksy sertifikaatti vain, jos palvelimen ylläpitäjä on julkaissut sormenjäljen, joka täsmää yllä olevan kanssa.</string>
-
     <!-- Room Details -->
     <string name="room_details_title">Huoneen tiedot</string>
     <string name="room_details_people">Henkilöt</string>
     <string name="room_details_files">Tiedostot</string>
     <string name="room_details_settings">Asetukset</string>
-
     <string name="malformed_id">Epämuotoinen tunnus. Anna sähköpostiosoite tai Matrix-tunnus (esim. \'@tunnus:verkkotunnus\')</string>
     <string name="room_details_people_invited_group_name">KUTSUTUT</string>
     <string name="room_details_people_present_group_name">JÄSENET</string>
-
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Syy sisällön ilmoittamiseen</string>
     <string name="room_event_action_report_prompt_ignore_user">Haluatko piilottaa kaikki tämän käyttäjän viestit\?
@@ -386,7 +348,6 @@
 \nHuomaa, että tämä toiminto käynnistää sovelluksen uudelleen ja siinä saattaa kestää jonkin aikaa.</string>
     <string name="room_event_action_cancel_upload">Peru lähetys</string>
     <string name="room_event_action_cancel_download">Peru lataus</string>
-
     <!-- Search -->
     <string name="search_hint">Etsi</string>
     <string name="search_members_hint">Etsi huoneen jäsenistä</string>
@@ -395,31 +356,28 @@
     <string name="tab_title_search_messages">VIESTIT</string>
     <string name="tab_title_search_people">HENKILÖT</string>
     <string name="tab_title_search_files">TIEDOSTOT</string>
-
     <!-- Room recents -->
     <string name="room_recents_join">LIITY</string>
     <string name="room_recents_directory">LUETTELO</string>
     <string name="room_recents_favourites">SUOSIKIT</string>
     <string name="room_recents_conversations">HUONEET</string>
-    <string name="room_recents_low_priority">MATALA TÄRKEYS</string> <!-- ??? doesn't sound quite right, but -->
+    <string name="room_recents_low_priority">MATALA TÄRKEYS</string>
+    <!-- ??? doesn't sound quite right, but -->
     <string name="room_recents_invites">KUTSUT</string>
     <string name="room_recents_start_chat">Aloita keskustelu</string>
     <string name="room_recents_create_room">Luo huone</string>
     <string name="room_recents_join_room">Liity huoneeseen</string>
     <string name="room_recents_join_room_title">Liity huoneeseen</string>
     <string name="room_recents_join_room_prompt">Syötä huonetunniste tai -alias</string>
-
     <!-- Directory -->
     <string name="directory_search_results_title">Selaa luetteloa</string>
     <string name="directory_searching_title">Haetaan luettelosta…</string>
-
     <!-- home room settings -->
     <string name="room_settings_favourite">Suosikki</string>
     <string name="room_settings_de_prioritize">Matala tärkeys</string>
     <string name="room_settings_direct_chat">Yksityiskeskustelu</string>
     <string name="room_settings_leave_conversation">Poistu keskustelusta</string>
     <string name="room_settings_forget">Unohda</string>
-
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Viestit</string>
     <string name="room_sliding_menu_settings">Asetukset</string>
@@ -428,9 +386,7 @@
     <string name="room_sliding_menu_third_party_notices">Kolmannen osapuolen tiedot</string>
     <string name="room_sliding_menu_copyright">Tekijänoikeustiedot</string>
     <string name="room_sliding_menu_privacy_policy">Tietosuojakäytäntö</string>
-
     <!-- Vector Settings -->
-
     <string name="settings_profile_picture">Profiilikuva</string>
     <string name="settings_display_name">Nimi</string>
     <string name="settings_email_address">Sähköposti</string>
@@ -439,22 +395,18 @@
     <string name="settings_add_phone_number">Lisää puhelinnumero</string>
     <string name="settings_app_info_link_summary">Näytä sovelluksen tiedot järjestelmän asetuksissa.</string>
     <string name="settings_app_info_link_title">Sovelluksen tiedot</string>
-
     <string name="settings_enable_all_notif">Ota ilmoitukset käyttöön tällä tilillä</string>
     <string name="settings_enable_this_device">Ota ilmoitukset käyttöön tässä istunnossa</string>
     <string name="settings_turn_screen_on">Näyttö päälle kolmeksi sekunniksi</string>
-
     <string name="settings_messages_in_one_to_one">Viestit yksityiskeskusteluissa</string>
     <string name="settings_messages_in_group_chat">Viestit ryhmäkeskusteluissa</string>
     <string name="settings_invited_to_room">Kun minut kutsutaan huoneeseen</string>
     <string name="settings_call_invitations">Saapuvat puhelut</string>
     <string name="settings_messages_sent_by_bot">Bottien lähettämät viestit</string>
-
     <string name="settings_background_sync">Taustasynkronointi</string>
     <string name="settings_enable_background_sync">Käytä taustasynkronointia</string>
     <string name="settings_set_sync_timeout">Synkronointipyynnön aikakatkaisu</string>
     <string name="settings_set_sync_delay">Viive synkronointien välillä</string>
-
     <string name="settings_version">Versio</string>
     <string name="settings_olm_version">olm-versio</string>
     <string name="settings_app_term_conditions">Käyttöehdot</string>
@@ -463,8 +415,6 @@
     <string name="settings_privacy_policy">Tietosuojakäytäntö</string>
     <string name="settings_clear_cache">Tyhjennä välimuisti</string>
     <!--string name="settings_room_privacy_label">Privacy</string-->
-
-
     <string name="settings_user_settings">Käyttäjäasetukset</string>
     <string name="settings_notifications">Ilmoitukset</string>
     <string name="settings_ignored_users">Piilotetut henkilöt</string>
@@ -490,19 +440,16 @@
     <string name="devices_delete_dialog_title">Tunnistautuminen</string>
     <string name="devices_delete_pswd">Salasana:</string>
     <string name="devices_delete_submit_button_label">Lähetä</string>
-
     <string name="settings_logged_in">Kirjautuneena nimellä</string>
     <string name="settings_home_server">Kotipalvelin</string>
-    <string name="settings_identity_server">Identiteettipalvelin</string> <!-- ??? -->
-
+    <string name="settings_identity_server">Identiteettipalvelin</string>
+    <!-- ??? -->
     <string name="account_email_validation_title">Odotetaan vahvistusta</string>
     <string name="account_email_validation_message">Tarkista sähköpostisi ja klikkaa sinne saamaasi linkkiä. Kun olet tehnyt tämän, paina jatka.</string>
     <string name="account_email_validation_error">Sähköpostin vahvistaminen epäonnistui. Tarkista sähköpostisi ja avaa lähettämässämme viestissä oleva linkki. Tämän jälkeen paina painiketta ”jatka”.</string>
-
     <string name="account_email_already_used_error">Tämä sähköpostiosoite on jo käytössä.</string>
     <string name="account_email_not_found_error">Tätä sähköpostiosoitetta ei löytynyt.</string>
     <string name="account_phone_number_already_used_error">Tämä puhelinnumero on jo käytössä.</string>
-
     <string name="settings_change_password">Vaihda salasana</string>
     <string name="settings_old_password">Nykyinen salasana</string>
     <string name="settings_new_password">Uusi salasana</string>
@@ -512,13 +459,10 @@
     <string name="settings_unignore_user">Näytä kaikki viestit käyttäjältä %s\?
 \n
 \nHuomaa, että tämä toiminto käynnistää sovelluksen uudelleen ja siinä saattaa kestää jonkin aikaa.</string>
-
     <string name="settings_delete_notification_targets_confirmation">Haluatko poistaa tämän ilmoituskohteen?</string>
-
-    <string name="settings_delete_threepid_confirmation">Are you sure you want to remove the %1$s %2$s?</string> <!-- ??? what even is this -->
-
+    <string name="settings_delete_threepid_confirmation">Haluatko varmasti poistaa kohteen %1$s %2$s\?</string>
+    <!-- ??? what even is this -->
     <string name="settings_select_country">Valitse maa</string>
-
     <string name="settings_phone_number_country_label">Maa</string>
     <string name="settings_phone_number_country_error">Valitse maa</string>
     <string name="settings_phone_number_label">Puhelinnumero</string>
@@ -528,21 +472,17 @@
     <string name="settings_phone_number_verification_error_empty_code">Anna aktivointikoodi</string>
     <string name="settings_phone_number_verification_error">Puhelinnumeron validointi epäonnistui</string>
     <string name="settings_phone_number_code">Aktivointikoodi</string>
-
     <!-- Room Settings -->
-
     <!-- room global settings-->
     <string name="room_settings_room_photo">Huoneen kuva</string>
     <string name="room_settings_room_name">Huoneen nimi</string>
     <string name="room_settings_topic">Aihe</string>
     <string name="room_settings_room_tag">Huoneen luokittelu</string>
     <string name="room_settings_tag_pref_dialog_title">Luokiteltu:</string>
-
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Suosikki</string>
     <string name="room_settings_tag_pref_entry_low_priority">Matala tärkeys</string>
     <string name="room_settings_tag_pref_entry_none">Ei mikään</string>
-
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Näkyvyys ja pääsy</string>
     <string name="room_settings_directory_visibility">Listaa tämä huone huoneluettelossa</string>
@@ -550,22 +490,18 @@
     <string name="room_settings_room_read_history_rules_pref_title">Huoneen historian luettavuus</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Kuka voi lukea huoneen historiaa\?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Kuka pääsee tähän huoneeseen\?</string>
-
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
     <string name="room_settings_read_history_entry_anyone">Kuka tahansa</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Vain jäsenet (tämän asetuksen valitsemisesta alkaen)</string>
     <string name="room_settings_read_history_entry_members_only_invited">Vain jäsenet (heidän kutsumisestaan alkaen)</string>
     <string name="room_settings_read_history_entry_members_only_joined">Vain jäsenet (heidän liittymisestään alkaen)</string>
-
     <!-- Room settings: "Who can access this room?" (access rule) -->
     <string name="room_settings_room_access_warning">Linkittääksesi huoneeseen, sillä pitää olla osoite.</string>
     <string name="room_settings_room_access_entry_only_invited">Vain kutsutut henkilöt</string>
     <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Kaikki, jotka tietävät huoneen osoitteen (paitsi vieraat)</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Kaikki jotka tietävät huoneen osoitteen, mukaanlukien vieraat</string>
-
     <!-- Room settings: banned users -->
     <string name="room_settings_banned_users_title">Porttikiellon saaneet käyttäjät</string>
-
     <!-- advanced -->
     <string name="room_settings_category_advanced_title">Lisäasetukset</string>
     <string name="room_settings_room_internal_id">Tämän huoneen sisäinen ID</string>
@@ -577,35 +513,29 @@
     <string name="room_settings_labs_end_to_end_warnings">Kirjaudu ulos salauksen aktivoimiseksi.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Lähetä salatut viestit vain vahvistetuille laitteille</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Älä lähetä tältä laitteelta salattuja viestejä tämän huoneen vahvistamattomille laitteille.</string>
-
     <!-- Room settings: advanced addresses -->
     <string name="room_settings_addresses_no_local_addresses">Huoneella ei ole paikallisia osoitteita</string>
     <string name="room_settings_addresses_add_new_address">Uusi osoite (esim. #foo:matrix.org")</string>
-
     <string name="room_settings_addresses_invalid_format_dialog_title">Virheellinen aliaksen muoto</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' ei ole kelvollinen muoto aliakselle</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Tälle huoneelle ei ole määritetty pääosoitetta.</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Pääosoitevaroitus</string>
-
     <string name="room_settings_set_main_address">Aseta pääosoitteeksi</string>
     <string name="room_settings_unset_main_address">Poista pääosoite</string>
     <string name="room_settings_copy_room_id">Kopioi huoneen tunniste</string>
     <string name="room_settings_copy_room_address">Kopioi huoneen osoite</string>
-
     <string name="room_settings_addresses_e2e_enabled">Tämä huone on salattu.</string>
     <string name="room_settings_addresses_e2e_disabled">Tämä huone ei käytä salausta.</string>
     <string name="room_settings_addresses_e2e_encryption_warning">Ota salaus käyttöön 
 \n(varoitus: salausta ei voi poistaa käytöstä!)</string>
-
     <!-- Directory -->
     <string name="directory_title">Luettelo</string>
-
     <!-- matrix error -->
-    <string name="failed_to_load_timeline_position">%s yritti ladata tietyn kohdan huoneen historiassa, mutta sitä ei löytynyt.</string> <!-- ??? -->
-
+    <string name="failed_to_load_timeline_position">%s yritti ladata tietyn kohdan huoneen historiassa, mutta sitä ei löytynyt.</string>
+    <!-- ??? -->
     <!-- encryption dialog -->
-    <string name="encryption_information_title">Päästä päähän -salauksen lisätiedot</string> <!-- ??? all of this encryption stuff here translated to Finnish sounds sort of dubious -->
-
+    <string name="encryption_information_title">Päästä päähän -salauksen lisätiedot</string>
+    <!-- ??? all of this encryption stuff here translated to Finnish sounds sort of dubious -->
     <string name="encryption_information_device_info">Tapahtuman tiedot</string>
     <string name="encryption_information_user_id">Käyttäjän Matrix-ID</string>
     <string name="encryption_information_curve25519_identity_key">Curve25519-ID-avain</string>
@@ -613,15 +543,13 @@
     <string name="encryption_information_algorithm">Algoritmi</string>
     <string name="encryption_information_session_id">Sessio-ID</string>
     <string name="encryption_information_decryption_error">Salauksenpurkuvirhe</string>
-
     <string name="encryption_information_sender_device_information">Lähettäjän istunnon tiedot</string>
     <string name="encryption_information_device_name">Julkinen nimi</string>
     <string name="encryption_information_name">Julkinen nimi</string>
-    <string name="encryption_information_device_id">Tunnus</string>
+    <string name="encryption_information_device_id">Istunnon tunnus</string>
     <string name="encryption_information_device_key">Istunnon avain</string>
     <string name="encryption_information_verification">Vahvistus</string>
     <string name="encryption_information_ed25519_fingerprint">Ed25519-sormenjälki</string>
-
     <string name="encryption_export_e2e_room_keys">Vie salatun huoneen avaimet</string>
     <string name="encryption_export_room_keys">Vie huoneen avaimet</string>
     <string name="encryption_export_room_keys_summary">Vie avaimet paikalliseen tiedostoon</string>
@@ -631,36 +559,29 @@
     <string name="encryption_export_saved_as">Huoneen osapuolten välisen salauksen avaimet tallennettiin tiedostoon \'%s\'
 \n
 \nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Element poistetaan.</string>
-
     <string name="encryption_import_e2e_room_keys">Tuo päästä päähän -salatun huoneen avaimet</string>
     <string name="encryption_import_room_keys">Tuo huoneen avaimet</string>
     <string name="encryption_import_room_keys_summary">Tuo avaimet paikallisesta tiedostosta</string>
     <string name="encryption_import_import">Tuo</string>
     <string name="encryption_never_send_to_unverified_devices_title">Lähetä salatut viestit vain vahvistetuille laitteille</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Älä lähetä salattuja viestejä vahvistamattomille laitteille tästä laitteesta.</string>
-
     <string name="encryption_information_not_verified">Vahvistamaton</string>
     <string name="encryption_information_verified">Vahvistettu</string>
     <string name="encryption_information_blocked">Kielletty</string>
-
     <string name="encryption_information_unknown_device">tuntematon istunto</string>
     <string name="encryption_information_none">ei mitään</string>
-
     <string name="encryption_information_verify">Vahvista</string>
     <string name="encryption_information_unverify">Poista vahvistus</string>
     <string name="encryption_information_block">Kiellä</string>
     <string name="encryption_information_unblock">Poista kielto</string>
-
     <string name="encryption_information_verify_device">Vahvista laite</string>
-    <string name="encryption_information_verify_device_warning">Vahvistaaksesi, että tähän laitteeseen voi luottaa, ota yhteyttä sen omistajaan jollain muulla tavalla (esimerkiksi soittamalla tai tapaamalla) ja varmista että hänen laitteensa avain on sama kuin alla oleva:</string> <!-- ??? -->
-    <string name="encryption_information_verify_device_warning2">Jos avain täsmää, paina painiketta \"vahvista\". Jos avain ei täsmää, se tarkoittaa, että jokin tuntematon osapuoli lukee keskustelujanne. Tässä tapauksessa paina painiketta \"kiellä\". 
-\nTulevaisuudessa tämä varmennusprosessi tulee olemaan hienostuneempi.</string>
+    <string name="encryption_information_verify_device_warning">Vahvistaaksesi, että tähän laitteeseen voi luottaa, ota yhteyttä sen omistajaan jollain muulla tavalla (esimerkiksi soittamalla tai tapaamalla) ja varmista että hänen laitteensa avain on sama kuin alla oleva:</string>
+    <!-- ??? -->
+    <string name="encryption_information_verify_device_warning2">Jos avaimet eivät täsmää, keskustelusi eivät luultavasti ole turvassa.</string>
     <string name="encryption_information_verify_key_match">Vahvistan, että avaimet täsmäävät</string>
-
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Huoneessa on tuntemattomia istuntoja</string>
     <string name="unknown_devices_alert_message">Huoneessa on tuntemattomia laitteita joita ei ole vahvistettu.\nLaitteet eivät välttämättä kuulu väitetyille omistajilleen.\nJokainen uusi laite kannattaa vahvistaa ennen kuin jatkat, mutta voit myös lähettää viestit vahvistamattomille laitteille.\n\nTuntemattomat laitteet:</string>
-
     <!-- directory activity  -->
     <string name="select_room_directory">Valitse huoneluettelo</string>
     <string name="directory_server_fail_to_retrieve_server">Palvelin saattaa olla tavoittamattomissa tai ylikuormitettu</string>
@@ -668,7 +589,6 @@
     <string name="directory_server_placeholder">Kotipalvelimen URL-osoite</string>
     <string name="directory_server_all_rooms_on_server">Kaikki huoneet palvelimella %s</string>
     <string name="directory_server_native_rooms">Kaikki alkuperäiset %s huoneet</string>
-
     <!-- historical -->
     <string name="historical_placeholder">Etsi historiasta</string>
     <string name="user_directory_header">Käyttäjäluettelo</string>
@@ -676,21 +596,16 @@
     <string name="settings_start_on_boot">Käynnistä automaattisesti</string>
     <string name="settings_clear_media_cache">Tyhjennä mediavälimuisti</string>
     <string name="settings_keep_media">Säilytä media</string>
-
     <string name="settings_always_show_timestamps">Näytä aikaleimat kaikille viesteille</string>
     <string name="settings_data_save_mode">Datansäästötila</string>
-
     <string name="settings_user_interface">Käyttöliittymä</string>
     <string name="settings_interface_language">Kieli</string>
     <string name="settings_select_language">Valitse kieli</string>
-
     <string name="media_saving_period_3_days">3 päivää</string>
     <string name="media_saving_period_1_week">1 viikko</string>
     <string name="media_saving_period_1_month">1 kuukausi</string>
     <string name="media_saving_period_forever">Ikuisesti</string>
-
     <string name="settings_theme">Teema</string>
-
     <string name="font_size">Kirjaisinkoko</string>
     <string name="tiny">Erittäin pieni</string>
     <string name="small">Pieni</string>
@@ -700,36 +615,28 @@
     <string name="largest">Isoin</string>
     <string name="huge">Valtava</string>
     <string name="offline">Offline</string>
-
     <string name="light_theme">Vaalea teema</string>
     <string name="dark_theme">Tumma teema</string>
     <string name="black_them">Musta teema</string>
-
     <string name="notification_sync_in_progress">Synkronoidaan…</string>
     <string name="notification_listening_for_events">Kuunnellaan tapahtumia</string>
     <string name="notification_noisy_notifications">Korostetut ilmoitukset</string>
     <string name="notification_silent_notifications">Hiljaiset ilmoitukset</string>
-
     <string name="title_activity_bug_report">Virheraportti</string>
-
     <string name="option_take_photo">Ota kuva</string>
     <string name="option_take_video">Kaappaa video</string>
-
     <string name="call">Puhelu</string>
     <string name="settings_notification_ringtone">Ilmoitusääni</string>
     <string name="settings_containing_my_display_name">Viesti sisältää näyttönimeni</string>
     <string name="settings_containing_my_user_name">Viesti sisältää käyttäjänimeni</string>
     <string name="settings_12_24_timestamps">Näytä aikaleimat 12 tunnin muodossa</string>
-
     <string name="settings_analytics">Analytiikka</string>
-
     <string name="widget_no_power_to_manage">Tarvitse oikeudet pienoissovellusten hallintaan tässä huoneessa</string>
     <string name="widget_creation_failure">Pienoissovelluksen luonti epäonnistui</string>
     <string name="settings_labs_create_conference_with_jitsi">Luo konferenssipuheluita jitsin avulla</string>
     <string name="widget_delete_message_confirmation">Haluatko varmasti poistaa pienoissovelluksen tästä huoneesta\?</string>
-
     <!-- Widget Integration Manager -->
-    <string name="widget_integration_unable_to_create">Pienoissovellusta ei voitu luoda.</string>
+    <string name="widget_integration_unable_to_create">Sovelmaa ei voitu luoda.</string>
     <string name="widget_integration_failed_to_send_request">Pyynnön lähetys epäonnistui.</string>
     <string name="widget_integration_positive_power_level">Oikeustason täytyy olla positiivinen luku.</string>
     <string name="widget_integration_must_be_in_room">Et ole tässä huoneessa.</string>
@@ -739,87 +646,64 @@
     <string name="widget_integration_room_not_visible">Huone %s ei ole näkyvillä.</string>
     <string name="room_add_matrix_apps">Lisää Matrix-sovelluksia</string>
     <string name="settings_labs_native_camera">Käytä järjestelmän kamerasovellusta</string>
-
     <!-- share keys -->
     <string name="you_added_a_new_device">Lisäsit uuden istunnon \'%s\', joka pyytää salausavaimia.</string>
     <string name="your_unverified_device_requesting">Vahvistamaton laitteesi \'%s\' pyytää salausavaimia.</string>
     <string name="start_verification">Aloita varmennus</string>
     <string name="share_without_verifying">Jaa ilman varmennusta</string>
     <string name="ignore_request">Hylkää pyyntö</string>
-
     <!-- conference call -->
     <string name="conference_call_warning_title">Varoitus!</string>
     <string name="conference_call_warning_message">Konferenssipuhelut ovat kehitysvaiheessa eivätkä välttämättä luotettavia.</string>
-
     <!-- slash commands -->
     <string name="command_error">Komentovirhe</string>
     <string name="unrecognized_command">Tuntematon komento: %s</string>
-
     <!-- notification statuses -->
     <string name="notification_off">Off</string>
     <string name="notification_noisy">Äänekäs</string>
-
     <string name="encrypted_message">Salattu viesti</string>
-
     <string name="title_activity_group_details">Yhteisön tiedot</string>
-
     <string name="loading">Ladataan…</string>
-
     <string name="action_exit">Poistu</string>
     <string name="bottom_action_groups">Yhteisöt</string>
-
     <string name="home_filter_placeholder_groups">Suodata yhteisöistä</string>
-
     <string name="groups_invite_header">Kutsu</string>
     <string name="groups_header">Yhteisöt</string>
     <string name="no_group_placeholder">Ei ryhmiä</string>
-
     <string name="start_new_chat_prompt_msg">Haluatko varmasti aloittaa uuden keskustelun käyttäjän %s kanssa\?</string>
     <string name="start_voice_call_prompt_msg">Haluatko varmasti aloittaa äänipuhelun\?</string>
     <string name="start_video_call_prompt_msg">Haluatko varmasti aloittaa videopuhelun\?</string>
-
     <string name="groups_list">Ryhmälistaus</string>
-
-    <string name="room_participants_ban_prompt_msg">Haluatko varmasti antaa tälle käyttäjälle porttikiellon tähän keskusteluun\?</string>
-
+    <string name="room_participants_ban_prompt_msg">Käyttäjän estäminen poistaa hänet tästä huoneesta ja estää häntä liittymästä huoneeseen uudelleen.</string>
     <string name="room_settings_all_messages_noisy">Kaikki viestit (äänekäs)</string>
     <string name="room_settings_all_messages">Kaikki viestit</string>
     <string name="room_settings_mention_only">Vain maininnat</string>
     <string name="room_settings_mute">Vaimenna</string>
-    <string name="room_settings_add_homescreen_shortcut">Lisää pikakuvake aloitusruudulle</string>
-
+    <string name="room_settings_add_homescreen_shortcut">Lisää aloitusruudulle</string>
     <string name="settings_inline_url_preview">Osoitteen esikatselu</string>
     <string name="settings_vibrate_on_mention">Värise, kun käyttäjä mainitaan</string>
-
     <string name="settings_flair">Tyyli</string>
-
     <string name="room_settings_room_notifications_title">Ilmoitukset</string>
     <string name="room_settings_add_new_group">Uusi yhteisötunnus (esim. +foo:matrix.org)</string>
     <string name="room_settings_invalid_group_format_dialog_title">Virheellinen yhteisötunnus</string>
     <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ei ole sallittu yhteisötunnus</string>
-
-
     <string name="create">Luo</string>
     <string name="create_community">Luo yhteisö</string>
     <string name="community_name">Yhteisön nimi</string>
     <string name="community_name_hint">Esimerkki</string>
     <string name="community_id">Yhteisön ID</string>
     <string name="community_id_hint">esimerkki</string>
-
     <!-- group details -->
     <string name="group_details_home">Koti</string>
     <string name="group_details_people">Ihmiset</string>
     <string name="group_details_rooms">Huoneet</string>
     <string name="no_users_placeholder">Ei käyttäjiä</string>
-
     <string name="rooms">Huoneet</string>
     <string name="joined">Jäsenet</string>
     <string name="invited">Kutsuttu</string>
     <string name="filter_group_members">Rajaa jäsenlistaa</string>
     <string name="filter_group_rooms">Rajaa huonelistaa</string>
-
     <string name="group_no_long_description">Yhteisön pääkäyttäjä ei ole antanut pitkää kuvausta yhteisölle.</string>
-
     <string name="has_been_kicked">Sinut poistettiin %1$s käyttäjän %2$s toimesta</string>
     <string name="has_been_banned">Sinut estettiin %1$s käyttäjän %2$s toimesta</string>
     <string name="reason_colon">Syy: %1$s</string>
@@ -829,53 +713,41 @@
     <string name="settings_send_markdown">Markdown-muotoilu</string>
     <string name="markdown_has_been_enabled">Markdown on käytössä.</string>
     <string name="markdown_has_been_disabled">Markdown on pois käytöstä.</string>
-
     <string name="settings_call_category">Puhelut</string>
     <string name="settings_call_ringtone_dialog_title">Valitse soittoääni puheluille:</string>
-
     <string name="room_sliding_menu_version_x">Versio %s</string>
     <string name="settings_password">Salasana</string>
     <string name="deactivate_account_prompt_password">Kirjoita salasanasi jatkaaksesi:</string>
     <string name="error_empty_field_your_password">Kirjoita salasanasi.</string>
     <string name="status_theme">Status.im-teema</string>
-
     <string name="settings_send_typing_notifs">Lähetä kirjoitusilmoitukset</string>
     <string name="settings_show_read_receipts">Näytä lukukuittaukset</string>
     <string name="settings_show_join_leave_messages">Näytä liittymiset ja poistumiset</string>
     <string name="settings_show_avatar_display_name_changes_messages">Näytä tilin tapahtumat</string>
     <string name="settings_preview_media_before_sending">Esikatsele media ennen lähettämistä</string>
-
     <string name="settings_labs_enable_send_voice">Lähetä ääniviestejä</string>
     <string name="settings_opt_in_of_analytics">Lähetä analytiikkatietoja</string>
     <string name="send_bug_report_rage_shake">Ravista raivokkaasti ilmoittaaksesi ongelmasta</string>
-
     <string name="settings_deactivate_account_section">Deaktivoi tili</string>
     <string name="settings_deactivate_my_account">Deaktivoi tilini</string>
-
     <string name="deactivate_account_title">Deaktivoi tili</string>
     <string name="deactivate_account_submit">Deaktivoi tili</string>
-
     <string name="title_activity_choose_sticker">Lähetä tarra</string>
     <string name="are_you_sure">Oletko varma?</string>
     <string name="dialog_title_third_party_licences">Kolmannen osapuolen lisenssit</string>
-
     <string name="download">Lataa</string>
     <string name="accept">Hyväksy</string>
     <string name="skip">Ohita</string>
     <string name="action_sign_out_confirmation_simple">Oletko varma, että haluat kirjautua ulos?</string>
     <string name="dialog_title_error">Virhe</string>
-
     <string name="send_bug_report_description_in_english">Jos mahdollista, kirjoita kuvaus englanniksi.</string>
     <string name="option_send_sticker">Lähetä tarra</string>
     <string name="no_sticker_application_dialog_content">Sinulla ei ole yhtään tarrapakettia käytössä.
-
-Haluatko lisätä paketteja?</string>
-
+\n
+\nHaluatko lisätä paketteja\?</string>
     <string name="auth_accept_policies">Lue ja hyväksy tämän kotipalvelimen käytännöt:</string>
-
     <string name="title_activity_keys_backup_setup">Avainten varmuuskopiointi</string>
     <string name="title_activity_keys_backup_restore">Käytä avainten varmuuskopiointia</string>
-
     <string name="keys_backup_is_not_finished_please_wait">Avainten varmuuskopio ei ole valmis, odotathan hetken…</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Menetät salatut viestisi, jos kirjaudut ulos nyt</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">Avainten varmuuskopio on meneillään. Jos kirjaudut ulos, menetät pääsyn salattuihin viesteihisi.</string>
@@ -885,7 +757,6 @@ Haluatko lisätä paketteja?</string>
     <string name="keys_backup_activate">Käytä avainten varmuuskopiointia</string>
     <string name="backup">Varmuuskopioi</string>
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Menetät pääsyn salattuihin viesteihisi, ellet varmuuskopioi avaimiasi ennen uloskirjautumista.</string>
-
     <string name="stay">Pysy</string>
     <string name="speak">Puhu</string>
     <string name="clear">Tyhjennä</string>
@@ -893,31 +764,22 @@ Haluatko lisätä paketteja?</string>
     <string name="call_anyway">Soita silti</string>
     <string name="done">Valmis</string>
     <string name="abort">Keskeytä</string>
-
     <string name="actions">Toiminnot</string>
     <string name="system_alerts_header">Järjestelmähälytykset</string>
-
     <string name="option_send_voice">Lähetä ääntä</string>
-
     <string name="go_on_with">jatka sovelluksella…</string>
     <string name="error_no_external_application_found">Yhtään ulkopuolista sovellusta tämän toiminnon suorittamiseksi ei löytynyt.</string>
-
     <string name="e2e_re_request_encryption_key"><u>Pyydä salausavaimia uudelleen</u> muista istunnoistasi.</string>
-
     <string name="e2e_re_request_encryption_key_sent">Avainpyyntö lähetetty.</string>
-
     <string name="e2e_re_request_encryption_key_dialog_title">Pyyntö lähetetty</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Käynnistä Element toisella laitteella, joka voi purkaa viestin, jotta se voi lähettää avaimet tähän istuntoon.</string>
-
     <plurals name="membership_changes">
         <item quantity="one">yksi jäsenyysmuutos</item>
         <item quantity="other">%d jäsenyysmuutosta</item>
     </plurals>
-
     <string name="settings_call_ringtone_use_app_ringtone">Käytä Elementin oletussoittoääntä saapuville puheluille</string>
     <string name="settings_call_ringtone_title">Saapuvien puheluiden soittoääni</string>
     <string name="video_call_in_progress">Videopuhelu menossa…</string>
-
     <string name="list_members">Käyttäjälista</string>
     <string name="open_chat_header">Avaa otsikko</string>
     <string name="room_sync_in_progress">Synkronoidaan…</string>
@@ -945,24 +807,19 @@ Haluatko lisätä paketteja?</string>
         <item quantity="one">1 pv</item>
         <item quantity="other">%d pv</item>
     </plurals>
-
     <string name="room_participants_now">Nyt %1$s</string>
     <string name="room_participants_ago">Oli %1$s %2$s sitten</string>
-
     <string name="room_participants_action_kick">Poista huoneesta</string>
     <string name="reason_hint">Syy</string>
-
     <string name="room_participants_invite_join_names">"%1$s, "</string>
     <string name="room_participants_invite_join_names_and">%1$s ja %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
-
     <string name="room_message_placeholder_reply_to_encrypted">Lähetä salattu vastaus…</string>
     <string name="room_message_placeholder_reply_to_not_encrypted">Lähetä vastaus (salaamaton)…</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">yksi uusi viesti</item>
         <item quantity="other">%d uutta viestiä</item>
     </plurals>
-
     <plurals name="room_details_selected">
         <item quantity="one">yksi valittu</item>
         <item quantity="other">%d valittu</item>
@@ -977,7 +834,6 @@ Haluatko lisätä paketteja?</string>
     </plurals>
     <string name="settings_notification_advanced">Yksityiskohtaiset ilmoitusasetukset</string>
     <string name="settings_notification_by_event">Ilmoituksen tärkeys kohteittain</string>
-
     <string name="settings_notification_privacy">Ilmoitusten yksityisyys</string>
     <string name="settings_notification_troubleshoot">Ratkaise ilmoituksien ongelmia</string>
     <string name="settings_troubleshoot_diagnostic">Vianmääritys</string>
@@ -986,70 +842,59 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Vianmäärityksessä ei löytynyt ongelmia. Jos et edelleenkään saa ilmoituksia, lähetä virheraportti, jotta meidän on helpompi tutkia ongelmaa.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Yksi tai useampi testi epäonnistui, kokeile ehdotettuja korjauksia.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Yksi tai useampi testi epäonnistui. Lähetäthän virheraportin, jotta meidän on helpompi tutkia ongelmaa.</string>
-
-    <string name="settings_troubleshoot_test_system_settings_title">Järjestelmäasetukset</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Järjestelmäasetukset.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Ilmoitukset ovat käytössä järjestelmäasetuksissa.</string>
     <string name="settings_troubleshoot_test_system_settings_failed">Ilmoitukset ovat pois käytöstä järjestelmäasetuksissa.
 \nTarkistathan järjestelmäasetukset.</string>
     <string name="open_settings">Avaa asetukset</string>
-
     <string name="settings_troubleshoot_test_account_settings_title">Tilin asetukset.</string>
     <string name="settings_troubleshoot_test_account_settings_success">Ilmoitukset ovat käytössä tililläsi.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Ilmoitukset eivät ole käytössä tililläsi. 
 \nTarkista tilisi asetukset.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Ota käyttöön</string>
-
     <string name="settings_troubleshoot_test_device_settings_title">Istunnon asetukset.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Ilmoitukset ovat käytössä tässä istunnossa.</string>
     <string name="settings_troubleshoot_test_device_settings_failed">Ilmoitukset eivät ole käytössä tässä istunnossa.
 \nTarkista Elementin asetukset.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Ota käyttöön</string>
-
     <string name="settings_troubleshoot_test_bing_settings_title">Mukautetut asetukset.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Huomaathan, että osa viestityypeistä on asetettu olemaan hiljaisia (tuottavat ilmoituksen ilman ääntä).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Osa ilmoituksista on otettu pois käytöstä mukautetuissa asetuksissasi.</string>
     <string name="settings_troubleshoot_test_bing_settings_failed_to_load_rules">Mukautettujen sääntöjen lataaminen epäonnistui. Yritä uudelleen.</string>
     <string name="settings_troubleshoot_test_bing_settings_quickfix">Tarkista asetukset</string>
-
     <string name="settings_troubleshoot_test_play_services_title">Play Services -palvelun tarkistus</string>
     <string name="settings_troubleshoot_test_play_services_success">Google Play Services APK on saatavilla ja ajan tasalla.</string>
     <string name="settings_troubleshoot_test_play_services_failed">Element käyttää Google Play Services -palvelua ilmoitusten välittämiseen, mutta se ei näytä olevan määritetty oikein:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">Korjaa Play Services -palvelu</string>
-
     <string name="settings_troubleshoot_test_fcm_title">Firebase-tunniste</string>
     <string name="settings_troubleshoot_test_fcm_success">FCM-tunniste haettu onnistuneesti: 
 \n%1$s</string>
     <string name="settings_troubleshoot_test_fcm_failed">FCM-tunnisteen haku epäonnistui: 
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
-\nTämä virhe ei ole Elementin hallinnassa ja Googlen mukaan tämä virhe tarkoittaa, että tällä laitteella on liikaa FCM:ään liittyneitä sovelluksia. Tämä virhe ilmenee vain tapauksissa, jossa on on erittäin paljon sovelluksia asennettuna, joten sen ei pitäisi vaikuttaa normaaliin käyttäjään.</string>
+    <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s] 
+\nElement ei voi vaikuttaa tähän virheeseen, ja Googlen mukaan tämä virhe tarkoittaa, että tällä laitteella on liikaa FCM:ään rekisteröityjä sovelluksia. Tämä virhe ilmenee vain tapauksissa, joissa on erittäin paljon FCM:ään rekisteröityjä sovelluksia asennettuna, joten tätä ei pitäisi tapahtua normaalisti.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
 \nTämä virhe ei ole Elementin ratkaistavissa. Se voi johtua useasta eri syystä. Ehkä tämä toimii, jos yrität myöhemmin. Voit myös tarkistaa, että Google Play Services -palvelu ei ole rajoitettuna järjestelmäasetuksissa, ja että laitteesi kello on oikein. Tämä voi tapahtua myös mukautetun käyttöjärjestelmän kanssa.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s] 
 \nTämä virhe ei ole Elementin ratkaistavissa. Tässä puhelimessa ei ole Google-tiliä. Lisää laitteeseesi Google-tili tätä toimintoa varten.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Lisää tili</string>
-
     <string name="settings_troubleshoot_test_token_registration_title">Tunnisteen rekisteröinti</string>
     <string name="settings_troubleshoot_test_token_registration_success">FCM-tunniste rekisteröity onnistuneesti kotipalvelimelle.</string>
     <string name="settings_troubleshoot_test_token_registration_failed">FCM-tunnisteen rekisteröinti kotipalvelimelle epäonnistui: 
 \n%1$s</string>
-
     <string name="settings_troubleshoot_test_foreground_service_started_title">Ilmoituspalvelu</string>
     <string name="settings_troubleshoot_test_foreground_service_startedt_success">Ilmoituspalvelu on käynnissä.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_failed">Ilmoituspalvelu ei ole käynnissä.
 \nKokeile Elementin uudelleenkäynnistystä.</string>
     <string name="settings_troubleshoot_test_foreground_service_started_quickfix">Käynnistä palvelu</string>
-
     <string name="settings_troubleshoot_test_service_restart_title">Ilmoituspalvelun automaattinen uudelleenkäynnistys</string>
     <string name="settings_troubleshoot_test_service_restart_success">Palvelu suljettiin ja se käynnistyi uudelleen automaattisesti.</string>
     <string name="settings_troubleshoot_test_service_restart_failed">Palvelun uudelleenkäynnistäminen epäonnistui</string>
-
     <string name="settings_troubleshoot_test_service_boot_title">Käynnistä laitteen käynnistyessä</string>
     <string name="settings_troubleshoot_test_service_boot_success">Palvelu käynnistetään, kun laite käynnistetään uudelleen.</string>
     <string name="settings_troubleshoot_test_service_boot_failed">Palvelua ei käynnistetä laitteen uudelleenkäynnistyksen yhteydessä. Et tule saamaan ilmoituksia ennen kuin Element on käynnistetty uudelleen.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Ota käyttöön automaattinen käynnistys</string>
-
     <string name="settings_troubleshoot_test_bg_restricted_title">Tarkista taustapalveluiden rajoitukset</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Taustapalveluiden rajoitukset ovat pois käytöstä. Tämä testi tulee ajaa mobiilidatayhteydellä (ilman wlania). 
 \n%1$s</string>
@@ -1057,12 +902,10 @@ Haluatko lisätä paketteja?</string>
 \nTyötä, jota Element yrittää tehdä, rajoitetaan aggressiivisesti, kun se on taustalla, mikä saattaa vaikuttaa ilmoituksiin.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Poista rajoitukset</string>
-
     <string name="settings_troubleshoot_test_battery_title">Akunkäytön optimointi</string>
     <string name="settings_troubleshoot_test_battery_success">Akunkäytön optimointi ei vaikuta Elementin toimintaan.</string>
     <string name="settings_troubleshoot_test_battery_failed">Jos käyttäjä jättää laitteen paikalleen ilman latausjohtoa niin, että näyttö on pois päältä, laite siirtyy torkkutilaan. Tämä estää sovelluksia käyttämästä verkkoyhteyksiä ja lykkää niiden töitä, synkronointeja ja perushälytyksiä.</string>
     <string name="settings_troubleshoot_test_battery_quickfix">Jätä optimointi huomiotta</string>
-
     <string name="settings_notification_privacy_normal">Normaali</string>
     <string name="settings_notification_privacy_reduced">Heikentynyt yksityisyys</string>
     <string name="settings_notification_privacy_need_permission">Tämä sovellus tarvitsee oikeuden ajaakseen taustapalveluaan</string>
@@ -1071,13 +914,10 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_notification_privacy_secure_message_content">• ilmoituksessa olevan viestin sisältö <b>haetaan turvallisesti suoraan Matrix-kotipalvelimelta</b></string>
     <string name="settings_notification_privacy_nosecure_message_content">• ilmoitus sisältää <b>metadataa ja itse viestin</b></string>
     <string name="settings_notification_privacy_message_content_not_shown">• ilmoitus <b>ei näytä viestin sisältöä</b></string>
-
     <string name="settings_noisy_notifications_preferences">Mukauta äänekkäitä ilmoituksia</string>
     <string name="settings_call_notifications_preferences">Mukauta soittoilmoituksia</string>
     <string name="settings_silent_notifications_preferences">Mukauta hiljaisia ilmoituksia</string>
     <string name="settings_system_preferences_summary">Valitse Ledin väri, värinä ja ääni…</string>
-
-
     <string name="settings_cryptography_manage_keys">Salausavainten hallinta</string>
     <string name="settings_inline_url_preview_summary">Esikatsele linkkejä keskustelussa (vaatii tuen kotipalvelimelta).</string>
     <string name="settings_send_typing_notifs_summary">Ilmoita muille, että olet kirjoittamassa viestiä.</string>
@@ -1089,31 +929,22 @@ Haluatko lisätä paketteja?</string>
     <string name="startup_notification_privacy_message">Element voi ajaa itseään taustalla hallitakseen sinulle näytettäviä ilmoituksia turvallisesti ja yksityisesti. Tämä voi vaikuttaa akunkäyttöön.</string>
     <string name="startup_notification_privacy_button_grant">Anna oikeus</string>
     <string name="startup_notification_privacy_button_other">Valitse toinen vaihtoehto</string>
-
     <string name="startup_notification_fdroid_battery_optim_title">Taustayhteys</string>
     <string name="startup_notification_fdroid_battery_optim_message">Elementin tarvitsee käyttää taustayhteyttä, jotta se voi näyttää luotettavia ilmoituksia.
 \nSeuraavalla ruudulla sinulta kysytään lupaa, jotta Element voi pitää itsensä käynnissä taustalla.</string>
     <string name="startup_notification_fdroid_battery_optim_button_grant">Anna oikeus</string>
-
     <string name="settings_opt_in_of_analytics_summary">Element kerää anonyymiä analytiikkaa sovelluksen parantamiseksi.</string>
     <string name="settings_opt_in_of_analytics_prompt">Otathan analytiikan käyttöön Elementin parantamiseksi.</string>
     <string name="settings_opt_in_of_analytics_ok">Kyllä, haluan auttaa!</string>
-
     <string name="settings_data_save_mode_summary">Datansäästötila ottaa käyttöön erityisen suodattimen, joka poistaa paikallaoloilmoitukset ja kirjoittamisen ilmoitukset.</string>
-
     <string name="account_email_error">Sähköpostiasi varmennettaessa tapahtui virhe.</string>
-
     <string name="account_phone_number_error">Puhelinnumeroasi varmennettaessa tapahtui virhe.</string>
     <string name="account_additional_info">Lisätietoa: %s</string>
-
     <string name="settings_without_flair">Et ole yhdenkään yhteisön jäsen.</string>
-
     <string name="encryption_export_notice">Luo salalause salataksesi viedyt avaimet. Tarvitset saman salalauseen avainten tuomiseen.</string>
     <string name="encryption_message_recovery">Salattujen viestien palautus</string>
     <string name="encryption_settings_manage_message_recovery_summary">Hallitse avainten varmuuskopiointia</string>
-
     <string name="lock_screen_hint">Kirjoita tähän…</string>
-
     <plurals name="notification_unread_notified_messages">
         <item quantity="one">yksi lukematon ilmoitettu viesti</item>
         <item quantity="other">%d lukematonta ilmoitettua viestiä</item>
@@ -1130,13 +961,11 @@ Haluatko lisätä paketteja?</string>
         <item quantity="one">yksi aktiivinen sovelma</item>
         <item quantity="other">%d aktiivista sovelmaa</item>
     </plurals>
-
     <string name="widget_integration_missing_parameter">Vaadittu parametri puuttuu.</string>
     <string name="widget_integration_invalid_parameter">Parametri ei ole kelvollinen.</string>
     <string name="settings_labs_native_camera_summary">Käynnistä järjestelmän kamera Elementin kameraruudun sijaan.</string>
     <string name="settings_labs_keyboard_options_to_send_message">Käytä näppäimistön rivinvaihtopainiketta viestin lähettämiseen</string>
     <string name="settings_labs_enable_send_voice_summary">Tämä valinta vaatii kolmannen osapuolen sovelluksen viestien tallennukseen.</string>
-
     <string name="command_problem_with_parameters">Komento ”%s” vaatii enemmän parametreja, tai jotkin parametrit ovat virheellisiä.</string>
     <string name="command_description_emote">Näyttää toiminnon</string>
     <string name="command_description_ban_user">Estää käyttäjän annetulla id:llä</string>
@@ -1151,13 +980,11 @@ Haluatko lisätä paketteja?</string>
     <string name="command_description_nick">Vaihtaa näytettävän nimimerkkisi</string>
     <string name="command_description_markdown">Markdown päällä/pois</string>
     <string name="command_description_clear_scalar_token">Matrix-sovellusten hallinnan korjaamiseen</string>
-
     <string name="notification_silent">Hiljainen</string>
     <plurals name="group_members">
         <item quantity="one">yksi jäsen</item>
         <item quantity="other">%d jäsentä</item>
     </plurals>
-
     <plurals name="group_rooms">
         <item quantity="one">yksi huone</item>
         <item quantity="other">%d huonetta</item>
@@ -1165,10 +992,8 @@ Haluatko lisätä paketteja?</string>
     <string name="receipt_avatar">Kuittauksen hahmokuva</string>
     <string name="notice_avatar">Ilmoituksen hahmokuva</string>
     <string name="avatar">Hahmokuva</string>
-
     <string name="dialog_user_consent_content">Jatkaaksesi kotipalvelimen %1$s käyttöä, sinun täytyy hyväksyä palvelun käyttöehdot.</string>
     <string name="dialog_user_consent_submit">Näytä ehdot</string>
-
     <string name="deactivate_account_content">Tämä tekee tilistäsi lopullisesti käyttökelvottoman. Et voi kirjautua sisään eikä kukaan pysty rekisteröitymään samalla käyttäjätunnuksella. Tämä saa tilisi poistumaan kaikista huoneista, joissa se on osallisena, ja poistaa tilin tiedot identiteettipalvelimelta. <b>Tämä toiminto on peruuttamaton</b>. 
 \n
 \nTilin deaktivointi <b>ei oletuksena saa meitä unohtamaan lähettämiäsi viestejä</b>. Jos haluat meidän unohtavan viestisi, merkitse alapuolella oleva valintaruutu.
@@ -1180,49 +1005,36 @@ Haluatko lisätä paketteja?</string>
     <string name="room_tombstone_continuation_link">Keskustelu jatkuu täällä</string>
     <string name="room_tombstone_continuation_description">Tämä huone on jatkoa toiselle keskustelulle</string>
     <string name="room_tombstone_predecessor_link">Paina tästä nähdäksesi vanhemmat viestit</string>
-
     <string name="resource_limit_exceeded_title">Resurssiraja saavutettu</string>
     <string name="resource_limit_contact_action">Ota yhteys ylläpitäjään</string>
-
     <string name="resource_limit_contact_admin">ota yhteys palvelun ylläpitäjään</string>
-
     <string name="resource_limit_soft_default">Tämä kotipalvelin on ylittänyt yhden resurssirajoistaan, joten <b>osa käyttäjistä ei pysty kirjautumaan sisään</b>.</string>
     <string name="resource_limit_hard_default">Tämä kotipalvelin on ylittänyt yhden resurssirajoistaan.</string>
-
     <string name="resource_limit_soft_mau"> Tämä kotipalvelin on saavuttanut kuukausittaisten aktiivisten käyttäjien rajansa, joten <b>osa käyttäjistä ei pysty kirjautumaan sisään</b>.</string>
     <string name="resource_limit_hard_mau">Tämä kotipalvelin on saavuttanut kuukausittaisten aktiivisten käyttäjien rajansa.</string>
-
     <string name="resource_limit_soft_contact">Tee %s saadaksesi tätä rajaa korotettua.</string>
     <string name="resource_limit_hard_contact">Tee %s jatkaaksesi palvelun käyttöä.</string>
-
     <string name="settings_lazy_loading_title">Lataa huoneen käyttäjät laiskasti</string>
     <string name="settings_lazy_loading_description">Paranna suorituskykyä lataamalla huoneen jäsenet vasta, kun huone näytetään ensimmäisen kerran.</string>
     <string name="error_lazy_loading_not_supported_by_home_server">Kotipalvelimesi ei tue huoneen jäsenten laiskaa latausta. Yritä myöhemmin.</string>
-
     <string name="unknown_error">Törmäsimme virheeseen</string>
-
     <string name="merged_events_expand">laajenna</string>
     <string name="merged_events_collapse">supista</string>
-
     <string name="settings_info_area_show">Näytä infoalue</string>
     <string name="show_info_area_always">Aina</string>
     <string name="show_info_area_messages_and_errors">Viesteille ja virheille</string>
     <string name="show_info_area_only_errors">Vain virheille</string>
-
     <string name="generic_label">%1$s:</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="plus_x">+%d</string>
     <string name="x_plus">%d+</string>
     <string name="no_valid_google_play_services_apk">Kelvollista Google Play Services APK:ta ei löytynyt. Ilmoitukset eivät ehkä toimi oikein.</string>
-
     <string name="passphrase_create_passphrase">Luo salalause</string>
     <string name="passphrase_passphrase_does_not_match">Salalause ei täsmää</string>
     <string name="passphrase_empty_error_message">Syötä salalause</string>
     <string name="passphrase_passphrase_too_weak">Salalause on liian heikko</string>
-
     <string name="keys_backup_passphrase_not_empty_error_message">Poista salalause, jos haluat Element generoivan palautusavaimen.</string>
     <string name="keys_backup_no_session_error">Matrix-istuntoa ei ole saatavilla</string>
-
     <string name="keys_backup_setup_step1_title">Älä koskaan menetä salattuja viestejä</string>
     <string name="keys_backup_setup_step1_description">Salatuissa huoneissa viestit ovat suojattuna osapuolten välisellä salauksella. Vain sinä ja vastaanottaja(t) omistavat avaimet näiden viestien lukemiseen.
 \n
@@ -1230,7 +1042,6 @@ Haluatko lisätä paketteja?</string>
     <string name="keys_backup_setup">Aloita avainten varmuuskopioinnin käyttö</string>
     <string name="keys_backup_setup_step1_advanced">(Edistynyt)</string>
     <string name="keys_backup_setup_step1_manual_export">Tallenna avaimet käsin</string>
-
     <string name="keys_backup_setup_step2_text_title">Turvaa varmuuskopiosi salalauseella.</string>
     <string name="keys_backup_setup_step2_text_description">Tallennamme salatun kopion avaimistasi kotipalvelimellesi. Suojaa varmuuskopiosi salalauseella pitääksesi sen turvattuna. 
 \n 
@@ -1252,7 +1063,6 @@ Haluatko lisätä paketteja?</string>
     <string name="recovery_key_export_saved_as_warning">Palautusavain on tallennettu kohteeseen \'%s\'.
 \n
 \nVaroitus: tämä tiedosto saatetaan poistaa, mikäli Element poistetaan.</string>
-
     <string name="keys_backup_setup_step3_please_make_copy">Teethän kopion</string>
     <string name="keys_backup_setup_step3_share_intent_chooser_title">Jaa palautusavain kohteelle…</string>
     <string name="keys_backup_setup_step3_generating_key_status">Luodaan palautusavainta käyttäen salalausetta. Tässä saattaa kestää useampi sekunti.</string>
@@ -1260,25 +1070,18 @@ Haluatko lisätä paketteja?</string>
     <string name="unexpected_error">Odottamaton virhe</string>
     <string name="keys_backup_setup_backup_started_title">Varmuuskopiointi aloitettu</string>
     <string name="keys_backup_setup_backup_started_message">Salausavaimiasi siirretään kotipalvelimellesi tausta-ajona. Ensimmäisessä varmuuskopioinnissa saattaa mennä useampi minuutti.</string>
-
-
     <string name="keys_backup_setup_skip_title">Oletko varma\?</string>
     <string name="keys_backup_setup_skip_msg">Saatat menettää pääsyn viesteihisi jos kirjaudut ulos tai menetät tämän laitteen.</string>
-
     <string name="keys_backup_restore_is_getting_backup_version">Haetaan varmuuskopion versiota…</string>
     <string name="keys_backup_restore_with_passphrase">Käytä palautuksen salalausetta ottaaksesi käyttöön salatun viestihistoriasi</string>
     <string name="keys_backup_restore_use_recovery_key">käyttää palautusavaintasi</string>
     <string name="keys_backup_restore_with_passphrase_helper_with_link">Jos et tiedä palautuksen salalausettasi, voit %s.</string>
-
     <string name="keys_backup_restore_with_recovery_key">Käytä palautusavainta ottaaksesi salatun viestihistoriasi käyttöön</string>
     <string name="keys_backup_restore_key_enter_hint">Syötä palautusavain</string>
-
     <string name="keys_backup_restore_setup_recovery_key">Viestien palautus</string>
-
     <string name="keys_backup_restore_with_key_helper">Menetitkö palautusavaimesi\? Voit asettaa uuden asetuksissa.</string>
     <string name="keys_backup_passphrase_error_decrypt">Varmuuskopiota ei pystytty purkamaan tällä salalauseella. Tarkista, että syötit oikean palautuksen salalauseen.</string>
     <string name="network_error_please_check_and_retry">Verkkovirhe: tarkista yhteytesi ja yritä uudelleen.</string>
-
     <string name="keys_backup_restoring_waiting_message">Palautetaan varmuuskopiota:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Lasketaan palautusavainta…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Ladataan avaimia…</string>
@@ -1286,7 +1089,6 @@ Haluatko lisätä paketteja?</string>
     <string name="keys_backup_unlock_button">Otetaan historia käyttöön</string>
     <string name="keys_backup_recovery_code_empty_error_message">Syötä palautusavain</string>
     <string name="keys_backup_recovery_code_error_decrypt">Varmuuskopiota ei pystytty purkamaan tällä palautusavaimella. Tarkista, että olet syöttänyt oikean palautusavaimen.</string>
-
     <string name="keys_backup_restore_success_title">Varmuuskopio palautettu %s !</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Varmuuskopio palautettiin yhdellä avaimella.</item>
@@ -1296,18 +1098,13 @@ Haluatko lisätä paketteja?</string>
         <item quantity="one">Yksi uusi avain lisätty tähän istuntoon.</item>
         <item quantity="other">%d uutta avainta lisätty tähän listuntoon.</item>
     </plurals>
-
     <string name="keys_backup_get_version_error">Uusimman palautusavaimen version hakeminen epäonnistui (%s).</string>
     <string name="keys_backup_no_keysbackup_sdk_error">Istunnon kryptografia ei ole aktivoitu</string>
-
-
     <string name="keys_backup_settings_restore_backup_button">Palauta varmuuskopiosta</string>
     <string name="keys_backup_settings_delete_backup_button">Poista varmuuskopio</string>
-
     <string name="keys_backup_settings_status_ok">Avaimien varmuuskopiointi on käytössä tällä laitteella.</string>
     <string name="keys_backup_settings_status_ko">Avaimien varmuuskopiointi ei ole käytössä tässä istunnossa.</string>
     <string name="keys_backup_settings_status_not_setup">Avaimiasi ei varmuuskopioida tästä istunnosta.</string>
-
     <string name="keys_backup_settings_signature_from_unknown_device">Varmuuskopiossa on allekirjoitus tuntemattomasta laitteesta ID:llä %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">Varmuuskopiossa on pätevä allekirjoitus tästä istunnosta.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Varmuuskopiossa on pätevä allekirjoitus varmennetulta laitteelta %s.</string>
@@ -1315,51 +1112,38 @@ Haluatko lisätä paketteja?</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Varmuuskopiossa on epäkelpo allekirjoitus varmennetulta laitteelta %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">Varmuuskopiossa on epäkelpo allekirjoitus tuntemattomalta laitteelta %s</string>
     <string name="keys_backup_get_trust_error">Varmuuskopion luotettavuustietojen hakeminen epäonnistui (%s).</string>
-
     <string name="keys_backup_settings_untrusted_backup">Käyttääksesi avainten varmuuskopiointia tällä laitteella, palauta salalauseellasi tai palautusavaimella nyt.</string>
     <string name="keys_backup_settings_deleting_backup">Poistetaan varmuuskopiota…</string>
     <string name="keys_backup_settings_delete_backup_error">Varmuuskopion poisto epäonnistui (%s)</string>
-
     <string name="keys_backup_settings_delete_confirm_title">Poista varmuuskopio</string>
     <string name="keys_backup_settings_delete_confirm_message">Poista varmuuskopioidut salausavaimesi palvelimelta\? Et voi sen jälkeen käyttää palautusavaintasi lukeaksesi salattuja viestejäsi.</string>
-
     <string name="new_recovery_method_popup_title">Uusi avainvarmuuskopio</string>
     <string name="new_recovery_method_popup_was_me">Se oli minä</string>
     <string name="keys_backup_banner_setup_line1">Älä koskaan menetä salattuja viestejäsi</string>
     <string name="keys_backup_banner_setup_line2">Aloita avainten varmuuskopioinnin käyttö</string>
-
     <string name="keys_backup_banner_recover_line1">Älä koskaan menetä salattuja viestejäsi</string>
     <string name="keys_backup_banner_recover_line2">Käytä avainten varmuuskopiointia</string>
-
     <string name="keys_backup_banner_update_line1">Uudet salattujen viestien avaimet</string>
     <string name="keys_backup_banner_update_line2">Hallinnoi avainten varmuuskopioinnissa</string>
-
     <string name="keys_backup_banner_in_progress">Varmuuskopioidaan avaimia…</string>
-
     <string name="keys_backup_info_keys_all_backup_up">Kaikki avaimet varmuuskopioitu</string>
     <plurals name="keys_backup_info_keys_backing_up">
         <item quantity="one">Varmuuskopioidaan yhtä avainta…</item>
         <item quantity="other">Varmuuskopioidaan %d avainta…</item>
     </plurals>
-
     <string name="keys_backup_info_title_version">Versio</string>
     <string name="keys_backup_info_title_algorithm">Algoritmi</string>
     <string name="keys_backup_info_title_signature">Allekirjoitus</string>
-
     <string name="ignore">Jätä huomiotta</string>
-
     <string name="auth_login_sso">Kirjaudu sisään kertakirjautumisella</string>
     <string name="login_error_unknown_host">Tämä osoite ei ole saavutettavissa. Tarkistathan osoitteen</string>
     <string name="login_error_ssl_handshake">Laitteesi käyttää vanhentunutta, haavoittuvaista TLS-protokollan versiota. Turvallisuutesi tähden et voi muodostaa yhteyttä</string>
     <string name="settings_send_message_with_enter">Lähetä viesti enter-näppäimellä</string>
     <string name="settings_send_message_with_enter_summary">Näppäimistön enter-näppäin lähettää viestin sen sijaan, että se lisäisi rivinvaihdon</string>
-
     <string name="settings_change_password_submit">Päivitä salasana</string>
     <string name="settings_fail_to_update_password_invalid_current_password">Salasana ei ole kelvollinen</string>
     <string name="passwords_do_not_match">Salasanat eivät täsmää</string>
-
     <string name="notification_unread_notified_messages_in_room">%1$s -&gt; %2$s</string>
-
     <string name="new_recovery_method_popup_description">Uusi avainvarmuuskopio löydetty.
 \n
 \nJos et asettanut uutta palautustapaa, hyökkääjä saattaa yrittää päästä käsiksi tiliisi. Vaihda tilisi salasana ja aseta uusi palautustapa asetuksissa välittömästi.</string>
@@ -1368,7 +1152,6 @@ Haluatko lisätä paketteja?</string>
     <string name="autodiscover_well_known_autofill_dialog_message">Element löysi mukautetun palvelinasetuksen userId:si domainille ”%1$s”:
 \n%2$s</string>
     <string name="autodiscover_well_known_autofill_confirm">Käytä asetuksia</string>
-
     <string name="notification_sync_init">Alustetaan palvelua</string>
     <string name="settings_media">Media</string>
     <string name="settings_default_compression">Oletuksena oleva pakkauksen määrä</string>
@@ -1376,7 +1159,6 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_default_media_source">Oletuksena oleva medialähde</string>
     <string name="media_source_choose">Valitse</string>
     <string name="settings_play_shutter_sound">Toista sulkimen ääni</string>
-
     <string name="action_mark_room_read">Merkitse luetuksi</string>
     <string name="settings_notification_privacy_no_background_sync">Sovelluksen <b>ei</b> tarvitse pitää yhteyttä kotipalvelimeen taustalla, minkä pitäisi vähentää akunkäyttöä</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -1387,51 +1169,42 @@ Haluatko lisätä paketteja?</string>
         <item quantity="one">yksi ilmoitus</item>
         <item quantity="other">%d ilmoitusta</item>
     </plurals>
-
     <string name="notification_unknown_new_event">Uusi tapahtuma</string>
     <string name="notification_unknown_room_name">Huone</string>
     <string name="notification_new_messages">Uusia viestejä</string>
     <string name="notification_new_invitation">Uusi kutsu</string>
     <string name="notification_sender_me">Minä</string>
     <string name="notification_inline_reply_failed">** Lähetys epäonnistui — avaathan huoneen</string>
-
     <string name="error_jitsi_not_supported_on_old_device">Valitettavasti konferenssipuhelut Jitsin kanssa eivät toimi vanhoissa laitteissa (laitteet, joissa on Android 5.0 tai vanhempi)</string>
-
     <string name="encryption_information_unknown_ip">tuntematon IP-osoite</string>
-    <string name="you_added_a_new_device_with_info">Uusi laite pyytää salausavaimia.
-\nLaitteen nimi: %1$s
-\nViimeksi nähty: %2$s
-\nJos et kirjautunut toisella laitteella, voit jättää tämän pyynnön huomiotta.</string>
+    <string name="you_added_a_new_device_with_info">Uusi istunto pyytää salausavaimia.
+\nIstunnon nimi: %1$s
+\nNähty viimeksi: %2$s
+\nJos et kirjautunut toisessa paikkaa, jätä tämä pyyntö huomiotta.</string>
     <string name="share_without_verifying_short_label">Jaa</string>
     <string name="sas_security_advise">Parhaan turvallisuuden takaamiseksi suosittelemme, että teet tämän kasvotusten tai muun luotetun viestintäkeinon avulla.</string>
     <string name="sas_view_request_action">Näytä pyyntö</string>
     <string name="sas_got_it">Selvä</string>
-
     <string name="sas_cancelled_dialog_title">Pyyntö peruttu</string>
     <string name="sas_error_m_unexpected_message">Istunto vastaanotti odottamattoman viestin</string>
     <string name="sas_error_m_invalid_message">Virheellinen viesti vastaanotettu</string>
     <string name="sas_error_m_key_mismatch">Avain ei täsmää</string>
     <string name="sas_error_m_user_error">Käyttäjä ei täsmää</string>
     <string name="sas_error_unknown">Tuntematon virhe</string>
-
     <string name="keys_backup_setup_override_backup_prompt_tile">Kotipalvelimellasi on jo varmuuskopio</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Näyttää, että olet jo asettanut avainten varmuuskopioinnin toisesta istunnosta. Halutatko korvata sen tällä\?</string>
     <string name="keys_backup_setup_override_replace">Korvaa</string>
     <string name="keys_backup_setup_override_stop">Seis</string>
-
     <string name="keys_backup_settings_checking_backup_state">Tarkistetaan varmuuskopion tilaa</string>
     <string name="sas_waiting_for_partner">Odotetaan vastapuolen varmistusta…</string>
-
     <string name="sas_error_m_unknown_transaction">Istunto ei ole tietoinen kyseisestä transaktiosta</string>
     <string name="sas_error_m_mismatched_sas">SAS ei täsmännyt</string>
     <string name="edit">Muokkaa</string>
     <string name="reply">Vastaa</string>
-
     <string name="global_retry">Yritä uudelleen</string>
     <string name="room_list_empty">Aloita sovelluksen käyttö liittymällä huoneeseen.</string>
     <string name="send_you_invite">Lähetti sinulle kutsun</string>
     <string name="invited_by">%s kutsui</string>
-
     <string name="room_list_catchup_empty_body">Sinulla ei ole enempää lukemattomia viestejä</string>
     <string name="room_list_catchup_welcome_title">Tervetuloa kotiin!</string>
     <string name="room_list_catchup_welcome_body">Löydät täältä lukemattomat viestit</string>
@@ -1439,14 +1212,12 @@ Haluatko lisätä paketteja?</string>
     <string name="room_list_people_empty_body">Tässä näytetään yksityiset keskustelusi</string>
     <string name="room_list_rooms_empty_title">Huoneet</string>
     <string name="room_list_rooms_empty_body">Huoneesi näytetään tässä</string>
-
     <string name="title_activity_emoji_reaction_picker">Reaktiot</string>
     <string name="reactions_agree">Samaa mieltä</string>
     <string name="reactions_like">Tykkää</string>
     <string name="message_add_reaction">Lisää reaktio</string>
     <string name="message_view_reaction">Näytä reaktiot</string>
     <string name="reactions">Reaktiot</string>
-
     <string name="event_redacted_by_user_reason">Käyttäjä poisti tapahtuman</string>
     <string name="event_redacted_by_admin_reason">Huoneen ylläpitäjä moderoi tapahtuman</string>
     <string name="malformed_message">Epämuotoinen tapahtuma, ei voida näyttää</string>
@@ -1454,13 +1225,10 @@ Haluatko lisätä paketteja?</string>
     <string name="error_no_network">Ei verkkoa. Tarkista internet-yhteytesi.</string>
     <string name="please_wait">Odota…</string>
     <string name="group_all_communities">Kaikki yhteisöt</string>
-
     <string name="room_preview_no_preview">Tätä huonetta ei voi esikatsella</string>
     <string name="room_preview_world_readable_room_not_supported_yet">Element ei vielä tue täysin julkisen huoneen esikatselua</string>
-
     <string name="fab_menu_create_room">Huoneet</string>
     <string name="fab_menu_create_chat">Yksityisviestit</string>
-
     <string name="create_room_title">Uusi huone</string>
     <string name="create_room_action_create">LUO</string>
     <string name="create_room_name_hint">Huoneen nimi</string>
@@ -1468,68 +1236,47 @@ Haluatko lisätä paketteja?</string>
     <string name="create_room_public_description">Kuka tahansa voi liittyä tähän huoneeseen</string>
     <string name="keys_backup_unable_to_get_trust_info">Luottamustietoa haettaessa tapahtui virhe</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">Avainten varmuuskopioinnin tietoja haettaessa tapahtui virhe</string>
-
     <string name="your_unverified_device_requesting_with_info">Tuntematon laite pyytää salausavaimia
 \nLaitteen nimi: %1$s
 \nViimeksi nähty: %2$s
 \nJos et kirjautunut toisella laitteella, voit jättää tämän pyynnön huomiotta.</string>
-
     <string name="settings_sdk_version">Matrix SDK:n versio</string>
     <string name="settings_other_third_party_notices">Muut kolmansien osapuolten huomautukset</string>
     <string name="quick_reactions">Pikareaktiot</string>
-
     <string name="settings_preferences">Asetukset</string>
     <string name="settings_security_and_privacy">Tietoturva ja yksityisyys</string>
     <string name="room_list_catchup_empty_title">Olet ajan tasalla!</string>
     <string name="last_edited_info_message">Viimeksi muokannut %1$s %2$s</string>
-
-
     <string name="change_room_directory_network">Vaihda verkkoa</string>
     <string name="navigate_to_room_when_already_in_the_room">Katselet jo tätä huonetta!</string>
-
     <string name="settings_general_title">Yleiset</string>
     <string name="preference_voice_and_video">Ääni ja video</string>
     <string name="preference_root_help_about">Ohje ja tietoa</string>
-
-
     <string name="send_suggestion">Tee ehdotus</string>
     <string name="send_suggestion_content">Kirjoita ehdotuksesi alle.</string>
     <string name="send_suggestion_report_placeholder">Kuvaile ehdotuksesi tässä</string>
     <string name="send_suggestion_sent">Kiitos, ehdotus on lähetetty</string>
     <string name="send_suggestion_failed">Ehdotuksen lähettäminen epäonnistui (%s)</string>
-
     <string name="settings_labs_show_hidden_events_in_timeline">Näytä piilotetut tapahtumat aikajanalla</string>
-
     <string name="bottom_action_people_x">Yksityisviestit</string>
-
     <string name="send_file_step_idle">Odotetaan…</string>
     <string name="send_file_step_encrypting_file">Salataan tiedostoa…</string>
     <string name="send_file_step_sending_file">Lähetetään tiedostoa (%1$s / %2$s)</string>
-
     <string name="downloading_file">Ladataan tiedostoa %1$s…</string>
     <string name="downloaded_file">Tiedosto %1$s ladattu!</string>
-
     <string name="edited_suffix">(muokattu)</string>
-
-
     <string name="no_message_edits_found">Muokkauksia ei löytynyt</string>
-
     <string name="room_filtering_filter_hint">Suodata keskusteluja…</string>
     <string name="room_filtering_footer_title">Etkö löydä, mitä etsit\?</string>
     <string name="room_filtering_footer_create_new_room">Luo uusi huone</string>
     <string name="room_filtering_footer_create_new_direct_message">Lähetä uusi yksityisviesti</string>
     <string name="room_filtering_footer_open_room_directory">Näytä huoneluettelo</string>
-
     <string name="link_copied_to_clipboard">Linkki kopioitu leikepöydälle</string>
-
     <string name="creating_direct_room">Luodaan huonetta…</string>
     <string name="direct_room_start_search">Näet tuloksia kirjoittamalla jotain</string>
     <string name="joining_room">Liitytään huoneeseen…</string>
-
     <string name="message_view_edit_history">Näytä muokkaushistoria</string>
-
     <string name="title_activity_verify_device">Vahvista istunto</string>
-
     <string name="start_verification_short_label">Vahvista</string>
     <string name="key_share_request">Avaimen jakopyyntö</string>
     <string name="sas_verify_start_button_title">Aloita vahvistaminen</string>
@@ -1542,55 +1289,40 @@ Haluatko lisätä paketteja?</string>
 \n%s</string>
     <string name="sas_cancelled_by_me">Vahvistus on peruttu.
 \nSyy: %s</string>
-
     <string name="sas_verification_request_notification_channel">Vuorovaikutteinen laitteen vahvistus</string>
     <string name="sas_incoming_request_notif_title">Vahvistuspyyntö</string>
     <string name="sas_incoming_request_notif_content">%s haluaa vahvistaa laitteesi</string>
-
     <string name="sas_error_m_user">Käyttäjä perui vahvistuksen</string>
     <string name="sas_error_m_timeout">Vahvistustoimenpide aikakatkaistiin</string>
     <string name="create_room_directory_title">Huoneluettelo</string>
     <string name="create_room_directory_description">Julkaise tämä huone huoneluettelossa</string>
-
     <string name="settings_push_rules">Viesti-ilmoitusten säännöt</string>
     <string name="disconnect">Katkaise yhteys</string>
     <string name="decline">Kieltäydy</string>
-
     <string name="people_no_identity_server">Identiteettipalvelinta ei ole määritetty.</string>
-
     <string name="call_failed_no_ice_title">Puhelu epäonnistui väärin määritetyn palvelimen takia</string>
     <string name="call_failed_dont_ask_again">Älä kysy uudestaan</string>
-
     <string name="login_error_homeserver_not_found">Kotipalvelinta ei voi tavoittaa tästä URL-osoitteesta, tarkista osoite</string>
     <string name="invite_no_identity_server_error">Lisää identiteettipalvelin asetuksissasi, jotta voit tehdä tämän toiminnon.</string>
-    <string name="settings_background_fdroid_sync_mode">Taustasynkronointitila (kokeellinen)</string>
+    <string name="settings_background_fdroid_sync_mode">Taustasynkronointitila</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Ei taustasynkronointia</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Et saa ilmoituksia saapuvista viesteistä, kun sovellus on taustalla.</string>
     <string name="settings_background_sync_update_error">Asetusten päivittäminen epäonnistui.</string>
-
-
     <string name="settings_set_workmanager_delay">Haluttu synkronointiväli</string>
     <string name="settings_set_workmanager_delay_summary">%s
 \nSynkronointia saatetaan lykätä resursseista (akusta) tai laitteen tilasta (virransäästö) riippuen.</string>
     <string name="encryption_information_device_name_with_warning">Julkinen nimi (näkyy ihmisille, joihin olet yhteydessä)</string>
     <string name="device_name_warning">Istunnon julkinen nimi näkyy ihmisille, joihin olet yhteydessä</string>
     <string name="widget_integration_review_terms">Jatkaaksesi sinun täytyy hyväksyä palvelun käyttöehdot.</string>
-
     <string name="identity_server_not_defined">Et käytä identiteettipalvelinta</string>
     <string name="identity_server_not_defined_for_password_reset">Identiteettipalvelinta ei ole määritetty, salasanan palautus vaaditaan.</string>
-
     <string name="error_user_already_logged_in">Näyttää, että yrität yhdistää toiseen kotipalvelimeen. Haluatko kirjautua ulos\?</string>
-
     <string name="push_gateway_item_url">URL-osoite:</string>
     <string name="labs_swipe_to_reply_in_timeline">Ota käyttöön pyyhkäisemällä vastaaminen aikajanalla</string>
-
     <string name="terms_of_service">Käyttöehdot</string>
     <string name="review_terms">Lue ehdot</string>
     <string name="terms_description_for_integration_manager">Käytä botteja, siltoja, sovelmia ja tarrapaketteja</string>
-
     <string name="read_at">Lue osoitteessa</string>
-
-
     <string name="identity_server">Identiteettipalvelin</string>
     <string name="disconnect_identity_server">Katkaise yhteys identiteettipalvelimeen</string>
     <string name="add_identity_server">Määritä identiteettipalvelin</string>
@@ -1598,7 +1330,6 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_discovery_identity_server_info">Käytät palvelinta %1$s löytääksesi tuntemiasi ihmisiä ja ollaksesi heidän löydettävissään.</string>
     <string name="settings_discovery_identity_server_info_none">Et käytä tällä hetkellä identiteettipalvelinta. Jotta voit löytää tuntemiasi ihmisiä ja jotta he löytävät sinut, määritä identiteettipalvelin alla.</string>
     <string name="settings_discovery_mail_pending">Odottaa</string>
-
     <string name="settings_discovery_enter_identity_server">Syötä uusi identiteettipalvelin</string>
     <string name="settings_discovery_bad_identity_server">Identiteettipalvelimeen ei saatu yhteyttä</string>
     <string name="settings_discovery_please_enter_server">Syötä identiteettipalvelimen URL-osoite</string>
@@ -1612,24 +1343,19 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_discovery_confirm_mail">Lähetimme sinulle vahvistussähköpostin osoitteeseen %s, tarkista sähköpostisi ja klikkaa vahvistuslinkkiä</string>
     <string name="labs_allow_extended_logging">Ota yksityiskohtaiset lokit käyttöön.</string>
     <string name="error_terms_not_accepted">Yritä uudelleen, kun olet hyväksynyt kotipalvelimesi käyttöehdot.</string>
-
     <string name="error_network_timeout">Palvelimen vastaus näyttäisi olevan liian hidas. Tämä voi johtua kehnosta yhteydestä tai palvelimella olevasta ongelmasta. Yritä hetken kuluttua uudelleen.</string>
-
     <string name="send_attachment">Lähetä liite</string>
-
     <string name="a11y_create_room">Luo uusi huone</string>
     <string name="a11y_show_password">Näytä salasana</string>
     <string name="a11y_hide_password">Piilota salasana</string>
     <string name="a11y_jump_to_bottom">Siirry loppuun</string>
-
     <string name="three_users_read">%1$s, %2$s ja %3$s lukivat</string>
     <string name="two_users_read">%1$s ja %2$s lukivat</string>
     <string name="one_user_read">%s luki</string>
     <plurals name="fallback_users_read">
-        <item quantity="one">1 käyttäjä luki</item>
-        <item quantity="other">%d käyttäjää luki</item>
+        <item quantity="one">1 käyttäjä on lukenut</item>
+        <item quantity="other">%d käyttäjää on lukenut</item>
     </plurals>
-
     <string name="error_attachment">Liitettä noudettaessa tapahtui virhe.</string>
     <string name="attachment_type_file">Tiedosto</string>
     <string name="attachment_type_camera">Kamera</string>
@@ -1638,7 +1364,6 @@ Haluatko lisätä paketteja?</string>
     <string name="report_content_spam">Se on roskapostia</string>
     <string name="report_content_inappropriate">Se on sopimaton</string>
     <string name="no_network_indicator">Verkkoyhteyttä ei ole juuri nyt</string>
-
     <string name="none">Ei mitään</string>
     <string name="call_failed_no_ice_description">Pyydä kotipalvelimesi (%1$s) ylläpitäjää määrittämään TURN-palvelin, jotta puhelut toimivat luotettavasti.
 \n
@@ -1654,11 +1379,9 @@ Haluatko lisätä paketteja?</string>
     <string name="message_edits">Viestimuokkaukset</string>
     <string name="terms_description_for_identity_server">Ole löydettävissä</string>
     <string name="settings_text_message_sent">Tekstiviesti on lähetetty numeroon %s. Syötä sen sisältämä varmistuskoodi.</string>
-
     <string name="settings_push_rules_no_rules">Viesti-ilmoitusten sääntöjä ei ole määritetty</string>
     <string name="a11y_create_direct_message">Luo uusi yksityiskeskustelu</string>
     <string name="resources_script">Latn</string>
-
     <string name="revoke">Kumoa</string>
     <string name="review">Tarkasta</string>
     <string name="auth_add_phone_message_2">Aseta puhelinnumerosi, ja voit myöhemmin antaa muiden löytää sinut puhelinnumerosi perusteella.</string>
@@ -1667,8 +1390,6 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_add_3pid_confirm_password_title">Vahvista salasanasi</string>
     <string name="settings_add_3pid_flow_not_supported">Et voi tehdä tätä mobiili-Elementista</string>
     <string name="settings_add_3pid_authentication_needed">Tunnistautuminen vaaditaan</string>
-
-
     <string name="settings_integrations">Integraatiot</string>
     <string name="settings_integrations_summary">Käytä integraatioiden lähdettä bottien, siltojen ja tarrapakettien hallintaan.
 \nIntegraatioiden lähteet vastaanottavat asetusdataa ja voivat muokata sovelmia, lähettää kutsuja huoneeseen ja muokata oikeustasoja puolestasi.</string>
@@ -1676,7 +1397,6 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_discovery_manage">Muokkaa etsinnän asetuksia.</string>
     <string name="settings_integration_allow">Salli integraatiot</string>
     <string name="settings_integration_manager">Integraatioiden lähde</string>
-
     <string name="room_widget_activity_title">Sovelma</string>
     <string name="room_widget_permission_title">Lataa sovelma</string>
     <string name="room_widget_permission_added_by">Sovelman lisäsi:</string>
@@ -1687,107 +1407,82 @@ Haluatko lisätä paketteja?</string>
     <string name="room_widget_reload">Lataa sovelma uudelleen</string>
     <string name="room_widget_open_in_browser">Avaa selaimessa</string>
     <string name="room_widget_revoke_access">Kumoa minun pääsy</string>
-
     <string name="room_widget_permission_display_name">Näyttönimesi</string>
     <string name="room_widget_permission_avatar_url">Profiilikuvasi osoite</string>
     <string name="room_widget_permission_user_id">Käyttäjätunnisteesi</string>
     <string name="room_widget_permission_theme">Teemasi</string>
     <string name="room_widget_permission_widget_id">Sovelman tunniste</string>
     <string name="room_widget_permission_room_id">Huoneen tunniste</string>
-
-
     <string name="room_widget_resource_permission_title">Tämä sovelma haluaa käyttää seuraavia resursseja:</string>
     <string name="room_widget_resource_grant_permission">Salli</string>
     <string name="room_widget_resource_decline_permission">Estä kaikki</string>
     <string name="room_widget_webview_access_camera">Käytä kameraa</string>
     <string name="room_widget_webview_access_microphone">Käytä mikrofonia</string>
     <string name="room_widget_webview_read_protected_media">Lue DRM-suojattua mediaa</string>
-
     <string name="integration_manager_not_configured">Ei integraatioiden lähteitä asetettuna.</string>
     <string name="ignore_request_short_label">Huomiotta</string>
-
     <string name="invalid_or_expired_credentials">Olet kirjautunut ulos epäkelpojen tai vanhentuneiden pääsytietojen takia.</string>
-
     <string name="sas_verify_title">Varmenna vertaamalla lyhyttä tekstijonoa.</string>
     <string name="sas_incoming_request_description">Varmenna tämä laite merkkaamalla se luotetuksi. Kumppaneiden laitteisiin luottaminen antaa sinulle ylimääräistä mielenrauhaa, kun käytät osapuolten välistä salausta.</string>
     <string name="sas_incoming_request_description_2">Tämän laitteen varmentaminen merkkaa sen luotetuksi, ja samoin sinun laitteesi merkataan luotetuksi kumppanisi näkökulmasta.</string>
-
     <string name="sas_emoji_description">Varmenna tämä laite varmistamalla, että seuraava emoji ilmestyy kumppanisi näytölle</string>
     <string name="sas_decimal_description">Varmenna tämä laite varmistamalla, että seuraavat numerot ilmestyvät kumppanisi näytölle</string>
-
     <string name="sas_verified_successful_description">Turvalliset viestit tämän käyttäjän kanssa ovat salattuja päästä päähän, eivätkä kolmannet osapuolet voi lukea niitä.</string>
     <string name="sas_verifying_keys">Mitään ei tule näytölle\? Kaikki asiakasohjelmat eivät vielä tue interaktiivista varmennusta. Käytä vanhaa varmennustapaa.</string>
     <string name="sas_legacy_verification_button_title">Käytä vanhaa varmennustapaa.</string>
-
     <string name="sas_error_m_unknown_method">Laitteet eivät pysty sopimaan avaimista, tiivisteestä, MAC:sta tai SAS-metodista</string>
     <string name="sas_error_m_mismatched_commitment">Tiivisteet eivät täsmänneet</string>
-
     <string name="action_change">Muuta</string>
-
     <string name="import_e2e_keys_from_file">Tuo osapuolten välisen salauksen avaimet tiedostosta ”%1$s”.</string>
-
     <string name="settings_expert">Edistynyt</string>
     <string name="settings_push_gateway_no_pushers">Ei rekisteröityjä viesti-ilmoitusten yhdyskäytäviä</string>
-
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
     <string name="push_gateway_item_app_display_name">app_display_name:</string>
     <string name="push_gateway_item_device_name">device_name:</string>
     <string name="push_gateway_item_format">Formaatti:</string>
-
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Rekisteröi tunniste</string>
-
     <string name="send_file_step_encrypting_thumbnail">Salataan pikkukuvaa…</string>
     <string name="send_file_step_sending_thumbnail">Lähetetään pikkukuvaa (%1$s / %2$s)</string>
     <string name="room_directory_search_hint">Nimi tai tunniste (#example:matrix.org)</string>
-
     <string name="add_by_matrix_id">Lisää Matrix-tunnisteella</string>
     <string name="direct_room_no_known_users">Tuloksia ei löytynyt. Käytä ”Lisää Matrix-tunnisteella” etsiäksesi palvelimelta.</string>
     <string name="direct_room_filter_hint">Suodata käyttäjätunnuksella tai tunnisteella…</string>
-
     <string name="settings_discovery_emails_title">Etsittävät sähköpostiosoitteet</string>
     <string name="settings_discovery_no_mails">Vaihtoehdot ilmestyvät, kunhan olet lisännyt sähköpostiosoitteen.</string>
     <string name="settings_discovery_no_msisdn">Vaihtoehdot ilmestyvät, kunhan olet lisännyt puhelinnumeron.</string>
     <string name="settings_discovery_msisdn_title">Etsittävät puhelinnumerot</string>
     <string name="labs_allow_extended_logging_summary">Runsassanaiset lokit auttavat antamalla enemmän tietoa kehittäjille, kun lähetät virheilmoituksen. Vaikka runsaammat lokit ovat käytössä, sovellus ei lähetä viestien sisältöjä tai mitään muuta yksityistä tietoa.</string>
-
-
     <string name="a11y_open_drawer">Avaa navigaatiovalikko</string>
     <string name="a11y_create_menu_open">Avaa huoneen luontivalikko</string>
     <string name="a11y_create_menu_close">Sulje huoneen luontivalikko…</string>
     <string name="a11y_close_keys_backup_banner">Sulje avainten varmuuskopion mainos</string>
     <string name="error_file_too_big">Tiedosto ”%1$s” (%2$s) on liian iso lähetettäväksi. Raja on %3$s.</string>
-
     <string name="attachment_type_contact">Yhteystieto</string>
     <string name="attachment_type_audio">Ääni</string>
     <string name="error_handling_incoming_share">Jakotiedon käsittely epäonnistui</string>
-
     <string name="report_content_custom">Muokattu ilmianto…</string>
     <string name="report_content_custom_title">Ilmianna tämä sisältö</string>
     <string name="report_content_custom_hint">Sisällön ilmiannon syy</string>
     <string name="report_content_custom_submit">ILMIANNA</string>
-    <string name="block_user">ESTÄ KÄYTTÄJÄ</string>
-
+    <string name="block_user">JÄTÄ KÄYTTÄJÄ HUOMIOTTA</string>
     <string name="content_reported_title">Sisältö ilmiannettu</string>
-    <string name="content_reported_content">Tämä sisältö on ilmiannettu.
-\n
-\nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit</string>
+    <string name="content_reported_content">Tämä sisältö on ilmiannettu. 
+\n 
+\nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit.</string>
     <string name="content_reported_as_spam_title">Ilmiannettu roskapostina</string>
-    <string name="content_reported_as_spam_content">Tämä sisältö on ilmiannettu roskapostina.
-\n
-\nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit</string>
+    <string name="content_reported_as_spam_content">Tämä sisältö on ilmiannettu roskapostina. 
+\n 
+\nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit.</string>
     <string name="content_reported_as_inappropriate_title">Ilmiannettu epäsopivana</string>
-    <string name="content_reported_as_inappropriate_content">Tämä sisältö on ilmiannettu epäsopivana.
-\n
-\nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit</string>
-
+    <string name="content_reported_as_inappropriate_content">Tämä sisältö on ilmiannettu epäsopivana. 
+\n 
+\nJos et halua nähdä enempää sisältöä tältä käyttäjältä, voit estää hänet piilottaaksesi hänen viestit.</string>
     <string name="permissions_rationale_msg_keys_backup_export">Element tarvitsee oikeuden tallentaakseen osapuolten välisen salauksen avaimesi talteen.
 \n
 \nSalli pääsy tiedostoihin seuraavassa ponnahdusikkunassa, jotta voit viedä avaimesi käsin.</string>
-
     <string name="login_error_no_homeserver_found">Tämä ei ole kelvollinen Matrix-palvelimen osoite</string>
-    <string name="message_ignore_user">Estä käyttäjä</string>
-
+    <string name="message_ignore_user">Jätä käyttäjä huomiotta</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Kaikki viestit (äänekäs)</string>
     <string name="room_list_quick_actions_notifications_all">Kaikki viestit</string>
     <string name="room_list_quick_actions_notifications_mentions">Vain maininnat</string>
@@ -1798,22 +1493,16 @@ Haluatko lisätä paketteja?</string>
     <string name="command_description_spoiler">Lähettää annetun viestin ilonpilaajana</string>
     <string name="spoiler">Ilonpilaaja</string>
     <string name="reaction_search_type_hint">Syötä avainsanat löytääksesi reaktion.</string>
-
     <string name="no_ignored_users">Et jätä yhtään käyttäjää huomiotta</string>
-
     <string name="help_long_click_on_room_for_more_options">Tee pitkä klikkaus huoneelle nähdäksesi lisää asetuksia</string>
-
-
     <string name="room_join_rules_public">%1$s asetti huoneen julkiseksi kelle tahansa, joka tietää huoneen osoitteen.</string>
     <string name="room_join_rules_invite">%1$s muutti huoneeseen liittymisen vaatimaan kutsua.</string>
     <string name="timeline_unread_messages">Lukemattomia viestejä</string>
-
-    <string name="login_splash_title">Vapauta keskustelusi</string>
+    <string name="login_splash_title">Sinun keskustelusi. Pidä ne hallussasi.</string>
     <string name="login_splash_text1">Keskustele kaksistaan tai ryhmissä</string>
     <string name="login_splash_text2">Pidä keskustelut yksityisinä ja salattuina</string>
     <string name="login_splash_text3">Laajenna ja muokkaa kokemustasi</string>
     <string name="login_splash_submit">Aloita</string>
-
     <string name="login_server_title">Valitse palvelin</string>
     <string name="login_server_text">Kuten sähköpostissa, tunnuksilla on yksi koti, mutta voit keskustella koko maailman kanssa</string>
     <string name="login_server_matrix_org_text">Liity miljoonien joukkoon suurimmalla julkisella palvelimella</string>
@@ -1821,7 +1510,6 @@ Haluatko lisätä paketteja?</string>
     <string name="login_server_modular_learn_more">Lue lisää</string>
     <string name="login_server_other_title">Muut</string>
     <string name="login_server_other_text">Mukautetut ja monimutkaiset asetukset</string>
-
     <string name="login_continue">Jatka</string>
     <string name="login_connect_to">Yhdistä palvelimeen %1$s</string>
     <string name="login_connect_to_modular">Yhdistä Element Matrix Services</string>
@@ -1830,7 +1518,6 @@ Haluatko lisätä paketteja?</string>
     <string name="login_signup">Rekisteröidy</string>
     <string name="login_signin">Kirjaudu sisään</string>
     <string name="login_signin_sso">Jatka kertakirjautumiseen</string>
-
     <string name="login_server_url_form_modular_hint">Element Matrix Services in osoite</string>
     <string name="login_server_url_form_other_hint">Osoite</string>
     <string name="login_server_url_form_modular_text">Korkealuokkaista isännöintiä organisaatioille</string>
@@ -1843,58 +1530,46 @@ Haluatko lisätä paketteja?</string>
     <string name="login_registration_not_supported">Sovellus ei pysty luomaan uusia tunnuksia tälle kotipalvelimelle.
 \n
 \nHaluatko rekisteröityä web-klientillä\?</string>
-
     <string name="login_login_with_email_error">Tämä sähköpostiosoite ei ole liitettynä mihinkään tunnukseen.</string>
-
     <string name="login_reset_password_on">Palauta salasana palvelimella %1$s</string>
     <string name="login_reset_password_notice">Sähköpostiisi lähetetään viesti uuden salananan asettamiseksi.</string>
     <string name="login_reset_password_submit">Seuraava</string>
     <string name="login_reset_password_email_hint">Sähköposti</string>
     <string name="login_reset_password_password_hint">Uusi salasana</string>
-
     <string name="login_reset_password_warning_title">Varoitus!</string>
     <string name="login_reset_password_warning_content">Salasanan vaihtaminen nollaa kaikki osapuolten välisen salauksen avaimet kaikilla laitteillasi, joka estää sinua lukemasta vanhoja viestejä. Ota käyttöön avainten varmuuskopiointi tai vie huoneen avaimet toiselta laitteelta ennen kuin vaihdat salasanasi.</string>
     <string name="login_reset_password_warning_submit">Jatka</string>
-
     <string name="login_reset_password_error_not_found">Tämä sähköposti ei ole liitettynä mihinkään tunnukseen</string>
-
     <string name="login_reset_password_mail_confirmation_title">Tarkista sähköpostisi</string>
     <string name="login_reset_password_mail_confirmation_notice">Vahvistusviesti lähetettiin osoitteeseen %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Näpäytä linkkiä vahvistaaksesi uuden salasanasi. Seurattuasi siinä olevaa linkkiä, klikkaa alapuolelta.</string>
     <string name="login_reset_password_mail_confirmation_submit">Olen vahvistanut sähköpostiosoitteeni</string>
-
     <string name="login_reset_password_success_title">Valmis!</string>
     <string name="login_reset_password_success_notice">Salasanasi on vaihdettu.</string>
     <string name="login_reset_password_success_notice_2">Olet kirjautunut ulos kaikilta laitteilta, etkä saa enää viesti-ilmoituksia. Ottaaksesi viesti-ilmoitukset uudelleen käyttöön, kirjaudu sisään jokaisella laitteellasi.</string>
     <string name="login_reset_password_success_submit">Takaisin sisäänkirjautumiseen</string>
-
     <string name="login_reset_password_cancel_confirmation_title">Varoitus</string>
     <string name="login_reset_password_cancel_confirmation_content">Salasanaasi ei ole vielä vaihdettu.
 \n
 \nPeru salasananvaihtoprosessi\?</string>
-
     <string name="login_set_email_title">Aseta sähköpostiosoite</string>
     <string name="login_set_email_notice">Aseta sähköpostiosoite palauttaaksesi tunnuksesi. Myöhemmin, voit antaa muiden löytää sinut sähköpostillasi.</string>
     <string name="login_set_email_mandatory_hint">Sähköposti</string>
     <string name="login_set_email_optional_hint">Sähköposti (vapaaehtoinen)</string>
     <string name="login_set_email_submit">Seuraava</string>
-
     <string name="login_set_msisdn_title">Aseta puhelinnumero</string>
     <string name="login_set_msisdn_notice">Aseta puhelinnumero antaaksesi muiden löytää sinut puhellinumerosi perusteella.</string>
     <string name="login_set_msisdn_notice2">Käytä maailmanlaajuista puhelinnumeron muotoa.</string>
     <string name="login_set_msisdn_mandatory_hint">Puhelinnumero</string>
     <string name="login_set_msisdn_optional_hint">Puhelinnumero (vapaaehtoinen)</string>
     <string name="login_set_msisdn_submit">Seuraava</string>
-
     <string name="login_msisdn_confirm_title">Vahvista puhelinnumero</string>
     <string name="login_msisdn_confirm_notice">Lähetimme sinulle koodin numeroon %1$s. Syötä se alapuolelle vahvistaaksesi numeron.</string>
     <string name="login_msisdn_confirm_hint">Syötä koodi</string>
     <string name="login_msisdn_confirm_send_again">Lähetä uudelleen</string>
     <string name="login_msisdn_confirm_submit">Seuraava</string>
-
     <string name="login_msisdn_error_not_international">Kansainvälisten puhelinnumeroiden pitää alkaa merkillä ”+”</string>
     <string name="login_msisdn_error_other">Puhelinnumero vaikuttaa epäkelvolta. Tarkista numero</string>
-
     <string name="login_signup_to">Rekisteröidy palvelimelle %1$s</string>
     <string name="login_signin_username_hint">Käyttäjätunnus tai sähköpostiosoite</string>
     <string name="login_signup_password_hint">Salasana</string>
@@ -1904,30 +1579,24 @@ Haluatko lisätä paketteja?</string>
     <string name="login_signup_cancel_confirmation_content">Tunnustasi ei ole vielä luotu.
 \n
 \nPeru rekisteröintiprosessi\?</string>
-
     <string name="login_a11y_choose_matrix_org">Valitse matrix.org</string>
     <string name="login_a11y_choose_modular">Valitse Element Matrix Services</string>
     <string name="login_a11y_choose_other">Valitse muu kotipalvelin</string>
     <string name="login_a11y_captcha_container">Ratkaise seuraava kuvavarmennushaaste</string>
     <string name="login_terms_title">Hyväksy ehdot jatkaaksesi</string>
-
     <string name="login_wait_for_email_title">Tarkista sähköpostisi</string>
     <string name="login_wait_for_email_notice">Lähetimme sähköpostin osoitteeseen %1$s.
 \nKlikkaa siinä olevaa linkkiä jatkaaksesi tunnuksen luontia.</string>
     <string name="login_validation_code_is_not_correct">Syöttämäsi koodi ei ole kelvollinen. Tarkista se.</string>
     <string name="login_error_outdated_homeserver_title">Vanhentunut kotipalvelin</string>
     <string name="login_error_outdated_homeserver_content">Tämä kotipalvelin pyörii liian vanhalla versiolla, jotta pystyisimme yhdistämään siihen. Pyydä kotipalvelimesi ylläpitäjää päivittämään palvelimensa.</string>
-
     <plurals name="login_error_limit_exceeded_retry_after">
         <item quantity="one">Liian monta pyyntöä lähetettiin. Voit yrittää uudelleen 1 sekunnissa…</item>
         <item quantity="other">Liian monta pyyntöä lähetettiin. Voit yrittää uudelleen %1$d sekunnissa…</item>
     </plurals>
-
     <string name="seen_by">Nähty toimesta</string>
-
     <string name="signed_out_title">Olet kirjautunut ulos</string>
     <string name="signed_out_submit">Kirjaudu sisään uudelleen</string>
-
     <string name="soft_logout_title">Olet kirjautunut ulos</string>
     <string name="soft_logout_signin_title">Kirjaudu sisään</string>
     <string name="soft_logout_signin_notice">Kotipalvelimen (%1$s) ylläpitäjä on kirjannut sinut ulos tunnukseltasi %2$s (%3$s).</string>
@@ -1938,7 +1607,6 @@ Haluatko lisätä paketteja?</string>
 \n
 \nPoista ne jos olet lopettanut tämän laitteen käytön, tai haluat kirjautua sisään toiselle tunnukselle.</string>
     <string name="soft_logout_clear_data_submit">Poista kaikki tiedot</string>
-
     <string name="soft_logout_clear_data_dialog_title">Poista tiedot</string>
     <string name="soft_logout_clear_data_dialog_content">Poista kaikki tälle laitteelle tallennetut tiedot\?
 \nKirjaudu sisään päästäksesi käsiksi tunnuksesi tietoihin ja viesteihin.</string>
@@ -1946,12 +1614,9 @@ Haluatko lisätä paketteja?</string>
     <string name="soft_logout_clear_data_dialog_submit">Poista tiedot</string>
     <string name="soft_logout_sso_not_same_user_error">Nykyinen istunto on käyttäjälle %1$s, ja yritit kirjautuas isään käyttäjälle %2$s. Element ei tue tätä.
 \nPoista ensin tietosi ja kirjaudu sen jälkeen toisella tunnuksella. Voit vaihtoehtoisesti käyttää Elementin selainversiota.</string>
-
     <string name="permalink_malformed">matrix.to-linkkisi oli epämuodostunut</string>
     <string name="bug_report_error_too_short">Kuvaus on liian lyhyt</string>
-
     <string name="login_server_url_form_other_notice">Syötä palvelin tai sen Elementin osoite, mihin haluat yhdistää</string>
-
     <string name="signed_out_notice">Se voi johtua monesta eri syystä:
 \n
 \n• olet vaihtanut salasanasi toisella laitteella
@@ -1965,17 +1630,14 @@ Haluatko lisätä paketteja?</string>
     <string name="settings">Asetukset</string>
     <string name="devices_current_device">Nykyinen istunto</string>
     <string name="devices_other_devices">Muut istunnot</string>
-
     <string name="create_room_encryption_title">Ota salaus käyttöön</string>
     <string name="create_room_encryption_description">Salausta ei voi poistaa käytöstä, kun se on kerran otettu käyttöön.</string>
-
     <string name="verification_request_waiting">Odotetaan…</string>
     <string name="verification_request_other_cancelled">%s peruutti</string>
     <string name="verification_request_you_cancelled">Sinä peruutit</string>
     <string name="verification_request_other_accepted">%s hyväksyi</string>
     <string name="verification_request_you_accepted">Sinä hyväksyit</string>
     <string name="you">Sinä</string>
-
     <string name="room_profile_section_security_learn_more">Lue lisää</string>
     <string name="room_profile_section_more_notifications">Ilmoitukset</string>
     <plurals name="room_profile_section_more_member_list">
@@ -1984,10 +1646,8 @@ Haluatko lisätä paketteja?</string>
     </plurals>
     <string name="room_profile_section_more_leave">Poistu huoneesta</string>
     <string name="room_profile_leaving_room">Poistutaan huoneesta…</string>
-
     <string name="login_signup_username_hint">Käyttäjätunnus</string>
     <string name="notification_initial_sync">Synkronoidaan tietoja ensimmäistä kertaa…</string>
-
     <string name="settings_developer_mode">Kehittäjämoodi</string>
     <string name="settings_developer_mode_summary">Kehittäjämoodi aktivoi piilotettuja ominaisuuksia, mutta voi tehdä sovelluksesta epävakaan. Vain kehittäjille!</string>
     <string name="settings_rageshake">Raivoravistus</string>
@@ -1995,13 +1655,9 @@ Haluatko lisätä paketteja?</string>
     <string name="settings_rageshake_detection_threshold_summary">Ravista puhelintasi testataksesi tunnistusrajan</string>
     <string name="rageshake_detected">Ravistus tunnistettu!</string>
     <string name="autocomplete_limited_results">Näytetään vain ensimmäiset tulokset, kirjoita lisää kirjaimia…</string>
-
     <string name="settings_developer_mode_fail_fast_summary">Element voi kaatuilla tavallista useammin odottamattomien virheiden vuoksi</string>
-
     <string name="command_description_shrug">Lisää ¯\\_(ツ)_/¯ tavallisen viestin alkuun</string>
-
     <string name="login_error_threepid_denied">Käyttämäsi sähköpostipalvelun ei ole sallittu rekisteröityä tälle palvelimelle</string>
-
     <string name="verification_sas_match">Täsmäävät</string>
     <string name="verification_sas_do_not_match">Eivät täsmää</string>
     <string name="verify_user_sas_emoji_help_text">Vahvista käyttäjä tarkastamalla että seuraavat emojit vastaavat täysin heidän ruudullaan näkyviä.</string>
@@ -2015,29 +1671,20 @@ Haluatko lisätä paketteja?</string>
 \n - Varmentamasi toisen käyttäjän kotipalvelin
 \n - Sinun tai toisen käyttäjän Internet-yhteys
 \n - Sinun tai toisen käyttäjän käyttämä laite</string>
-
     <string name="sent_an_audio_file">Äänitiedosto</string>
     <string name="sent_a_file">Tiedosto</string>
-
     <string name="verification_sent">Varmennus lähetetty</string>
     <string name="verification_request">Varmennuspyyntö</string>
-
-
     <string name="verification_verify_device">Varmenna istunto</string>
     <string name="verification_verify_device_manually">Varmenna manuaalisesti</string>
-
     <string name="verification_scan_notice">Lue koodi toisen käyttäjän laitteesta varmentaaksenne toisenne tietoturvallisesti</string>
     <string name="verification_scan_their_code">Lue toisen käyttäjän koodi</string>
     <string name="verification_scan_emoji_title">Lukeminen ei onnistu</string>
     <string name="verification_scan_emoji_subtitle">Vertailkaa emojeilla jos et ole toisen käyttäjän luona</string>
-
     <string name="verification_no_scan_emoji_title">Varmenna vertaamalla emojeja</string>
-
     <string name="verify_by_emoji_title">Varmenna emojeilla</string>
     <string name="verify_by_emoji_description">Jos koodin lukeminen ei onnistu, varmenna vertaamalla lyhyttä sarjaa emojeja.</string>
-
     <string name="a13n_qr_code_description">QR-koodi</string>
-
     <string name="verification_verify_user">Varmenna %s</string>
     <string name="verification_verified_user">Varmennettu %s</string>
     <string name="verification_request_waiting_for">Odotetaan käyttäjää %s…</string>
@@ -2055,79 +1702,56 @@ Haluatko lisätä paketteja?</string>
     <string name="room_member_power_level_admins">Ylläpitäjät</string>
     <string name="room_member_power_level_moderators">Moderaattorit</string>
     <string name="room_member_power_level_users">Käyttäjät</string>
-
     <string name="room_member_power_level_admin_in">Ylläpitäjä %1$s:ssä</string>
     <string name="room_member_power_level_moderator_in">Moderaattori %1$s:ssä</string>
     <string name="room_member_jump_to_read_receipt">Siirry lukukuittaukseen</string>
-
     <string name="rendering_event_error_type_of_event_not_handled">Element ei osaa käsitellä tapahtumia joiden tyyppi on \'%1$s\'</string>
     <string name="rendering_event_error_type_of_message_not_handled">Element ei osaa käsitellä viestejä joiden tyyppi on \'%1$s\'</string>
     <string name="rendering_event_error_exception">Element ei osannut piirtää tapahtuman jonka tunniste on \'%1$s\' sisältöä</string>
-
     <string name="room_list_sharing_header_recent_rooms">Viimeaikaiset huoneet</string>
     <string name="room_list_sharing_header_other_rooms">Muut huoneet</string>
-
     <string name="command_description_rainbow">Lähettää annetun viestin väritettynä sateenkaaren väreillä</string>
     <string name="room_settings_enable_encryption">Ota käyttöön osapuolten välinen salaus</string>
     <string name="room_settings_enable_encryption_warning">Salausta ei voi enää poistaa käytöstä sen jälkeen kun se on otettu käyttöön.</string>
-
     <string name="room_settings_enable_encryption_dialog_title">Otetaanko salaus käyttöön\?</string>
     <string name="room_settings_enable_encryption_dialog_content">Salausta ei voi ottaa pois käytöstä sen jälkeen kun se on otettu käyttöön. Salattuja viestejä ei pysty lukemaan edes palvelin, vain ainoastaan huoneessa olijat. Salauksen käyttöönotto voi estää bottien ja siltojen toiminnan huoneessa.</string>
     <string name="room_settings_enable_encryption_dialog_submit">Ota salaus käyttöön</string>
-
     <string name="verification_request_notice">Salauksen mahdollistamiseksi varmenna %s tarkastamalla kertakäyttöinen koodi.</string>
     <string name="verification_request_start_notice">Tee tämä toisen käyttäjän ollessa läsnä tai käyttäkää toista viestintävälinettä tietoturvan varmistamiseksi.</string>
-
     <string name="verification_emoji_notice">Verratkaa emojeja ja varmistakaa että ne ovat samassa järjestyksessä kummallakin.</string>
     <string name="verification_code_notice">Vertaa koodia joka näkyy toisen käyttäjän ruudulla.</string>
     <string name="verification_conclusion_ok_notice">Tämän käyttäjän kanssa käyty viestintä on nyt päästä päähän salattu ja sitä ei pysty kukaan ulkopuolinen vakoilemaan.</string>
     <string name="verification_conclusion_ok_self_notice">Istuntosi on nyt vahvistettu. Sillä on pääsy salattuihin viesteihisi ja muut käyttäjät näkevät sen luotettuna.</string>
-
-
     <string name="settings_active_sessions_list">Aktiiviset istunnot</string>
     <string name="settings_active_sessions_show_all">Näytä kaikki istunnot</string>
     <string name="settings_active_sessions_manage">Istuntojen hallinta</string>
     <string name="settings_active_sessions_signout_device">Kirjaudu ulos tästä istunnosta</string>
-
     <string name="settings_failed_to_get_crypto_device_info">Ei salaukseen liittyvää tietoa</string>
-
     <string name="settings_active_sessions_verified_device_desc">Istunto on luotettu, koska olet vahvistanut sen:</string>
     <string name="settings_active_sessions_unverified_device_desc">Vahvista tämä istunto jotta se merkitään luotetuksi ja se saa pääsyn salattuihin viesteihin. Jos et ole kirjautunut tähän istuntoon, tunnuksesi on saattanut vuotaa hyökkääjälle:</string>
-
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d käynnissä oleva istunto</item>
         <item quantity="other">%d käynnissä olevaa istuntoa</item>
     </plurals>
-
     <string name="crosssigning_verify_this_session">Varmenna tämä kirjautuminen</string>
     <string name="crosssigning_other_user_not_trust">Muut käyttäjät eivät välttämättä luota siihen</string>
     <string name="verification_open_other_to_verify">Käytä olemassaolevaa istuntoa tämän istunnon varmentamiseksi jotta se saa oikeudet salattuihin viesteihin.</string>
-
-
     <string name="verification_profile_verify">Varmenna</string>
     <string name="verification_profile_verified">Varmennettu</string>
     <string name="verification_profile_warning">Varoitus</string>
-
     <string name="room_member_profile_failed_to_get_devices">Ei saatu istuntoja</string>
     <string name="room_member_profile_sessions_section_title">Istunnot</string>
     <string name="trusted">Luotettu</string>
     <string name="not_trusted">Ei luotettu</string>
-
-    <string name="verification_profile_device_verified_because">"Tämä istunto on luotettu salattuun viestintään koska  %1$s (%2$s) varmisti sen:"</string>
+    <string name="verification_profile_device_verified_because">"Tähän istuntoon luotetetaan salatussa viestinnässä, koska  %1$s (%2$s) varmisti sen:"</string>
     <string name="verification_profile_device_new_signing">%1$s (%2$s) kirjautui sisään uuteen istuntoon:</string>
     <string name="verification_profile_device_untrust_info">Tämän käyttäjän kanssa käyty viestintä merkitään virheiksi kunnes käyttäjä luottaa tähän istuntoon. Voit vaihtoehtoisesti käsin varmentaa sen.</string>
-
-
     <string name="reset_cross_signing">Nollaa avaimet</string>
-
     <string name="a11y_qr_code_for_verification">QR-koodi</string>
-
     <string name="qr_code_scanned_by_other_notice">Melkein valmis! Näkyykä %s:lla sama kilven kuva\?</string>
     <string name="qr_code_scanned_by_other_yes">Kyllä</string>
     <string name="qr_code_scanned_by_other_no">Ei</string>
-
     <string name="no_connectivity_to_the_server_indicator">Yhteys kotipalvelimeen on poikki</string>
-
     <string name="settings_dev_tools">Kehittäjän työkalut</string>
     <plurals name="poll_info">
         <item quantity="one">%d ääni</item>
@@ -2139,9 +1763,7 @@ Haluatko lisätä paketteja?</string>
     </plurals>
     <string name="command_description_poll">Luo yksinkertaisen äänestyksen</string>
     <string name="verification_use_passphrase">Jos et pääse käsiksi olemassaolevaan istuntoon</string>
-
     <string name="new_signin">Uusi sisäänkirjautuminen</string>
-
     <string name="enter_secret_storage_passphrase_warning">Varoitus:</string>
     <string name="message_action_item_redact">Poista…</string>
     <string name="share_confirm_room">Haluatko lähettää tämän liitteen %1$s\?:lle\?</string>
@@ -2149,53 +1771,38 @@ Haluatko lisätä paketteja?</string>
         <item quantity="one">Lähetä kuva alkuperäisessä koossa</item>
         <item quantity="other">Lähetä kuvat alkuperäisessä koossa</item>
     </plurals>
-
     <string name="delete_event_dialog_title">Vahvista poisto</string>
     <string name="delete_event_dialog_content">Haluatko varmasti poistaa tämän tapahtuman\? Huomaa, että jos poistat huoneen nimen tai otsikon muutostapahtuman, se voi perua muutoksen.</string>
     <string name="delete_event_dialog_reason_checkbox">Anna syy</string>
     <string name="event_redacted_by_user_reason_with_reason">Käyttäjä poistanut tapahtuman, syynä: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Tapahtuma moderoitu huoneen ylläpitäjän toimesta, syynä: %1$s</string>
-
     <string name="keys_backup_restore_success_title_already_up_to_date">Avaimet ovat jo ajan tasalla!</string>
-
     <string name="login_default_session_public_name">Element Android</string>
-
     <string name="settings_key_requests">Avainpyynnöt</string>
-
     <string name="refresh">Päivitä</string>
-
     <string name="new_session">Uusi kirjautuminen. Olitko se sinä\?</string>
     <string name="new_session_review">Paina tarkastellaksesi ja varmentaaksesi</string>
     <string name="verify_new_session_was_not_me">En ollut</string>
     <string name="verify_new_session_compromized">Tilillesi saatetaan olla murtauduttu</string>
-
     <string name="verify_cancel_self_verification_from_untrusted">Jos perut, et voi lukea salattuja viestejäsi tällä laitteella eivätkä muut käyttäjät luota siihen</string>
     <string name="verify_cancel_self_verification_from_trusted">Jos perut, et voi lukea salattuja viestejäsi uudella laitteellasi eivätkä muut käyttäjät luota siihen</string>
     <string name="verify_cancelled_notice">Varmenna laitteesi ohjelman asetuksista.</string>
     <string name="verification_cancelled">Vahvistus peruttu</string>
-
     <string name="recovery_passphrase">Palautussalasana</string>
     <string name="account_password">Tilin salasana</string>
-
     <string name="set_recovery_passphrase">Aseta %s</string>
     <string name="confirm_recovery_passphrase">Vahvista %s</string>
-
     <string name="enter_account_password">Anna %s jatkaaksesi.</string>
-
-    <string name="bootstrap_info_text">Pura ja salaa salatut viestit ja luottamukset asettamalla %s</string>
+    <string name="bootstrap_info_text">Pura ja salaa salatut viestit ja luottamukset asettamalla %s.</string>
     <string name="bootstrap_info_confirm_text">Anna %s uudestaan vahvistaaksesi sen.</string>
     <string name="bootstrap_dont_reuse_pwd">Älä käytä tilisi salasanaa muualla.</string>
-
-
     <string name="bootstrap_loading_text">Odota hetki, kiitos.</string>
     <string name="bootstrap_loading_title">Alustetaan palautusta.</string>
     <string name="your_recovery_key">Palautusavaimesi</string>
     <string name="bootstrap_finish_title">Valmista!</string>
     <string name="keep_it_safe">Pidä se turvassa</string>
     <string name="finish">Lopeta</string>
-
     <string name="bootstrap_save_key_description">Käytä %1$s:tä turvaverkkona jos onnistut unohtamaan %2$s:n.</string>
-
     <string name="bootstrap_crosssigning_progress_initializing">Julkaistaan luodut identiteettiavaimet</string>
     <string name="bootstrap_crosssigning_progress_pbkdf2">Luodaan salausavain salasanasta</string>
     <string name="bootstrap_crosssigning_progress_default_key">Määritetään SSSS-oletusavain</string>
@@ -2203,22 +1810,15 @@ Haluatko lisätä paketteja?</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Synkronoidaan käyttäjän avain</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Synkronoidaan allekirjoitusavain</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Alustetaan avainten varmuuskopiointi</string>
-
-
     <string name="bootstrap_cross_signing_success">%2$s ja %1$s asetettu.
 \n
 \nPidä ne tallessa. Tarvitset ne salattujen viestiesi ja tietojesi avaamiseen, jos suljet kaikki istuntosi.</string>
-
     <string name="bootstrap_crosssigning_print_it">Tulosta se jos mahdollista ja säilytä tuloste turvallisessa paikassa</string>
     <string name="bootstrap_crosssigning_save_usb">Tallenna se muistitikulle tai varmuuskopiolevylle talteen</string>
     <string name="bootstrap_crosssigning_save_cloud">Kopioi se henkilökohtaiseen pilvitallennustilaasi</string>
-
     <string name="auth_flow_not_supported">Tätä ei pysty tekemään kännykällä</string>
-
     <string name="room_member_power_level_custom">Mukautettu</string>
     <string name="room_member_power_level_custom_in">Mukautettu (%1$d) %2$s:ssä</string>
-
     <string name="delete_event_dialog_reason_hint">Syy poistoon</string>
-
     <string name="message_key">Viestin avain</string>
-</resources>
+</resources>
\ No newline at end of file

From 9bf615e90c15d6610a1ce2327498c2ec0b9d7b13 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Fri, 16 Oct 2020 11:02:29 +0200
Subject: [PATCH 268/278] Fix composer: update constraints layout and fix some
 glitches

---
 CHANGES.md                                    |  1 +
 vector/build.gradle                           |  3 +-
 .../room/detail/composer/TextComposerView.kt  | 61 ++++++++-----------
 ...onstraint_set_composer_layout_expanded.xml | 13 ++--
 4 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3441af2f71..0d3bc066fd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -35,6 +35,7 @@ Bugfix 🐛:
  - Don't set presence when handling a push notification or polling (#2156)
  - Be robust against `StrandHogg` task injection
  - Clear alerts if user sign out
+ - Fix rows are hidden in Textinput (#2234)
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/vector/build.gradle b/vector/build.gradle
index 00f3f26545..bfd50117d1 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -313,8 +313,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment:$fragment_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    // Keep at 2.0.0-beta4 at the moment, as updating is breaking some UI
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation "androidx.sharetarget:sharetarget:1.0.0"
     implementation 'androidx.core:core-ktx:1.3.2'
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
index 9266186a59..f4b14571c0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
@@ -28,9 +28,11 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.text.toSpannable
 import androidx.core.view.isVisible
-import androidx.transition.AutoTransition
+import androidx.transition.ChangeBounds
+import androidx.transition.Fade
 import androidx.transition.Transition
 import androidx.transition.TransitionManager
+import androidx.transition.TransitionSet
 import butterknife.BindView
 import butterknife.ButterKnife
 import im.vector.app.R
@@ -113,29 +115,7 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
             return
         }
         currentConstraintSetId = R.layout.constraint_set_composer_layout_compact
-        if (animate) {
-            val transition = AutoTransition()
-            transition.duration = animationDuration
-            transition.addListener(object : Transition.TransitionListener {
-                override fun onTransitionEnd(transition: Transition) {
-                    transitionComplete?.invoke()
-                }
-
-                override fun onTransitionResume(transition: Transition) {}
-
-                override fun onTransitionPause(transition: Transition) {}
-
-                override fun onTransitionCancel(transition: Transition) {}
-
-                override fun onTransitionStart(transition: Transition) {}
-            }
-            )
-            TransitionManager.beginDelayedTransition((parent as? ViewGroup ?: this), transition)
-        }
-        ConstraintSet().also {
-            it.clone(context, currentConstraintSetId)
-            it.applyTo(this)
-        }
+        applyNewConstraintSet(animate, transitionComplete)
     }
 
     fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
@@ -144,10 +124,28 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
             return
         }
         currentConstraintSetId = R.layout.constraint_set_composer_layout_expanded
+        applyNewConstraintSet(animate, transitionComplete)
+    }
+
+    private fun applyNewConstraintSet(animate: Boolean, transitionComplete: (() -> Unit)?) {
         if (animate) {
-            val transition = AutoTransition()
-            transition.duration = animationDuration
-            transition.addListener(object : Transition.TransitionListener {
+            configureAndBeginTransition(transitionComplete)
+        }
+        ConstraintSet().also {
+            it.clone(context, currentConstraintSetId)
+            // in case shield is hidden, we will have glitch without this
+            it.getConstraint(R.id.composer_shield).propertySet.visibility = composerShieldImageView.visibility
+            it.applyTo(this)
+        }
+    }
+
+    private fun configureAndBeginTransition(transitionComplete: (() -> Unit)? = null) {
+        val transition = TransitionSet().apply {
+            ordering = TransitionSet.ORDERING_SEQUENTIAL
+            addTransition(ChangeBounds())
+            addTransition(Fade(Fade.IN))
+            duration = animationDuration
+            addListener(object : Transition.TransitionListener {
                 override fun onTransitionEnd(transition: Transition) {
                     transitionComplete?.invoke()
                 }
@@ -159,14 +157,9 @@ class TextComposerView @JvmOverloads constructor(context: Context, attrs: Attrib
                 override fun onTransitionCancel(transition: Transition) {}
 
                 override fun onTransitionStart(transition: Transition) {}
-            }
-            )
-            TransitionManager.beginDelayedTransition((parent as? ViewGroup ?: this), transition)
-        }
-        ConstraintSet().also {
-            it.clone(context, currentConstraintSetId)
-            it.applyTo(this)
+            })
         }
+        TransitionManager.beginDelayedTransition((parent as? ViewGroup ?: this), transition)
     }
 
     fun setRoomEncrypted(isEncrypted: Boolean, roomEncryptionTrustLevel: RoomEncryptionTrustLevel?) {
diff --git a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
index cd4d48c056..dba996309e 100644
--- a/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
+++ b/vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
@@ -62,7 +62,7 @@
     <TextView
         android:id="@+id/composer_related_message_preview"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="?vctr_message_text_color"
@@ -113,8 +113,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/composer_shield"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="1"
         tools:src="@tools:sample/avatars" />
 
 
@@ -126,9 +124,7 @@
         app:layout_constraintEnd_toStartOf="@+id/composerEditText"
         app:layout_constraintBottom_toBottomOf="@id/composer_avatar_view"
         app:layout_constraintStart_toEndOf="@+id/composer_avatar_view"
-        tools:src="@drawable/ic_shield_black"
-        tools:visibility="visible"
-        />
+        tools:src="@drawable/ic_shield_black" />
 
 
 
@@ -162,7 +158,6 @@
         app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/composerEditText"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
         app:layout_constraintVertical_bias="1"
         tools:ignore="MissingPrefix" />
@@ -176,8 +171,8 @@
         android:nextFocusUp="@id/composerEditText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintStart_toEndOf="@id/composer_avatar_view"
+        app:layout_constraintStart_toEndOf="@id/composer_shield"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem/random" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e19af47b7710b6902b2d3e324a8ba06a553ac0f7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 16 Oct 2020 14:00:57 +0000
Subject: [PATCH 269/278] Translated using Weblate (Italian)

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/it/
---
 matrix-sdk-android/src/main/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/res/values-it/strings.xml b/matrix-sdk-android/src/main/res/values-it/strings.xml
index 7aa2169b1f..d4479be674 100644
--- a/matrix-sdk-android/src/main/res/values-it/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-it/strings.xml
@@ -176,7 +176,7 @@
     <string name="notice_room_third_party_invite_with_reason_by_you">Hai mandato un invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Hai revocato l\'invito a %1$s a unirsi alla stanza. Motivo: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Hai accettato l\'invito per %1$s. Motivo: %2$s</string>
-    <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %2$s. Motivo: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Hai ritirato l\'invito di %1$s. Motivo: %2$s</string>
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Hai aggiunto %1$s come indirizzo per questa stanza.</item>
         <item quantity="other">Hai aggiunto %1$s come indirizzi per questa stanza.</item>

From d314c8ae587337efb1ef07fdd78164feb6ac50db Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 16 Oct 2020 13:58:52 +0000
Subject: [PATCH 270/278] Translated using Weblate (Bengali (India))

Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/bn_IN/
---
 .../src/main/res/values-bn-rIN/strings.xml    | 37 ++-----------------
 1 file changed, 3 insertions(+), 34 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
index 5d38f0b3ee..8d31488283 100644
--- a/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-bn-rIN/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_user_sent_image">%1$s একটি ফটো পাঠিয়েছে।</string>
     <string name="summary_user_sent_sticker">%1$s একটি স্তিকার পাঠিয়েছে।</string>
-
     <string name="notice_room_invite_no_invitee">%s এর আমন্ত্রণ</string>
     <string name="notice_room_invite">%1$s %2$s কে আমন্ত্রণ করেছে</string>
     <string name="notice_room_invite_you">%1$s আপনাকে আমন্ত্রণ করেছে</string>
@@ -24,7 +23,6 @@
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_you_sent_image">আপনি একটি ছবি প্রেরণ করেছেন।</string>
     <string name="summary_you_sent_sticker">আপনি একটি স্তিকার পাঠিয়েছেন।</string>
-
     <string name="notice_room_invite_no_invitee_by_you">আপনার আমন্ত্রণ</string>
     <string name="notice_room_created">%1$s কক্ষটি তৈরি করেছেন</string>
     <string name="notice_room_created_by_you">আপনি কক্ষটি তৈরি করেছেন</string>
@@ -63,12 +61,10 @@
     <string name="notice_end_to_end_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (%1$s)</string>
     <string name="notice_room_update">%s এই কক্ষটিকে আপগ্রেড করেছে।</string>
     <string name="notice_room_update_by_you">আপনি এই কক্ষটি আপগ্রেড করেছেন।</string>
-
     <string name="notice_requested_voip_conference">%1$s একটি ভিওআইপি সম্মেলনের জন্য অনুরোধ করেছে</string>
     <string name="notice_requested_voip_conference_by_you">আপনি একটি ভিওআইপি সম্মেলনের অনুরোধ করেছেন</string>
     <string name="notice_voip_started">ভিওআইপি সম্মেলন শুরু হয়েছে</string>
     <string name="notice_voip_finished">ভিওআইপি সম্মেলন শেষ হয়েছে</string>
-
     <string name="notice_avatar_changed_too">(আবতারটিও পরিবর্তন করা হয়েছিল)</string>
     <string name="notice_room_name_removed">%1$s কক্ষের নাম সরিয়েছে</string>
     <string name="notice_room_name_removed_by_you">আপনি কক্ষের নাম সরিয়েছেন</string>
@@ -88,54 +84,39 @@
     <string name="notice_room_third_party_revoked_invite_by_you">আপনি %1$s এর কক্ষে যোগদানের জন্য আমন্ত্রণটি বাতিল করেছেন</string>
     <string name="notice_room_third_party_registered_invite">%1$s %2$s এর জন্য আমন্ত্রণটি গ্রহণ করেছে</string>
     <string name="notice_room_third_party_registered_invite_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন</string>
-
     <string name="notice_widget_added">%1$s %2$s উইজেট যুক্ত করেছে</string>
     <string name="notice_widget_added_by_you">আপনি %1$s উইজেট যুক্ত করেছেন</string>
     <string name="notice_widget_removed">%1$s %2$s উইজেট সরিয়ে দিয়েছেন</string>
     <string name="notice_widget_removed_by_you">আপনি %1$s উইজেট সরিয়েছেন</string>
     <string name="notice_widget_modified">%1$s %2$s উইজেট পরিবর্তন করেছেন</string>
     <string name="notice_widget_modified_by_you">আপনি %1$s উইজেট পরিবর্তন করেছেন</string>
-
     <string name="power_level_admin">অ্যাডমিন</string>
     <string name="power_level_moderator">নিয়ামক</string>
     <string name="power_level_default">ডিফল্ট</string>
     <string name="power_level_custom">কাস্টম (%1$d)</string>
     <string name="power_level_custom_no_value">কাস্টম</string>
-
     <string name="notice_power_level_changed_by_you">আপনি %1$s এর পাওয়ার স্তর পরিবর্তন করেছেন।</string>
     <string name="notice_power_level_changed">%1$s %2$s এর পাওয়ার স্তর পরিবর্তন করেছে।</string>
     <string name="notice_power_level_diff">%1$s %2$s থেকে %3$s পর্যন্ত</string>
-
     <string name="notice_crypto_unable_to_decrypt">** ডিক্রিপ্ট করতে অক্ষম: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">প্রেরকের ডিভাইস আমাদের এই বার্তার জন্য কীগুলি প্রেরণ করেনি।</string>
-
     <string name="could_not_redact">পুনরায় প্রতিক্রিয়া করতে পারেনি</string>
     <string name="unable_to_send_message">বার্তা পাঠাতে অক্ষম</string>
-
     <string name="message_failed_to_upload">চিত্র আপলোড করতে ব্যর্থ</string>
-
     <string name="network_error">নেটওয়ার্ক ত্রুটি</string>
     <string name="matrix_error">ম্যাট্রিক্স ত্রুটি</string>
-
     <string name="room_error_join_failed_empty_room">খালি কক্ষে পুনরায় যোগদান করা বর্তমানে সম্ভব নয়।</string>
-
     <string name="encrypted_message">এনক্রিপ্ট করা বার্তা</string>
-
     <string name="medium_email">ইমেল ঠিকানা</string>
     <string name="medium_phone_number">ফোন নম্বর</string>
-
     <string name="room_displayname_invite_from">%s থেকে আমন্ত্রণ করুন</string>
     <string name="room_displayname_room_invite">কক্ষ আমন্ত্রণ</string>
-
     <string name="room_displayname_two_members">%1$s এবং %2$s</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s এবং অন্য ১ জন</item>
         <item quantity="other">%1$s এবং অন্যান্য %2$d জন</item>
     </plurals>
-
     <string name="room_displayname_empty_room">খালি কক্ষ</string>
-
     <string name="initial_sync_start_importing_account">প্রাথমিক সিঙ্ক:
 \nঅ্যাকাউন্ট আমদানি করা হচ্ছে…</string>
     <string name="initial_sync_start_importing_account_crypto">প্রাথমিক সিঙ্ক:
@@ -152,10 +133,8 @@
 \nসম্প্রদায়গুলি আমদানি করা হচ্ছে</string>
     <string name="initial_sync_start_importing_account_data">প্রাথমিক সিঙ্ক:
 \nঅ্যাকাউন্ট ডেটা আমদানি করা হচ্ছে</string>
-
     <string name="event_status_sending_message">বার্তা প্রেরণ করা হচ্ছে …</string>
     <string name="clear_timeline_send_queue">প্রেরণ সারি পরিষ্কার করুন</string>
-
     <string name="notice_room_invite_no_invitee_with_reason">%1$s এর আমন্ত্রণ। কারণ: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">আপনার আমন্ত্রণ। কারণ: %1$s</string>
     <string name="notice_room_invite_with_reason">%1$s আমন্ত্রিত করেছেন %2$s কে। কারণ: %3$s</string>
@@ -167,7 +146,7 @@
     <string name="notice_room_leave_with_reason_by_you">আপনি কক্ষ ছেড়ে দিয়েছেন। কারণ: %1$s</string>
     <string name="notice_room_reject_with_reason">%1$s আমন্ত্রণ বাতিল করেছেন। কারণ: %2$s</string>
     <string name="notice_room_reject_with_reason_by_you">আপনি আমন্ত্রণটি বাতিল করেছেন। কারণ: %1$s</string>
-    <string name="notice_room_kick_with_reason">%1$s %2$s কে কিক করেছে। কারণ: %2$s</string>
+    <string name="notice_room_kick_with_reason">%1$s %2$s কে কিক করেছে। কারণ: %3$s</string>
     <string name="notice_room_kick_with_reason_by_you">আপনি %1$s কে কীক করেছেন। কারণ: %2$s</string>
     <string name="notice_room_unban_with_reason">%1$s %2$s কে নিষিদ্ধ তালিকা থেকে মুক্ত করেছে। কারণ: %3$s</string>
     <string name="notice_room_unban_with_reason_by_you">আপনি %1$s কে নিষিদ্ধ মুক্ত করেছেন। কারণ: %2$s</string>
@@ -181,45 +160,35 @@
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">আপনি %1$s এর জন্য আমন্ত্রণটি গ্রহণ করেছেন। কারণ: %2$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s %2$s এর আমন্ত্রণ ফেরত নিয়েছে। কারণ: %3$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">আপনি %1$s এর আমন্ত্রণ প্রত্যাহার করেছেন। কারণ: %2$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s যুক্ত করেছে।</item>
         <item quantity="other">%1$s এই ঘরের ঠিকানাগুলি হিসাবে %2$s যুক্ত করেছে।</item>
     </plurals>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">আপনি এই কক্ষের জন্য ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
         <item quantity="other">আপনি এই কক্ষের ঠিকানা হিসাবে %1$s যুক্ত করেছেন।</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s এই ঘরের ঠিকানা হিসাবে %2$s সরানো হয়েছে।</item>
         <item quantity="other">%1$s %3$s কে এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">আপনি এই ঘরের ঠিকানা হিসাবে %1$s সরিয়েছেন।</item>
         <item quantity="other">আপনি এই ঘরের ঠিকানা হিসাবে %2$s গুলি সরিয়েছেন।</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s %2$s যোগ করেছে এবং %3$s গুলি এই ঘরের ঠিকানা হিসাবে সরানো হয়েছে।</string>
     <string name="notice_room_aliases_added_and_removed_by_you">আপনি %1$s যোগ করেছেন এবং %2$s কে এই ঘরের ঠিকানা হিসাবে সরিয়ে দিয়েছেন।</string>
-
     <string name="notice_room_canonical_alias_set">%1$s এই ঘরের মূল ঠিকানাটি %2$s তে সেট করে।</string>
     <string name="notice_room_canonical_alias_set_by_you">আপনি এই ঘরের মূল ঠিকানাটি %1$s তে সেট করেছেন।</string>
     <string name="notice_room_canonical_alias_unset">%1$s এই ঘরের মূল ঠিকানা সরিয়ে নিয়েছে।</string>
     <string name="notice_room_canonical_alias_unset_by_you">আপনি এই ঘরের মূল ঠিকানা সরিয়েছেন।</string>
-
     <string name="notice_room_guest_access_can_join">%1$s অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছে।</string>
     <string name="notice_room_guest_access_can_join_by_you">আপনি অতিথিদের ঘরে যোগদানের অনুমতি দিয়েছেন।</string>
     <string name="notice_room_guest_access_forbidden">%1$s অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছে।</string>
     <string name="notice_room_guest_access_forbidden_by_you">আপনি অতিথিদের ঘরে যোগদান করতে বাধা দিয়েছেন।</string>
-
     <string name="notice_end_to_end_ok">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে।</string>
     <string name="notice_end_to_end_ok_by_you">আপনি শেষ থেকে শেষ এনক্রিপশন চালু করেছেন।</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s এন্ড-টু-এন্ড এনক্রিপশন চালু করেছে (অজানা অ্যালগরিদম %2$s)।</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">আপনি শেষ-থেকে-শেষ এনক্রিপশন চালু করেছেন (অজানা অ্যালগরিদম %1$s )।</string>
-
     <string name="key_verification_request_fallback_message">%s আপনার কীটি যাচাই করার জন্য অনুরোধ করছে, তবে আপনার ক্লায়েন্ট ইন-চ্যাট কী যাচাইকরণ সমর্থন করে না। কীগুলি যাচাই করতে আপনাকে লিগ্যাসি কী যাচাইকরণ ব্যবহার করতে হবে।</string>
-
-</resources>
+</resources>
\ No newline at end of file

From 31e73b2f8c2f66e70ebf5dd021724ece4c2e5aec Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 16 Oct 2020 14:00:19 +0000
Subject: [PATCH 271/278] Translated using Weblate (Estonian)

Currently translated at 100.0% (190 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/et/
---
 matrix-sdk-android/src/main/res/values-et/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-et/strings.xml b/matrix-sdk-android/src/main/res/values-et/strings.xml
index 3c24ed8c2f..71ee50f075 100644
--- a/matrix-sdk-android/src/main/res/values-et/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-et/strings.xml
@@ -119,7 +119,7 @@
     <string name="notice_room_kick_by_you">Sina müksasid %1$s välja</string>
     <string name="notice_room_unban">%1$s taastas %2$s ligipääsu</string>
     <string name="notice_room_unban_by_you">Sina taastasid %1$s ligipääsu</string>
-    <string name="notice_room_ban">%1$s keelas %1$s ligipääsu</string>
+    <string name="notice_room_ban">%1$s keelas %2$s ligipääsu</string>
     <string name="notice_room_ban_by_you">Sina keelasid %1$s ligipääsu</string>
     <string name="notice_room_withdraw_by_you">Sina võtsid tagasi %1$s kutse</string>
     <string name="notice_avatar_url_changed_by_you">Sina muutsid oma tunnuspilti</string>
@@ -157,13 +157,13 @@
     <string name="power_level_admin">Peakasutaja</string>
     <string name="power_level_moderator">Moderaator</string>
     <string name="power_level_default">Tavakasutaja</string>
-    <string name="power_level_custom">Kohandatud kasutajaõigused (%1$s)</string>
+    <string name="power_level_custom">Kohandatud kasutajaõigused (%1$d)</string>
     <string name="power_level_custom_no_value">Kohandatud õigused</string>
     <string name="notice_power_level_changed_by_you">Sina muutsid kasutaja %1$s õigusi.</string>
     <string name="notice_power_level_changed">%1$s muutis kasutaja %2$s õigusi.</string>
     <string name="notice_power_level_diff">%1$s õiguste muutus %2$s -&gt; %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Sinu kutse. Põhjus %1$s</string>
-    <string name="notice_room_invite_with_reason_by_you">Sina kutsusid kasutajat %1$s. Põhjus: %1$s</string>
+    <string name="notice_room_invite_with_reason_by_you">Sina kutsusid kasutajat %1$s. Põhjus: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">Sina liitusid jututoaga. Põhjus: %1$s</string>
     <string name="notice_room_leave_with_reason_by_you">Sina lahkusid jututoast. Põhjus: %1$s</string>
     <string name="notice_room_reject_with_reason_by_you">Sina lükkasid kutse tagasi. Põhjus: %1$s</string>

From dce60d0061597b0ced08806c15c6df25dca3e285 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 16 Oct 2020 14:01:31 +0000
Subject: [PATCH 272/278] Translated using Weblate (Kabyle)

Currently translated at 88.4% (168 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/kab/
---
 .../src/main/res/values-kab/strings.xml       | 47 ++++---------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-kab/strings.xml b/matrix-sdk-android/src/main/res/values-kab/strings.xml
index ec498256f2..e557a7c824 100644
--- a/matrix-sdk-android/src/main/res/values-kab/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-kab/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s t.yuzen tugna.</string>
@@ -23,16 +23,11 @@
     <string name="power_level_moderator">Aseɣyad</string>
     <string name="power_level_default">Amezwer</string>
     <string name="power_level_custom_no_value">Sagen</string>
-
     <string name="notice_power_level_diff">%1$s seg %2$s ɣer %3$s</string>
-
     <string name="message_failed_to_upload">Tegguma ad d-tali tugna</string>
-
     <string name="medium_email">Tansa n yimayl</string>
-
     <string name="summary_user_sent_sticker">%1$s azen astiker.</string>
     <string name="summary_you_sent_sticker">Tuzneḍ amenṭaḍ.</string>
-
     <string name="notice_room_unban">%1$s yekkes agdal i %2$s</string>
     <string name="notice_room_unban_by_you">Tekkseḍ agdal i %1$s</string>
     <string name="notice_room_ban">%1$s igdel %2$s</string>
@@ -46,12 +41,12 @@
     <string name="notice_display_name_changed_from_by_you">Tbeddleḍ isem-ik•im i d-ittuseknen seg %1$s ɣer %2$s</string>
     <string name="notice_display_name_removed">%1$s yekkes isem-is i d-ittuseknen (yella %2$s)</string>
     <string name="notice_display_name_removed_by_you">Tekkseḍ isem-ik·im yettwaskanen (d %1$s)</string>
-    <string name="notice_room_topic_changed">%1$S isnifel asentel s: %2$S</string>
-    <string name="notice_room_topic_changed_by_you">Tesnifleḍ asentel s: %2$S</string>
+    <string name="notice_room_topic_changed">%1$s isnifel asentel s: %2$s</string>
+    <string name="notice_room_topic_changed_by_you">Tesnifleḍ asentel s: %1$s</string>
     <string name="notice_room_avatar_changed">%1$s ibeddel avaṭar n texxamt</string>
     <string name="notice_room_avatar_changed_by_you">Tbeddleḍ avaṭar n texxamt</string>
     <string name="notice_room_name_changed">%1$s ibeddel isem n texxamt s: %2$s</string>
-    <string name="notice_room_name_changed_by_you">Tbeddleḍ isem n texxamt s: %2$s</string>
+    <string name="notice_room_name_changed_by_you">Tbeddleḍ isem n texxamt s: %1$s</string>
     <string name="notice_placed_video_call">%s isɛedda siwel s tvidyut.</string>
     <string name="notice_placed_video_call_by_you">Tesɛeddaḍ siwel s tvidyut.</string>
     <string name="notice_placed_voice_call">%s isɛedda asiwel s taɣect.</string>
@@ -68,15 +63,13 @@
     <string name="notice_room_visibility_world_readable">yal yiwen.</string>
     <string name="notice_room_visibility_unknown">arussin (%s).</string>
     <string name="notice_end_to_end">%1$s isermed awgelhen seg yixef ɣer yixef (%2$s)</string>
-    <string name="notice_end_to_end_by_you">Tesremdeḍ awgelhen seg yixef ɣer yixef (%2$s)</string>
+    <string name="notice_end_to_end_by_you">Tesremdeḍ awgelhen seg yixef ɣer yixef (%1$s)</string>
     <string name="notice_room_update">%s ileqqem taxxamt-a.</string>
     <string name="notice_room_update_by_you">Tleqqmeḍ taxxamt-a.</string>
-
     <string name="notice_requested_voip_conference">%1$s isuter-d asarag VoIP</string>
     <string name="notice_requested_voip_conference_by_you">Tsutreḍ-d asarag VoIP</string>
     <string name="notice_voip_started">Asarag VoIP yebda</string>
     <string name="notice_voip_finished">Asarag VoIP yekfa</string>
-
     <string name="notice_avatar_changed_too">(avatar daɣen ibeddel)</string>
     <string name="notice_room_name_removed">%1$s yekkes isem n texxamt</string>
     <string name="notice_room_name_removed_by_you">Tekkseḍ isem n texxamt</string>
@@ -94,51 +87,37 @@
     <string name="notice_room_third_party_invite_by_you">Tuzneḍ tinubga i %1$s akken ad yeddu ɣer texxamt</string>
     <string name="notice_room_third_party_registered_invite">%1$s iqbel tinubga i %2$s</string>
     <string name="notice_room_third_party_registered_invite_by_you">Tqebleḍ tinubga i %1$s</string>
-
     <string name="notice_widget_added">%1$s yerna awiǧit %2$s</string>
     <string name="notice_widget_added_by_you">Terniḍ awiǧit %1$s</string>
     <string name="notice_widget_removed">%1$s yekkes awiǧit %2$s</string>
     <string name="notice_widget_removed_by_you">Tekkseḍ awiǧit %1$s</string>
     <string name="notice_widget_modified">%1$s ibeddel awiǧit %2$s</string>
     <string name="notice_widget_modified_by_you">Tbeddleḍ awiǧit %1$s</string>
-
-    <string name="power_level_custom">Sagen (%1$)</string>
+    <string name="power_level_custom">Sagen (%1$d)</string>
     <string name="notice_power_level_changed_by_you">Tbeddleḍ aswir n tezmert n %1$s.</string>
     <string name="notice_power_level_changed">%1$s ibeddel aswir n tezmert n %2$s.</string>
     <string name="notice_crypto_unable_to_decrypt">** Awgelhen d awezɣi: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Ibenk n umazan ur aɣ-d-yuzin ara tisura i yizen-a.</string>
-
     <string name="unable_to_send_message">Tuzna n yizen d tawezɣit</string>
-
     <string name="network_error">Tuccḍa deg uẓeṭṭa</string>
     <string name="matrix_error">Tuccḍa deg Matrix</string>
-
     <string name="notice_made_future_room_visibility">%1$s iga amazray n texxamyt i d-iteddun yettban i %2$s</string>
     <string name="notice_made_future_room_visibility_by_you">Tgiḍ amazray n texxamyt i d-iteddun yettban i %1$s</string>
     <string name="notice_room_third_party_revoked_invite">%1$s issefsax tinubga i %2$s i wakken ad d-yekcem ɣer texxamt</string>
     <string name="notice_room_third_party_revoked_invite_by_you">Tesfesxeḍ tinubga i %1$s i wakken ad d-yernu ɣer texxamt</string>
     <string name="room_error_join_failed_empty_room">D awezɣi tura ad nales ad nuɣal ɣer texxamt tilemt.</string>
-
     <string name="encrypted_message">Izen yettwawgelhen</string>
-
     <string name="medium_phone_number">Uṭṭun n tiliɣri</string>
-
     <string name="room_displayname_invite_from">Tinubga sɣur %s</string>
     <string name="room_displayname_room_invite">Tinubga ɣer texxamt</string>
-
     <string name="room_displayname_two_members">%1$s d %2$s</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s d 1 wayeḍ</item>
         <item quantity="other">%1$s d %2$d wiyaḍ</item>
     </plurals>
-
     <string name="notice_end_to_end_unknown_algorithm_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef (alguritm %1$s ur yettwassen ara).</string>
-
     <string name="key_verification_request_fallback_message">%s isuter-d ad isenqed tasarut-ik·im, maca amsaɣ-ik·im ur issefrak ara asenqed n tsura deg yidiwenniyen. Ilaq-ak·am useqdec asenqed iqdim n tsura i usenqed n tsura.</string>
-
     <string name="room_displayname_empty_room">Taxxamt tilemt</string>
-
     <string name="initial_sync_start_importing_account">Amtawi n tazwara:
 \nAktar n umiḍan…</string>
     <string name="initial_sync_start_importing_account_crypto">Amtawi n tazwara:
@@ -155,7 +134,6 @@
 \nAktar n tmezdagnutin</string>
     <string name="initial_sync_start_importing_account_data">Amtawi n tazwara:
 \nAktar n yisefka n umiḍan</string>
-
     <string name="event_status_sending_message">Tuzzna n yizen…</string>
     <string name="notice_room_invite_no_invitee_with_reason">Tinubga n %1$s. Tamentilt: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Tinubga-k•m. Tamentilt: %1$s</string>
@@ -180,46 +158,37 @@
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Tqebleḍ tinubga i %1$s. Tamentilt: %2$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s issefsex tinubga n %2$s. Tamentilt: %3$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Tesfesxeḍ tinubga n %1$s. Tamentilt: %2$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s yerna %2$s d tansa i texxamt-a.</item>
         <item quantity="other">%1$s yerna %2$s d tansiwin i texxamt-a.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Terniḍ %1$s d tansa i texxamt-a.</item>
         <item quantity="other">Terniḍ %1$s d tansiwin i texxamt-a.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s yekkes %2$s am tansa i texxamt-a.</item>
         <item quantity="other">%1$s yekkes %3$s am tansiwin i texxamt-a.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Tekkseḍ %1$s am tansa i texxamt-a.</item>
         <item quantity="other">Tekkseḍ %2$s am tansiwin i texxamt-a.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s yerna %2$s terniḍ tekkseḍ %3$s am tansiwin i texxamt-a.</string>
     <string name="notice_room_aliases_added_and_removed_by_you">Terniḍ %1$s terniḍ tekkseḍ %2$s am tansiwin i texxamt-a.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s isbadu %2$s am tansa tagejdant i texxamt-a.</string>
     <string name="notice_room_canonical_alias_set_by_you">Tesbaduḍ %1$s am tansa tagejdant i texxamt-a.</string>
     <string name="notice_room_canonical_alias_unset">%1$s yekkes tansa tagejdant i texxamt-a.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Tekkseḍ tansa tagejdant i texxamt-a.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s isireg inebgawen ad ddun ɣer texxamt.</string>
     <string name="notice_room_guest_access_can_join_by_you">Tsirgeḍ inebgawen ad ddun ɣer texxamt.</string>
     <string name="notice_room_guest_access_forbidden">%1$s issewḥel inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Tesweḥleḍ inebgawen iwakken ur tteddun ara ɣer texxamt.</string>
-
     <string name="notice_end_to_end_ok">%1$s yermed awgelhen seg yixef ɣer yixef.</string>
     <string name="notice_end_to_end_ok_by_you">Tremdeḍ awgelhen seg yixef ɣer yixef.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s yermed awgelhen seg yixef ɣer yixef (alguritm %2$s ur yettwassen ara).</string>
     <string name="clear_timeline_send_queue">Sfeḍ tabdart n uraǧu n tuzzna</string>
-
-    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s issefsex tinubga n %2$s i tmerniwt ɣer texxamt. Tamentilt: %2$s</string>
+    <string name="notice_room_third_party_revoked_invite_with_reason">%1$s issefsex tinubga n %2$s i tmerniwt ɣer texxamt. Tamentilt: %3$s</string>
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Tesfesxeḍ tinubga n %1$s i tmerna ɣer texxamt. Tamentilt: %2$s</string>
     <string name="could_not_redact">Yegguma ad yaru</string>
-</resources>
+</resources>
\ No newline at end of file

From 3bf11d1a0b9666cc3e88d9f71702470bde44bbf4 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit.marty@gmail.com>
Date: Fri, 16 Oct 2020 14:02:02 +0000
Subject: [PATCH 273/278] Translated using Weblate (Slovak)

Currently translated at 86.3% (164 of 190 strings)

Translation: Element Android/Element Android Sdk
Translate-URL: https://translate.element.io/projects/element-android/element-sdk/sk/
---
 .../src/main/res/values-sk/strings.xml        | 48 ++-----------------
 1 file changed, 5 insertions(+), 43 deletions(-)

diff --git a/matrix-sdk-android/src/main/res/values-sk/strings.xml b/matrix-sdk-android/src/main/res/values-sk/strings.xml
index da869eacc2..c75c8b4832 100644
--- a/matrix-sdk-android/src/main/res/values-sk/strings.xml
+++ b/matrix-sdk-android/src/main/res/values-sk/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="summary_message">%1$s: %2$s</string>
     <string name="summary_user_sent_image">%1$s poslal/a obrázok.</string>
-
     <string name="notice_room_invite_no_invitee">Pozvanie od %s</string>
     <string name="notice_room_invite">%1$s pozval/a %2$s</string>
     <string name="notice_room_invite_you">%1$s vás pozval/a</string>
@@ -30,58 +29,42 @@
     <string name="notice_room_visibility_world_readable">pre každého.</string>
     <string name="notice_room_visibility_unknown">neznámym (%s).</string>
     <string name="notice_end_to_end">%1$s povolil/a E2E šifrovanie (%2$s)</string>
-
     <string name="notice_requested_voip_conference">%1$s požiadal/a o VoIP konferenciu</string>
     <string name="notice_voip_started">Začala sa VoIP konferencia</string>
     <string name="notice_voip_finished">Skončila sa VoIP konferencia</string>
-
     <string name="notice_avatar_changed_too">(aj obrázok v profile)</string>
     <string name="notice_room_name_removed">%1$s odstránil/a názov miestnosti</string>
     <string name="notice_room_topic_removed">%1$s odstránil/a tému miestnosti</string>
     <string name="notice_profile_change_redacted">%1$s aktualizoval/a svoj profil %2$s</string>
     <string name="notice_room_third_party_invite">%1$s pozval/a %2$s vstúpiť do miestnosti</string>
     <string name="notice_room_third_party_registered_invite">%1$s prijal/a pozvanie pre %2$s</string>
-
     <string name="notice_crypto_unable_to_decrypt">** Nie je možné dešifrovať: %s **</string>
     <string name="notice_crypto_error_unkwown_inbound_session_id">Zo zariadenia odosieľateľa nebolo možné získať kľúče potrebné na dešifrovanie tejto správy.</string>
-
     <string name="could_not_redact">Nie je možné vymazať</string>
     <string name="unable_to_send_message">Nie je možné odoslať správu</string>
-
     <string name="message_failed_to_upload">Nepodarilo sa nahrať obrázok</string>
-
     <string name="network_error">Chyba siete</string>
     <string name="matrix_error">Chyba Matrix</string>
-
     <string name="room_error_join_failed_empty_room">V súčasnosti nie je možné znovu vstúpiť do prázdnej miestnosti.</string>
-
     <string name="encrypted_message">Šifrovaná správa</string>
-
     <string name="medium_email">Emailová adresa</string>
     <string name="medium_phone_number">Telefónne číslo</string>
-
     <string name="summary_user_sent_sticker">%1$s poslal/a nálepku.</string>
-
     <string name="room_displayname_invite_from">Pozvanie od %s</string>
     <string name="room_displayname_room_invite">Pozvanie do miestnosti</string>
     <string name="room_displayname_two_members">%1$s a %2$s</string>
     <string name="room_displayname_empty_room">Prázdna miestnosť</string>
-
     <plurals name="room_displayname_three_and_more_members">
         <item quantity="one">%1$s a 1 ďalší</item>
         <item quantity="few">%1$s a %2$d ďalší</item>
         <item quantity="many">%1$s a %2$d ďalších</item>
-        <item quantity="other" />
+        <item quantity="other"/>
     </plurals>
-
-
     <string name="notice_room_update">%s aktualizoval/a túto miestnosť.</string>
-
     <string name="notice_event_redacted">Odstránená správa</string>
     <string name="notice_event_redacted_by">Odstránená správa používateľom %1$s</string>
     <string name="notice_event_redacted_with_reason">Odstránená správa [dôvod: %1$s]</string>
     <string name="notice_event_redacted_by_with_reason">Odstránená správa používateľom %1$s [dôvod: %2$s]</string>
-
     <string name="initial_sync_start_importing_account">Úvodná synchronizácia:
 \nPrebieha import účtu…</string>
     <string name="initial_sync_start_importing_account_crypto">Úvodná synchronizácia:
@@ -98,10 +81,8 @@
 \nPrebieha import komunít</string>
     <string name="initial_sync_start_importing_account_data">Úvodná synchronizácia:
 \nPrebieha import údajov účtu</string>
-
     <string name="event_status_sending_message">Odosielanie správy…</string>
     <string name="clear_timeline_send_queue">Vymazať správy na odoslanie</string>
-
     <string name="notice_room_third_party_revoked_invite">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti</string>
     <string name="notice_room_invite_no_invitee_with_reason">Pozvanie od %1$s. Dôvod: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s pozval/a %2$s. Dôvod: %3$s</string>
@@ -116,28 +97,22 @@
     <string name="notice_room_third_party_revoked_invite_with_reason">%1$s zamietol/a pozvanie používateľa %2$s vstúpiť do miestnosti. Dôvod: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s prijal/a pozvanie pre %2$s. Dôvod: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s vzal/a späť pozvanie %2$s. Dôvod: %3$s</string>
-
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s pridal/a adresu %2$s pre túto miestnosť.</item>
         <item quantity="few">%1$s pridal/a adresy %2$s pre túto miestnosť.</item>
         <item quantity="other">%1$s pridal/a adresy %2$s pre túto miestnosť.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed">
         <item quantity="one">%1$s odstránil/a adresu %2$s pre túto miestnosť.</item>
         <item quantity="few">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
         <item quantity="other">%1$s odstránil/a adresy %3$s pre túto miestnosť.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed">%1$s pridal/a adresy %2$s a odstránil/a adresy %3$s pre túto miestnosť.</string>
-
     <string name="notice_room_canonical_alias_set">%1$s nastavil/a hlavnú adresu tejto miestnosti %2$s.</string>
     <string name="notice_room_canonical_alias_unset">%1$s odstránil/a hlavnú adresu tejto miestnosti.</string>
-
     <string name="notice_room_guest_access_can_join">%1$s povolil/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
     <string name="summary_you_sent_image">Poslali ste obrázok.</string>
     <string name="summary_you_sent_sticker">Poslali ste nálepku.</string>
-
     <string name="notice_room_invite_no_invitee_by_you">Pozvanie od vás</string>
     <string name="notice_room_created">%1$s vytvoril/a miestnosť</string>
     <string name="notice_room_created_by_you">Vytvorili ste miestnosť</string>
@@ -166,7 +141,6 @@
     <string name="notice_made_future_room_visibility_by_you">Sprístupnili ste budúcu históriu miestnosti %1$s</string>
     <string name="notice_end_to_end_by_you">Povolili ste E2E šifrovanie (%1$s)</string>
     <string name="notice_room_update_by_you">Aktualizovali ste túto miestnosť.</string>
-
     <string name="notice_requested_voip_conference_by_you">Požiadali ste o VoIP konferenciu</string>
     <string name="notice_room_name_removed_by_you">Odstránili ste názov miestnosti</string>
     <string name="notice_room_topic_removed_by_you">Odstránili ste tému miestnosti</string>
@@ -174,26 +148,22 @@
     <string name="notice_room_avatar_removed_by_you">Odstránili ste obrázok miestnosti</string>
     <string name="notice_profile_change_redacted_by_you">Aktualizovali ste svoj profil %1$s</string>
     <string name="notice_room_third_party_invite_by_you">Pozvali ste %1$s vstúpiť do miestnosti</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">Zamietli ste pozvanie používateľa %2$s vstúpiť do miestnosti</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti</string>
     <string name="notice_room_third_party_registered_invite_by_you">Prijali ste pozvanie pre %1$s</string>
-
     <string name="notice_widget_added">%1$s pridal/a widget %2$s</string>
     <string name="notice_widget_added_by_you">Pridali ste widget %1$s</string>
     <string name="notice_widget_removed">%1$s odstránil/a widget %2$s</string>
     <string name="notice_widget_removed_by_you">Odstránili ste widget %1$s</string>
     <string name="notice_widget_modified">%1$s upravil/a widget %2$s</string>
     <string name="notice_widget_modified_by_you">Upravili ste widget %1$s</string>
-
     <string name="power_level_admin">Správca</string>
     <string name="power_level_moderator">Moderátor</string>
     <string name="power_level_default">Predvolený</string>
     <string name="power_level_custom">Vlastná úroveň (%1$d)</string>
     <string name="power_level_custom_no_value">Vlastná úroveň</string>
-
     <string name="notice_power_level_changed_by_you">Zmenili ste úroveň moci používateľa %1$s.</string>
     <string name="notice_power_level_changed">%1$s zmenil úroveň moci používateľa %2$s.</string>
     <string name="notice_power_level_diff">%1$s z %2$s na %3$s</string>
-
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Pozvanie od vás. Dôvod: %1$s</string>
     <string name="notice_room_invite_with_reason_by_you">Pozvali ste %1$s. Dôvod: %2$s</string>
     <string name="notice_room_join_with_reason_by_you">Vstúpili ste do miestnosti. Dôvod: %1$s</string>
@@ -206,33 +176,25 @@
     <string name="notice_room_third_party_revoked_invite_with_reason_by_you">Zamietli ste pozvanie používateľa %1$s vstúpiť do miestnosti. Dôvod: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Prijali ste pozvanie pre %1$s. Dôvod: %2$s</string>
     <string name="notice_room_withdraw_with_reason_by_you">Vzali ste späť pozvanie %1$s. Dôvod: %2$s</string>
-
     <plurals name="notice_room_aliases_added_by_you">
         <item quantity="one">Pridali ste adresu %1$s pre túto miestnosť.</item>
         <item quantity="few">Pridali ste adresy %1$s pre túto miestnosť.</item>
         <item quantity="other">Pridali ste adresy %1$s pre túto miestnosť.</item>
     </plurals>
-
     <plurals name="notice_room_aliases_removed_by_you">
         <item quantity="one">Odstránili ste adresu %1$s pre túto miestnosť.</item>
         <item quantity="few">Odstránili ste adresy %2$s pre túto miestnosť.</item>
         <item quantity="other">Odstránili ste adresy %2$s pre túto miestnosť.</item>
     </plurals>
-
     <string name="notice_room_aliases_added_and_removed_by_you">Pridali ste %1$s a odstránili adresy %2$s pre túto miestnosť.</string>
-
-    <string name="notice_room_canonical_alias_set_by_you">Nastavili ste hlavnú adresu tejto miestnosti %2$s.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Nastavili ste hlavnú adresu tejto miestnosti %1$s.</string>
     <string name="notice_room_canonical_alias_unset_by_you">Odstránili ste hlavnú adresu tejto miestnosti.</string>
-
     <string name="notice_room_guest_access_can_join_by_you">Povolili ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
     <string name="notice_room_guest_access_forbidden">%1$s zakázal/a hosťom///návštevníkom prístup do tejto miestnosti.</string>
     <string name="notice_room_guest_access_forbidden_by_you">Zakázali ste hosťom///návštevníkom prístup do tejto miestnosti.</string>
-
     <string name="notice_end_to_end_ok">%1$s povolil/a E2E šifrovanie.</string>
     <string name="notice_end_to_end_ok_by_you">Povolili ste E2E šifrovanie.</string>
     <string name="notice_end_to_end_unknown_algorithm">%1$s povolil/a E2E šifrovanie (Nerozpoznaný algorytmus %2$s).</string>
     <string name="notice_end_to_end_unknown_algorithm_by_you">Povolili ste E2E šifrovanie (Nerozpoznaný algorytmus %1$s).</string>
-
     <string name="key_verification_request_fallback_message">%s požaduje overenie vašich šifrovacích kľúčov, ale váš klient nepodporuje overenie kľúčov v konverzácii. Budete musieť použiť zastaralú metódu overenia.</string>
-
-</resources>
+</resources>
\ No newline at end of file

From b07e7a4a36336d49c4121ceb6d4019706e20cf42 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 16 Oct 2020 16:10:50 +0200
Subject: [PATCH 274/278] Use file.length if cursor returns -1 as file size.

Author: Onuray (squashed)
---
 CHANGES.md                                    |  1 +
 .../session/content/UploadContentWorker.kt    | 57 ++++++++++++-------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 0d3bc066fd..d7c700a0c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,7 @@ Bugfix 🐛:
  - Be robust against `StrandHogg` task injection
  - Clear alerts if user sign out
  - Fix rows are hidden in Textinput (#2234)
+ - Uploading a file to a room caused it to have a info.size of -1 (#2141)
 
 Translations 🗣:
  - Move store data to `/fastlane/metadata/android` (#812)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index 03827b90e2..e133d9226b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -48,10 +48,10 @@ import java.io.File
 import java.util.UUID
 import javax.inject.Inject
 
-private data class NewImageAttributes(
-        val newWidth: Int?,
-        val newHeight: Int?,
-        val newFileSize: Int
+private data class NewAttachmentAttributes(
+        val newWidth: Int? = null,
+        val newHeight: Int? = null,
+        val newFileSize: Long
 )
 
 /**
@@ -145,7 +145,11 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
 
             return try {
                 val fileToUpload: File
-                var newImageAttributes: NewImageAttributes? = null
+                var newAttachmentAttributes = NewAttachmentAttributes(
+                        params.attachment.width?.toInt(),
+                        params.attachment.height?.toInt(),
+                        params.attachment.size
+                )
 
                 if (attachment.type == ContentAttachmentData.Type.IMAGE && params.compressBeforeSending) {
                     fileToUpload = imageCompressor.compress(context, workingFile, MAX_IMAGE_SIZE, MAX_IMAGE_SIZE)
@@ -154,8 +158,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                 compressedFile.inputStream().use {
                                     val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
                                     val bitmap = BitmapFactory.decodeStream(it, null, options)
-                                    val fileSize = bitmap?.byteCount ?: 0
-                                    newImageAttributes = NewImageAttributes(
+                                    val fileSize = bitmap?.byteCount?.toLong() ?: compressedFile.length()
+                                    newAttachmentAttributes = NewAttachmentAttributes(
                                             options.outWidth,
                                             options.outHeight,
                                             fileSize
@@ -200,12 +204,17 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                     Timber.e(failure, "## FileService: Failed to update file cache")
                 }
 
+                // Fix: OpenableColumns.SIZE may return -1 or 0
+                if (params.attachment.size <= 0) {
+                    newAttachmentAttributes = newAttachmentAttributes.copy(newFileSize = fileToUpload.length())
+                }
+
                 handleSuccess(params,
                         contentUploadResponse.contentUri,
                         uploadedFileEncryptedFileInfo,
                         uploadThumbnailResult?.uploadedThumbnailUrl,
                         uploadThumbnailResult?.uploadedThumbnailEncryptedFileInfo,
-                        newImageAttributes)
+                        newAttachmentAttributes)
             } catch (t: Throwable) {
                 Timber.e(t, "## FileService: ERROR ${t.localizedMessage}")
                 handleFailure(params, t)
@@ -285,10 +294,10 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                       encryptedFileInfo: EncryptedFileInfo?,
                                       thumbnailUrl: String?,
                                       thumbnailEncryptedFileInfo: EncryptedFileInfo?,
-                                      newImageAttributes: NewImageAttributes?): Result {
+                                      newAttachmentAttributes: NewAttachmentAttributes): Result {
         notifyTracker(params) { contentUploadStateTracker.setSuccess(it) }
         params.localEchoIds.forEach {
-            updateEvent(it.eventId, attachmentUrl, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newImageAttributes)
+            updateEvent(it.eventId, attachmentUrl, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo, newAttachmentAttributes)
         }
 
         val sendParams = MultipleEventSendingDispatcherWorker.Params(
@@ -306,14 +315,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                     encryptedFileInfo: EncryptedFileInfo?,
                                     thumbnailUrl: String? = null,
                                     thumbnailEncryptedFileInfo: EncryptedFileInfo?,
-                                    newImageAttributes: NewImageAttributes?) {
+                                    newAttachmentAttributes: NewAttachmentAttributes) {
         localEchoRepository.updateEcho(eventId) { _, event ->
             val messageContent: MessageContent? = event.asDomain().content.toModel()
             val updatedContent = when (messageContent) {
-                is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newImageAttributes)
+                is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
                 is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo)
-                is MessageFileContent  -> messageContent.update(url, encryptedFileInfo)
-                is MessageAudioContent -> messageContent.update(url, encryptedFileInfo)
+                is MessageFileContent  -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
+                is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 else                   -> messageContent
             }
             event.content = ContentMapper.map(updatedContent.toContent())
@@ -326,14 +335,14 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
 
     private fun MessageImageContent.update(url: String,
                                            encryptedFileInfo: EncryptedFileInfo?,
-                                           newImageAttributes: NewImageAttributes?): MessageImageContent {
+                                           newAttachmentAttributes: NewAttachmentAttributes?): MessageImageContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
                 info = info?.copy(
-                        width = newImageAttributes?.newWidth ?: info.width,
-                        height = newImageAttributes?.newHeight ?: info.height,
-                        size = newImageAttributes?.newFileSize ?: info.size
+                        width = newAttachmentAttributes?.newWidth ?: info.width,
+                        height = newAttachmentAttributes?.newHeight ?: info.height,
+                        size = newAttachmentAttributes?.newFileSize?.toInt() ?: info.size
                 )
         )
     }
@@ -353,18 +362,22 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     }
 
     private fun MessageFileContent.update(url: String,
-                                          encryptedFileInfo: EncryptedFileInfo?): MessageFileContent {
+                                          encryptedFileInfo: EncryptedFileInfo?,
+                                          size: Long): MessageFileContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
-                encryptedFileInfo = encryptedFileInfo?.copy(url = url)
+                encryptedFileInfo = encryptedFileInfo?.copy(url = url),
+                info = info?.copy(size = size)
         )
     }
 
     private fun MessageAudioContent.update(url: String,
-                                           encryptedFileInfo: EncryptedFileInfo?): MessageAudioContent {
+                                           encryptedFileInfo: EncryptedFileInfo?,
+                                           size: Long): MessageAudioContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
-                encryptedFileInfo = encryptedFileInfo?.copy(url = url)
+                encryptedFileInfo = encryptedFileInfo?.copy(url = url),
+                audioInfo = audioInfo?.copy(size = size)
         )
     }
 

From aa91c410825a3bf92bad8619ca58c82f4ac05942 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 16 Oct 2020 16:36:09 +0200
Subject: [PATCH 275/278] Fix lint issue

---
 vector/src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index e8912c0640..ac7ba642bd 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2259,7 +2259,7 @@
     <string name="direct_room_profile_not_encrypted_subtitle">Сообщения здесь не зашифрованы.</string>
     <string name="login_error_outdated_homeserver_warning_content">На этом домашнем сервере работает старая версия. Попросите администратора вашего домашнего сервера выполнить обновление. Вы можете продолжить, но некоторые функции могут работать некорректно.</string>
     <string name="direct_room_join_rules_invite_by_you">Вы сделали доступ только по приглашению.</string>
-    <string name="direct_room_join_rules_invite">%@ сделал(а) доступ только по приглашению.</string>
+    <string name="direct_room_join_rules_invite">%1$s сделал(а) доступ только по приглашению.</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">Показать полную историю в зашифрованных комнатах</string>
     <string name="notification_unread_notified_messages_and_invitation">%1$s и %2$s</string>
     <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s в %2$s и %3$s</string>

From ca0af0f34203bbcfaaa128ab72d8a58475cfd5cd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 16 Oct 2020 16:38:33 +0200
Subject: [PATCH 276/278] Fix bad cases

---
 vector/src/main/res/values-kab/strings.xml | 4 ++--
 vector/src/main/res/values-ru/strings.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml
index e213ae3f03..27e8259efd 100644
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@@ -729,8 +729,8 @@
         <item quantity="other">%dwussan</item>
     </plurals>
 
-    <string name="room_participants_now">%1$S tura</string>
-    <string name="room_participants_ago">Seg %1$S %2$S</string>
+    <string name="room_participants_now">%1$s tura</string>
+    <string name="room_participants_ago">Seg %1$s %2$s</string>
 
     <string name="room_participants_header_admin_tools">IFECKA N UNEDBAL</string>
     <string name="room_participants_header_call">SIWEL</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index ac7ba642bd..7375bc6293 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -862,7 +862,7 @@
     </plurals>
     <string name="room_participants_now">Сейчас %1$s</string>
     <string name="room_participants_ago">%1$s %2$s назад</string>
-    <string name="room_participants_invite_join_names">"%1$S "</string>
+    <string name="room_participants_invite_join_names">"%1$s "</string>
     <string name="room_participants_invite_join_names_and">%1$s и %2$s</string>
     <string name="room_participants_invite_join_names_combined">%1$s %2$s</string>
     <plurals name="room_details_selected">

From 0ffe20d863fc1d1172ebef2b3c086cab05566404 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 16 Oct 2020 16:31:32 +0200
Subject: [PATCH 277/278] Small changes

---
 .../session/content/UploadContentWorker.kt    | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
index e133d9226b..4a30d6c1e6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -157,18 +157,21 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                                 // Get new Bitmap size
                                 compressedFile.inputStream().use {
                                     val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-                                    val bitmap = BitmapFactory.decodeStream(it, null, options)
-                                    val fileSize = bitmap?.byteCount?.toLong() ?: compressedFile.length()
+                                    BitmapFactory.decodeStream(it, null, options)
                                     newAttachmentAttributes = NewAttachmentAttributes(
-                                            options.outWidth,
-                                            options.outHeight,
-                                            fileSize
+                                            newWidth = options.outWidth,
+                                            newHeight = options.outHeight,
+                                            newFileSize = compressedFile.length()
                                     )
                                 }
                             }
                             .also { filesToDelete.add(it) }
                 } else {
                     fileToUpload = workingFile
+                    // Fix: OpenableColumns.SIZE may return -1 or 0
+                    if (params.attachment.size <= 0) {
+                        newAttachmentAttributes = newAttachmentAttributes.copy(newFileSize = fileToUpload.length())
+                    }
                 }
 
                 val contentUploadResponse = if (params.isEncrypted) {
@@ -204,11 +207,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                     Timber.e(failure, "## FileService: Failed to update file cache")
                 }
 
-                // Fix: OpenableColumns.SIZE may return -1 or 0
-                if (params.attachment.size <= 0) {
-                    newAttachmentAttributes = newAttachmentAttributes.copy(newFileSize = fileToUpload.length())
-                }
-
                 handleSuccess(params,
                         contentUploadResponse.contentUri,
                         uploadedFileEncryptedFileInfo,
@@ -320,7 +318,8 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
             val messageContent: MessageContent? = event.asDomain().content.toModel()
             val updatedContent = when (messageContent) {
                 is MessageImageContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes)
-                is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo)
+                is MessageVideoContent -> messageContent.update(url, encryptedFileInfo, thumbnailUrl, thumbnailEncryptedFileInfo,
+                        newAttachmentAttributes.newFileSize)
                 is MessageFileContent  -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 is MessageAudioContent -> messageContent.update(url, encryptedFileInfo, newAttachmentAttributes.newFileSize)
                 else                   -> messageContent
@@ -350,13 +349,15 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
     private fun MessageVideoContent.update(url: String,
                                            encryptedFileInfo: EncryptedFileInfo?,
                                            thumbnailUrl: String?,
-                                           thumbnailEncryptedFileInfo: EncryptedFileInfo?): MessageVideoContent {
+                                           thumbnailEncryptedFileInfo: EncryptedFileInfo?,
+                                           size: Long): MessageVideoContent {
         return copy(
                 url = if (encryptedFileInfo == null) url else null,
                 encryptedFileInfo = encryptedFileInfo?.copy(url = url),
                 videoInfo = videoInfo?.copy(
                         thumbnailUrl = if (thumbnailEncryptedFileInfo == null) thumbnailUrl else null,
-                        thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = thumbnailUrl)
+                        thumbnailFile = thumbnailEncryptedFileInfo?.copy(url = thumbnailUrl),
+                        size = size
                 )
         )
     }

From ff84319e59f5cac9aa7e4819670b1a8c24414bbe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 16 Oct 2020 17:09:31 +0200
Subject: [PATCH 278/278] Prepare release 1.0.9

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d7c700a0c9..99058117b6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Changes in Element 1.0.9 (2020-XX-XX)
+Changes in Element 1.0.9 (2020-10-16)
 ===================================================
 
 Features ✨: