From e53801957c30d286736aeb0ab18489adf5649b22 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 19 Feb 2021 13:36:39 +0000
Subject: [PATCH 01/65] Add subscribeToChanges/unsubscribeToChanges to
 VectorPreferences

---
 .../app/features/settings/VectorPreferences.kt     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 d3ef36a80b..a0fe525d3e 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
@@ -239,6 +239,20 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     }
 
     private val defaultPrefs = DefaultSharedPreferences.getInstance(context)
+    
+    /**
+     * Allow subscribing and unsubscribing to configuration changes. This is
+     * particularly useful when you need to be notified of a configuration change
+     * in a background service, e.g. for the P2P demos.
+     */
+    
+    public fun subscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
+        defaultPrefs.registerOnSharedPreferenceChangeListener(listener)
+    }
+
+    public fun unsubscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
+        defaultPrefs.unregisterOnSharedPreferenceChangeListener(listener)
+    }
 
     /**
      * Clear the preferences.

From adc461d2f3c28bf95957caba357995561b6e30b8 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:23:38 +0000
Subject: [PATCH 02/65] Update VectorPreferences.kt

---
 .../im/vector/app/features/settings/VectorPreferences.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 a0fe525d3e..fbd53f09c5 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
@@ -16,6 +16,7 @@
 package im.vector.app.features.settings
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.media.RingtoneManager
 import android.net.Uri
 import android.provider.MediaStore
@@ -246,11 +247,11 @@ class VectorPreferences @Inject constructor(private val context: Context) {
      * in a background service, e.g. for the P2P demos.
      */
     
-    public fun subscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
+    fun subscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         defaultPrefs.registerOnSharedPreferenceChangeListener(listener)
     }
 
-    public fun unsubscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
+    fun unsubscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         defaultPrefs.unregisterOnSharedPreferenceChangeListener(listener)
     }
 

From 2b403371a3370b073908581ebb09d9528c045722 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri, 19 Feb 2021 15:17:42 +0000
Subject: [PATCH 03/65] Update VectorPreferences.kt

---
 .../java/im/vector/app/features/settings/VectorPreferences.kt   | 2 --
 1 file changed, 2 deletions(-)

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 fbd53f09c5..eba7403a05 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
@@ -246,11 +246,9 @@ class VectorPreferences @Inject constructor(private val context: Context) {
      * particularly useful when you need to be notified of a configuration change
      * in a background service, e.g. for the P2P demos.
      */
-    
     fun subscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         defaultPrefs.registerOnSharedPreferenceChangeListener(listener)
     }
-
     fun unsubscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         defaultPrefs.unregisterOnSharedPreferenceChangeListener(listener)
     }

From f6ac57ec9359229e452f7f87252221dc6a549114 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 21:11:06 +0000
Subject: [PATCH 04/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index db7f940e38..3d5fada807 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2876,4 +2876,9 @@
         <item quantity="one">Enviar vídeo com o tamanho original</item>
         <item quantity="other">Enviar vídeos com o tamanho original</item>
     </plurals>
+    <string name="teammate_spaces_might_not_join">No momento pessoas podem não ser capaz de se juntar a quaisquer salas privadas que você fizer.
+\n
+\nNós vamos melhorar isto como parte da beta, mas só queríamos deixar você saber.</string>
+    <string name="teammate_spaces_arent_quite_ready">Espaços de colegas de trabalho não estão bem prontos mas você ainda pode dar-lhes uma tentativa</string>
+    <string name="continue_anyway">Continuar Mesmo Assim</string>
 </resources>
\ No newline at end of file

From 51119ceec4b990caf8d812a2f1e1f4edb3903f54 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 21:36:51 +0000
Subject: [PATCH 05/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 3d5fada807..6a86e58d11 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -429,7 +429,7 @@
     <string name="auth_reset_password_error_unauthorized">Falha para verificar endereço de email: assegure-se que clicou no link no email</string>
     <string name="auth_reset_password_success_message">Sua senha tem sido resettada.
 \n
-\nVocê tem sido feito logout de todas as sessões e não vai mais receber notificações push. Para reativar notificações, faça re-login em cada dispositivo.</string>
+\nVocê tem sido feito logout de todas as sessões e não vai mais receber notificações push. Para re-ativar notificações, re-faça login em cada dispositivo.</string>
     <!-- Login Screen -->
     <string name="login_error_must_start_http">URL deve começar com http[s]://</string>
     <string name="login_error_network_error">Incapaz de fazer login: Erro de rede</string>

From 861d652d88a3331ba2093dd98fa85486289a85f0 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 21:45:05 +0000
Subject: [PATCH 06/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 6a86e58d11..0f684d145c 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1995,7 +1995,7 @@
     <string name="verification_sas_match">Eles correspondem</string>
     <string name="verification_sas_do_not_match">Eles não correspondem</string>
     <string name="verify_user_sas_emoji_help_text">Verifique esta(e) usuária(o) ao confirmar que os seguintes emoji únicos aparecem na tela dela(e), na mesma ordem.</string>
-    <string name="verify_user_sas_emoji_security_tip">Para máxima segurança, use um outro meio de comunicação confiado ou faça isto em pessoa.</string>
+    <string name="verify_user_sas_emoji_security_tip">Para segurança ótima, use um outro meio de comunicação confiado ou faça isto em pessoa.</string>
     <string name="verification_green_shield">Procure pelo escudo verde para assegurar que um/uma usuário(a) é confiado. Confie em todos(as) os/as usuários(as) numa sala para assegurar que a sala é segura.</string>
     <string name="verification_conclusion_not_secure">Não seguro</string>
     <string name="verification_conclusion_compromised">Um dos seguintes pode estar comprometido:

From 1ea48f89b4bf44bf5e6492de18f7d15b66b6fb43 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 21:56:35 +0000
Subject: [PATCH 07/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 0f684d145c..458d8243b7 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1358,7 +1358,7 @@
     <string name="room_participants_unban_title">Desbanir usuária(o)</string>
     <string name="room_participants_unban_prompt_msg">Desbanir usuária(o) vai permitir-lhe se juntar à sala de novo.</string>
     <string name="settings_add_3pid_confirm_password_title">Confirme sua senha</string>
-    <string name="template_settings_add_3pid_flow_not_supported">Você não pode fazer isto de ${app_name} celular</string>
+    <string name="template_settings_add_3pid_flow_not_supported">Você não pode fazer isto desde ${app_name} mobile</string>
     <string name="settings_add_3pid_authentication_needed">Autenticação é requerida</string>
     <string name="settings_notification_privacy_no_background_sync">O app <b>não</b> precisa de se conectar ao ServidorCasa no background, isto deveria reduzir uso de bateria</string>
     <string name="settings_background_fdroid_sync_mode">Modo Sinc no Background</string>

From de0b745eb980883002430af04cfa2e2e412ebba3 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 22:10:33 +0000
Subject: [PATCH 08/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 458d8243b7..cf45cbf5ee 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1602,7 +1602,7 @@
     <string name="sas_waiting_for_partner">Esperando por parceira(o) confirmar…</string>
     <string name="sas_verified">Verificada!</string>
     <string name="sas_verified_successful">Você tem confirmado esta sessão com sucesso.</string>
-    <string name="sas_verified_successful_description">Mensagens seguras com esta(e) usuária(o) estão encriptadas ponta-a-ponta e não são capazes de ser lidas por terceiros.</string>
+    <string name="sas_verified_successful_description">Mensagens seguras com esta(e) usuária(o) são encriptadas ponta-a-ponta e não são capazes de ser lidas por terceiros.</string>
     <string name="sas_got_it">Entendido</string>
     <string name="sas_verifying_keys">Nada aparecendo\? Não todos os clientes suportam verificação interativa ainda. Use verificação legado.</string>
     <string name="sas_legacy_verification_button_title">Usar verificação legado.</string>

From e6e7f82eb625b54f62fd07bcd02f40230614197a Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 22:36:15 +0000
Subject: [PATCH 09/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index cf45cbf5ee..ce235e3b8a 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1943,7 +1943,7 @@
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Este não é um identificador de usuária(o) válido. Formato esperado: \'@usuarix:servidorcasa.org\'</string>
     <string name="autodiscover_well_known_error">Incapaz de encontrar um servidorcasa válido. Por favor cheque seu identificador</string>
     <string name="seen_by">Vista por</string>
-    <string name="signed_out_title">Você fez signout</string>
+    <string name="signed_out_title">Você está com signout feito</string>
     <string name="signed_out_notice">Pode ser devido a várias razões:
 \n
 \n• Você tem mudado sua senha numa outra sessão.
@@ -1952,7 +1952,7 @@
 \n
 \n• O/a administrador(a) de seu servidor tem invalidado seu acesso por razão de segurança.</string>
     <string name="signed_out_submit">Fazer signin de novo</string>
-    <string name="soft_logout_title">Você fez signout</string>
+    <string name="soft_logout_title">Você está com signout feito</string>
     <string name="soft_logout_signin_title">Fazer signin</string>
     <string name="soft_logout_signin_notice">A/o admin de seu servidorcasa (%1$s) fez seu signout de sua conta %2$s (%3$s).</string>
     <string name="soft_logout_signin_e2e_warning_notice">Faça signin para recuperar chaves de encriptação armazenadas exclusivamente neste dispositivo. Você precisa delas para ler todas suas mensagens seguras em qualquer dispositivo.</string>
@@ -2361,7 +2361,7 @@
     <string name="crypto_error_withheld_generic">Você não pode acessar esta mensagem porque o/a enviador(a) propositalmente não enviou as chaves</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Esperando por histórico de encriptação</string>
     <string name="disclaimer_title">Riot agora é Element!</string>
-    <string name="disclaimer_content">Nós estamos animados em anunciar que nós mudamos de nome! Seu app está atualizado e o signin está feito a sua conta.</string>
+    <string name="disclaimer_content">Nós estamos animados em anunciar que nós mudamos de nome! Seu app está atualizado e você está com signin feito a sua conta.</string>
     <string name="disclaimer_negative_button">ENTENDI</string>
     <string name="disclaimer_positive_button">SABER MAIS</string>
     <string name="save_recovery_key_chooser_hint">Salvar chave de recuperação em</string>

From 7a12d29d3977e04fcc96288652f7bc61fbe672ef Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 22:37:07 +0000
Subject: [PATCH 10/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 ce235e3b8a..617ceb8fb8 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2361,7 +2361,7 @@
     <string name="crypto_error_withheld_generic">Você não pode acessar esta mensagem porque o/a enviador(a) propositalmente não enviou as chaves</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Esperando por histórico de encriptação</string>
     <string name="disclaimer_title">Riot agora é Element!</string>
-    <string name="disclaimer_content">Nós estamos animados em anunciar que nós mudamos de nome! Seu app está atualizado e você está com signin feito a sua conta.</string>
+    <string name="disclaimer_content">Nós estamos animados em anunciar que nós temos mudado de nome! Seu app está atualizado e você está com signin feito a sua conta.</string>
     <string name="disclaimer_negative_button">ENTENDI</string>
     <string name="disclaimer_positive_button">SABER MAIS</string>
     <string name="save_recovery_key_chooser_hint">Salvar chave de recuperação em</string>

From e826900bd3c3d0de122295551907d72581594b60 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 22:38:38 +0000
Subject: [PATCH 11/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 617ceb8fb8..e85ef28212 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1637,7 +1637,7 @@
     <string name="invited_by">Convidada(o) por %s</string>
     <string name="room_list_catchup_empty_title">Você está em dia!</string>
     <string name="room_list_catchup_empty_body">Você não tem mais nenhuma mensagem não-lida</string>
-    <string name="room_list_catchup_welcome_title">Boas-vindas!</string>
+    <string name="room_list_catchup_welcome_title">Boas vindas a casa!</string>
     <string name="room_list_catchup_welcome_body">Fique em dia com suas mensagens não-lidas aqui</string>
     <string name="room_list_people_empty_title">Conversas</string>
     <string name="room_list_people_empty_body">Suas conversas de mensagem direta vai ser exibidas aqui. Toque no + à direita fundo para começar algumas.</string>
@@ -2790,7 +2790,7 @@
     <string name="invite_by_mxid">Convidar por nome de usuária(o)</string>
     <string name="invite_by_email">Convidar por email</string>
     <string name="invite_people_menu">Convidar pessoas</string>
-    <string name="suggested_rooms_pills_on_empty_header">Boas-vindas a %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_header">Boas vindas a %1$s, %2$s.</string>
     <string name="you_are_invited">Você está convidada(o)</string>
     <string name="labs_use_restricted_join_rule_desc">Aviso requer suporte de servidor e versão de sala experimental</string>
     <string name="user_invites_you">%s convida você</string>
@@ -2810,7 +2810,7 @@
     <string name="looking_for_someone_not_in_space">Procurando por alguém que não está em %s\?</string>
     <string name="labs_use_restricted_join_rule">Espaço Experimental - Sala Restringida.</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Espaços são uma nova forma de agrupar salas e pessoas.</string>
-    <string name="spaces_beta_welcome_to_spaces">Boas-vindas a Espaços!</string>
+    <string name="spaces_beta_welcome_to_spaces">Boas vindas a Espaços!</string>
     <string name="space_add_rooms">Adicionar salas</string>
     <string name="space_add_existing_rooms">Adicionar salas e espaços existentes</string>
     <string name="space_leave_prompt_msg_as_admin">Você é admin deste espaço, assegure-se que você tem transferido direito de admin a um outro membro antes de sair.</string>

From 08af370600090cd5c3663df676eebf96b15133bb Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 22:50:45 +0000
Subject: [PATCH 12/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 e85ef28212..191b9846ad 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2510,7 +2510,7 @@
     <string name="rotate_and_crop_screen_title">Rotar e recortar</string>
     <string name="create_room_settings_section">Configurações de sala</string>
     <string name="create_room_topic_hint">Tópico</string>
-    <string name="create_room_topic_section">Tópico da sala (opcional)</string>
+    <string name="create_room_topic_section">Tópico de sala (opcional)</string>
     <string name="create_room_name_section">Nome de sala</string>
     <string name="send_bug_report_include_key_share_history">Enviar histórico de requisições de compartilhamento de chaves</string>
     <string name="no_more_results">Mais nenhum resultado</string>

From a1bfe099adb9ffb702113e60254ec27d8cc1f2e6 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 22:56:50 +0000
Subject: [PATCH 13/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 191b9846ad..f5a9635a48 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1077,7 +1077,7 @@
     <string name="startup_notification_privacy_title">Privacidade de Notificação</string>
     <string name="template_startup_notification_privacy_message">${app_name} pode rodar no background para gerenciar suas notificações seguramente e privadamente. Isto pode afetar uso de bateria.</string>
     <string name="startup_notification_privacy_button_grant">Conceder permissão</string>
-    <string name="startup_notification_privacy_button_other">Escolha um outra opção</string>
+    <string name="startup_notification_privacy_button_other">Escolher uma outra opção</string>
     <string name="settings_opt_in_of_analytics">Enviar dados de analítica</string>
     <string name="template_settings_opt_in_of_analytics_summary">${app_name} coleta analítica anônima para nos permitir melhorar o aplicativo.</string>
     <string name="template_settings_opt_in_of_analytics_prompt">Por favor ative analítica para nos ajudar a melhorar ${app_name}.</string>
@@ -1846,7 +1846,7 @@
     <string name="login_server_matrix_org_text">Junte-se a milhões de graça no maior servidor público</string>
     <string name="login_server_modular_text">Hospedagem premium para organizações</string>
     <string name="login_server_modular_learn_more">Saiba mais</string>
-    <string name="login_server_other_title">Outros</string>
+    <string name="login_server_other_title">Outro</string>
     <string name="login_server_other_text">Configurações personalizadas &amp; avançadas</string>
     <string name="login_continue">Continuar</string>
     <string name="login_connect_to">Conectar-se a %1$s</string>
@@ -2010,7 +2010,7 @@
     <string name="sent_a_file">Arquivo</string>
     <string name="send_a_sticker">Sticker</string>
     <string name="verification_request_waiting">Esperando…</string>
-    <string name="verification_request_other_cancelled">%s cancelado</string>
+    <string name="verification_request_other_cancelled">%s cancelou</string>
     <string name="verification_request_you_cancelled">Você cancelou</string>
     <string name="verification_request_other_accepted">%s aceitou</string>
     <string name="verification_request_you_accepted">Você aceitou</string>

From d4c8c645d1fa1148645b14be677252190317f69e Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Thu, 17 Jun 2021 23:04:15 +0000
Subject: [PATCH 14/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 f5a9635a48..eaec973570 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -2519,7 +2519,7 @@
     <string name="show_advanced">Mostrar avançadas</string>
     <string name="hide_advanced">Esconder avançadas</string>
     <string name="matrix_to_card_title">Link Matrix</string>
-    <string name="room_created_summary_no_topic_creation_text">%s para deixar pessoas sabendo do que esta sala se trata.</string>
+    <string name="room_created_summary_no_topic_creation_text">%s para deixar pessoas saberem do que esta sala se trata.</string>
     <string name="create_room_alias_empty">Por favor proveja um endereço de sala</string>
     <string name="direct_room_user_list_recent_title">Recente</string>
     <string name="qr_code_not_scanned">QR code não scannado!</string>

From 22f3f612d7501222ccbf71cd6a8ae70603f91382 Mon Sep 17 00:00:00 2001
From: Erik Huizinga <erikhuizinga@users.noreply.github.com>
Date: Fri, 18 Jun 2021 12:26:30 +0200
Subject: [PATCH 15/65] Apply Google Services Gradle plugin more robustly

Fixes #3527
---
 vector/build.gradle | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index 21f62647c0..10d593994e 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -246,6 +246,8 @@ android {
 
     productFlavors {
         gplay {
+            apply plugin: 'com.google.gms.google-services'
+
             dimension "store"
             isDefault = true
             versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
@@ -506,7 +508,3 @@ dependencies {
         exclude group: 'org.jetbrains.kotlin'
     }
 }
-
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Gplay")) {
-    apply plugin: 'com.google.gms.google-services'
-}

From cc5260b31138476bc49fca67936e312106297b06 Mon Sep 17 00:00:00 2001
From: Erik Huizinga <erikhuizinga@users.noreply.github.com>
Date: Fri, 18 Jun 2021 17:23:10 +0200
Subject: [PATCH 16/65] Disable non-Gplay flavor *GoogleServices* tasks

---
 vector/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vector/build.gradle b/vector/build.gradle
index 10d593994e..62afed1b0a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -247,6 +247,9 @@ android {
     productFlavors {
         gplay {
             apply plugin: 'com.google.gms.google-services'
+            afterEvaluate {
+                tasks.matching { it.name.contains("GoogleServices") && !it.name.contains("Gplay") }*.enabled = false
+            }
 
             dimension "store"
             isDefault = true

From e0a5241cafe9c5a99d2dea1646519fe8fc2dbf1b Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Sun, 20 Jun 2021 00:02:59 +0000
Subject: [PATCH 17/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 2 +-
 1 file changed, 1 insertion(+), 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 eaec973570..7fe24cbb4b 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -359,7 +359,7 @@
     <string name="send_bug_report_include_crash_logs">Enviar crash logs</string>
     <string name="send_bug_report_include_screenshot">Enviar screenshot</string>
     <string name="send_bug_report">Reportar bug</string>
-    <string name="send_bug_report_description">Por favor descreva o bug. O que você fez\? O que você esperava que acontecese\? O que aconteceu na verdade\?</string>
+    <string name="send_bug_report_description">Por favor descreva o bug. O que você fez\? O que você esperava que acontecesse\? O que na verdade aconteceu\?</string>
     <string name="send_bug_report_placeholder">Descreva seu problema aqui</string>
     <string name="send_bug_report_logs_description">A fim de diagnosticar problemas, logs deste cliente vão ser enviados com este reporte de bug. Este reporte de bug, incluindo os logs e o screenshot, não será visível publicamente. Se você prefere somente enviar o texto acima, por favor desmarque:</string>
     <string name="send_bug_report_alert_message">Você parece estar agitando o telefone em frustração. Você gostaria de abrir a tela de reporte de bug\?</string>

From a64c7e5df2bf11d53d2ad42ceb710dc442e0e154 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Fri, 18 Jun 2021 05:09:31 +0000
Subject: [PATCH 18/65] Translated using Weblate (Czech)

Currently translated at 100.0% (2490 of 2490 strings)

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

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 7523be029e..0b37b4e046 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2859,4 +2859,9 @@
     <string name="directory_add_a_new_server_prompt">Zadejte název nového serveru, který chcete prozkoumat.</string>
     <string name="directory_add_a_new_server">Přidat nový server</string>
     <string name="directory_your_server">Váš server</string>
+    <string name="continue_anyway">Přesto pokračovat</string>
+    <string name="teammate_spaces_might_not_join">V současné době se lidé nemohou připojit k soukromým místnostem, které jste vytvořili.
+\n
+\nV rámci beta verze to zlepšíme, ale jen jsme vás chtěli informovat.</string>
+    <string name="teammate_spaces_arent_quite_ready">Prostory pro spolupracovníky nejsou ještě zcela připravené, ale přesto je můžete vyzkoušet</string>
 </resources>
\ No newline at end of file

From b0c23426df27b23a998c9c0d09d885ab38908048 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Fri, 18 Jun 2021 16:09:31 +0000
Subject: [PATCH 19/65] Translated using Weblate (German)

Currently translated at 99.7% (2485 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index fa6d20d007..faff212373 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2866,4 +2866,9 @@
     <string name="send_feedback_space_title">Spaces Feedback</string>
     <string name="directory_add_a_new_server_error_already_added">Dieser Server ist schon in der Liste vorhanden</string>
     <string name="directory_add_a_new_server_error">Server oder Raumliste kann nicht gefunden werden</string>
+    <string name="teammate_spaces_might_not_join">Momentan kann es sein, dass einige Leute deinen privaten Räumen nicht beitreten können.
+\n
+\nDies werden wir demnächst als Teil der Beta verbessern, wir wollten aber sicherstellen, dass du bescheid weißt.</string>
+    <string name="teammate_spaces_arent_quite_ready">Team-Spaces sind noch nicht fertig entwickelt, du kannst sie aber schon testen</string>
+    <string name="continue_anyway">Trotzdem fortfahren</string>
 </resources>
\ No newline at end of file

From 5555b0dbb7247ce828b3401a1105f18389447d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 17 Jun 2021 18:47:43 +0000
Subject: [PATCH 20/65] Translated using Weblate (Estonian)

Currently translated at 100.0% (2490 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 88081c59c5..49761f6d88 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -2806,4 +2806,9 @@
     <string name="directory_add_a_new_server_prompt">Sisesta serveri nimi, mille sisu sa soovid uurida.</string>
     <string name="directory_add_a_new_server">Lisa uus server</string>
     <string name="directory_your_server">Sinu server</string>
+    <string name="teammate_spaces_arent_quite_ready">Kaasteeliste kogukonnakeskused pole veel päris valmis, aga sa võid neid juba proovida</string>
+    <string name="continue_anyway">Jätka ikkagi</string>
+    <string name="teammate_spaces_might_not_join">Hetkel teiste kasutajate liitumine sinu poolt tehtud privaatsete jututubadega ei pruugi õnnestuda.
+\n
+\nKuna tegemist on beetaversiooniga, siis me veel parandame seda funktsionaalsust, aga lihtsalt tahtsime sind teavitada.</string>
 </resources>
\ No newline at end of file

From f6dd07eb64738431143c7a77ff47bcc17312ff85 Mon Sep 17 00:00:00 2001
From: Vancha <tjipke@tutanota.com>
Date: Fri, 18 Jun 2021 22:22:40 +0000
Subject: [PATCH 21/65] Translated using Weblate (Frisian)

Currently translated at 25.7% (641 of 2490 strings)

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

diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml
index 12a1df9012..5bdcc26d1f 100644
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@@ -630,4 +630,39 @@
     <string name="room_settings_room_access_public_title">Iepenbier</string>
     <string name="room_settings_room_access_entry_knock">Eltsenien kin by disse keamer oankopje, leden kinne don akseptearje as ôfslaan</string>
     <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Eltsenien dyt in link nei disse keamer hat, sels gasten</string>
+    <string name="no_ignored_users">Do hast gjin brûkers negearre</string>
+    <string name="settings_ignored_users">Negearre brûkers</string>
+    <string name="preference_voice_and_video">Stim &amp; Fideo</string>
+    <string name="settings_advanced_settings">Avansearre ynstellingen</string>
+    <string name="login_server_other_text">Oanpaste en avansearre ynstellingen</string>
+    <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Akkount Tafoegje</string>
+    <string name="settings_troubleshoot_test_bing_settings_title">Oanpaste Ynstellingen.</string>
+    <string name="settings_troubleshoot_test_device_settings_quickfix">Ynskeakelje</string>
+    <string name="settings_troubleshoot_test_account_settings_quickfix">Ynskeakelje</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Notifikaasjes binne ynskeakele foar dyn akkount.</string>
+    <string name="settings_troubleshoot_test_account_settings_title">Akkount Ynstellingen.</string>
+    <string name="open_settings">Ynstellingen Iepenje</string>
+    <string name="settings_troubleshoot_test_system_settings_success">Notifikaasjes binne ynskeakele yn de systeem ynstellingen.</string>
+    <string name="settings_troubleshoot_test_system_settings_title">Systeem Ynstellingen.</string>
+    <string name="settings_troubleshoot_diagnostic_run_button_title">Tests Útfiere</string>
+    <string name="settings_phone_numbers">Telefoannûmers</string>
+    <string name="settings_emails">E-mailadressen</string>
+    <string name="settings_add_3pid_confirm_password_title">Wachtwurd befêstigje</string>
+    <string name="settings_app_info_link_summary">Applikaasje informaasje yn de systeem ynstellingen sjen litte.</string>
+    <string name="settings_app_info_link_title">Applikaasje informaasje</string>
+    <string name="settings_add_phone_number">Telefoannûmer tafoegje</string>
+    <string name="settings_phone_number_empty">Der is gjin telefoannûmer tafoege oan syn akkount</string>
+    <string name="settings_add_email_address">E-mailadres tafoegje</string>
+    <string name="settings_email_address">Email</string>
+    <string name="room_sliding_menu_settings">Ynstellingen</string>
+    <string name="room_settings_leave_conversation">Petear Ferlitte</string>
+    <string name="room_settings_direct_chat">Direkt Petear</string>
+    <string name="room_settings_all_messages">Alle berjochten</string>
+    <string name="room_settings_all_messages_noisy">Alle berjochten (lûd)</string>
+    <string name="room_details_settings">Ynstellingen</string>
+    <string name="room_permissions_change_settings">Ynstellingen feroarje</string>
+    <string name="room_settings_permissions_title">Keamer rjochten</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Do hast de tsjinner ACLs foar dizze keamer feroare.</string>
+    <string name="notice_room_server_acl_updated_title">%s hat de tsjinner ACLs foar dizze keamer feroare.</string>
+    <string name="notice_avatar_url_changed_by_you">Do hast dyn profyl ôfbylding feroare</string>
 </resources>
\ No newline at end of file

From e77cca4495b2c9d27aaf85d9d8800ff2b6936d41 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 18 Jun 2021 06:50:19 +0000
Subject: [PATCH 22/65] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2490 of 2490 strings)

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

diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 797ea4f036..ba1e3a9e8e 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2811,4 +2811,9 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="directory_add_a_new_server_prompt">Add meg a felfedezni kívánt új szerver nevét.</string>
     <string name="directory_add_a_new_server">Új szerver hozzáadása</string>
     <string name="directory_your_server">Matrix szervered</string>
+    <string name="teammate_spaces_might_not_join">Az emberek jelen pillanatban nem fognak tudni csatlakozni egyetlen olyan privát szobához sem amit készítettél.
+\n
+\nEzt folyamatosan fejlesztjük a béta program keretében, csak szerettünk volna tájékoztatni róla.</string>
+    <string name="teammate_spaces_arent_quite_ready">A csoporttárs terek még nem igazán vannak készen de már tehetsz velük egy próbát</string>
+    <string name="continue_anyway">Mindenképpen folytatás</string>
 </resources>
\ No newline at end of file

From b5ff31b84ea29633b062b2ca0eb6ac256990657e Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Fri, 18 Jun 2021 09:28:16 +0000
Subject: [PATCH 23/65] Translated using Weblate (Albanian)

Currently translated at 99.5% (2479 of 2490 strings)

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

diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 73512f103c..167d4a6354 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -2796,4 +2796,9 @@
     <string name="directory_add_a_new_server_prompt">Jepni emrin e e një shërbyesi të ri që doni të eksploroni.</string>
     <string name="directory_add_a_new_server">Shtoni shërbyes të ri</string>
     <string name="directory_your_server">Shërbyesi juaj</string>
+    <string name="teammate_spaces_might_not_join">Hëpërhë, personat mund të mos jenë në gjendje të hyjnë në çfarëdo dhome private që krijoni.
+\n
+\nDo ta përmirësojmë këtë punë, si pjesë e versionit beta, thjesht donim t’ua bënim të ditur.</string>
+    <string name="teammate_spaces_arent_quite_ready">Hapësirat për anëtarë ekipi ende s’janë tërësisht gati, por mund t’i provoni</string>
+    <string name="continue_anyway">Vazhdo, Sido Qoftë</string>
 </resources>
\ No newline at end of file

From 8e595a7605b4971a82f4475d311e751c2a5ecfa2 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sat, 19 Jun 2021 10:10:16 +0000
Subject: [PATCH 24/65] Translated using Weblate (Swedish)

Currently translated at 100.0% (2490 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index ce65fd9a5a..d9b58bb605 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -2806,4 +2806,9 @@
     <string name="directory_add_a_new_server_prompt">Ange namnet för en ny server du vill utforska.</string>
     <string name="directory_add_a_new_server">Lägg till en ny server</string>
     <string name="directory_your_server">Din server</string>
+    <string name="teammate_spaces_might_not_join">För tillfället så kan folk kanske inte gå med i privata rum som du skapar.
+\n
+\nVi kommer att förbättra detta som en del av betan, men ville låta dig veta.</string>
+    <string name="teammate_spaces_arent_quite_ready">Lagkamratsutrymmen är inte riktigt färdiga men du kan ändå testa dem</string>
+    <string name="continue_anyway">Fortsätt ändå</string>
 </resources>
\ No newline at end of file

From 061ab76c21ca97edcde165e324a6362d06d1f203 Mon Sep 17 00:00:00 2001
From: sr093906 <spice2wolf@gmail.com>
Date: Fri, 18 Jun 2021 02:58:54 +0000
Subject: [PATCH 25/65] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2490 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index d3cc148943..190ea00a1e 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -2763,4 +2763,9 @@
     <string name="directory_add_a_new_server_prompt">输入你想要探索的新服务器的名称。</string>
     <string name="directory_add_a_new_server">添加一个新的服务器</string>
     <string name="directory_your_server">你的服务器</string>
+    <string name="teammate_spaces_might_not_join">眼下，人们可能无法加入您设置的任何私人房间。
+\n
+\n作为测试版的一部分，我们将对此进行改进，只是想让你知道。</string>
+    <string name="teammate_spaces_arent_quite_ready">队友空间还没有完全准备好，但你仍然可以尝试一下</string>
+    <string name="continue_anyway">不论如何继续</string>
 </resources>
\ No newline at end of file

From efe0a1737eea55897ac732cdfbf921630c6e2464 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 18 Jun 2021 03:00:53 +0000
Subject: [PATCH 26/65] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2490 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 1c67fdbbcd..e6577580b5 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -2753,4 +2753,9 @@
     <string name="directory_add_a_new_server_prompt">輸入您想要探索的新伺服器名稱。</string>
     <string name="directory_add_a_new_server">加入新的伺服器</string>
     <string name="directory_your_server">您的伺服器</string>
+    <string name="teammate_spaces_might_not_join">目前，人們可能無法加入您開啟的任何私人聊天室。
+\n
+\n作為測試版的一部分，我們會對此進行改善，但想先讓您知道。</string>
+    <string name="teammate_spaces_arent_quite_ready">隊友空間還沒有完全準備好，但您仍可以試試看</string>
+    <string name="continue_anyway">無論如何都要繼續</string>
 </resources>
\ No newline at end of file

From f7be5996e5cfbd7a7e6a03c4f1e240214c6e4dc7 Mon Sep 17 00:00:00 2001
From: zeritti <woodenmo@posteo.de>
Date: Sun, 20 Jun 2021 08:33:40 +0000
Subject: [PATCH 27/65] Translated using Weblate (Czech)

Currently translated at 100.0% (21 of 21 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
---
 fastlane/metadata/android/cs-CZ/changelogs/40101070.txt | 2 ++
 fastlane/metadata/android/cs-CZ/changelogs/40101080.txt | 2 ++
 fastlane/metadata/android/cs-CZ/changelogs/40101090.txt | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 fastlane/metadata/android/cs-CZ/changelogs/40101070.txt
 create mode 100644 fastlane/metadata/android/cs-CZ/changelogs/40101080.txt
 create mode 100644 fastlane/metadata/android/cs-CZ/changelogs/40101090.txt

diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40101070.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101070.txt
new file mode 100644
index 0000000000..2a6afb21a5
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: beta podpora pro Spaces. Komprimace videa před odesláním.
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.7
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40101080.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101080.txt
new file mode 100644
index 0000000000..5ec173ebea
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40101080.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: vylepšení pro Spaces
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.8
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40101090.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101090.txt
new file mode 100644
index 0000000000..782a2fa8c5
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40101090.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: doplněna podpora pro síť gitter.im
+Úplný záznam změn: https://github.com/vector-im/element-android/releases/tag/v1.1.9

From 13ec7a500a4468ff4bf38beb17b6cf43ffaa65a4 Mon Sep 17 00:00:00 2001
From: Ridhubharan <ridhudon@gmail.com>
Date: Tue, 22 Jun 2021 17:31:49 +0000
Subject: [PATCH 28/65] Added translation using Weblate (Tamil)

---
 vector/src/main/res/values-ta/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 vector/src/main/res/values-ta/strings.xml

diff --git a/vector/src/main/res/values-ta/strings.xml b/vector/src/main/res/values-ta/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/vector/src/main/res/values-ta/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 3b31f3956c3cb2cfa04c0bc49c64f8a948db33b0 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Mon, 21 Jun 2021 18:01:18 +0000
Subject: [PATCH 29/65] Translated using Weblate (German)

Currently translated at 99.9% (2488 of 2490 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 | 66 ++++++++++++-----------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index faff212373..6b8aa1c07e 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -511,7 +511,7 @@
     <string name="preview">Vorschau</string>
     <string name="reject">Ablehnen</string>
     <!-- Room -->
-    <string name="room_jump_to_first_unread">Zur ersten ungelesenen Nachricht springen.</string>
+    <string name="room_jump_to_first_unread">Zur ersten ungelesenen Nachricht</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, welche nicht mit diesem Konto verknüpft ist.
@@ -650,9 +650,9 @@
     <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_messages_in_one_to_one">Direktnachrichten</string>
+    <string name="settings_messages_in_group_chat">Gruppenchats</string>
+    <string name="settings_invited_to_room">Einladungen</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>
@@ -797,7 +797,7 @@
     <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_e2e_room_keys">Ende-zu-Ende-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>
     <string name="encryption_export_export">Exportieren</string>
@@ -877,7 +877,7 @@
     <string name="widget_integration_no_permission_in_room">Du hast keine Berechtigung, diese Aktion in diesem Raum auszuführen.</string>
     <string name="widget_integration_missing_room_id">Anfrage beinhaltet keine Raum-ID.</string>
     <string name="widget_integration_room_not_visible">Raum %s ist nicht sichtbar.</string>
-    <string name="room_add_matrix_apps">Matrix-Apps hinzufügen</string>
+    <string name="room_add_matrix_apps">Integrationen hinzufügen</string>
     <string name="settings_notification_ringtone">Benachrichtigungston</string>
     <string name="widget_integration_failed_to_send_request">Anfrage konnte nicht gesendet werden.</string>
     <string name="widget_integration_missing_user_id">Anfrage enthält keine user_id.</string>
@@ -887,7 +887,7 @@
     <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 mit meinem Anzeigenamen</string>
-    <string name="settings_containing_my_user_name">Nachrichten, die meinen Benutzernamen enthalten</string>
+    <string name="settings_containing_my_user_name">Nachrichten mit meinen Benutzernamen</string>
     <string name="you_added_a_new_device">Du hast die neue Sitzung \'%s\' hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
     <string name="your_unverified_device_requesting">Deine bislang nicht verifiziertes Sitzung \'%s\' fordert Verschlüsselungs-Schlüssel an.</string>
     <string name="start_verification">Verifizierung beginnen</string>
@@ -1028,7 +1028,7 @@
 \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_deactivate_my_account">Meinen Account deaktivieren</string>
     <string name="settings_opt_in_of_analytics">Sende Analysedaten</string>
     <string name="template_settings_opt_in_of_analytics_summary">${app_name} sammelt anonyme Analysedaten um uns zu helfen, die App zu verbessern.</string>
     <string name="template_settings_opt_in_of_analytics_prompt">Bitte aktive Analysedaten um uns zu helfen ${app_name} zu verbessern.</string>
@@ -1150,11 +1150,11 @@
     <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">Schreibbenachrichtigungen senden</string>
     <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
     <string name="settings_send_markdown">Markdown-Formatierung</string>
     <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen, etwa Sternchen (*) um kursiven Text anzuzeigen.</string>
-    <string name="settings_show_read_receipts">Zeige Lesebestätigungen</string>
+    <string name="settings_show_read_receipts">Lesebestätigungen zeigen</string>
     <string name="settings_show_read_receipts_summary">Klicke auf die Lesebestätigungen für eine detailliertere Liste.</string>
     <string name="settings_show_join_leave_messages_summary">Einladungen, Kicks und Banns bleiben unberührt.</string>
     <string name="settings_password">Passwort</string>
@@ -1223,7 +1223,7 @@
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Einschränkungen deaktivieren</string>
     <string name="settings_troubleshoot_test_battery_title">Batterieoptimierung</string>
     <string name="template_settings_troubleshoot_test_battery_success">${app_name} wird nicht von Batterieoptimierungen beeinflusst.</string>
-    <string name="settings_notification_troubleshoot">Fehler bei Benachrichtigungen finden</string>
+    <string name="settings_notification_troubleshoot">Benachrichtigungsprobleme finden</string>
     <string name="settings_troubleshoot_diagnostic">Diagnose von Fehlern</string>
     <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose ist OK. Wenn du immer noch keine Benachrichtigungen bekommst, sende bitte einen Fehlerbericht, um uns beim Nachforschen zu helfen.</string>
     <string name="settings_troubleshoot_test_play_services_title">Prüfung der Play-Dienste</string>
@@ -1254,8 +1254,8 @@
     <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="settings_silent_notifications_preferences">Stumme Benachrichtigungen einstellen</string>
+    <string name="settings_system_preferences_summary">LED-Farbe, Vibration und Ton wählen</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>
@@ -1391,7 +1391,7 @@
     <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">Nachricht mit Eingabetaste senden</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>
@@ -1569,7 +1569,7 @@
     <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="labs_swipe_to_reply_in_timeline">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>
@@ -1638,7 +1638,7 @@
     <string name="settings_integrations">Integrationen</string>
     <string name="settings_integrations_summary">Benutze einen Integrations-Manager um Bots, Brücken, Widgets und Sticker-Pakete zu verwalten. 
 \nIntegrations-Manager erhalten Konfigurationsdaten und können Widgets verändern, Raum-Einladungen senden und in deinem Namen Berechtigungslevel setzen.</string>
-    <string name="settings_integration_allow">Erlaube Integrationen</string>
+    <string name="settings_integration_allow">Integrationen erlauben</string>
     <string name="room_widget_activity_title">Widget</string>
     <string name="room_widget_permission_title">Widget laden</string>
     <string name="room_widget_permission_added_by">Dieses Widget wurde hinzugefügt von:</string>
@@ -1659,7 +1659,7 @@
     <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="settings_discovery_manage">Erkennungseinstellungen verwalten.</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>
@@ -2101,8 +2101,8 @@
     <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_messages_at_room">Nachrichten mit \"@room\"</string>
+    <string name="settings_messages_in_e2e_group_chat">Verschlüsselte 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>
@@ -2113,7 +2113,7 @@
     <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="settings_when_rooms_are_upgraded">Raumupgrades</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>
@@ -2123,7 +2123,7 @@
     <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="settings_messages_in_e2e_one_to_one">Verschlüsselte Direktnachrichten</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>
@@ -2150,7 +2150,7 @@
     <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_title">Screenshots innerhalb der Anwendung verhindern</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>
@@ -2381,7 +2381,7 @@
     <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="settings_call_show_confirmation_dialog_title">Verhindere versehentliche Anrufe</string>
+    <string name="settings_call_show_confirmation_dialog_title">Versehentliche Anrufe verhindern</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">Einrichten</string>
     <string name="no_permissions_to_start_conf_call">Dir fehlt die Berechtigung in diesem Raum eine Konferenz zu starten</string>
@@ -2397,7 +2397,7 @@
         <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_manage_integrations">Integrationen verwalten</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
@@ -2456,7 +2456,7 @@
     <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiviere Gerät-spezifische Biometrie wie Fingerabdrücke und Gesichtserkennung.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrie aktivieren</string>
     <string name="settings_security_application_protection_screen_title">Schutz konfigurieren</string>
-    <string name="settings_security_application_protection_title">Zugriff schützen</string>
+    <string name="settings_security_application_protection_title">Zugriffsschutz</string>
     <string name="settings_security_application_protection_summary">Schütze den Zugriff mit PIN und Biometrie.</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
         <item quantity="one">Zeigen das Gerät, mit dem du jetzt überprüfen kannst</item>
@@ -2556,7 +2556,7 @@
     <string name="template_invite_friends_text">Hey, schreibe mit mir auf ${app_name}: %s</string>
     <string name="invite_friends">Freunde einladen</string>
     <string name="add_people">Leute hinzufügen</string>
-    <string name="topic_prefix">"Thema "</string>
+    <string name="topic_prefix">"Thema: "</string>
     <string name="add_a_topic_link_text">Füge ein Thema hinzu</string>
     <string name="room_created_summary_no_topic_creation_text">%s, um zu zeigen um was es in diesem Raum geht.</string>
     <string name="this_is_the_beginning_of_dm">Das ist der Anfang deiner Direktnachrichten mit %s.</string>
@@ -2629,7 +2629,7 @@
     <string name="settings_show_emoji_keyboard_summary">Knopf zum Nachrichteneditor hinzufügen, der die Emoji-Tastatur öffnet</string>
     <string name="settings_show_emoji_keyboard">Emoji-Tastatur anzeigen</string>
     <string name="settings_chat_effects_description">Nutze /confetti Kommando oder sende Nachrichten, die ❄️ oder 🎉 enthalten</string>
-    <string name="settings_chat_effects_title">Chat-Effekte zeigen</string>
+    <string name="settings_chat_effects_title">Chateffekte</string>
     <string name="room_permissions_change_topic">Thema ändern</string>
     <string name="room_permissions_upgrade_the_room">Raum aktualisieren</string>
     <string name="room_permissions_notice">Rollen, die zum Ändern verschiedener Teile des Raums erforderlich sind, auswählen</string>
@@ -2642,8 +2642,8 @@
     <string name="failed_to_initialize_cross_signing">Cross-Signing konnte nicht eingerichtet werden</string>
     <string name="error_unauthorized">Nicht autorisierte, fehlende gültige Authentifizierungsdaten</string>
     <string name="call_transfer_users_tab_title">Nutzer</string>
-    <string name="call_transfer_failure">Beim Übertragen des Anrufs ist ein Fehler aufgetreten</string>
-    <string name="call_transfer_title">Übertragen</string>
+    <string name="call_transfer_failure">Beim Weiterleiten des Anrufs ist ein Fehler aufgetreten</string>
+    <string name="call_transfer_title">Weiterleiten</string>
     <string name="call_transfer_connect_action">Verbinden</string>
     <plurals name="call_one_active_and_other_paused">
         <item quantity="one">1 aktiver Anruf (%1$s) · 1 pausierter Anruf</item>
@@ -2735,7 +2735,7 @@
     <string name="event_status_failed_messages_warning">Senden der Nachricht gescheitert</string>
     <string name="event_status_a11y_sending">Wird gesendet</string>
     <string name="event_status_sent_message">Nachricht gesendet</string>
-    <string name="call_transfer_consult_first">Zuerst nachfragen</string>
+    <string name="call_transfer_consult_first">Zuerst anfragen</string>
     <string name="space_type_private">Privat</string>
     <string name="space_type_public">Öffentlich</string>
     <string name="create_spaces_you_can_change_later">Du kannst dies später ändern</string>
@@ -2755,9 +2755,9 @@
     <string name="invite_just_to_this_room_desc">Diese werden kein Teil von %s sein</string>
     <string name="share_space_link_message">Tritt meinem Space %1$s %2$s bei</string>
     <string name="suggested_rooms_pills_on_empty_header">Willkommen zu %1$s, %2$s.</string>
-    <string name="labs_use_restricted_join_rule_desc">Warnung benötigt Server Unterstützung und eine experimentelle Raumversion</string>
+    <string name="labs_use_restricted_join_rule_desc">Warnung: benötigt Server-Unterstützung und eine experimentelle Raumversion</string>
     <string name="labs_use_restricted_join_rule">Experimenteller Space - Zugangsbeschränkter Raum.</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">Mit Spaces hast du die Möglichkeit Personen und Räume zu gruppieren.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Mit Spaces kannst du Personen und Räume zu gruppieren.</string>
     <string name="spaces_beta_welcome_to_spaces">Sag hallo zu Spaces!</string>
     <string name="space_add_existing_rooms">Füge bereits existierende Räume und Spaces hinzu</string>
     <string name="skip_for_now">Vorübergehend überspringen</string>
@@ -2871,4 +2871,6 @@
 \nDies werden wir demnächst als Teil der Beta verbessern, wir wollten aber sicherstellen, dass du bescheid weißt.</string>
     <string name="teammate_spaces_arent_quite_ready">Team-Spaces sind noch nicht fertig entwickelt, du kannst sie aber schon testen</string>
     <string name="continue_anyway">Trotzdem fortfahren</string>
+    <string name="call_transfer_consulting_with">Bei %1$s anfragen</string>
+    <string name="call_transfer_transfer_to_title">Zu %1$s weiterleiten</string>
 </resources>
\ No newline at end of file

From 25b954767830c546ab712af6ed5101b96a698537 Mon Sep 17 00:00:00 2001
From: Thor Arne Johansen <tajcon@gmail.com>
Date: Tue, 22 Jun 2021 13:35:05 +0000
Subject: [PATCH 30/65] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 62.8% (1564 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
---
 vector/src/main/res/values-nb-rNO/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml
index 827c7ceaae..bf220237da 100644
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@@ -140,7 +140,7 @@
     <string name="ssl_remain_offline">Ignorer</string>
     <string name="room_details_people">Folk</string>
     <string name="room_details_files">Filer</string>
-    <string name="room_details_settings">Instillinger</string>
+    <string name="room_details_settings">Innstillinger</string>
     <string name="room_details_people_present_group_name">BLE MED</string>
     <string name="room_event_action_cancel_upload">Avbryt opplastning</string>
     <string name="room_event_action_cancel_download">Avbryt nedlasting</string>
@@ -318,7 +318,7 @@
     <string name="attachment_type_audio">Lyd</string>
     <string name="attachment_type_gallery">Galleri</string>
     <string name="room_list_quick_actions_notifications_mute">Demp</string>
-    <string name="room_list_quick_actions_settings">Instillinger</string>
+    <string name="room_list_quick_actions_settings">Innstillinger</string>
     <string name="login_server_modular_learn_more">Lær mer</string>
     <string name="login_server_other_title">Annet</string>
     <string name="login_continue">Fortsett</string>
@@ -349,7 +349,7 @@
     <string name="soft_logout_signin_title">Logg på</string>
     <string name="soft_logout_signin_submit">Logg på</string>
     <string name="soft_logout_signin_password_hint">Passord</string>
-    <string name="settings">Instillinger</string>
+    <string name="settings">Innstillinger</string>
     <string name="devices_current_device">Gjeldende økt</string>
     <string name="command_description_shrug">Føyer til ¯\\_(ツ)_/¯ på en råtekstmelding</string>
     <string name="sent_a_video">Video.</string>
@@ -897,13 +897,13 @@
     <string name="auth_recaptcha_message">Denne hjemmetjeneren vil vite om du er en robot</string>
     <string name="auth_threepid_warning_message">Registrering med e-post og telefonummer samtidig fungerer ikke enda. Bare telefonummeret kommer til å bli registrert.
 \n
-\nDu kan legge e-postadressen din til i instillinger.</string>
-    <string name="auth_use_server_options">Bruk egendefinerte tjenerinstillinger (avansert)</string>
+\nDu kan legge e-postadressen din til i innstillinger.</string>
+    <string name="auth_use_server_options">Bruk egendefinerte tjenerinnstillinger (avansert)</string>
     <string name="call_failed_no_connection_description">Klarte ikke å starte en sanntidskopling.
 \nVennligst be hjemmetjeneradministratoren din om å sette opp en TURN server så samtaler blir mer stabile.</string>
     <string name="call_failed_no_ice_description">Vennligst be administratoren for hjemmetjeneren din (%1$s) til å sette opp en TURN tjener for at telefonsamtaler skal fungere ordentlig.
 \n
-\nAlternativt kan du prøve å bruke den offentlige tjeneren på %2$s, men dette vil ikke være like stabilt, og det vil dele IP-adressen din med den serveren. Du kan styre dette i instillinger.</string>
+\nAlternativt kan du prøve å bruke den offentlige tjeneren på %2$s, men dette vil ikke være like stabilt, og det vil dele IP-adressen din med den serveren. Du kan styre dette i innstillinger.</string>
     <string name="login_error_login_email_not_yet">E-postkoblingen som ikke er klikket på ennå</string>
     <string name="login_error_user_in_use">Dette brukernavnet er allerede brukt</string>
     <string name="login_error_not_json">Inneholdt ikke gyldig JSON</string>

From 919ebaa82e43aa2f1906f54b213ae15b0b56f5ef Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 24 Jun 2021 12:41:23 +0200
Subject: [PATCH 31/65] Fix some issues with timeline cache invalidation and
 visibility.

---
 changelog.d/3542.bugfix                        |  1 +
 .../detail/timeline/TimelineEventController.kt | 18 ++++++++++++++++--
 .../factory/TimelineItemFactoryParams.kt       |  1 +
 .../helper/MessageInformationDataFactory.kt    | 15 ++++++++-------
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 changelog.d/3542.bugfix

diff --git a/changelog.d/3542.bugfix b/changelog.d/3542.bugfix
new file mode 100644
index 0000000000..8e133e1e30
--- /dev/null
+++ b/changelog.d/3542.bugfix
@@ -0,0 +1 @@
+Fix some issues with timeline cache invalidation and visibility.
\ No newline at end of file
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 a0f87b9749..bbb1b7a06f 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
@@ -39,13 +39,13 @@ import im.vector.app.features.home.room.detail.UnreadState
 import im.vector.app.features.home.room.detail.timeline.factory.MergedHeaderItemFactory
 import im.vector.app.features.home.room.detail.timeline.factory.ReadReceiptsItemFactory
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactory
+import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 import im.vector.app.features.home.room.detail.timeline.helper.ContentDownloadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineControllerInterceptorHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventDiffUtilCallback
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityHelper
 import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventVisibilityStateChangedListener
-import im.vector.app.features.home.room.detail.timeline.factory.TimelineItemFactoryParams
 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.BasedMergedItem
@@ -163,10 +163,19 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
         override fun onChanged(position: Int, count: Int, payload: Any?) {
             synchronized(modelCache) {
                 assertUpdateCallbacksAllowed()
-                (position until (position + count)).forEach {
+                (position until position + count).forEach {
                     // Invalidate cache
                     modelCache[it] = null
                 }
+                // Also invalidate the first previous displayable event if
+                // it's sent by the same user so we are sure we have up to date information.
+                val invalidatedSenderId: String? = currentSnapshot.getOrNull(position)?.senderInfo?.userId
+                val prevDisplayableEventIndex = currentSnapshot.subList(0, position).indexOfLast {
+                    timelineEventVisibilityHelper.shouldShowEvent(it, eventIdToHighlight)
+                }
+                if (prevDisplayableEventIndex != -1 && currentSnapshot[prevDisplayableEventIndex].senderInfo.userId == invalidatedSenderId) {
+                    modelCache[prevDisplayableEventIndex] = null
+                }
                 requestModelBuild()
             }
         }
@@ -209,6 +218,7 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     )
 
     init {
+        isDebugLoggingEnabled = true
         addInterceptor(this)
         requestModelBuild()
     }
@@ -340,10 +350,14 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
             val event = currentSnapshot[position]
             val nextEvent = currentSnapshot.nextOrNull(position)
             val prevEvent = currentSnapshot.prevOrNull(position)
+            val nextDisplayableEvent = currentSnapshot.subList(position + 1, currentSnapshot.size).firstOrNull {
+                timelineEventVisibilityHelper.shouldShowEvent(it, eventIdToHighlight)
+            }
             val params = TimelineItemFactoryParams(
                     event = event,
                     prevEvent = prevEvent,
                     nextEvent = nextEvent,
+                    nextDisplayableEvent = nextDisplayableEvent,
                     highlightedEventId = eventIdToHighlight,
                     lastSentEventIdWithoutReadReceipts = lastSentEventWithoutReadReceipts,
                     callback = callback
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
index f92cd2800a..0e595ba30e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/TimelineItemFactoryParams.kt
@@ -23,6 +23,7 @@ data class TimelineItemFactoryParams(
         val event: TimelineEvent,
         val prevEvent: TimelineEvent? = null,
         val nextEvent: TimelineEvent? = null,
+        val nextDisplayableEvent: TimelineEvent? = null,
         val highlightedEventId: String? = null,
         val lastSentEventIdWithoutReadReceipts: String? = null,
         val callback: TimelineEventController.Callback? = null
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 124b196f72..221149aced 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -50,27 +50,28 @@ import javax.inject.Inject
 class MessageInformationDataFactory @Inject constructor(private val session: Session,
                                                         private val roomSummariesHolder: RoomSummariesHolder,
                                                         private val dateFormatter: VectorDateFormatter,
+                                                        private val visibilityHelper: TimelineEventVisibilityHelper,
                                                         private val vectorPreferences: VectorPreferences) {
 
     fun create(params: TimelineItemFactoryParams): MessageInformationData {
         val event = params.event
-        val nextEvent = params.nextEvent
+        val nextDisplayableEvent = params.nextDisplayableEvent
         val eventId = event.eventId
 
         val date = event.root.localDateTime()
-        val nextDate = nextEvent?.root?.localDateTime()
+        val nextDate = nextDisplayableEvent?.root?.localDateTime()
         val addDaySeparator = date.toLocalDate() != nextDate?.toLocalDate()
         val isNextMessageReceivedMoreThanOneHourAgo = nextDate?.isBefore(date.minusMinutes(60))
                 ?: false
 
         val showInformation =
                 addDaySeparator
-                        || event.senderInfo.avatarUrl != nextEvent?.senderInfo?.avatarUrl
-                        || event.senderInfo.disambiguatedDisplayName != nextEvent?.senderInfo?.disambiguatedDisplayName
-                        || nextEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED)
+                        || event.senderInfo.avatarUrl != nextDisplayableEvent?.senderInfo?.avatarUrl
+                        || event.senderInfo.disambiguatedDisplayName != nextDisplayableEvent?.senderInfo?.disambiguatedDisplayName
+                        || nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED)
                         || isNextMessageReceivedMoreThanOneHourAgo
-                        || isTileTypeMessage(nextEvent)
-                        || nextEvent.isEdition()
+                        || isTileTypeMessage(nextDisplayableEvent)
+                        || nextDisplayableEvent.isEdition()
 
         val time = dateFormatter.format(event.root.originServerTs, DateFormatKind.MESSAGE_SIMPLE)
         val e2eDecoration = getE2EDecoration(event)

From bafd01c0f4cefb652e0309a2de1bc12fc4068f18 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Thu, 24 Jun 2021 07:19:30 +0000
Subject: [PATCH 32/65] Translated using Weblate (French)

Currently translated at 100.0% (2490 of 2490 strings)

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

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 2d5cad33f3..c33afe70d1 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2813,4 +2813,9 @@
     <string name="directory_add_a_new_server">Ajouter un nouveau serveur</string>
     <string name="directory_your_server">Votre serveur</string>
     <string name="call_transfer_consulting_with">Consultation de %1$s</string>
+    <string name="teammate_spaces_might_not_join">Pour l’instant, vos coéquipiers pourraient ne pas pouvoir rejoindre les salons privés que vous créez.
+\n
+\nNous allons améliorer ceci dans la bêta, mais nous voulions vous en faire part.</string>
+    <string name="teammate_spaces_arent_quite_ready">Les espaces pour les équipes ne sont pas tout à fait prêts, mais vous pouvez quand même les essayer</string>
+    <string name="continue_anyway">Poursuivre malgré tout</string>
 </resources>
\ No newline at end of file

From 7c04391037dd38aabcd49d0d1b5100cfcca1fcef Mon Sep 17 00:00:00 2001
From: BramvdnHeuvel <bram.vdh1999@gmail.com>
Date: Thu, 24 Jun 2021 08:56:42 +0000
Subject: [PATCH 33/65] Translated using Weblate (Dutch)

Currently translated at 52.1% (1298 of 2490 strings)

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

diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index b2c1aff6ec..a76c94cc05 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1477,4 +1477,66 @@
     <string name="notice_room_created">%1$s heeft de kamer aangemaakt</string>
     <string name="notice_room_invite_no_invitee_by_you">Jouw uitnodiging</string>
     <string name="summary_you_sent_image">Je hebt een afbeelding gestuurd.</string>
+    <string name="notice_room_ban_with_reason_by_you">U heeft %1$s verbannen. Reden: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">U heeft de verbanning van %1$s opgeheven. Reden: %2$s</string>
+    <string name="notice_room_kick_with_reason_by_you">U heeft %1$s eruit getrapt. Reden: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">U heeft de uitnodiging geweigerd. Reden: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">U bent vertrokken. Reden: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason">%1$s is vertrokken. Reden: %2$s</string>
+    <string name="notice_room_leave_with_reason_by_you">U heeft de ruimte verlaten. Reden: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">U heeft zich aangesloten. Reden: %1$s</string>
+    <string name="notice_direct_room_join_with_reason">%1$s heeft zich aangesloten. Reden: %2$s</string>
+    <string name="notice_room_join_with_reason_by_you">U heeft zich aangesloten bij de kamer. Reden: %1$s</string>
+    <plurals name="room_displayname_four_and_more_members">
+        <item quantity="one">%1$s, %2$s, %3$s en %4$d andere</item>
+        <item quantity="other">%1$s, %2$s, %3$s en %4$d anderen</item>
+    </plurals>
+    <string name="room_displayname_4_members">%1$s, %2$s, %3$s en %4$s</string>
+    <string name="room_displayname_3_members">%1$s, %2$s en %3$s</string>
+    <string name="notice_power_level_diff">%1$s van %2$s naar %3$s</string>
+    <string name="notice_power_level_changed">%1$s heeft het machtigingsniveau van %2$s aangepast.</string>
+    <string name="notice_power_level_changed_by_you">U heeft het machtigingsniveau van %1$s aangepast.</string>
+    <string name="power_level_custom_no_value">Speciaal</string>
+    <string name="power_level_custom">Speciaal (%1$d)</string>
+    <string name="power_level_default">Standaardlid</string>
+    <string name="power_level_admin">Beheerder</string>
+    <string name="notice_widget_jitsi_modified_by_you">U heeft de videoconferentie aangepast</string>
+    <string name="notice_widget_jitsi_modified">Videoconferentie aangepast door %1$s</string>
+    <string name="notice_widget_jitsi_removed_by_you">U heeft de videoconferentie beëindigd</string>
+    <string name="notice_widget_jitsi_removed">Videoconferentie beëindigd door %1$s</string>
+    <string name="notice_widget_jitsi_added_by_you">U heeft een videoconferentie gestart</string>
+    <string name="notice_widget_jitsi_added">Videoconferentie gestart door %1$s</string>
+    <string name="notice_widget_modified_by_you">U heeft de widget %1$s aangepast</string>
+    <string name="notice_widget_modified">%1$s heeft de widget %2$s aangepast</string>
+    <string name="notice_widget_removed_by_you">U heeft de widget %1$s verwijderd</string>
+    <string name="notice_widget_removed">%1$s heeft de widget %2$s verwijderd</string>
+    <string name="notice_widget_added_by_you">U heeft de widget %1$s toegevoegd</string>
+    <string name="notice_widget_added">%1$s heeft de widget %2$s toegevoegd</string>
+    <string name="notice_room_third_party_registered_invite_by_you">U heeft de uitnodiging voor %1$s geaccepteerd</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">U heeft de uitnodiging voor %1$s ingetrokken</string>
+    <string name="notice_direct_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s ingetrokken</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">U heeft de uitnodiging voor %1$s ingetrokken om zich bij de kamer aan te sluiten</string>
+    <string name="notice_room_third_party_invite_by_you">U heeft een uitnodiging gestuurd naar %1$s om zich bij de kamer aan te sluiten</string>
+    <string name="notice_room_avatar_removed_by_you">U heeft de kameravatar verwijderd</string>
+    <string name="notice_room_avatar_removed">%1$s heeft de kameravatar verwijderd</string>
+    <string name="notice_room_topic_removed_by_you">U heeft het kameronderwerp verwijderd</string>
+    <string name="notice_room_name_removed_by_you">U heeft de kamernaam verwijderd</string>
+    <string name="notice_room_update_by_you">U heeft de ruimte geüpgradet.</string>
+    <string name="notice_call_candidates_by_you">U verstuurde data om het gesprek op te zetten.</string>
+    <string name="notice_call_candidates">%s verstuurde data om het gesprek op te zetten.</string>
+    <string name="notice_placed_voice_call_by_you">U heeft een audiogesprek geopend.</string>
+    <string name="notice_placed_video_call_by_you">U heeft een videogesprek geopend.</string>
+    <string name="notice_room_name_changed_by_you">U heeft de ruimtenaam veranderd naar: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">U heeft de ruimteavatar aangepast</string>
+    <string name="notice_room_avatar_changed">%1$s heeft de ruimteavatar aangepast</string>
+    <string name="notice_room_topic_changed_by_you">U heeft het onderwerp gewijzigd naar: %1$s</string>
+    <string name="notice_display_name_removed_by_you">U heeft uw weergavenaam verwijderd (voorheen %1$s)</string>
+    <string name="notice_room_withdraw_by_you">U heeft de uitnodiging van %1$s ingetrokken</string>
+    <string name="notice_room_ban_by_you">U heeft %1$s verbannen</string>
+    <string name="notice_room_unban_by_you">U heeft de verbanning van %1$s opgeheven</string>
+    <string name="notice_room_kick_by_you">U heeft %1$s eruit getrapt</string>
+    <string name="notice_direct_room_join_by_you">U sloot zich aan</string>
+    <string name="notice_direct_room_join">%1$s sluit aan</string>
+    <string name="notice_room_join_by_you">Je hebt de kamer betreden</string>
+    <string name="summary_you_sent_sticker">Je hebt een sticker verzonden.</string>
 </resources>
\ No newline at end of file

From 473259f150de166ab8668d3052c918d2075678e5 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Thu, 24 Jun 2021 11:31:53 +0000
Subject: [PATCH 34/65] Translated using Weblate (French)

Currently translated at 100.0% (21 of 21 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 .../android/fr-FR/changelogs/40101070.txt     |  2 +
 .../android/fr-FR/changelogs/40101080.txt     |  2 +
 .../android/fr-FR/changelogs/40101090.txt     |  2 +
 .../android/fr-FR/full_description.txt        | 47 +++++++++++--------
 4 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/40101070.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/40101080.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/40101090.txt

diff --git a/fastlane/metadata/android/fr-FR/changelogs/40101070.txt b/fastlane/metadata/android/fr-FR/changelogs/40101070.txt
new file mode 100644
index 0000000000..66cc5d1671
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40101070.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : prise en charge des espaces en bêta. Compression des vidéos avant envoi.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.7
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40101080.txt b/fastlane/metadata/android/fr-FR/changelogs/40101080.txt
new file mode 100644
index 0000000000..31a4b72363
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40101080.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : amélioration des espaces.
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.8
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40101090.txt b/fastlane/metadata/android/fr-FR/changelogs/40101090.txt
new file mode 100644
index 0000000000..99f02f1bb2
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40101090.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : ajout de la prise en charge de gitter.im
+Intégralité des changements : https://github.com/vector-im/element-android/releases/tag/v1.1.9
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index 066b94868b..78fcdf5617 100644
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -1,30 +1,39 @@
-Element est une nouvelle application de messagerie et de collaboration qui :
+Element est à la fois une messagerie sécurisée et une application de collaboration en équipe, idéale pour les conversations de groupe en télétravail. Cette application utilise le chiffrement de bout en bout. Elle permet de mettre en place des téléconférences vidéo, du partage de fichier et des appels vocaux.
 
-1. Vous permet de préserver votre vie privée
-2. Vous permet de communiquer avec n’importe qui sur réseau Matrix, et plus encore grâce aux intégrations d’autres applications telles que Slack ou Discord
-3. Vous protège de la publicité et de la collecte de données
-4. Vous protège grâce au chiffrement de bout-à-bout et à la signature croisée pour authentifier les autres utilisateurs
+<b>Les fonctionnalités d’Element incluent :</b>
+- Outils de communication en ligne avancés
+- Communication d’entreprise sécurisée par le chiffrement de bout en bout des messages, même pour les travailleurs à distance
+- Messagerie décentralisée basée sur le framework open source Matrix
+- Partage sécurisé de fichiers avec chiffrement des données lors de la gestion de projet
+- Conversations vidéo par voix sur IP et partage d’écran
+- Intégration facile avec vos outils de collaboration, de gestion de projet, services de VoIP et autres applications de messagerie
 
-Element est complètement différente des autres applications de messagerie et de collaboration puisque l’application est décentralisée et open-source.
+Element est complètement différente des autres applications de messagerie et de collaboration. Elle s’appuie sur Matrix, un réseau ouvert de communication décentralisée. Elle permet l’auto-hébergement pour que ses utilisateurs restent le plus en contrôle possible de leurs données et leurs messages.
 
-Element vous permet d’héberger vous-même ou de choisir un hôte vous permettant d’assurer votre vie privée, la propriété et le contrôle de vos données et de vos conversations. Cela vous donne accès à un réseau ouvert. Vous n’êtes donc pas condamné à parler à d’autres utilisateurs d’Element seulement. Et c'est très sécurisé.
+<b>Confidentialité et messagerie chiffrée</b>
+Element vous protège des publicités non désirées, du minage de données et des prisons dorées. Elle protègé vos données et vos communications vocales grâce au chiffrement de bout en bout et à la vérification de signature croisée entre appareils.
 
-Element peut faire tout ça car elle est basée sur Matrix, le protocole standard pour la communication ouverte et décentralisée.
+Element vous donne la main sur votre confidentialité en vous permettant de communiquer de manière sécurisée avec tout le réseau Matrix ou d’autres applications de communication d’entreprise au travers d’intégrations d’applications comme Slack.
 
-Element vous donne le contrôle en vous laissant choisir qui héberge vos conversations. Depuis l'application Element, vous pouvez choisir votre hôte de différentes manières :
+<b>Element peut être auto-hébergé</b>
+Pour une meilleure souveraineté sur vos données et conversations, Element peut être auto-hébergé ou vous pouvez choisir votre hôte Matrix - la norme open source pour les communications décentralisées. Element garantit votre confidentialité, conformité aux normes de sécurité, tout en proposant une intégration souple.
 
-1. Créer un compte gratuit sur le serveur public matrix.org hébergé par les développeurs de Matrix, ou choisir parmi les milliers de serveurs public hébergés par des bénévoles
-2. Héberger vous-même votre compte en installant un serveur sur votre propre machine
-3. Créer un compte sur un serveur personnalisé en souscrivant sur la plateforme d'hébergement « Element Matrix Services » (EMS)
+<b>Vos données vous appartiennent</b>
+Vous décidez où stocker vos données et messages. Aucun risque de minage de données où d’accès par des tierce parties.
 
-<b>Pourquoi choisir Element ?</b>
+Element vous place aux commandes de différente manières :
+1. Inscrivez vous sur le serveur public matrix.org hébergé par les développeurs de Matrix ou choisissez parmi des milliers de serveurs publics hébergés par des bénévoles
+2. Auto-hébergez votre compte sur un serveur de votre proper infrastructure informatique
+3. Inscrivez vous à la plateforme d’hébergement Element Matrix Services
 
-<b>VOS DONNÉES VOUS APPARTIENNENT</b> : vous décidez où stocker vos données et messages. Ils vous appartiennent et vous les maîtrisez. Aucune multinationale ne viendra extraire vos données pour les envoyer au plus offrant.
+<b>Messagerie et collaboration ouvertes</b>
+Vous pouvez discuter avec tout le réseau Matrix, que vos interlocuteurs utilisent Element, une autre application Matrix, ou même s’ils utilisent une application complètement différente.
 
-<b>MESSAGERIE ET COLLABORATION OUVERTES</b> : vous pouvez discuter avec tout le réseau Matrix, qu’ils utilisent Element ou une autre application Matrix, même s’ils utilisent une autre plateforme de messagerie telle que Slack, IRC ou XMPP.
+<b>Ultra sécurisé</b>
+Chiffrement de bout en bout (seules les personnes dans la conversation peuvent déchiffrer les messages) et vérification de signature croisée entre appareils.
 
-<b>ULTRA SÉCURISÉ</b> : chiffrement de bout en bout (seuls les membres d’une conversation peuvent déchiffrer les messages), et signature croisée pour vérifier les appareils de vos interlocuteurs.
+<b>Communication et intégration parfaites</b>
+Messagerie instantannée, appels audio et vidéo, partage de fichier, partage d’écran et bien d’autres intégrations, bots et widgets. Lancez des salons, des communautés, restez en contact et menez vos projets à bien.
 
-<b>TOUTES VOS COMMUNICATIONS</b> : messagerie, appels audio et vidéo, partage de fichier, partage d’écran et un grand nombre d’intégrations, robots et widgets. Participez à des salons, des communautés, restez en contact et faites avancer vos projets.
-
-<b>PARTOUT AVEC VOUS</b> : votre historique reste synchronisé entre tous vos appareils et sur le web sur https://element.io/app.
+<b>Reprenez où vous vous êtes arrêté</b>
+Restez en contact où que vous soyez grâce à l’historique des messages synchronisé entre tous vos appareils et sur le web sur https://app.element.io

From 230b3f31d7edf01caa6b8399e9572450797ee90b Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Sat, 26 Jun 2021 18:53:27 +0000
Subject: [PATCH 35/65] Translated using Weblate (German)

Currently translated at 99.9% (2488 of 2490 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 6b8aa1c07e..b673e29a2f 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1255,7 +1255,7 @@
     <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">Stumme Benachrichtigungen einstellen</string>
-    <string name="settings_system_preferences_summary">LED-Farbe, Vibration und Ton wählen</string>
+    <string name="settings_system_preferences_summary">LED-Farbe, Vibration, Ton usw. wählen</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>
@@ -2791,7 +2791,7 @@
     <string name="create_spaces_me_and_teammates">Meine Teamkameraden und ich</string>
     <string name="create_spaces_organise_rooms">Ein privater Space um deine Räume zu organisieren</string>
     <string name="create_spaces_join_info_help">Um einem bereits existierenden Space beizutreten, benötigst du eine Einladung.</string>
-    <string name="create_spaces_type_header">Wir haben Spaces entwickelt, damit ihr eure vielen Räume besser organisieren könnt.</string>
+    <string name="create_spaces_type_header">Wir haben Spaces entwickelt, damit ihr eure Räume besser organisieren könnt</string>
     <string name="your_private_space">Dein privater Space</string>
     <string name="your_public_space">Dein öffentlicher Space</string>
     <string name="command_description_join_space">Betrete einen Space mit der angegebenen ID</string>

From 2764ecb2563e0fa15a176cfd80bd05c96781f8db Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Sat, 26 Jun 2021 09:51:46 +0000
Subject: [PATCH 36/65] Translated using Weblate (Italian)

Currently translated at 99.8% (2486 of 2490 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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 2bffefc310..1714d28a89 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -2868,4 +2868,9 @@
     <string name="directory_add_a_new_server_prompt">Inserisci il nome di un nuovo server che vuoi esplorare.</string>
     <string name="directory_add_a_new_server">Aggiungi un nuovo server</string>
     <string name="directory_your_server">Il tuo server</string>
+    <string name="teammate_spaces_might_not_join">Al momento le persone potrebbero non poter entrare nelle stanze private che crei.
+\n
+\nMiglioreremo questa cosa come parte della beta, ma volevamo almeno fartelo sapere.</string>
+    <string name="teammate_spaces_arent_quite_ready">Gli spazi dei compagni non sono ancora pronti del tutto, ma puoi comunque provarli</string>
+    <string name="continue_anyway">Continua comunque</string>
 </resources>
\ No newline at end of file

From bca220f90930b05e0b879c87896572ba0707f4ce Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 28 Jun 2021 17:02:06 +0200
Subject: [PATCH 37/65] Fix issue on button styles

---
 library/ui-styles/src/main/res/values/dimens_font.xml    | 2 +-
 library/ui-styles/src/main/res/values/styles_buttons.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/ui-styles/src/main/res/values/dimens_font.xml b/library/ui-styles/src/main/res/values/dimens_font.xml
index 92df8dbf35..1b5a826acb 100644
--- a/library/ui-styles/src/main/res/values/dimens_font.xml
+++ b/library/ui-styles/src/main/res/values/dimens_font.xml
@@ -8,6 +8,6 @@
     <dimen name="text_size_caption">12sp</dimen>
     <dimen name="text_size_micro">10sp</dimen>
 
-    <dimen name="text_size_button">16sp</dimen>
+    <dimen name="text_size_button">14sp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/styles_buttons.xml b/library/ui-styles/src/main/res/values/styles_buttons.xml
index 8d34995751..ad90469a52 100644
--- a/library/ui-styles/src/main/res/values/styles_buttons.xml
+++ b/library/ui-styles/src/main/res/values/styles_buttons.xml
@@ -6,6 +6,7 @@
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="cornerRadius">8dp</item>
         <item name="lineHeight">24sp</item>
     </style>
 
@@ -32,6 +33,7 @@
         <item name="android:paddingRight">16dp</item>
         <item name="android:minWidth">94dp</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="cornerRadius">8dp</item>
         <item name="lineHeight">24sp</item>
     </style>
 
@@ -48,6 +50,7 @@
         <item name="colorControlHighlight">?colorSecondary</item>
         <item name="materialThemeOverlay">@style/VectorMaterialThemeOverlayPositive</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="cornerRadius">8dp</item>
         <item name="lineHeight">24sp</item>
     </style>
 
@@ -61,6 +64,7 @@
         <item name="strokeColor">@color/button_background_tint_selector</item>
         <item name="strokeWidth">1dp</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Button</item>
+        <item name="cornerRadius">8dp</item>
         <item name="lineHeight">24sp</item>
     </style>
 

From 0d02a197a5fb8e7d53537d074a6501580cab024b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 20:54:59 +0200
Subject: [PATCH 38/65] Remove redundant mimetype (vector-im/element-web#2547)

---
 changelog.d/3273.feature                            |  1 +
 .../room/model/message/MessageAudioContent.kt       |  2 +-
 .../room/model/message/MessageFileContent.kt        |  3 +--
 .../room/model/message/MessageImageContent.kt       |  3 +--
 .../room/model/message/MessageStickerContent.kt     |  2 +-
 .../room/model/message/MessageVideoContent.kt       |  2 +-
 .../crypto/attachments/MXEncryptedAttachments.kt    | 13 +++++++------
 .../internal/crypto/model/rest/EncryptedFileInfo.kt |  6 ------
 .../internal/session/content/UploadContentWorker.kt |  4 ++--
 9 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 changelog.d/3273.feature

diff --git a/changelog.d/3273.feature b/changelog.d/3273.feature
new file mode 100644
index 0000000000..0edc81796b
--- /dev/null
+++ b/changelog.d/3273.feature
@@ -0,0 +1 @@
+Remove redundant mimetype (vector-im/element-web#2547)
\ No newline at end of file
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 fcf3d73cbe..b4ba5c0a66 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
@@ -54,5 +54,5 @@ data class MessageAudioContent(
 ) : MessageWithAttachmentContent {
 
     override val mimeType: String?
-        get() = encryptedFileInfo?.mimetype ?: audioInfo?.mimeType
+        get() = audioInfo?.mimeType
 }
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 d93f115322..96877b4d9f 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
@@ -60,8 +60,7 @@ data class MessageFileContent(
 ) : MessageWithAttachmentContent {
 
     override val mimeType: String?
-        get() = encryptedFileInfo?.mimetype
-                ?: info?.mimeType
+        get() = info?.mimeType
                 ?: MimeTypeMap.getFileExtensionFromUrl(filename ?: body)?.let { extension ->
                     MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
                 }
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 73e27b64e3..73fd1eab56 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
@@ -20,7 +20,6 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
-import org.matrix.android.sdk.api.util.MimeTypes
 import org.matrix.android.sdk.internal.crypto.model.rest.EncryptedFileInfo
 
 @JsonClass(generateAdapter = true)
@@ -55,5 +54,5 @@ data class MessageImageContent(
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageImageInfoContent {
     override val mimeType: String?
-        get() = encryptedFileInfo?.mimetype ?: info?.mimeType ?: MimeTypes.Images
+        get() = info?.mimeType
 }
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 280316d4b5..8e1d4d3d75 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
@@ -55,5 +55,5 @@ data class MessageStickerContent(
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageImageInfoContent {
     override val mimeType: String?
-        get() = encryptedFileInfo?.mimetype ?: info?.mimeType
+        get() = info?.mimeType
 }
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 b7581c9fbf..3f5d2dab2e 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
@@ -53,5 +53,5 @@ data class MessageVideoContent(
         @Json(name = "file") override val encryptedFileInfo: EncryptedFileInfo? = null
 ) : MessageWithAttachmentContent {
     override val mimeType: String?
-        get() = encryptedFileInfo?.mimetype ?: videoInfo?.mimeType
+        get() = videoInfo?.mimeType
 }
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 5a9852b6db..70730326da 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
@@ -39,7 +39,9 @@ internal object MXEncryptedAttachments {
     private const val SECRET_KEY_SPEC_ALGORITHM = "AES"
     private const val MESSAGE_DIGEST_ALGORITHM = "SHA-256"
 
-    fun encrypt(clearStream: InputStream, mimetype: String?, outputFile: File, progress: ((current: Int, total: Int) -> Unit)): EncryptedFileInfo {
+    fun encrypt(clearStream: InputStream,
+                outputFile: File,
+                progress: ((current: Int, total: Int) -> Unit)): EncryptedFileInfo {
         val t0 = System.currentTimeMillis()
         val secureRandom = SecureRandom()
         val initVectorBytes = ByteArray(16) { 0.toByte() }
@@ -86,7 +88,6 @@ internal object MXEncryptedAttachments {
 
         return EncryptedFileInfo(
                 url = null,
-                mimetype = mimetype,
                 key = EncryptedFileKey(
                         alg = "A256CTR",
                         ext = true,
@@ -155,10 +156,9 @@ internal object MXEncryptedAttachments {
      * Encrypt an attachment stream.
      * DO NOT USE for big files, it will load all in memory
      * @param attachmentStream the attachment stream. Will be closed after this method call.
-     * @param mimetype the mime type
      * @return the encryption file info
      */
-    fun encryptAttachment(attachmentStream: InputStream, mimetype: String?): EncryptionResult {
+    fun encryptAttachment(attachmentStream: InputStream): EncryptionResult {
         val t0 = System.currentTimeMillis()
         val secureRandom = SecureRandom()
 
@@ -207,7 +207,6 @@ internal object MXEncryptedAttachments {
         return EncryptionResult(
                 encryptedFileInfo = EncryptedFileInfo(
                         url = null,
-                        mimetype = mimetype,
                         key = EncryptedFileKey(
                                 alg = "A256CTR",
                                 ext = true,
@@ -232,7 +231,9 @@ internal object MXEncryptedAttachments {
      * @param outputStream     the outputStream where the decrypted attachment will be write.
      * @return true in case of success, false in case of error
      */
-    fun decryptAttachment(attachmentStream: InputStream?, elementToDecrypt: ElementToDecrypt?, outputStream: OutputStream): Boolean {
+    fun decryptAttachment(attachmentStream: InputStream?,
+                          elementToDecrypt: ElementToDecrypt?,
+                          outputStream: OutputStream): Boolean {
         // sanity checks
         if (null == attachmentStream || elementToDecrypt == null) {
             Timber.e("## decryptAttachment() : null stream")
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 0ed6c0dac9..4fc3adb42c 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
@@ -29,12 +29,6 @@ data class EncryptedFileInfo(
         @Json(name = "url")
         val url: String? = null,
 
-        /**
-         * Not documented
-         */
-        @Json(name = "mimetype")
-        val mimetype: String? = null,
-
         /**
          * Required. A JSON Web Key object.
          */
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 237411db53..f14c85cf80 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
@@ -234,7 +234,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                             .also { filesToDelete.add(it) }
 
                     uploadedFileEncryptedFileInfo =
-                            MXEncryptedAttachments.encrypt(fileToUpload.inputStream(), attachment.getSafeMimeType(), encryptedFile) { read, total ->
+                            MXEncryptedAttachments.encrypt(fileToUpload.inputStream(), encryptedFile) { read, total ->
                                 notifyTracker(params) {
                                     contentUploadStateTracker.setEncrypting(it, read.toLong(), total.toLong())
                                 }
@@ -315,7 +315,7 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                         if (params.isEncrypted) {
                             Timber.v("Encrypt thumbnail")
                             notifyTracker(params) { contentUploadStateTracker.setEncryptingThumbnail(it) }
-                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(thumbnailData.bytes.inputStream(), thumbnailData.mimeType)
+                            val encryptionResult = MXEncryptedAttachments.encryptAttachment(thumbnailData.bytes.inputStream())
                             val contentUploadResponse = fileUploader.uploadByteArray(
                                     byteArray = encryptionResult.encryptedByteArray,
                                     filename = null,

From 7f70a03f41a15fc015c2dea7a8515bb60b1dbf55 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 4 May 2021 21:00:06 +0200
Subject: [PATCH 39/65] Use interface field

---
 .../sdk/internal/session/room/send/DefaultSendService.kt    | 6 +++---
 .../home/room/detail/timeline/factory/MessageItemFactory.kt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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 449189e6b5..092fec4d72 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
@@ -142,7 +142,7 @@ internal class DefaultSendService @AssistedInject constructor(
                     // The image has not yet been sent
                     val attachmentData = ContentAttachmentData(
                             size = messageContent.info!!.size,
-                            mimeType = messageContent.info.mimeType!!,
+                            mimeType = messageContent.mimeType,
                             width = messageContent.info.width.toLong(),
                             height = messageContent.info.height.toLong(),
                             name = messageContent.body,
@@ -169,7 +169,7 @@ internal class DefaultSendService @AssistedInject constructor(
                 is MessageFileContent  -> {
                     val attachmentData = ContentAttachmentData(
                             size = messageContent.info!!.size,
-                            mimeType = messageContent.info.mimeType!!,
+                            mimeType = messageContent.mimeType,
                             name = messageContent.getFileName(),
                             queryUri = Uri.parse(messageContent.url),
                             type = ContentAttachmentData.Type.FILE
@@ -181,7 +181,7 @@ internal class DefaultSendService @AssistedInject constructor(
                     val attachmentData = ContentAttachmentData(
                             size = messageContent.audioInfo?.size ?: 0,
                             duration = messageContent.audioInfo?.duration?.toLong() ?: 0L,
-                            mimeType = messageContent.audioInfo?.mimeType,
+                            mimeType = messageContent.mimeType,
                             name = messageContent.body,
                             queryUri = Uri.parse(messageContent.url),
                             type = ContentAttachmentData.Type.AUDIO
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 b1bac3378e..4767269833 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
@@ -314,7 +314,7 @@ class MessageItemFactory @Inject constructor(
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .imageContentRenderer(imageContentRenderer)
                 .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder)
-                .playable(messageContent.info?.mimeType == MimeTypes.Gif)
+                .playable(messageContent.mimeType == MimeTypes.Gif)
                 .highlighted(highlight)
                 .mediaData(data)
                 .apply {

From 1d8b95560bb8ede75f4ccdc0d8efc61f694ab855 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 29 Jun 2021 14:57:43 +0200
Subject: [PATCH 40/65] Fix / dm flattenParents always growing

---
 .../sdk/internal/session/room/summary/RoomSummaryUpdater.kt      | 1 -
 1 file changed, 1 deletion(-)

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 7cbcfee713..842c9d3aba 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
@@ -199,7 +199,6 @@ internal class RoomSummaryUpdater @Inject constructor(
         measureTimeMillis {
             val lookupMap = realm.where(RoomSummaryEntity::class.java)
                     .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
-                    .equalTo(RoomSummaryEntityFields.IS_DIRECT, false)
                     // we order by roomID to be consistent when breaking parent/child cycles
                     .sort(RoomSummaryEntityFields.ROOM_ID)
                     .findAll().map {

From a5b09b9dc37c50799c4c4b0a620b59320b72f3e6 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 29 Jun 2021 15:01:43 +0200
Subject: [PATCH 41/65] change log

---
 changelog.d/3583.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3583.bugfix

diff --git a/changelog.d/3583.bugfix b/changelog.d/3583.bugfix
new file mode 100644
index 0000000000..5f273c1779
--- /dev/null
+++ b/changelog.d/3583.bugfix
@@ -0,0 +1 @@
+Fix crash out of memory
\ No newline at end of file

From c350c94827099aeb5d6d6948edbe32260dba3b3b Mon Sep 17 00:00:00 2001
From: libexus <libexus@gmail.com>
Date: Mon, 28 Jun 2021 18:29:24 +0000
Subject: [PATCH 42/65] Translated using Weblate (German)

Currently translated at 99.9% (2488 of 2490 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 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index b673e29a2f..5b5fb0809d 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -741,7 +741,7 @@
     <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">Jede*r</string>
+    <string name="room_settings_read_history_entry_anyone">Alle</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>
@@ -805,7 +805,7 @@
     <string name="passphrase_confirm_passphrase">Passphrase bestätigen</string>
     <string name="encryption_export_saved_as">Die Ende-zu-Ende-Raumschlüssel wurden in \'%s\' gespeichert.
 \n
-\nAchtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird.</string>
+\nWarnung: Diese Datei wird möglicherweise 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>
@@ -1153,7 +1153,7 @@
     <string name="settings_send_typing_notifs">Schreibbenachrichtigungen senden</string>
     <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
     <string name="settings_send_markdown">Markdown-Formatierung</string>
-    <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen, etwa Sternchen (*) um kursiven Text anzuzeigen.</string>
+    <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen wie Sternchen (*), um kursiven Text anzuzeigen.</string>
     <string name="settings_show_read_receipts">Lesebestätigungen zeigen</string>
     <string name="settings_show_read_receipts_summary">Klicke auf die Lesebestätigungen für eine detailliertere Liste.</string>
     <string name="settings_show_join_leave_messages_summary">Einladungen, Kicks und Banns bleiben unberührt.</string>
@@ -1989,7 +1989,7 @@
 \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_show_all">Alle Sitzungen anzeigen</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>
@@ -2579,7 +2579,7 @@
     <string name="room_preview_not_found">Der Raum ist gerade nicht zugänglich.
 \nVersuche es später nochmal, oder bitte einen Raum-Admin um Hilfe.</string>
     <string name="room_alias_published_alias_add_manually">Eine neue Adresse veröffentlichen</string>
-    <string name="room_alias_published_alias_subtitle">Mit einer öffentlichen Adresse kann jede*r mit jedem Server deinem Raum beitreten. Um eine Adresse zu veröffentlichen, muss sie zuerst als lokale Adresse gesetzt sein.</string>
+    <string name="room_alias_published_alias_subtitle">Mit einer öffentlichen Adresse kann jeder den Raum betreten. Um eine Adresse zu veröffentlichen, muss sie zuerst als lokale Adresse gesetzt sein.</string>
     <string name="room_alias_publish_to_directory">Diesen Raum im Verzeichnis von %1$s veröffentlichen\?</string>
     <string name="room_alias_unpublish_confirmation">Die Adresse \"%1$s\" nicht mehr veröffentlichen\?</string>
     <string name="room_alias_action_unpublish">Diese Adresse nicht mehr veröffentlichen</string>

From 1a0f29ff9484ded65f75941be98bde81c1a48ae6 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Tue, 29 Jun 2021 09:57:06 +0000
Subject: [PATCH 43/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 7fe24cbb4b..f574e30a0e 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -313,8 +313,8 @@
     <string name="invite">Convidar</string>
     <!-- actions -->
     <string name="action_sign_out">Fazer signout</string>
-    <string name="action_voice_call">Chamada de Voz</string>
-    <string name="action_video_call">Chamada de Vídeo</string>
+    <string name="action_voice_call">Chamar por Voz</string>
+    <string name="action_video_call">Chamar por Vídeo</string>
     <string name="action_global_search">Pesquisa global</string>
     <string name="action_mark_all_as_read">Marcar tudo como lido</string>
     <string name="action_historical">Histórico</string>
@@ -894,7 +894,7 @@
     <string name="groups_list">Lista de Grupos</string>
     <string name="call">Chamar</string>
     <string name="room_participants_ban_prompt_msg">Banir usuária(o) vai expulsá-la(o) desta sala e preveni-la(o) de se juntar de novo.</string>
-    <string name="room_settings_all_messages_noisy">Todas as mensagens (barulhentas)</string>
+    <string name="room_settings_all_messages_noisy">Todas as mensagens (barulhento)</string>
     <string name="room_settings_all_messages">Todas as mensagens</string>
     <string name="room_settings_mention_only">Menções somente</string>
     <string name="room_settings_mute">Mudo</string>
@@ -1015,7 +1015,7 @@
     <string name="receipt_avatar">Avatar de recibo</string>
     <string name="notice_avatar">Avatar de nota</string>
     <string name="avatar">Avatar</string>
-    <string name="send_bug_report_rage_shake">Agite com raiva para reportar bug</string>
+    <string name="send_bug_report_rage_shake">Agitar com raiva para reportar bug</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 precisa de permissão para rodar no background</string>
@@ -1203,7 +1203,7 @@
     <string name="settings_send_typing_notifs">Enviar notificações de digitação</string>
     <string name="settings_send_typing_notifs_summary">Deixar outras(os) usuárias(os) saberem que você está digitando.</string>
     <string name="settings_show_read_receipts">Mostrar recibos de leitura</string>
-    <string name="settings_show_read_receipts_summary">Clicar nos recibos de leitura para uma lista detalhada.</string>
+    <string name="settings_show_read_receipts_summary">Clique nos recibos de leitura para uma lista detalhada.</string>
     <string name="settings_show_join_leave_messages">Mostrar eventos de juntar-se e sair</string>
     <string name="settings_show_join_leave_messages_summary">Convites, expulsões e bans são desafetados.</string>
     <string name="settings_show_avatar_display_name_changes_messages">Mostrar eventos de conta</string>
@@ -1387,7 +1387,7 @@
     <string name="reset_secure_backup_title">Gere uma nova Chave de Segurança ou defina uma nova Frase de Segurança para seu backup existente.</string>
     <string name="reset_secure_backup_warning">Isto vai substituir sua Chave ou Frase atual.</string>
     <string name="settings_discovery_category">Descoberta</string>
-    <string name="settings_discovery_manage">Gerencie suas configurações de descoberta.</string>
+    <string name="settings_discovery_manage">Gerenciar suas configurações de descoberta.</string>
     <string name="settings_data_save_mode_summary">Modo de economia de dados aplica um filtro específico para que atualizações de presença e notificações de digitação sejam filtradas fora.</string>
     <string name="settings_integration_allow">Permitir integrações</string>
     <string name="settings_integration_manager">Gerenciador de Integração</string>
@@ -1600,7 +1600,7 @@
     <string name="sas_incoming_verification_request_dialog">Você recebeu uma requisição de verificação entrante.</string>
     <string name="sas_view_request_action">Visualizar requisição</string>
     <string name="sas_waiting_for_partner">Esperando por parceira(o) confirmar…</string>
-    <string name="sas_verified">Verificada!</string>
+    <string name="sas_verified">Verificada(o)!</string>
     <string name="sas_verified_successful">Você tem confirmado esta sessão com sucesso.</string>
     <string name="sas_verified_successful_description">Mensagens seguras com esta(e) usuária(o) são encriptadas ponta-a-ponta e não são capazes de ser lidas por terceiros.</string>
     <string name="sas_got_it">Entendido</string>
@@ -1640,7 +1640,7 @@
     <string name="room_list_catchup_welcome_title">Boas vindas a casa!</string>
     <string name="room_list_catchup_welcome_body">Fique em dia com suas mensagens não-lidas aqui</string>
     <string name="room_list_people_empty_title">Conversas</string>
-    <string name="room_list_people_empty_body">Suas conversas de mensagem direta vai ser exibidas aqui. Toque no + à direita fundo para começar algumas.</string>
+    <string name="room_list_people_empty_body">Suas conversas de mensagem direta vão ser exibidas aqui. Toque no + à direita fundo para começar algumas.</string>
     <string name="room_list_rooms_empty_title">Salas</string>
     <string name="room_list_rooms_empty_body">Suas salas vão ser exibidas aqui. Toque no + à direita fundo para encontrar umas existentes ou começar algumas propriamente suas.</string>
     <string name="title_activity_emoji_reaction_picker">Reações</string>
@@ -1669,7 +1669,7 @@
     <string name="create_room_title">Nova Sala</string>
     <string name="create_room_action_create">CRIAR</string>
     <string name="create_room_name_hint">Nome</string>
-    <string name="create_room_public_title">Público</string>
+    <string name="create_room_public_title">Pública</string>
     <string name="create_room_public_description">Qualquer pessoa vai ser capaz de se juntar a esta sala</string>
     <string name="create_room_directory_title">Diretório de Salas</string>
     <string name="create_room_directory_description">Publicar esta sala no diretório de salas</string>
@@ -1816,7 +1816,7 @@
 \nPor favor permita acesso no próximo pop-up para ser capaz de exportar suas chaves manualmente.</string>
     <string name="no_network_indicator">Não há nenhuma conexão de rede no momento</string>
     <string name="message_ignore_user">Ignorar usuária(o)</string>
-    <string name="room_list_quick_actions_notifications_all_noisy">Todas as mensagens (barulhentas)</string>
+    <string name="room_list_quick_actions_notifications_all_noisy">Todas as mensagens (barulhento)</string>
     <string name="room_list_quick_actions_notifications_all">Todas as mensagens</string>
     <string name="room_list_quick_actions_notifications_mentions">Menções somente</string>
     <string name="room_list_quick_actions_notifications_mute">Mutar</string>
@@ -1840,7 +1840,7 @@
     <string name="login_splash_text1">Faça chat com pessoas diretamente ou em grupos</string>
     <string name="login_splash_text2">Mantenha conversas privadas com encriptação</string>
     <string name="login_splash_text3">Extenda &amp; personalize sua experiência</string>
-    <string name="login_splash_submit">Comece agora</string>
+    <string name="login_splash_submit">Começar agora</string>
     <string name="login_server_title">Selecione um servidor</string>
     <string name="login_server_text">Assim como email, contas têm uma casa, embora você pode falar com qualquer pessoa</string>
     <string name="login_server_matrix_org_text">Junte-se a milhões de graça no maior servidor público</string>
@@ -2036,7 +2036,7 @@
     <string name="room_profile_not_encrypted_subtitle">Mensagens nesta sala não são encriptadas ponta-a-ponta.</string>
     <string name="room_profile_encrypted_subtitle">Mensagens nesta sala são encriptadas ponta-a-ponta.
 \n
-\nSuas mensagens são asseguradas com cadeados e somente você e a/o recipente têm as chaves únicas para os destrancar.</string>
+\nSuas mensagens são asseguradas com cadeados e somente você e a/o recipente têm as chaves únicas para as destrancar.</string>
     <string name="room_profile_section_security">Segurança</string>
     <string name="room_profile_section_security_learn_more">Saiba mais</string>
     <string name="room_profile_section_more">Mais</string>
@@ -2109,7 +2109,7 @@
     <string name="complete_security">Completar Segurança</string>
     <string name="verification_open_other_to_verify">Use uma sessão existente para verificar esta aqui, garantindo-lhe acesso a mensagens encriptadas.</string>
     <string name="verification_profile_verify">Verificar</string>
-    <string name="verification_profile_verified">Verificada</string>
+    <string name="verification_profile_verified">Verificada(o)</string>
     <string name="verification_profile_warning">Aviso</string>
     <string name="room_member_profile_failed_to_get_devices">Falha para obter sessões</string>
     <string name="room_member_profile_sessions_section_title">Sessões</string>
@@ -2207,7 +2207,7 @@
     <string name="bootstrap_crosssigning_progress_key_backup">Configurando Backup de Chave</string>
     <string name="bootstrap_cross_signing_success">Suas %2$s &amp; %1$s estão agora definidas.
 \n
-\nMantenha-as seguras! Você vai precisar delas para destrancar mensagens encriptadas e informação segura se você perder todas as suas sessões ativas.</string>
+\nMantenha-as seguras! Você vai precisar delas para destrancar mensagens encriptadas e informação segura se você perder todas suas sessões ativas.</string>
     <string name="bootstrap_crosssigning_print_it">Imprima-a e armazene-a em algum lugar seguro</string>
     <string name="bootstrap_crosssigning_save_usb">Salve-a em uma chave USB ou drive de backup</string>
     <string name="bootstrap_crosssigning_save_cloud">Copie-a para seu armazenamento nuvem pessoal</string>
@@ -2475,7 +2475,7 @@
     <string name="direct_room_profile_section_more_settings">Configurações</string>
     <string name="direct_room_profile_encrypted_subtitle">Mensagens aqui são encriptadas ponta-a-ponta.
 \n
-\nSuas mensagens são asseguradas com cadeados e somente você e a/o recipiente têm as chaves únicas para os destrancar.</string>
+\nSuas mensagens são asseguradas com cadeados e somente você e a/o recipiente têm as chaves únicas para as destrancar.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Mensagens aqui não são encriptadas ponta-a-ponta.</string>
     <string name="login_error_outdated_homeserver_warning_content">Este servidorcasa está rodando uma versão antiga. Peça à/ao admin de seu servidorcasa para fazer upgrade. Você pode continuar, mas algumas funcionalidades podem não funcionar corretamente.</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">Mostrar histórico completo em salas encriptadas</string>

From de64df3cdba8428290c226f2ec3a89b6102a91fc Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 30 Jun 2021 14:50:30 +0200
Subject: [PATCH 44/65] Fix crash after video call

---
 changelog.d/3577.bugfix                       |   1 +
 .../app/features/call/webrtc/WebRtcCall.kt    | 274 ++++++++++--------
 2 files changed, 149 insertions(+), 126 deletions(-)
 create mode 100644 changelog.d/3577.bugfix

diff --git a/changelog.d/3577.bugfix b/changelog.d/3577.bugfix
new file mode 100644
index 0000000000..6b3917292f
--- /dev/null
+++ b/changelog.d/3577.bugfix
@@ -0,0 +1 @@
+Fix crash after video call.
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
index d3a9dd7edf..3259b0915f 100644
--- a/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
@@ -83,9 +83,9 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Provider
 import kotlin.coroutines.CoroutineContext
 
-private const val STREAM_ID = "ARDAMS"
-private const val AUDIO_TRACK_ID = "ARDAMSa0"
-private const val VIDEO_TRACK_ID = "ARDAMSv0"
+private const val STREAM_ID = "userMedia"
+private const val AUDIO_TRACK_ID = "${STREAM_ID}a0"
+private const val VIDEO_TRACK_ID = "${STREAM_ID}v0"
 private val DEFAULT_AUDIO_CONSTRAINTS = MediaConstraints()
 
 class WebRtcCall(
@@ -274,12 +274,77 @@ class WebRtcCall(
         peerConnection = peerConnectionFactory.createPeerConnection(rtcConfig, PeerConnectionObserver(this))
     }
 
-    fun attachViewRenderers(localViewRenderer: SurfaceViewRenderer?, remoteViewRenderer: SurfaceViewRenderer, mode: String?) {
-        Timber.v("## VOIP attachViewRenderers localRendeder $localViewRenderer / $remoteViewRenderer")
-        localSurfaceRenderers.addIfNeeded(localViewRenderer)
-        remoteSurfaceRenderers.addIfNeeded(remoteViewRenderer)
-
+    /**
+     * Without consultation
+     */
+    fun transferToUser(targetUserId: String, targetRoomId: String?) {
         sessionScope?.launch(dispatcher) {
+            mxCall.transfer(
+                    targetUserId = targetUserId,
+                    targetRoomId = targetRoomId,
+                    createCallId = CallIdGenerator.generate(),
+                    awaitCallId = null
+            )
+            endCall(sendEndSignaling = false)
+        }
+    }
+
+    /**
+     * With consultation
+     */
+    fun transferToCall(transferTargetCall: WebRtcCall) {
+        sessionScope?.launch(dispatcher) {
+            val newCallId = CallIdGenerator.generate()
+            transferTargetCall.mxCall.transfer(
+                    targetUserId = mxCall.opponentUserId,
+                    targetRoomId = null,
+                    createCallId = null,
+                    awaitCallId = newCallId
+            )
+            mxCall.transfer(
+                    targetUserId = transferTargetCall.mxCall.opponentUserId,
+                    targetRoomId = null,
+                    createCallId = newCallId,
+                    awaitCallId = null
+            )
+            endCall(sendEndSignaling = false)
+            transferTargetCall.endCall(sendEndSignaling = false)
+        }
+    }
+
+    fun acceptIncomingCall() {
+        sessionScope?.launch {
+            Timber.v("## VOIP acceptIncomingCall from state ${mxCall.state}")
+            if (mxCall.state == CallState.LocalRinging) {
+                internalAcceptIncomingCall()
+            }
+        }
+    }
+
+    /**
+     * Sends a DTMF digit to the other party
+     * @param digit The digit (nb. string - '#' and '*' are dtmf too)
+     */
+    fun sendDtmfDigit(digit: String) {
+        sessionScope?.launch {
+            for (sender in peerConnection?.senders.orEmpty()) {
+                if (sender.track()?.kind() == "audio" && sender.dtmf()?.canInsertDtmf() == true) {
+                    try {
+                        sender.dtmf()?.insertDtmf(digit, 100, 70)
+                        return@launch
+                    } catch (failure: Throwable) {
+                        Timber.v("Fail to send Dtmf digit")
+                    }
+                }
+            }
+        }
+    }
+
+    fun attachViewRenderers(localViewRenderer: SurfaceViewRenderer?, remoteViewRenderer: SurfaceViewRenderer, mode: String?) {
+        sessionScope?.launch(dispatcher) {
+            Timber.v("## VOIP attachViewRenderers localRendeder $localViewRenderer / $remoteViewRenderer")
+            localSurfaceRenderers.addIfNeeded(localViewRenderer)
+            remoteSurfaceRenderers.addIfNeeded(remoteViewRenderer)
             when (mode) {
                 VectorCallActivity.INCOMING_ACCEPT  -> {
                     internalAcceptIncomingCall()
@@ -299,67 +364,31 @@ class WebRtcCall(
         }
     }
 
-    /**
-     * Without consultation
-     */
-    suspend fun transferToUser(targetUserId: String, targetRoomId: String?) {
-        mxCall.transfer(
-                targetUserId = targetUserId,
-                targetRoomId = targetRoomId,
-                createCallId = CallIdGenerator.generate(),
-                awaitCallId = null
-        )
-        endCall(sendEndSignaling = false)
-    }
-
-    /**
-     * With consultation
-     */
-    suspend fun transferToCall(transferTargetCall: WebRtcCall) {
-        val newCallId = CallIdGenerator.generate()
-        transferTargetCall.mxCall.transfer(
-                targetUserId = mxCall.opponentUserId,
-                targetRoomId = null,
-                createCallId = null,
-                awaitCallId = newCallId
-        )
-        mxCall.transfer(
-                targetUserId = transferTargetCall.mxCall.opponentUserId,
-                targetRoomId = null,
-                createCallId = newCallId,
-                awaitCallId = null
-        )
-        endCall(sendEndSignaling = false)
-        transferTargetCall.endCall(sendEndSignaling = false)
-    }
-
-    fun acceptIncomingCall() {
-        sessionScope?.launch {
-            Timber.v("## VOIP acceptIncomingCall from state ${mxCall.state}")
-            if (mxCall.state == CallState.LocalRinging) {
-                internalAcceptIncomingCall()
+    private suspend fun attachViewRenderersInternal() = withContext(dispatcher) {
+        // render local video in pip view
+        localSurfaceRenderers.forEach { renderer ->
+            renderer.get()?.let { pipSurface ->
+                pipSurface.setMirror(cameraInUse?.type == CameraType.FRONT)
+                // no need to check if already added, addSink is checking that
+                localVideoTrack?.addSink(pipSurface)
             }
         }
-    }
 
-    /**
-     * Sends a DTMF digit to the other party
-     * @param digit The digit (nb. string - '#' and '*' are dtmf too)
-     */
-    fun sendDtmfDigit(digit: String) {
-        for (sender in peerConnection?.senders.orEmpty()) {
-            if (sender.track()?.kind() == "audio" && sender.dtmf()?.canInsertDtmf() == true) {
-                try {
-                    sender.dtmf()?.insertDtmf(digit, 100, 70)
-                    return
-                } catch (failure: Throwable) {
-                    Timber.v("Fail to send Dtmf digit")
-                }
+        // If remote track exists, then sink it to surface
+        remoteSurfaceRenderers.forEach { renderer ->
+            renderer.get()?.let { participantSurface ->
+                remoteVideoTrack?.addSink(participantSurface)
             }
         }
     }
 
     fun detachRenderers(renderers: List<SurfaceViewRenderer>?) {
+        sessionScope?.launch(dispatcher) {
+            detachRenderersInternal(renderers)
+        }
+    }
+
+    private suspend fun detachRenderersInternal(renderers: List<SurfaceViewRenderer>?) = withContext(dispatcher) {
         Timber.v("## VOIP detachRenderers")
         if (renderers.isNullOrEmpty()) {
             // remove all sinks
@@ -452,24 +481,6 @@ class WebRtcCall(
         })
     }
 
-    private fun attachViewRenderersInternal() {
-        // render local video in pip view
-        localSurfaceRenderers.forEach { renderer ->
-            renderer.get()?.let { pipSurface ->
-                pipSurface.setMirror(this.cameraInUse?.type == CameraType.FRONT)
-                // no need to check if already added, addSink is checking that
-                localVideoTrack?.addSink(pipSurface)
-            }
-        }
-
-        // If remote track exists, then sink it to surface
-        remoteSurfaceRenderers.forEach { renderer ->
-            renderer.get()?.let { participantSurface ->
-                remoteVideoTrack?.addSink(participantSurface)
-            }
-        }
-    }
-
     private suspend fun getTurnServer(): TurnServerResponse? {
         return tryOrNull {
             sessionProvider.get()?.callSignalingService()?.getTurnServer()
@@ -580,9 +591,11 @@ class WebRtcCall(
     }
 
     fun setCaptureFormat(format: CaptureFormat) {
-        Timber.v("## VOIP setCaptureFormat $format")
-        videoCapturer?.changeCaptureFormat(format.width, format.height, format.fps)
-        currentCaptureFormat = format
+        sessionScope?.launch(dispatcher) {
+            Timber.v("## VOIP setCaptureFormat $format")
+            videoCapturer?.changeCaptureFormat(format.width, format.height, format.fps)
+            currentCaptureFormat = format
+        }
     }
 
     private fun updateMuteStatus() {
@@ -645,13 +658,17 @@ class WebRtcCall(
     }
 
     fun muteCall(muted: Boolean) {
-        micMuted = muted
-        updateMuteStatus()
+        sessionScope?.launch(dispatcher) {
+            micMuted = muted
+            updateMuteStatus()
+        }
     }
 
     fun enableVideo(enabled: Boolean) {
-        videoMuted = !enabled
-        updateMuteStatus()
+        sessionScope?.launch(dispatcher) {
+            videoMuted = !enabled
+            updateMuteStatus()
+        }
     }
 
     fun canSwitchCamera(): Boolean {
@@ -668,28 +685,30 @@ class WebRtcCall(
     }
 
     fun switchCamera() {
-        Timber.v("## VOIP switchCamera")
-        if (mxCall.state is CallState.Connected && mxCall.isVideoCall) {
-            val oppositeCamera = getOppositeCameraIfAny() ?: return
-            videoCapturer?.switchCamera(
-                    object : CameraVideoCapturer.CameraSwitchHandler {
-                        // Invoked on success. |isFrontCamera| is true if the new camera is front facing.
-                        override fun onCameraSwitchDone(isFrontCamera: Boolean) {
-                            Timber.v("## VOIP onCameraSwitchDone isFront $isFrontCamera")
-                            cameraInUse = oppositeCamera
-                            localSurfaceRenderers.forEach {
-                                it.get()?.setMirror(isFrontCamera)
+        sessionScope?.launch(dispatcher) {
+            Timber.v("## VOIP switchCamera")
+            if (mxCall.state is CallState.Connected && mxCall.isVideoCall) {
+                val oppositeCamera = getOppositeCameraIfAny() ?: return@launch
+                videoCapturer?.switchCamera(
+                        object : CameraVideoCapturer.CameraSwitchHandler {
+                            // Invoked on success. |isFrontCamera| is true if the new camera is front facing.
+                            override fun onCameraSwitchDone(isFrontCamera: Boolean) {
+                                Timber.v("## VOIP onCameraSwitchDone isFront $isFrontCamera")
+                                cameraInUse = oppositeCamera
+                                localSurfaceRenderers.forEach {
+                                    it.get()?.setMirror(isFrontCamera)
+                                }
+                                listeners.forEach {
+                                    tryOrNull { it.onCameraChanged() }
+                                }
                             }
-                            listeners.forEach {
-                                tryOrNull { it.onCameraChanged() }
-                            }
-                        }
 
-                        override fun onCameraSwitchError(errorDescription: String?) {
-                            Timber.v("## VOIP onCameraSwitchError isFront $errorDescription")
-                        }
-                    }, oppositeCamera.name
-            )
+                            override fun onCameraSwitchError(errorDescription: String?) {
+                                Timber.v("## VOIP onCameraSwitchError isFront $errorDescription")
+                            }
+                        }, oppositeCamera.name
+                )
+            }
         }
     }
 
@@ -718,11 +737,12 @@ class WebRtcCall(
         return currentCaptureFormat
     }
 
-    private fun release() {
+    private suspend fun release() {
         listeners.clear()
         mxCall.removeListener(this)
         timer.stop()
         timer.tickListener = null
+        detachRenderersInternal(null)
         videoCapturer?.stopCapture()
         videoCapturer?.dispose()
         videoCapturer = null
@@ -736,6 +756,8 @@ class WebRtcCall(
         localAudioTrack = null
         localVideoSource = null
         localVideoTrack = null
+        remoteAudioTrack = null
+        remoteVideoTrack = null
         cameraAvailabilityCallback = null
     }
 
@@ -745,7 +767,7 @@ class WebRtcCall(
             if (stream.audioTracks.size > 1 || stream.videoTracks.size > 1) {
                 Timber.e("## VOIP StreamObserver weird looking stream: $stream")
                 // TODO maybe do something more??
-                mxCall.hangUp()
+                endCall(true)
                 return@launch
             }
             if (stream.audioTracks.size == 1) {
@@ -774,27 +796,27 @@ class WebRtcCall(
     }
 
     fun endCall(sendEndSignaling: Boolean = true, reason: CallHangupContent.Reason? = null) {
-        if (mxCall.state == CallState.Terminated) {
-            return
-        }
-        // Close tracks ASAP
-        localVideoTrack?.setEnabled(false)
-        localVideoTrack?.setEnabled(false)
-        cameraAvailabilityCallback?.let { cameraAvailabilityCallback ->
-            val cameraManager = context.getSystemService<CameraManager>()!!
-            cameraManager.unregisterAvailabilityCallback(cameraAvailabilityCallback)
-        }
-        val wasRinging = mxCall.state is CallState.LocalRinging
-        mxCall.state = CallState.Terminated
         sessionScope?.launch(dispatcher) {
+            if (mxCall.state == CallState.Terminated) {
+                return@launch
+            }
+            // Close tracks ASAP
+            localVideoTrack?.setEnabled(false)
+            localVideoTrack?.setEnabled(false)
+            cameraAvailabilityCallback?.let { cameraAvailabilityCallback ->
+                val cameraManager = context.getSystemService<CameraManager>()!!
+                cameraManager.unregisterAvailabilityCallback(cameraAvailabilityCallback)
+            }
+            val wasRinging = mxCall.state is CallState.LocalRinging
+            mxCall.state = CallState.Terminated
             release()
             onCallEnded(callId)
-        }
-        if (sendEndSignaling) {
-            if (wasRinging) {
-                mxCall.reject()
-            } else {
-                mxCall.hangUp(reason)
+            if (sendEndSignaling) {
+                if (wasRinging) {
+                    mxCall.reject()
+                } else {
+                    mxCall.hangUp(reason)
+                }
             }
         }
     }

From 3378be935b4985230e769b4aaed66f2920586e8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:06:02 +0000
Subject: [PATCH 45/65] Bump orchestrator from 1.3.0 to 1.4.0

Bumps orchestrator from 1.3.0 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.test:orchestrator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cb00b0fd56..dd39d37fcf 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -194,5 +194,5 @@ dependencies {
     // Plant Timber tree for test
     androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
-    androidTestUtil 'androidx.test:orchestrator:1.3.0'
+    androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }

From 2ebfeb1709cc58e66a8027800122a229439426a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:06:24 +0000
Subject: [PATCH 46/65] Bump androidxTest_version from 1.3.0 to 1.4.0

Bumps `androidxTest_version` from 1.3.0 to 1.4.0.

Updates `core` from 1.3.0 to 1.4.0

Updates `runner` from 1.3.0 to 1.4.0

Updates `rules` from 1.3.0 to 1.4.0

---
updated-dependencies:
- dependency-name: androidx.test:core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 6 +++---
 vector/build.gradle             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cb00b0fd56..3eec2548c6 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -182,9 +182,9 @@ dependencies {
     testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
 
     kaptAndroidTest "com.google.dagger:dagger-compiler:$daggerVersion"
-    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:1.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.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.65'
diff --git a/vector/build.gradle b/vector/build.gradle
index 7c01cb550e..c341cb81a5 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -316,7 +316,7 @@ dependencies {
 
     // Tests
     def kluent_version = '1.67'
-    def androidxTest_version = '1.3.0'
+    def androidxTest_version = '1.4.0'
     def espresso_version = '3.3.0'
 
     implementation project(":matrix-sdk-android")

From f1001231d600f22f8b2c0b67968b3b5b6313968e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:06:35 +0000
Subject: [PATCH 47/65] Bump mockk from 1.11.0 to 1.12.0

Bumps [mockk](https://github.com/mockk/mockk) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cb00b0fd56..f8d91b24ff 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -175,7 +175,7 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:4.5.1'
     //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.11.0'
+    testImplementation 'io.mockk:mockk:1.12.0'
     testImplementation 'org.amshove.kluent:kluent-android:1.67'
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test

From 7316bf4ee0744ceb9b682a37c2bace5016cf8a39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:07:27 +0000
Subject: [PATCH 48/65] Bump mockk-android from 1.11.0 to 1.12.0

Bumps [mockk-android](https://github.com/mockk/mockk) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cb00b0fd56..5372aa11bc 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -188,7 +188,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'org.amshove.kluent:kluent-android:1.65'
-    androidTestImplementation 'io.mockk:mockk-android:1.11.0'
+    androidTestImplementation 'io.mockk:mockk-android:1.12.0'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
     // Plant Timber tree for test

From 752290424c4eab6b85727545356a99052b41edec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:07:55 +0000
Subject: [PATCH 49/65] Bump core-ktx from 1.5.0 to 1.6.0

Bumps core-ktx from 1.5.0 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 attachment-viewer/build.gradle  | 2 +-
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 4b95b20029..a756e07cbd 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -55,7 +55,7 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation "androidx.recyclerview:recyclerview:1.2.1"
 
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cb00b0fd56..9a80f3db7c 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.3.0"
-    implementation "androidx.core:core-ktx:1.5.0"
+    implementation "androidx.core:core-ktx:1.6.0"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
diff --git a/vector/build.gradle b/vector/build.gradle
index 7c01cb550e..583773943e 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -336,7 +336,7 @@ dependencies {
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.sharetarget:sharetarget:1.1.0"
-    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation "androidx.media:media:1.3.1"
     implementation "androidx.transition:transition:1.4.1"
 

From 1ae88afcda68d7f3a1de6ca9cb9c68a3118ed50b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:09:18 +0000
Subject: [PATCH 50/65] Bump gradle from 4.2.1 to 4.2.2

Bumps gradle from 4.2.1 to 4.2.2.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b6c4a17559..c4f3dfd3c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.google.gms:google-services:4.3.8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3'

From adcd1a64df9e70c490ca8ebe149d9197796e024c Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 1 Jul 2021 15:28:26 +0200
Subject: [PATCH 51/65] empty migration to fix big flattenParentIds for DM

---
 .../database/RealmSessionStoreMigration.kt    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

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 2b3c3b28ee..40299d4593 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
@@ -19,9 +19,10 @@ package org.matrix.android.sdk.internal.database
 import io.realm.DynamicRealm
 import io.realm.FieldAttribute
 import io.realm.RealmMigration
-import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.events.model.EventType
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.RoomJoinRulesContent
+import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.session.room.model.create.RoomCreateContent
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
 import org.matrix.android.sdk.internal.database.model.CurrentStateEventEntityFields
@@ -40,13 +41,14 @@ import org.matrix.android.sdk.internal.database.model.SpaceChildSummaryEntityFie
 import org.matrix.android.sdk.internal.database.model.SpaceParentSummaryEntityFields
 import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.di.MoshiProvider
+import org.matrix.android.sdk.internal.query.process
 import timber.log.Timber
 import javax.inject.Inject
 
 class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
     companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 14L
+        const val SESSION_STORE_SCHEMA_VERSION = 15L
     }
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
@@ -66,6 +68,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         if (oldVersion <= 11) migrateTo12(realm)
         if (oldVersion <= 12) migrateTo13(realm)
         if (oldVersion <= 13) migrateTo14(realm)
+        if (oldVersion <= 14) migrateTo15(realm)
     }
 
     private fun migrateTo1(realm: DynamicRealm) {
@@ -292,7 +295,7 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
         Timber.d("Step 13 -> 14")
         val roomAccountDataSchema = realm.schema.create("RoomAccountDataEntity")
                 .addField(RoomAccountDataEntityFields.CONTENT_STR, String::class.java)
-                .addField(RoomAccountDataEntityFields.TYPE, String::class.java,  FieldAttribute.INDEXED)
+                .addField(RoomAccountDataEntityFields.TYPE, String::class.java, FieldAttribute.INDEXED)
 
         realm.schema.get("RoomEntity")
                 ?.addRealmListField(RoomEntityFields.ACCOUNT_DATA.`$`, roomAccountDataSchema)
@@ -306,4 +309,16 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
 
         roomAccountDataSchema.isEmbedded = true
     }
+
+    private fun migrateTo15(realm: DynamicRealm) {
+        // fix issue with flattenParentIds on DM that kept growing with duplicate
+        // so we reset it, will be updated next sync
+        realm.where("RoomSummaryEntity")
+                .process(RoomSummaryEntityFields.MEMBERSHIP_STR, Membership.activeMemberships())
+                .equalTo(RoomSummaryEntityFields.IS_DIRECT, true)
+                .findAll()
+                .onEach {
+                    it.setString(RoomSummaryEntityFields.FLATTEN_PARENT_IDS, null)
+                }
+    }
 }

From 9430d7a5dde307b16f1bfcc6ead8a6e2e16f722f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 23:07:36 +0000
Subject: [PATCH 52/65] Bump realm-gradle-plugin from 10.6.0 to 10.6.1

Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.6.0 to 10.6.1.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.6.1/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.6.0...v10.6.1)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index cb00b0fd56..631b99e1d6 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:10.6.0"
+        classpath "io.realm:realm-gradle-plugin:10.6.1"
     }
 }
 

From 1906fbdeaa5570681cee8c6e7129b9843f01a2c3 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Fri, 2 Jul 2021 01:03:38 +0000
Subject: [PATCH 53/65] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2490 of 2490 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index f574e30a0e..17e4f1e9d3 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -640,7 +640,7 @@
     <string name="room_sliding_menu_version">Versão</string>
     <string name="room_sliding_menu_term_and_conditions">Termos &amp; condições</string>
     <string name="room_sliding_menu_third_party_notices">Notas de terceiros</string>
-    <string name="room_sliding_menu_copyright">Direito de autor</string>
+    <string name="room_sliding_menu_copyright">Copyright</string>
     <string name="room_sliding_menu_privacy_policy">Política de privacidade</string>
     <!-- Vector Settings -->
     <string name="settings_profile_picture">Imagem de Perfil</string>
@@ -667,7 +667,7 @@
     <string name="settings_olm_version">versão de olm</string>
     <string name="settings_app_term_conditions">Termos &amp; condições</string>
     <string name="settings_third_party_notices">Notas de terceiros</string>
-    <string name="settings_copyright">Direitos de autor</string>
+    <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Política de privacidade</string>
     <string name="settings_clear_cache">Limpar cache</string>
     <!--string name="settings_room_privacy_label">Privacidade</string-->

From d4009476f9bcfd76f3e449886765185cac281a35 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Jul 2021 09:39:32 +0200
Subject: [PATCH 54/65] Cleanup

---
 .../home/room/detail/timeline/TimelineEventController.kt         | 1 -
 1 file changed, 1 deletion(-)

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 bbb1b7a06f..95d7acb571 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
@@ -218,7 +218,6 @@ class TimelineEventController @Inject constructor(private val dateFormatter: Vec
     )
 
     init {
-        isDebugLoggingEnabled = true
         addInterceptor(this)
         requestModelBuild()
     }

From 1eea734a4c32f5504e69dbdf268ed0a17acc0be8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Jul 2021 12:53:00 +0200
Subject: [PATCH 55/65] Fix compilation issue A bit weird, I did not figure out
 was was the original problem. Editiing the line, for instance adding any char
 fixes the issue, so I decided to put all on one line.

---
 vector/src/main/res/values-it/strings.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 1714d28a89..7632f11563 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1897,12 +1897,7 @@
     <string name="verify_user_sas_emoji_security_tip">Per avere la massima certezza effettuate l\'operazione tramite un mezzo di comunicazione già fidato oppure fatelo di persona.</string>
     <string name="verification_green_shield">Il badge verde garantisce che l\'identità dell\'utente è verificata. Verifica tutti gli utenti in una stanza per assicurarti che sia sicura.</string>
     <string name="verification_conclusion_not_secure">Non sicuro</string>
-    <string name="verification_conclusion_compromised">Uno dei seguenti potrebbe essere compromesso:
-\n
-\n - Il tuo Home Server
-\n - L\'Home Server 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="verification_conclusion_compromised">Uno dei seguenti potrebbe essere compromesso:\n\n - Il tuo Home Server\n - L\'Home Server 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>

From f06d2b1734a8bff31704a944709fc4342331904c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Jul 2021 14:55:30 +0200
Subject: [PATCH 56/65] Fix typo

---
 vector/src/main/res/values-pt-rBR/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 17e4f1e9d3..f1aa5b6fb9 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1637,7 +1637,7 @@
     <string name="invited_by">Convidada(o) por %s</string>
     <string name="room_list_catchup_empty_title">Você está em dia!</string>
     <string name="room_list_catchup_empty_body">Você não tem mais nenhuma mensagem não-lida</string>
-    <string name="room_list_catchup_welcome_title">Boas vindas a casa!</string>
+    <string name="room_list_catchup_welcome_title">Boas-vindas a casa!</string>
     <string name="room_list_catchup_welcome_body">Fique em dia com suas mensagens não-lidas aqui</string>
     <string name="room_list_people_empty_title">Conversas</string>
     <string name="room_list_people_empty_body">Suas conversas de mensagem direta vão ser exibidas aqui. Toque no + à direita fundo para começar algumas.</string>
@@ -2790,7 +2790,7 @@
     <string name="invite_by_mxid">Convidar por nome de usuária(o)</string>
     <string name="invite_by_email">Convidar por email</string>
     <string name="invite_people_menu">Convidar pessoas</string>
-    <string name="suggested_rooms_pills_on_empty_header">Boas vindas a %1$s, %2$s.</string>
+    <string name="suggested_rooms_pills_on_empty_header">Boas-vindas a %1$s, %2$s.</string>
     <string name="you_are_invited">Você está convidada(o)</string>
     <string name="labs_use_restricted_join_rule_desc">Aviso requer suporte de servidor e versão de sala experimental</string>
     <string name="user_invites_you">%s convida você</string>
@@ -2810,7 +2810,7 @@
     <string name="looking_for_someone_not_in_space">Procurando por alguém que não está em %s\?</string>
     <string name="labs_use_restricted_join_rule">Espaço Experimental - Sala Restringida.</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Espaços são uma nova forma de agrupar salas e pessoas.</string>
-    <string name="spaces_beta_welcome_to_spaces">Boas vindas a Espaços!</string>
+    <string name="spaces_beta_welcome_to_spaces">Boas-vindas a Espaços!</string>
     <string name="space_add_rooms">Adicionar salas</string>
     <string name="space_add_existing_rooms">Adicionar salas e espaços existentes</string>
     <string name="space_leave_prompt_msg_as_admin">Você é admin deste espaço, assegure-se que você tem transferido direito de admin a um outro membro antes de sair.</string>

From 2c7b947d274e7d47d552da13982c5a984b97c62c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Jul 2021 15:32:01 +0200
Subject: [PATCH 57/65] Fix compilation issue A bit weird, I did not figure out
 was was the original problem. Editiing the line, for instance adding any char
 fixes the issue, so I decided to put all on one line.

---
 vector/src/main/res/values-it/strings.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 7632f11563..1792d09cae 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1430,10 +1430,7 @@
 \nNome sessione: %1$s
 \nUltimo accesso: %2$s
 \nSe non hai effettuato l\'accesso da un\'altra sessione, ignora questa richiesta.</string>
-    <string name="your_unverified_device_requesting_with_info">Una sessione non verificata sta chiedendo le chiavi crittografiche. 
-\nNome sessione: %1$s 
-\nUltimo accesso: %2$s 
-\nSe non hai effettuato l\'accesso da un\'altra sessione, ignora questa richiesta.</string>
+    <string name="your_unverified_device_requesting_with_info">Una sessione non verificata sta chiedendo le chiavi crittografiche.\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>

From 2513be744c0e31c8c1b72a493ca5af7e16a1bbc6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Jul 2021 15:46:04 +0200
Subject: [PATCH 58/65] CryptoStore migration has to be object to avoid crash
 Thread: main, Exception: java.lang.IllegalArgumentException: Configurations
 cannot be different if used to open the same file. The most likely cause is
 that equals() and hashCode() are not overridden in the migration class:
 org.matrix.android.sdk.internal.database.RealmSessionStoreMigration

---
 changelog.d/3605.bugfix                       |  1 +
 .../sdk/internal/crypto/CryptoModule.kt       |  3 +--
 .../store/db/RealmCryptoStoreMigration.kt     | 24 +++++++++----------
 .../database/RealmSessionStoreMigration.kt    |  7 ++----
 .../SessionRealmConfigurationFactory.kt       |  3 +--
 .../legacy/DefaultLegacySessionImporter.kt    |  3 +--
 .../session/identity/IdentityModule.kt        |  3 +--
 .../db/RealmIdentityStoreMigration.kt         |  7 ++----
 8 files changed, 21 insertions(+), 30 deletions(-)
 create mode 100644 changelog.d/3605.bugfix

diff --git a/changelog.d/3605.bugfix b/changelog.d/3605.bugfix
new file mode 100644
index 0000000000..3e338a0c62
--- /dev/null
+++ b/changelog.d/3605.bugfix
@@ -0,0 +1 @@
+CryptoStore migration has to be object to avoid crash
\ No newline at end of file
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 e114f86a99..84d4fef5af 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
@@ -112,7 +112,6 @@ internal abstract class CryptoModule {
         @SessionScope
         fun providesRealmConfiguration(@SessionFilesDirectory directory: File,
                                        @UserMd5 userMd5: String,
-                                       realmCryptoStoreMigration: RealmCryptoStoreMigration,
                                        realmKeysUtils: RealmKeysUtils): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .directory(directory)
@@ -123,7 +122,7 @@ internal abstract class CryptoModule {
                     .modules(RealmCryptoStoreModule())
                     .allowWritesOnUiThread(true)
                     .schemaVersion(RealmCryptoStoreMigration.CRYPTO_STORE_SCHEMA_VERSION)
-                    .migration(realmCryptoStoreMigration)
+                    .migration(RealmCryptoStoreMigration)
                     .build()
         }
 
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 bca7914388..8e77f5b823 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
@@ -18,6 +18,9 @@ package org.matrix.android.sdk.internal.crypto.store.db
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
+import io.realm.DynamicRealm
+import io.realm.RealmMigration
+import io.realm.RealmObjectSchema
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.internal.crypto.model.MXDeviceInfo
@@ -35,29 +38,24 @@ import org.matrix.android.sdk.internal.crypto.store.db.model.KeysBackupDataEntit
 import org.matrix.android.sdk.internal.crypto.store.db.model.MyDeviceLastSeenInfoEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.OlmInboundGroupSessionEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.OlmSessionEntityFields
+import org.matrix.android.sdk.internal.crypto.store.db.model.OutboundGroupSessionInfoEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.OutgoingGossipingRequestEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.SharedSessionEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.TrustLevelEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.UserEntityFields
 import org.matrix.android.sdk.internal.crypto.store.db.model.WithHeldSessionEntityFields
+import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.di.SerializeNulls
-import io.realm.DynamicRealm
-import io.realm.RealmMigration
-import io.realm.RealmObjectSchema
-import org.matrix.android.sdk.internal.crypto.store.db.model.OutboundGroupSessionInfoEntityFields
 import org.matrix.androidsdk.crypto.data.MXOlmInboundGroupSession2
 import timber.log.Timber
-import javax.inject.Inject
 import org.matrix.androidsdk.crypto.data.MXDeviceInfo as LegacyMXDeviceInfo
 
-internal class RealmCryptoStoreMigration @Inject constructor(private val crossSigningKeysMapper: CrossSigningKeysMapper) : RealmMigration {
+internal object RealmCryptoStoreMigration : RealmMigration {
 
-    companion object {
-        // 0, 1, 2: legacy Riot-Android
-        // 3: migrate to RiotX schema
-        // 4, 5, 6, 7, 8, 9: migrations from RiotX (which was previously 1, 2, 3, 4, 5, 6)
-        const val CRYPTO_STORE_SCHEMA_VERSION = 12L
-    }
+    // 0, 1, 2: legacy Riot-Android
+    // 3: migrate to RiotX schema
+    // 4, 5, 6, 7, 8, 9: migrations from RiotX (which was previously 1, 2, 3, 4, 5, 6)
+    const val CRYPTO_STORE_SCHEMA_VERSION = 12L
 
     private fun RealmObjectSchema.addFieldIfNotExists(fieldName: String, fieldType: Class<*>): RealmObjectSchema {
         if (!hasField(fieldName)) {
@@ -384,6 +382,8 @@ internal class RealmCryptoStoreMigration @Inject constructor(private val crossSi
     private fun migrateTo7(realm: DynamicRealm) {
         Timber.d("Step 6 -> 7")
         Timber.d("Updating KeyInfoEntity table")
+        val crossSigningKeysMapper = CrossSigningKeysMapper(MoshiProvider.providesMoshi())
+
         val keyInfoEntities = realm.where("KeyInfoEntity").findAll()
         try {
             keyInfoEntities.forEach {
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 40299d4593..6eccaf8774 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
@@ -43,13 +43,10 @@ import org.matrix.android.sdk.internal.database.model.TimelineEventEntityFields
 import org.matrix.android.sdk.internal.di.MoshiProvider
 import org.matrix.android.sdk.internal.query.process
 import timber.log.Timber
-import javax.inject.Inject
 
-class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
+internal object RealmSessionStoreMigration : RealmMigration {
 
-    companion object {
-        const val SESSION_STORE_SCHEMA_VERSION = 15L
-    }
+    const val SESSION_STORE_SCHEMA_VERSION = 15L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.v("Migrating Realm Session from $oldVersion to $newVersion")
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 244fe3432a..1771c5b202 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
@@ -43,7 +43,6 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
         @SessionFilesDirectory val directory: File,
         @SessionId val sessionId: String,
         @UserMd5 val userMd5: String,
-        val migration: RealmSessionStoreMigration,
         context: Context) {
 
     // Keep legacy preferences name for compatibility reason
@@ -72,7 +71,7 @@ internal class SessionRealmConfigurationFactory @Inject constructor(
                 .allowWritesOnUiThread(true)
                 .modules(SessionRealmModule())
                 .schemaVersion(RealmSessionStoreMigration.SESSION_STORE_SCHEMA_VERSION)
-                .migration(migration)
+                .migration(RealmSessionStoreMigration)
                 .build()
 
         // Try creating a realm instance and if it succeeds we can clear the flag
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 4586cfea1e..ad2aff4c9d 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
@@ -42,7 +42,6 @@ import org.matrix.android.sdk.internal.legacy.riot.HomeServerConnectionConfig as
 internal class DefaultLegacySessionImporter @Inject constructor(
         private val context: Context,
         private val sessionParamsStore: SessionParamsStore,
-        private val realmCryptoStoreMigration: RealmCryptoStoreMigration,
         private val realmKeysUtils: RealmKeysUtils
 ) : LegacySessionImporter {
 
@@ -172,7 +171,7 @@ internal class DefaultLegacySessionImporter @Inject constructor(
                 .name("crypto_store.realm")
                 .modules(RealmCryptoStoreModule())
                 .schemaVersion(RealmCryptoStoreMigration.CRYPTO_STORE_SCHEMA_VERSION)
-                .migration(realmCryptoStoreMigration)
+                .migration(RealmCryptoStoreMigration)
                 .build()
 
         Timber.d("Migration: copy DB to encrypted DB")
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 7a39a333a5..4d664b76be 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
@@ -60,7 +60,6 @@ internal abstract class IdentityModule {
         @SessionScope
         fun providesIdentityRealmConfiguration(realmKeysUtils: RealmKeysUtils,
                                                @SessionFilesDirectory directory: File,
-                                               migration: RealmIdentityStoreMigration,
                                                @UserMd5 userMd5: String): RealmConfiguration {
             return RealmConfiguration.Builder()
                     .directory(directory)
@@ -69,7 +68,7 @@ internal abstract class IdentityModule {
                         realmKeysUtils.configureEncryption(this, SessionModule.getKeyAlias(userMd5))
                     }
                     .schemaVersion(RealmIdentityStoreMigration.IDENTITY_STORE_SCHEMA_VERSION)
-                    .migration(migration)
+                    .migration(RealmIdentityStoreMigration)
                     .allowWritesOnUiThread(true)
                     .modules(IdentityRealmModule())
                     .build()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt
index 6081dbab12..21c0f8eb9e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/identity/db/RealmIdentityStoreMigration.kt
@@ -19,13 +19,10 @@ package org.matrix.android.sdk.internal.session.identity.db
 import io.realm.DynamicRealm
 import io.realm.RealmMigration
 import timber.log.Timber
-import javax.inject.Inject
 
-internal class RealmIdentityStoreMigration @Inject constructor() : RealmMigration {
+internal object RealmIdentityStoreMigration : RealmMigration {
 
-    companion object {
-        const val IDENTITY_STORE_SCHEMA_VERSION = 1L
-    }
+    const val IDENTITY_STORE_SCHEMA_VERSION = 1L
 
     override fun migrate(realm: DynamicRealm, oldVersion: Long, newVersion: Long) {
         Timber.v("Migrating Realm Identity from $oldVersion to $newVersion")

From 4ad5deac3820b9965307f75720a6105bf805ae57 Mon Sep 17 00:00:00 2001
From: gradle-update-robot <gradle-update-robot@regolo.cc>
Date: Sat, 3 Jul 2021 00:09:56 +0000
Subject: [PATCH 59/65] Update Gradle Wrapper from 7.1 to 7.1.1.

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 283500479a..17ba19021b 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=a9e356a21595348b6f04b024ed0b08ac8aea6b2ac37e6c0ef58e51549cd7b9cb
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 76f4c81d2dec1b74dbd8ad84bc63349764feb912 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 2 Jul 2021 16:39:45 +0200
Subject: [PATCH 60/65] Hide password... Oups

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

diff --git a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
index 759e130e29..92dc76670f 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
@@ -41,7 +41,7 @@ fun SearchView.withoutLeftMargin() {
 }
 
 fun EditText.hidePassword() {
-    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
+    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
 }
 
 fun View.getMeasurements(): Pair<Int, Int> {

From 09e362ec6b05abf5e524205b30f9a085ba3b8e26 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Jul 2021 09:55:22 +0200
Subject: [PATCH 61/65] Release: towncrier

---
 CHANGES.md               | 17 +++++++++++++++++
 changelog.d/3542.bugfix  |  1 -
 changelog.d/3545.feature |  1 -
 changelog.d/3547.feature |  1 -
 changelog.d/3564.bugfix  |  1 -
 changelog.d/3577.bugfix  |  1 -
 changelog.d/3583.bugfix  |  1 -
 changelog.d/3605.bugfix  |  1 -
 8 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/3542.bugfix
 delete mode 100644 changelog.d/3545.feature
 delete mode 100644 changelog.d/3547.feature
 delete mode 100644 changelog.d/3564.bugfix
 delete mode 100644 changelog.d/3577.bugfix
 delete mode 100644 changelog.d/3583.bugfix
 delete mode 100644 changelog.d/3605.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 9947146a9e..e9a990f1b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+Changes in Element 1.1.12 (2021-07-05)
+======================================
+
+Features ✨
+----------
+ - Reveal password: use facility from com.google.android.material.textfield.TextInputLayout instead of manual handling. ([#3545](https://github.com/vector-im/element-android/issues/3545))
+ - Implements new design for Jump to unread and quick fix visibility issues. ([#3547](https://github.com/vector-im/element-android/issues/3547))
+
+Bugfixes 🐛
+----------
+ - Fix some issues with timeline cache invalidation and visibility. ([#3542](https://github.com/vector-im/element-android/issues/3542))
+ - Fix call invite processed after call is ended because of fastlane mode. ([#3564](https://github.com/vector-im/element-android/issues/3564))
+ - Fix crash after video call. ([#3577](https://github.com/vector-im/element-android/issues/3577))
+ - Fix crash out of memory ([#3583](https://github.com/vector-im/element-android/issues/3583))
+ - CryptoStore migration has to be object to avoid crash ([#3605](https://github.com/vector-im/element-android/issues/3605))
+
+
 Changes in Element v1.1.11 (2021-06-22)
 =======================================
 
diff --git a/changelog.d/3542.bugfix b/changelog.d/3542.bugfix
deleted file mode 100644
index 8e133e1e30..0000000000
--- a/changelog.d/3542.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some issues with timeline cache invalidation and visibility.
\ No newline at end of file
diff --git a/changelog.d/3545.feature b/changelog.d/3545.feature
deleted file mode 100644
index f582affbf2..0000000000
--- a/changelog.d/3545.feature
+++ /dev/null
@@ -1 +0,0 @@
-Reveal password: use facility from com.google.android.material.textfield.TextInputLayout instead of manual handling.
\ No newline at end of file
diff --git a/changelog.d/3547.feature b/changelog.d/3547.feature
deleted file mode 100644
index 8921932067..0000000000
--- a/changelog.d/3547.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implements new design for Jump to unread and quick fix visibility issues.
\ No newline at end of file
diff --git a/changelog.d/3564.bugfix b/changelog.d/3564.bugfix
deleted file mode 100644
index 74f71ccded..0000000000
--- a/changelog.d/3564.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix call invite processed after call is ended because of fastlane mode.
\ No newline at end of file
diff --git a/changelog.d/3577.bugfix b/changelog.d/3577.bugfix
deleted file mode 100644
index 6b3917292f..0000000000
--- a/changelog.d/3577.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash after video call.
\ No newline at end of file
diff --git a/changelog.d/3583.bugfix b/changelog.d/3583.bugfix
deleted file mode 100644
index 5f273c1779..0000000000
--- a/changelog.d/3583.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash out of memory
\ No newline at end of file
diff --git a/changelog.d/3605.bugfix b/changelog.d/3605.bugfix
deleted file mode 100644
index 3e338a0c62..0000000000
--- a/changelog.d/3605.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-CryptoStore migration has to be object to avoid crash
\ No newline at end of file

From 9673b3b15b3087a5861df770856b0e4d1e748c01 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Jul 2021 09:56:27 +0200
Subject: [PATCH 62/65] Release: fastlane

---
 fastlane/metadata/android/en-US/changelogs/40101120.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40101120.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/40101120.txt b/fastlane/metadata/android/en-US/changelogs/40101120.txt
new file mode 100644
index 0000000000..6118974777
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40101120.txt
@@ -0,0 +1,2 @@
+Main changes in this version: theme and style update and fix a crash after video call
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.12
\ No newline at end of file

From 72dcc9203232ef799db018270f181c7e0cb96c83 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Jul 2021 14:27:33 +0200
Subject: [PATCH 63/65] Version++

---
 vector/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/build.gradle b/vector/build.gradle
index c9a3724e11..2fa4561ba0 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -14,7 +14,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 1
-ext.versionPatch = 12
+ext.versionPatch = 13
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 86395826716e24d9b65c4b0e4385943f8cf8cb2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Jul 2021 12:38:04 +0000
Subject: [PATCH 64/65] Bump espresso_version from 3.3.0 to 3.4.0

Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 22aa308fab..d467221742 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -186,7 +186,7 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'org.amshove.kluent:kluent-android:1.65'
     androidTestImplementation 'io.mockk:mockk-android:1.12.0'
     androidTestImplementation "androidx.arch.core:core-testing:$arch_version"
diff --git a/vector/build.gradle b/vector/build.gradle
index 72a8cdd003..f6650d5125 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -322,7 +322,7 @@ dependencies {
     // Tests
     def kluent_version = '1.67'
     def androidxTest_version = '1.4.0'
-    def espresso_version = '3.3.0'
+    def espresso_version = '3.4.0'
 
     implementation project(":matrix-sdk-android")
     implementation project(":matrix-sdk-android-rx")

From 0e8018cbba266713de1d24e34c6447928a4d4cf3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Jul 2021 16:24:19 +0200
Subject: [PATCH 65/65] ktlint and format

---
 .../java/im/vector/app/features/settings/VectorPreferences.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 23cc3c30bd..b247dbfcf6 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
@@ -253,7 +253,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     }
 
     private val defaultPrefs = DefaultSharedPreferences.getInstance(context)
-    
+
     /**
      * Allow subscribing and unsubscribing to configuration changes. This is
      * particularly useful when you need to be notified of a configuration change
@@ -262,6 +262,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
     fun subscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         defaultPrefs.registerOnSharedPreferenceChangeListener(listener)
     }
+
     fun unsubscribeToChanges(listener: SharedPreferences.OnSharedPreferenceChangeListener) {
         defaultPrefs.unregisterOnSharedPreferenceChangeListener(listener)
     }