From af4f8d001e2b021d6669db00937ab77f35eca46f Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 30 May 2022 17:04:10 +0200
Subject: [PATCH 01/48] Fixes upgraded room duplication

---
 .../home/room/detail/upgrade/UpgradeRoomViewModelTask.kt     | 2 --
 .../app/features/spaces/explore/SpaceDirectoryController.kt  | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
index 2f91b9a35a..1f0404d659 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/upgrade/UpgradeRoomViewModelTask.kt
@@ -84,8 +84,6 @@ class UpgradeRoomViewModelTask @Inject constructor(
 //                                autoJoin = currentInfo.autoJoin ?: false,
                                 suggested = currentInfo.suggested
                         )
-
-                        parentSpace.removeChildren(params.roomId)
                     }
                 }
             } catch (failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 3f3b66cbcc..0905d891b6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -44,6 +44,7 @@ import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
+import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -110,6 +111,7 @@ class SpaceDirectoryController @Inject constructor(
                     ?.filter {
                         it.parentRoomId == (data.hierarchyStack.lastOrNull() ?: data.spaceId)
                     }
+                    ?.filterNot { it.isUpgradedRoom(data) }
                     ?: emptyList()
 
             if (flattenChildInfo.isEmpty()) {
@@ -209,4 +211,7 @@ class SpaceDirectoryController @Inject constructor(
             }
         }
     }
+
+    private fun SpaceChildInfo.isUpgradedRoom(data: SpaceDirectoryState) =
+            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState == VersioningState.UPGRADED_ROOM_JOINED }
 }

From 8d930446cae54020acfb7cb817ad1729d24b9022 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 31 May 2022 12:53:02 +0200
Subject: [PATCH 02/48] Fixes room filter not including UPGRADE_ROOM_NOT_JOINED

---
 .../app/features/spaces/explore/SpaceDirectoryController.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 0905d891b6..25e69959c7 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -213,5 +213,5 @@ class SpaceDirectoryController @Inject constructor(
     }
 
     private fun SpaceChildInfo.isUpgradedRoom(data: SpaceDirectoryState) =
-            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState == VersioningState.UPGRADED_ROOM_JOINED }
+            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState != VersioningState.NONE }
 }

From 01b7395c04a6d234bd37d725c37377eb576166fe Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 31 May 2022 12:53:28 +0200
Subject: [PATCH 03/48] Adds changelog file

---
 changelog.d/6200.bugfix | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog.d/6200.bugfix

diff --git a/changelog.d/6200.bugfix b/changelog.d/6200.bugfix
new file mode 100644
index 0000000000..41b0088a03
--- /dev/null
+++ b/changelog.d/6200.bugfix
@@ -0,0 +1,2 @@
+Fixes room not being in space after upgrade
+

From f6b0e8d13c388482eb50774c8392f09adcd5b02e Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Fri, 3 Jun 2022 12:02:50 +0200
Subject: [PATCH 04/48] Adds isUpgraded method to VersioningState

---
 changelog.d/6200.bugfix                                       | 1 -
 .../android/sdk/api/session/room/model/VersioningState.kt     | 4 +++-
 .../app/features/spaces/explore/SpaceDirectoryController.kt   | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog.d/6200.bugfix b/changelog.d/6200.bugfix
index 41b0088a03..ee204b4567 100644
--- a/changelog.d/6200.bugfix
+++ b/changelog.d/6200.bugfix
@@ -1,2 +1 @@
 Fixes room not being in space after upgrade
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
index b4e7b10d44..6d15d1a007 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
@@ -19,5 +19,7 @@ package org.matrix.android.sdk.api.session.room.model
 enum class VersioningState {
     NONE,
     UPGRADED_ROOM_NOT_JOINED,
-    UPGRADED_ROOM_JOINED
+    UPGRADED_ROOM_JOINED;
+
+    fun isUpgraded() = this != NONE
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 25e69959c7..5da5ae8510 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -44,7 +44,6 @@ import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
-import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -213,5 +212,5 @@ class SpaceDirectoryController @Inject constructor(
     }
 
     private fun SpaceChildInfo.isUpgradedRoom(data: SpaceDirectoryState) =
-            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState != VersioningState.NONE }
+            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState.isUpgraded() }
 }

From 654eede21bf91738f825ff6d2485fb9cf263784e Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 4 Jul 2022 10:06:00 +0100
Subject: [PATCH 05/48] Adds VersioningStateTest

---
 .../session/room/model/VersioningStateTest.kt | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 vector/src/test/java/org/matrix/android/sdk/api/session/room/model/VersioningStateTest.kt

diff --git a/vector/src/test/java/org/matrix/android/sdk/api/session/room/model/VersioningStateTest.kt b/vector/src/test/java/org/matrix/android/sdk/api/session/room/model/VersioningStateTest.kt
new file mode 100644
index 0000000000..473918d179
--- /dev/null
+++ b/vector/src/test/java/org/matrix/android/sdk/api/session/room/model/VersioningStateTest.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.api.session.room.model
+
+import org.amshove.kluent.shouldBe
+import org.junit.Test
+
+internal class VersioningStateTest {
+
+    @Test
+    fun `when VersioningState is NONE, then isUpgraded returns false`() {
+        val versioningState = VersioningState.NONE
+
+        val isUpgraded = versioningState.isUpgraded()
+
+        isUpgraded shouldBe false
+    }
+
+    @Test
+    fun `when VersioningState is UPGRADED_ROOM_NOT_JOINED, then isUpgraded returns true`() {
+        val versioningState = VersioningState.UPGRADED_ROOM_NOT_JOINED
+
+        val isUpgraded = versioningState.isUpgraded()
+
+        isUpgraded shouldBe true
+    }
+
+    @Test
+    fun `when VersioningState is UPGRADED_ROOM_JOINED, then isUpgraded returns true`() {
+        val versioningState = VersioningState.UPGRADED_ROOM_JOINED
+
+        val isUpgraded = versioningState.isUpgraded()
+
+        isUpgraded shouldBe true
+    }
+}

From e58652a1015b6a48a894c03549136a9bac4397d6 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Wed, 13 Jul 2022 21:04:14 +0000
Subject: [PATCH 06/48] Translated using Weblate (Catalan)

Currently translated at 100.0% (2265 of 2265 strings)

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

diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index 9491ebed77..05d10b0f5f 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -21,7 +21,7 @@
     <string name="notice_room_ban">%1$s ha vetat %2$s</string>
     <string name="notice_room_withdraw">%1$s ha retirat la invitació de %2$s</string>
     <string name="notice_avatar_url_changed">%1$s ha canviat la seva foto</string>
-    <string name="notice_made_future_room_visibility">%1$s ha establert la visibilitat de l\'històric futur de la sala a %2$s</string>
+    <string name="notice_made_future_room_visibility">%1$s ha activat la visualització de l\'històric de la sala (a partir d\'ara) a %2$s</string>
     <string name="notice_room_visibility_joined">tots els participants de la sala, des de que s\'hi uneixen.</string>
     <string name="notice_room_visibility_world_readable">qualsevol.</string>
     <string name="notice_avatar_changed_too">(també ha canviat la foto)</string>
@@ -153,7 +153,7 @@
     <string name="notice_room_update">%s ha actualitzat aquesta sala.</string>
     <string name="notice_made_future_direct_room_visibility_by_you">Has establert la visibilitat dels missatges futurs a %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s ha establert la visibilitat dels missatges futurs a %2$s</string>
-    <string name="notice_made_future_room_visibility_by_you">Has establert la visibilitat de l\'històric futur de la sala a %1$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Has establert la visibilitat de l\'històric de la sala (a partir d\'ara) a %1$s</string>
     <string name="notice_ended_call_by_you">Has finalitzat la trucada.</string>
     <string name="notice_answered_call_by_you">Has respost a la trucada.</string>
     <string name="notice_call_candidates_by_you">Has enviat dades per configurar la trucada.</string>
@@ -1055,7 +1055,7 @@
     <string name="login_splash_text2">Utilitza el xifrat per mantenir els teus xats privats</string>
     <string name="login_splash_title">Aquest xat és teu. Apropia-te\'n.</string>
     <string name="room_filtering_filter_hint">Filtra xats…</string>
-    <string name="this_is_the_beginning_of_dm">Inici de l\'històric del xat personal amb %s.</string>
+    <string name="this_is_the_beginning_of_dm">Inici de l\'històric del xat directe amb %s.</string>
     <string name="settings_hs_admin_e2e_disabled">L\'administrador del servidor ha desactivat el xifrat d\'extrem a extrem per defecte en sales privades i en xats directes.</string>
     <string name="room_member_open_or_create_dm">Xat personal</string>
     <string name="direct_room_profile_encrypted_subtitle">Els missatges d\'aquí estan xifrats d\'extrem a extrem.
@@ -1064,7 +1064,7 @@
     <string name="a11y_create_direct_message">Crea un nou xat personal</string>
     <string name="room_filtering_footer_create_new_direct_message">Envia un nou missatge</string>
     <string name="bottom_action_people_x">Xats directes</string>
-    <string name="direct_room_encryption_enabled_tile_description">Els missatges d\'aquesta sala estan xifrats d\'extrem a extrem.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Els missatges d\'aquest xat estan xifrats d\'extrem a extrem.</string>
     <string name="settings_labs_show_hidden_events_in_timeline">Mostra els esdeveniments amagats a la cronologia</string>
     <string name="send_suggestion_failed">No s\'ha pogut enviat el suggeriment (%s)</string>
     <string name="send_suggestion_sent">Gràcies, el suggeriment s\'ha enviat correctament</string>
@@ -2482,7 +2482,7 @@
     <string name="tooltip_attachment_photo">Obre càmera</string>
     <string name="message_bubbles">Mostra els contorns dels missatges</string>
     <string name="live_location_bottom_sheet_last_updated_at">Actualitzada fa %1$s</string>
-    <string name="labs_enable_live_location_summary">Implementació temporal: les ubicacions persisteixen a l\'historial de la sala</string>
+    <string name="labs_enable_live_location_summary">Implementació temporal: les ubicacions persisteixen a l\'històric de la sala</string>
     <string name="space_leave_radio_buttons_title">Coses en aquest espai</string>
     <string name="settings_autoplay_animated_images_summary">Reprodueix immediatament les imatges animades a la cronologia</string>
     <string name="live_location_bottom_sheet_stop_sharing">Deixa de compartir</string>
@@ -2529,4 +2529,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">\'Endpoint\' registrat correctament al servidor.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Registre d\'endpoint</string>
     <string name="action_next">Següent</string>
-</resources>
+    <string name="labs_enable_msc3061_share_history_desc">Quan convidis algú a una sala xifrada que comparteix l\'històric de missatges, aquest serà visible.</string>
+    <string name="poll_undisclosed_not_ended">Els resultats es mostraran quan acabi l\'enquesta</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Compartició de claus de sala per missatges antics</string>
+    <string name="send_your_first_msg_to_invite">Envia un primer missatge per convidar %s a parlar</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Els missatges d\'aquest xat seran xifrats d\'extrem a extrem.</string>
+    <string name="create_room_action_go">Crea</string>
+</resources>
\ No newline at end of file

From 8cc174a5c17db6cfb029b615f034d1d5cab54827 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 13 Jul 2022 11:10:38 +0000
Subject: [PATCH 07/48] Translated using Weblate (Czech)

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

diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index c15de7cc0d..cd66940316 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -2577,4 +2577,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">Koncový bod byl úspěšně zaregistrován na domovském serveru.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Registrace koncového bodu</string>
     <string name="action_next">Další</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Výsledky se zobrazí po ukončení hlasování</string>
+    <string name="labs_enable_msc3061_share_history_desc">Při pozvání do šifrované místnosti, která sdílí historii, bude zašifrovaná historie viditelná.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Sdílení klíčů místnosti pro minulé zprávy</string>
+    <string name="send_your_first_msg_to_invite">Odesláním první zprávy pozvete %s do místnosti</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Zprávy v této místnosti budou koncově šifrovány.</string>
+    <string name="create_room_action_go">Přejít</string>
+</resources>
\ No newline at end of file

From 663302b582df22d6881fee25ed2b425ade20e734 Mon Sep 17 00:00:00 2001
From: Lamdarer <Lamdarer@mailbox.org>
Date: Fri, 15 Jul 2022 11:50:58 +0000
Subject: [PATCH 08/48] Translated using Weblate (German)

Currently translated at 99.3% (2250 of 2265 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index bf69883e14..fcb82889f5 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -2528,4 +2528,5 @@
     <string name="ftue_account_created_personalize">Profil personalisieren</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name} ist auch für den Arbeitsplatz geeignet. Die sichersten Organisationen der Welt vertrauen darauf.</string>
     <string name="send_feedback_threads_info">Threads sind noch in Arbeit, und es stehen neue, aufregende Funktionen an, wie z. B. verbesserte Benachrichtigungen. Wir würden uns sehr über Dein Feedback freuen!</string>
-</resources>
+    <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in diesem Chat werden End-zu-End-Verschlüsselt</string>
+</resources>
\ No newline at end of file

From fcc334dc175fe6cac0fd4a8dbebf970b9f5fd36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Fri, 15 Jul 2022 19:48:42 +0000
Subject: [PATCH 09/48] Translated using Weblate (Estonian)

Currently translated at 99.6% (2257 of 2265 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 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index af4c9d3b4c..80881f45c0 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -1705,7 +1705,7 @@
     <string name="bad_passphrase_key_reset_all_action">Kas sa unustasid või kaotasid kõik võimalused taastada ligipääsu oma kontole\? Lähtesta kõik seadistused</string>
     <string name="direct_room_created_summary_item_by_you">Sina liitusid.</string>
     <string name="direct_room_created_summary_item">%s liitus.</string>
-    <string name="direct_room_encryption_enabled_tile_description">See jututuba on läbivalt krüptitud.</string>
+    <string name="direct_room_encryption_enabled_tile_description">See vestlus on läbivalt krüptitud.</string>
     <string name="direct_room_profile_section_more_leave">Lahku</string>
     <string name="direct_room_profile_section_more_settings">Seadistused</string>
     <string name="direct_room_profile_encrypted_subtitle">Sõnumid siin jututoas kasutavad läbivat krüptimist. 
@@ -2520,4 +2520,10 @@
     <string name="unifiedpush_distributor_background_sync">Sünkroniseerimine taustal</string>
     <string name="unifiedpush_distributor_fcm_fallback">Google\'i teenused</string>
     <string name="unifiedpush_getdistributors_dialog_title">Vali teavituste laadimise viis</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Tulemused on näha siis, kui küsitlus on lõppenud</string>
+    <string name="labs_enable_msc3061_share_history_desc">Kutsudes osalejaid krüptitud jututuppa, kus ajaloo jagamine on lubatud, on vanad sõnumid loetavad.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Minevikus saadetud sõnumite lugemiseks vajalike krüptovõtmete jagamine jututoas</string>
+    <string name="send_your_first_msg_to_invite">Saada oma esimene sõnum kutsudes %s vestlusesse</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">See vestlus saab olema läbivalt krüptitud.</string>
+    <string name="create_room_action_go">Mine</string>
+</resources>
\ No newline at end of file

From 5c50a1d15bfb362fbef0ad42e59b523a4a5f24a9 Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Wed, 13 Jul 2022 11:19:45 +0000
Subject: [PATCH 10/48] Translated using Weblate (Persian)

Currently translated at 100.0% (2265 of 2265 strings)

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

diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 95f9bedfae..a8dbe72b74 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -1095,7 +1095,7 @@
     <string name="direct_room_created_summary_item">%s پیوست.</string>
     <string name="room_created_summary_item_by_you">اتاق را ساخته و پیکربندی کردید.</string>
     <string name="encryption_not_enabled">رمزنگاری به کار نیفتاده</string>
-    <string name="direct_room_encryption_enabled_tile_description">پیام‌های این اتاق، رمزنگاری سرتاسری دارند.</string>
+    <string name="direct_room_encryption_enabled_tile_description">پیام‌های این گپ، رمزنگاری سرتاسری دارند.</string>
     <string name="encryption_enabled_tile_description">پیام‌های این اتاق رمزنگاری سرتاسری دارند. در نمایهٔ کاربران تأییدشان کرده و بیش‌تر بیاموزید.</string>
     <string name="encryption_enabled">رمزنگاری به کار افتاد</string>
     <string name="settings_when_rooms_are_upgraded">هنگام ارتقای اتاق‌ها</string>
@@ -1213,7 +1213,7 @@
     <string name="settings_troubleshoot_test_token_registration_failed">شکست در ثبت ژتون FCM در کارساز خانگی:
 \n%1$s</string>
     <string name="settings_troubleshoot_test_token_registration_success">ژتون FCM با موفقیت در کارساز خانگی ثبت شد.</string>
-    <string name="settings_troubleshoot_test_token_registration_title">ثبت توکن</string>
+    <string name="settings_troubleshoot_test_token_registration_title">ثبت ژتون</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">افزودن حساب کاربری</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nاین خطا خارج از مهار ${app_name} است. هیچ حساب گوگلی روی تلفن نیست. لطفاً مدیر حساب را گشوده و حساب گوگلی بیفزایید.</string>
@@ -1221,11 +1221,11 @@
 \nاین خطا خارج از مهار ${app_name} است و ممکن است به دلایل مختلفی رخ داده باشد. ممکن است اگر بعداً دوباره تلاش کنید، کار کند. می‌توانید بررسی کنید که مصرف دادهٔ خدمات پلی گوگل در تنظیمات سامانه محدود نشده باشد یا ساعت افزاره‌تان درست باشد. همچنین ممکن است روی رام‌های سفارشی اتفاق بیفتد.</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nاین خطا، خارج از مهار ${app_name} است و طبق گفتهٔ گوگل، نشانگر ثبت بیش‌از حد کاره‌ها در FCM است. خطا فقط در مواردی که تعداد خیلی زیادی کاره وجود داشته باشد رخ می‌دهد، پس کاربران معمولی نباید تحت تأثیر قرار گیرند.</string>
-    <string name="settings_troubleshoot_test_fcm_failed">بازیابی توکن FCM با مشکل مواجه شد:
+    <string name="settings_troubleshoot_test_fcm_failed">شکست در بازیابی ژتون FCM:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_success">توکن FCM با موفقیت بازیابی شد:
+    <string name="settings_troubleshoot_test_fcm_success">ژتون FCM با موفقیت بازیابی شد:
 \n%1$s</string>
-    <string name="settings_troubleshoot_test_fcm_title">توکن Firebase</string>
+    <string name="settings_troubleshoot_test_fcm_title">ژتون فایربیس</string>
     <string name="settings_troubleshoot_test_play_services_quickfix">مشکل Google Play Services را برطرف کنید</string>
     <string name="settings_troubleshoot_test_play_services_failed">المنت برای ارسال آگاهی‌ها از خدمات پلی گوگل استفاده می‌کند اما به نظر می‌رسد به درستی پیکربندی نشده است:
 \n%1$s</string>
@@ -1494,7 +1494,7 @@
     <string name="settings_discovery_disconnect_identity_server_info">قطع ارتباط با سرور هویت‌سنجی به این معنی است که توسط کاربران دیگر قابل شناسایی نخواهید بود و نمی توانید دیگران را از طریق ایمیل یا تلفن دعوت کنید.</string>
     <string name="settings_discovery_identity_server_info_none">در حال استفاده از کارساز هویتی نیستید. برای کشق و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید، یک کارساز هویت در زیر پیکربندی کنید.</string>
     <string name="settings_discovery_identity_server_info">دارید برای کشف و قابل کشف بودن به دست آشنایان موجودی که می‌شناسید از %1$s استفاده می‌کنید.</string>
-    <string name="settings_troubleshoot_test_token_registration_quick_fix">ثبت توکن</string>
+    <string name="settings_troubleshoot_test_token_registration_quick_fix">ثبت ژتون</string>
     <string name="push_gateway_item_format">فرمت:</string>
     <string name="push_gateway_item_url">آدرس:</string>
     <string name="push_gateway_item_device_name">نام نشست:</string>
@@ -2521,4 +2521,18 @@
     <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">بازنشانی روش آگاهی</string>
     <string name="push_gateway_item_profile_tag">برچسب نمایه:</string>
     <string name="action_next">بعدی</string>
-</resources>
+    <string name="live_location_labs_promotion_description">لطفاً به خاطر داشته باشید: این یک ویژگی آزمایشگاهی با پیاده‌سازی موقّتی است. یعنی نخواهید توانست تاریخجهٔ مکانتان را حذف کرده و کاربران پیش‌رفته خواهند توانست حتا پس از پایان هم‌رسانی مکان زنده‌تان با این اتاق، تاریخچهٔ مکانتان را ببینند.</string>
+    <string name="settings_troubleshoot_test_current_endpoint_failed">نتوانست نقطهٔ پایانی را بیابد.</string>
+    <string name="settings_troubleshoot_test_current_endpoint_success">نقطهٔ پایانی کنونی: %s</string>
+    <string name="settings_troubleshoot_test_current_endpoint_title">نقطهٔ پایانی</string>
+    <string name="poll_undisclosed_not_ended">هنگام پایان نظرسنجی، نتایج نمایان خواهند شد</string>
+    <string name="labs_enable_msc3061_share_history_desc">هنگام دعوت به اتاقی رمزشده که تاریخچه‌ای هم‌رسانده دارد، تاریخچهٔ رمز شده نمایان خواهد بود.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: هم‌رسانی کلیدهای اتاق برای پیام‌های گذشته</string>
+    <string name="send_your_first_msg_to_invite">نخستین پیامتان را برای دعوت %s به گپ بفرستید</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">پیام‌های این گپ رمزنگاری سرتاسری خواهند شد.</string>
+    <string name="create_room_action_go">رفتن</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">شکست در ثبت ژتون نقطهٔ پایانی روی کارساز خانگی:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">نقطهٔ پایانی با موفّقیت روی کارساز خانگی ثبت شد.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">ثبت نقطهٔ پایانی</string>
+</resources>
\ No newline at end of file

From ccdc61d34bd1bc46cae8048dab28745b77393215 Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Thu, 14 Jul 2022 14:26:27 +0000
Subject: [PATCH 11/48] Translated using Weblate (French)

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

diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 01852278ef..3cfbd5f9bd 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -2529,4 +2529,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">Le point de connexion a été correctement enregistré sur le serveur d’accueil.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Enregistrement du point de connexion</string>
     <string name="action_next">Suivant</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Les résultats seront visibles lorsque le sondage sera terminé</string>
+    <string name="labs_enable_msc3061_share_history_desc">Lors de l’invitation dans un salon chiffré qui partage son historique, son historique chiffré sera visible.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061 : Partage des clés du salon pour les messages passés</string>
+    <string name="send_your_first_msg_to_invite">Envoyez votre premier message pour inviter %s à discuter</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Les messages de ce salon seront chiffrés de bout en bout.</string>
+    <string name="create_room_action_go">C’est parti</string>
+</resources>
\ No newline at end of file

From d4c61c701886ed773eb1ed2eca6e7ee4ca03754b Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Fri, 15 Jul 2022 12:13:44 +0000
Subject: [PATCH 12/48] Translated using Weblate (Indonesian)

Currently translated at 100.0% (2265 of 2265 strings)

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

diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml
index 104203bf32..11752f934f 100644
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@@ -2032,7 +2032,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="room_created_summary_item_by_you">Anda membuat dan mengatur ruangan ini.</string>
     <string name="room_created_summary_item">%s membuat dan mengatur ruangan ini.</string>
     <string name="encryption_not_enabled">Enkripsi tidak diaktifkan</string>
-    <string name="direct_room_encryption_enabled_tile_description">Pesan di ruangan ini dienkripsi secara ujung-ke-ujung.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Pesan di obrolan ini dienkripsi secara ujung-ke-ujung.</string>
     <string name="encryption_enabled_tile_description">Pesan di ruangan ini dienkripsi secara ujung-ke-ujung. Pelajari lebih lanjut &amp; verifikasi pengguna di profil mereka.</string>
     <string name="encryption_enabled">Enkripsi diaktifkan</string>
     <string name="bootstrap_cancel_text">Jika Anda batalkan, Anda mungkin kehilangan pesan terenkripsi dan data Anda jika Anda kehilangan akses ke login Anda.
@@ -2483,4 +2483,10 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_success">Endpoint berhasil terdaftar ke homeserver.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Pendaftaran Endpoint</string>
     <string name="action_next">Lanjut</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Hasil akan ditampilkan ketika pemungutan suara berakhir</string>
+    <string name="labs_enable_msc3061_share_history_desc">Ketika mengundang ke ruangan terenkripsi yang juga membagikan riwayat, riwayat terenkripsi akan dapat dilihat.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Pembagian kunci ruangan untuk pesan lama</string>
+    <string name="send_your_first_msg_to_invite">Kirim pesan pertama Anda untuk mengundang %s ke obrolan</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Pesan di obrolan ini akan dienkripsi secara ujung-ke-ujung.</string>
+    <string name="create_room_action_go">Mulai</string>
+</resources>
\ No newline at end of file

From 26811c3c39982e8097be4a85098c488e392ce91d Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 13 Jul 2022 10:08:09 +0000
Subject: [PATCH 13/48] Translated using Weblate (Italian)

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

diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 3879e5a13c..140b63e4c8 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1692,7 +1692,7 @@
     <string name="secure_backup_reset_all">Reimposta tutto</string>
     <string name="bad_passphrase_key_reset_all_action">Hai dimenticato o perso tutte le opzioni di ripristino\? Reimposta tutto</string>
     <string name="direct_room_created_summary_item_by_you">Sei entrato.</string>
-    <string name="direct_room_encryption_enabled_tile_description">I messaggi in questa stanza sono crittografati E2E.</string>
+    <string name="direct_room_encryption_enabled_tile_description">I messaggi in questa conversazione sono cifrati end-to-end.</string>
     <string name="direct_room_profile_section_more_leave">Esci</string>
     <string name="direct_room_profile_section_more_settings">Impostazioni</string>
     <string name="direct_room_profile_encrypted_subtitle">I messaggi qui sono cifrati E2E.
@@ -2520,4 +2520,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">Endpoint registrato con successo sull\'homeserver.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Registrazione endpoint</string>
     <string name="action_next">Avanti</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">I risultati saranno visibili quando il sondaggio sarà terminato</string>
+    <string name="labs_enable_msc3061_share_history_desc">Quando si invita in una stanza crittografata che condivide la cronologia, la cronologia cifrata sarà visibile.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Condivisione chiavi stanza per messaggi passati</string>
+    <string name="send_your_first_msg_to_invite">Invia il primo messaggio per invitare %s a parlare</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">I messaggi in questa conversazione saranno cifrati end-to-end.</string>
+    <string name="create_room_action_go">Vai</string>
+</resources>
\ No newline at end of file

From 907dc000ef7b3152addcdb6e84b4eff7f3372011 Mon Sep 17 00:00:00 2001
From: Johan Smits <johan@smitsmail.net>
Date: Thu, 14 Jul 2022 19:46:28 +0000
Subject: [PATCH 14/48] Translated using Weblate (Dutch)

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

diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 9b5591d8d0..a9d9dd3658 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -1927,7 +1927,7 @@
     <string name="room_created_summary_item">%s heeft de kamer gemaakt en geconfigureerd.</string>
     <string name="encryption_unknown_algorithm_tile_description">De versleuteling die door deze kamer wordt gebruikt, wordt niet ondersteund</string>
     <string name="encryption_not_enabled">Versleuteling niet ingeschakeld</string>
-    <string name="direct_room_encryption_enabled_tile_description">Berichten in deze kamer zijn end-to-end-versleuteld.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Berichten in deze chat zijn end-to-end-versleuteld.</string>
     <string name="encryption_enabled_tile_description">Berichten in deze kamer zijn eind-tot-eind-versleuteld. Lees meer en verifieer persoon in hun profiel.</string>
     <string name="bootstrap_cancel_text">Als u nu annuleert, kunt u versleutelde berichten en gegevens kwijtraken als u de toegang tot uw aanmeldingen verliest.
 \n
@@ -2529,4 +2529,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">Eindpunt succesvol geregistreerd bij server.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Registratie van eindpunt</string>
     <string name="action_next">Volgende</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Resultaten zijn zichtbaar wanneer de poll is afgelopen</string>
+    <string name="labs_enable_msc3061_share_history_desc">Bij het uitnodigen in een versleutelde ruimte die geschiedenis deelt, is de versleutelde geschiedenis zichtbaar.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Kamersleutels delen voor eerdere berichten</string>
+    <string name="send_your_first_msg_to_invite">Stuur uw eerste bericht om %s uit te nodigen om te chatten</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Berichten in deze chat worden eind-tot-eind versleuteld.</string>
+    <string name="create_room_action_go">Ga</string>
+</resources>
\ No newline at end of file

From dafbb32b97dae0955f8ef8a1a5927481b56fa075 Mon Sep 17 00:00:00 2001
From: Didek <dawid@rejowski.xyz>
Date: Thu, 14 Jul 2022 12:46:18 +0000
Subject: [PATCH 15/48] Translated using Weblate (Polish)

Currently translated at 98.8% (2239 of 2265 strings)

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

diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 26e85f2473..a9d1df49d8 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1163,9 +1163,9 @@
         <item quantity="other">Wyślij obrazów w oryginalnym rozmiarze</item>
     </plurals>
     <string name="delete_event_dialog_title">Potwierdź Usunięcie</string>
-    <string name="delete_event_dialog_content">Jesteś pewny(-na), że chcesz usunąć to wydarzenie\? Jeżeli usuniesz nazwę pokoju lub zmienisz temat, wciąż będzie możliwe cofnięcie zmiany.</string>
+    <string name="delete_event_dialog_content">Czy na pewno chcesz usunąć to wydarzenie\? Pamiętaj, że skasowanie nazwy pokoju lub zmiana jego tematu może czasem je przywrócić.</string>
     <string name="delete_event_dialog_reason_checkbox">Podaj przyczynę</string>
-    <string name="delete_event_dialog_reason_hint">Przyczyna reakcji</string>
+    <string name="delete_event_dialog_reason_hint">Powód usunięcia</string>
     <string name="event_redacted_by_user_reason_with_reason">Wydarzenie usunięte przez użytkownika, przyczyna: %1$s</string>
     <string name="event_redacted_by_admin_reason_with_reason">Wydarzenie moderowane przez administratora pokoju, przyczyna: %1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">Klucze są już aktualne!</string>
@@ -2605,4 +2605,4 @@
     <string name="settings_troubleshoot_test_distributors_title">Dostępni dostawcy</string>
     <string name="settings_notification_method">Dostawca powiadomień</string>
     <string name="unifiedpush_getdistributors_dialog_title">Wybierz, którego dostawcy powiadomień push chcesz używać</string>
-</resources>
+</resources>
\ No newline at end of file

From fd6be11b6d7f0583783aff79d3157f6ba7f57b35 Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Wed, 13 Jul 2022 21:09:40 +0000
Subject: [PATCH 16/48] Translated using Weblate (Slovak)

Currently translated at 100.0% (2265 of 2265 strings)

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

diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index edc4163d0c..9ddfa08aa4 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -1810,7 +1810,7 @@
     <string name="invite_friends_text">Ahoj, ozvi sa mi na ${app_name}: %s</string>
     <string name="create_room_dm_failure">Nemohli sme vytvoriť vašu priamu správu. Skontrolujte používateľov, ktorých chcete pozvať, a skúste to znova.</string>
     <string name="notice_crypto_unable_to_decrypt_friendly_desc">Kvôli end-to-end šifrovaniu sa môže stať, že budete musieť chvíľu počkať, kým vám od niekoho príde správa, pretože vám neboli správne odoslané šifrovacie kľúče.</string>
-    <string name="direct_room_encryption_enabled_tile_description">Správy v tejto miestnosti sú šifrované od vás až k príjemcovi.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Správy v tejto konverzácii sú šifrované od vás až k príjemcovi.</string>
     <string name="encryption_enabled_tile_description">Správy v tejto miestnosti sú end-to-end šifrované. Zistite viac a overte používateľov v ich profile.</string>
     <string name="settings_hs_admin_e2e_disabled">Správca vášho servera predvolene vypol end-to-end šifrovanie v súkromných miestnostiach a v priamych správach.</string>
     <string name="verification_conclusion_ok_notice">Správy s týmto používateľom sú end-to-end šifrované a tretie strany ich nemôžu čítať.</string>
@@ -2577,4 +2577,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">Koncové zariadenie sa úspešne zaregistrovalo na domovský server.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Registrácia koncového bodu</string>
     <string name="action_next">Ďalej</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Výsledky budú viditeľné po ukončení ankety</string>
+    <string name="labs_enable_msc3061_share_history_desc">Pri pozvaní do zašifrovanej miestnosti, ktorá zdieľa históriu, bude zašifrovaná história viditeľná.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Zdieľanie kľúčov od miestnosti pre staršie správy</string>
+    <string name="send_your_first_msg_to_invite">Odošlite svoju prvú správu a pozvite %s do konverzácie</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Správy v tejto miestnosti sú šifrované od vás až k príjemcovi.</string>
+    <string name="create_room_action_go">Spustiť</string>
+</resources>
\ No newline at end of file

From c38082eb6358e1f0ed0bb8d5552c63187b283aa7 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 16 Jul 2022 11:33:51 +0000
Subject: [PATCH 17/48] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2265 of 2265 strings)

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

diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index a5b9571748..ed7a2c7438 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -22,7 +22,7 @@
     <string name="notice_placed_video_call">%s починає відеовиклик.</string>
     <string name="notice_placed_voice_call">%s розпочинає голосовий виклик.</string>
     <string name="notice_answered_call">%s відповідає на виклик.</string>
-    <string name="notice_ended_call">%s завершує дзвінок.</string>
+    <string name="notice_ended_call">%s завершує виклик.</string>
     <string name="notice_made_future_room_visibility">%1$s робить майбутню історію кімнати видимою для %2$s</string>
     <string name="notice_room_visibility_invited">всіх учасників кімнати, з моменту їх запрошення.</string>
     <string name="notice_room_visibility_joined">всіх учасників кімнати, з моменту їх приєднання.</string>
@@ -135,7 +135,7 @@
     <string name="notice_made_future_room_visibility_by_you">Ви зробили майбутню історію кімнати видимою для %1$s</string>
     <string name="notice_made_future_direct_room_visibility_by_you">Ви зробили майбутні повідомлення видимими для %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s робить майбутні повідомлення видимими для %2$s</string>
-    <string name="notice_ended_call_by_you">Ви завершили дзвінок.</string>
+    <string name="notice_ended_call_by_you">Ви завершили виклик.</string>
     <string name="notice_answered_call_by_you">Ви відповіли на виклик.</string>
     <string name="notice_call_candidates_by_you">Ви надіслали дані для налаштування виклику.</string>
     <string name="notice_call_candidates">%s надсилає дані для налаштування виклику.</string>
@@ -230,8 +230,10 @@
     <string name="call_in_progress">Виконується виклик…</string>
     <string name="call_error_user_not_responding">Абонент не відповідає.</string>
     <string name="permissions_rationale_popup_title">Інформація</string>
-    <string name="permissions_rationale_msg_record_audio">Для здійснення аудіодзвінків потрібен доступ до мікрофону.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Для здійснення відеодзвінків потрібен доступ до камери та мікрофону.\n\nБудь ласка, надайте його у наступних виринаючих вікнах, щоб мати змогу їх здійснити.</string>
+    <string name="permissions_rationale_msg_record_audio">Для здійснення аудіовикликів потрібен доступ до мікрофона.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Для здійснення відеовикликів потрібен доступ до камери та мікрофону.
+\n
+\nНадайте його у наступних спливних вікнах, щоб мати змогу їх здійснити.</string>
     <string name="yes">ТАК</string>
     <string name="no">НІ</string>
     <string name="_continue">Продовжити</string>
@@ -406,7 +408,7 @@
     <string name="notification_noisy">Гучно</string>
     <string name="encrypted_message">Зашифроване повідомлення</string>
     <string name="settings_labs_native_camera">Використовувати рідну камеру</string>
-    <string name="you_added_a_new_device">Щойно доданий вами пристрій \'%s\' править ключі шифрування.</string>
+    <string name="you_added_a_new_device">Щойно доданий вами сеанс «%s», який запитує ключі шифрування.</string>
     <string name="your_unverified_device_requesting">Ваш незвірений пристрій «%s» вимагає ключі шифрування.</string>
     <string name="start_verification">Почати перевірку</string>
     <string name="command_error">Помилка виконання команди</string>
@@ -600,13 +602,13 @@
     <string name="action_skip">Пропустити</string>
     <string name="failed_to_remove_widget">Не вдалося видалити віджет</string>
     <string name="failed_to_add_widget">Не вдалося додати віджет</string>
-    <string name="cannot_call_yourself">Ви не можете здійснити дзвінок із самим собою</string>
+    <string name="cannot_call_yourself">Ви не можете викликати самих себе</string>
     <string name="audio_meeting">Почати аудіо-зустріч</string>
     <string name="video_meeting">Почати відеозустріч</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">У вас немає повноважень розпочати дзвінок</string>
-    <string name="no_permissions_to_start_webrtc_call">У вас немає повноважень на дзвінок у цій кімнаті</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">У вас немає повноважень розпочати груповий виклик</string>
-    <string name="no_permissions_to_start_conf_call">У вас немає повноважень розпочати груповий виклик у цій кімнаті</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">У вас немає дозволу розпочати виклик</string>
+    <string name="no_permissions_to_start_webrtc_call">У вас немає дозволу розпочати виклик у цій кімнаті</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">У вас немає дозволу розпочати груповий виклик</string>
+    <string name="no_permissions_to_start_conf_call">У вас немає дозволу розпочати груповий виклик у цій кімнаті</string>
     <string name="action_reset">Скинути</string>
     <string name="action_dismiss">Відхилити</string>
     <string name="action_play">Грати</string>
@@ -628,7 +630,7 @@
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Мені не потрібні мої зашифровані повідомлення</string>
     <string name="warning_unsaved_change_discard">Скасувати зміни</string>
     <string name="login_error_ssl_other">Помилка SSL.</string>
-    <string name="cannot_call_yourself_with_invite">Ви не можете здійснити дзвінок із самим собою, дочекайтесь, доки інші учасники приймуть ваше запрошення</string>
+    <string name="cannot_call_yourself_with_invite">Ви не можете викликати себе самих, дочекайтесь, доки інші учасники погодяться на ваше запрошення</string>
     <string name="uploads_files_title">ФАЙЛИ</string>
     <string name="uploads_media_no_result">У цій кімнаті немає медіа</string>
     <string name="uploads_media_title">МЕДІА</string>
@@ -1005,9 +1007,9 @@
 \n
 \nВи можете будь-коли змінити цю дію в загальних налаштуваннях.</string>
     <string name="room_participants_action_ignore_title">Нехтувати користувача</string>
-    <string name="room_participants_power_level_demote">Понизити</string>
-    <string name="room_participants_power_level_demote_warning_prompt">Ви не зможете скасувати цю зміну, оскільки понижуєте свої права, якщо ви останній привілейований користувач у кімнаті, неможливо буде повернути собі привілеї.</string>
-    <string name="room_participants_power_level_demote_warning_title">Понизитися\?</string>
+    <string name="room_participants_power_level_demote">Зменшити</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Ви не зможете скасувати цю зміну, оскільки зменшуєте свої повноваження, якщо ви останній привілейований користувач у кімнаті, неможливо буде повернути собі повноваження.</string>
+    <string name="room_participants_power_level_demote_warning_title">Зменшити свої повноваження\?</string>
     <string name="permissions_denied_add_contact">Дозволити доступ до ваших контактів.</string>
     <string name="permissions_denied_qr_code">Щоб сканувати QR-код необхідно дозволити доступ до камери.</string>
     <string name="video_call_in_progress">Триває відеовиклик…</string>
@@ -1074,7 +1076,7 @@
     <string name="room_profile_not_encrypted_subtitle">Повідомлення в цій кімнаті не захищено наскрізним шифруванням.</string>
     <string name="direct_room_profile_not_encrypted_subtitle">Повідомлення тут не захищено наскрізним шифруванням.</string>
     <string name="room_settings_enable_encryption">Увімкнути наскрізне шифрування…</string>
-    <string name="direct_room_encryption_enabled_tile_description">Повідомлення в цій кімнаті захищені наскрізним шифруванням.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Повідомлення в цій бесіді захищені наскрізним шифруванням.</string>
     <string name="verification_verify_device">Звірити цей сеанс</string>
     <string name="settings_active_sessions_unverified_device_desc">Звірте цей сеанс, щоб позначити його надійним та надати йому доступ до зашифрованих повідомлень. Якщо ви не входили в цей сеанс, ваш обліковий запис може бути зламано:</string>
     <string name="room_directory_search_hint">Назва або ID (#example:matrix.org)</string>
@@ -1152,8 +1154,8 @@
     <string name="send_a_sticker">Наліпка</string>
     <string name="terms_description_for_integration_manager">Використовувати ботів, мости, віджети та пакунки наліпок</string>
     <string name="no_connectivity_to_the_server_indicator">Зв\'язок із сервером втрачено</string>
-    <string name="no_message_edits_found">Не знайдено жодної правки</string>
-    <string name="message_edits">Історія правок</string>
+    <string name="no_message_edits_found">Виправлень не знайдено</string>
+    <string name="message_edits">Історія виправлень</string>
     <string name="a11y_trust_level_trusted">Рівень довіри</string>
     <string name="not_trusted">Не довірений</string>
     <string name="trusted">Довірений</string>
@@ -2461,7 +2463,7 @@
     <string name="ftue_auth_use_case_title">З ким ви спілкуватиметеся найчастіше\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Ви вже переглядаєте цю гілку!</string>
     <string name="view_in_room">Переглянути у кімнаті</string>
-    <string name="reply_in_thread">Відповісти у гілку</string>
+    <string name="reply_in_thread">Відповісти в гілці</string>
     <string name="command_not_supported_in_threads">Команду «%s» розпізнано, але вона не підтримується в гілках.</string>
     <string name="search_thread_from_a_thread">З гілки</string>
     <string name="thread_list_empty_notice">Порада: Торкніться й утримуйте повідомлення і виберіть «%s».</string>
@@ -2623,4 +2625,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">Кінцеву точку успішно зареєстровано на домашньому сервері.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Реєстрація кінцевої точки</string>
     <string name="action_next">Далі</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Результати будуть видимі після завершення опитування</string>
+    <string name="labs_enable_msc3061_share_history_desc">Коли запросити когось у зашифровану кімнату, яка поширює історію, зашифрована історія буде видимою.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Поширення ключів кімнати для минулих повідомлень</string>
+    <string name="send_your_first_msg_to_invite">Надішліть своє перше повідомлення, щоб запросити %s до бесіди</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Повідомлення в цій бесіді будуть захищені наскрізним шифруванням.</string>
+    <string name="create_room_action_go">Уперед</string>
+</resources>
\ No newline at end of file

From bd7d3c5563d687f840f8ac1d8064b9ba682f6448 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 14 Jul 2022 02:59:51 +0000
Subject: [PATCH 18/48] Translated using Weblate (Chinese (Traditional))

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

diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 89b2a723e1..c04e293787 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1671,7 +1671,7 @@
     <string name="bad_passphrase_key_reset_all_action">忘記或遺失所有復原選項？重設所有東西</string>
     <string name="direct_room_created_summary_item_by_you">您已加入。</string>
     <string name="direct_room_created_summary_item">%s 已加入。</string>
-    <string name="direct_room_encryption_enabled_tile_description">此聊天室中的訊息有端到端加密。</string>
+    <string name="direct_room_encryption_enabled_tile_description">此聊天中的訊息有端到端加密。</string>
     <string name="direct_room_profile_section_more_leave">離開</string>
     <string name="direct_room_profile_section_more_settings">設定</string>
     <string name="direct_room_profile_encrypted_subtitle">這裡的訊息有端到端加密。
@@ -2481,4 +2481,10 @@
     <string name="settings_troubleshoot_test_endpoint_registration_success">端點成功註冊至家伺服器。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">端點註冊</string>
     <string name="action_next">下一步</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">結果將在投票結束時可見</string>
+    <string name="labs_enable_msc3061_share_history_desc">在分享歷史的加密聊天室中邀請時，加密歷史會是可見的。</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061：為過去的訊息分享聊天室金鑰</string>
+    <string name="send_your_first_msg_to_invite">傳送您的第一則訊息以邀請 %s 來聊天</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">此聊天中的訊息將會是端到端加密。</string>
+    <string name="create_room_action_go">到</string>
+</resources>
\ No newline at end of file

From 69979aa7614c71a5c197fcdeaf4b1edbd2e7b53f Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Thu, 14 Jul 2022 14:23:41 +0000
Subject: [PATCH 19/48] Translated using Weblate (French)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
---
 fastlane/metadata/android/fr-FR/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/fr-FR/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104260.txt b/fastlane/metadata/android/fr-FR/changelogs/40104260.txt
new file mode 100644
index 0000000000..2abff13ba4
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Utilisation de UnifiedPush qui permet aux utilisateur d’utiliser « push » sans FCM.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fr-FR/changelogs/40104270.txt b/fastlane/metadata/android/fr-FR/changelogs/40104270.txt
new file mode 100644
index 0000000000..fe61fd021c
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases

From c6d272c45e96cbea67b990601218048bce97b48d Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Wed, 13 Jul 2022 21:07:15 +0000
Subject: [PATCH 20/48] Translated using Weblate (Slovak)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sk/
---
 fastlane/metadata/android/sk/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/sk/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/sk/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/sk/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/sk/changelogs/40104260.txt b/fastlane/metadata/android/sk/changelogs/40104260.txt
new file mode 100644
index 0000000000..6980671174
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Použitie UnifiedPush a umožňuje používateľovi používať push bez FCM.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sk/changelogs/40104270.txt b/fastlane/metadata/android/sk/changelogs/40104270.txt
new file mode 100644
index 0000000000..50670f18c2
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Rôzne opravy chýb a vylepšenia stability.
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases

From b08b4324bcfdbef3a999b39634a9f36a8820413b Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 14 Jul 2022 20:21:13 +0000
Subject: [PATCH 21/48] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
---
 fastlane/metadata/android/uk/changelogs/40101000.txt | 2 +-
 fastlane/metadata/android/uk/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/uk/changelogs/40104270.txt | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/uk/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/uk/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/uk/changelogs/40101000.txt b/fastlane/metadata/android/uk/changelogs/40101000.txt
index 36870f5ef7..1b7d25f1b9 100644
--- a/fastlane/metadata/android/uk/changelogs/40101000.txt
+++ b/fastlane/metadata/android/uk/changelogs/40101000.txt
@@ -1,2 +1,2 @@
-Основні зміни в цій версії: поліпшення VoIP (аудіо та відео дзвінки в DM) та виправлення помилок!
+Основні зміни в цій версії: поліпшення VoIP (аудіо та відеовиклики у ПП) та виправлення помилок!
 Повний журнал змін: https://github.com/vector-im/element-android/releases/tag/v1.1.0
diff --git a/fastlane/metadata/android/uk/changelogs/40104260.txt b/fastlane/metadata/android/uk/changelogs/40104260.txt
new file mode 100644
index 0000000000..3e3219946a
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Застосовано UnifiedPush і дозволено користувачам отримувати push-сповіщення без FCM.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/uk/changelogs/40104270.txt b/fastlane/metadata/android/uk/changelogs/40104270.txt
new file mode 100644
index 0000000000..9664c615c1
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Усунуто різні вади й поліпшено стабільність.
+Перелік усіх змін: https://github.com/vector-im/element-android/releases

From 13218365bb8d9301fafff7ff3679e300534c486f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Fri, 15 Jul 2022 19:51:19 +0000
Subject: [PATCH 22/48] Translated using Weblate (Estonian)

Currently translated at 100.0% (70 of 70 strings)

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

diff --git a/fastlane/metadata/android/et/changelogs/40104260.txt b/fastlane/metadata/android/et/changelogs/40104260.txt
new file mode 100644
index 0000000000..2241582817
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: võimalus kasutada tõukesõnumite jaoks FCM'i asemel UnifiedPush'i.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/et/changelogs/40104270.txt b/fastlane/metadata/android/et/changelogs/40104270.txt
new file mode 100644
index 0000000000..1df5ac4176
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases

From fcc70c7bc8611ff9fa99d0fd0e14ac3ffe59a0db Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 13 Jul 2022 10:10:18 +0000
Subject: [PATCH 23/48] Translated using Weblate (Italian)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
---
 fastlane/metadata/android/it-IT/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/it-IT/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/it-IT/changelogs/40104260.txt b/fastlane/metadata/android/it-IT/changelogs/40104260.txt
new file mode 100644
index 0000000000..d52ed6b769
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: utilizza UnifiedPush e consente all'utente di avere notifiche push senza FCM.
+Cronologia completa: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/it-IT/changelogs/40104270.txt b/fastlane/metadata/android/it-IT/changelogs/40104270.txt
new file mode 100644
index 0000000000..556a6fc7ea
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: varie correzioni di errori e miglioramenti della stabilità.
+Cronologia completa: https://github.com/vector-im/element-android/releases

From da4e77bca4b291858031f47a54319c42cd352b79 Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Wed, 13 Jul 2022 11:21:25 +0000
Subject: [PATCH 24/48] Translated using Weblate (Persian)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
---
 fastlane/metadata/android/fa/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/fa/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/fa/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/fa/changelogs/40104260.txt b/fastlane/metadata/android/fa/changelogs/40104260.txt
new file mode 100644
index 0000000000..2e6de40015
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: استفاده از UnifiedPush و اجازه به کاربر برای داشتن آگاهی‌های ارسالی بدون FCM.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/fa/changelogs/40104270.txt b/fastlane/metadata/android/fa/changelogs/40104270.txt
new file mode 100644
index 0000000000..29efb95925
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases

From 982340b6b868fc47ba07dd99b1e37d068269eb65 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 14 Jul 2022 02:57:12 +0000
Subject: [PATCH 25/48] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
---
 fastlane/metadata/android/zh-TW/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/zh-TW/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104260.txt b/fastlane/metadata/android/zh-TW/changelogs/40104260.txt
new file mode 100644
index 0000000000..7569b4f491
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：使用 UnifiedPush 並允許使用者在沒有 FCM 的情況下推送。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/zh-TW/changelogs/40104270.txt b/fastlane/metadata/android/zh-TW/changelogs/40104270.txt
new file mode 100644
index 0000000000..4bcca9a0b8
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：多個臭蟲修復與穩定性改善。
+完整的變更紀錄：https://github.com/vector-im/element-android/releases

From b820434cea120c4ea61873ba305c6f545b4cb726 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 13 Jul 2022 11:11:55 +0000
Subject: [PATCH 26/48] Translated using Weblate (Czech)

Currently translated at 100.0% (70 of 70 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/40104260.txt | 2 ++
 fastlane/metadata/android/cs-CZ/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/cs-CZ/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/cs-CZ/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104260.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104260.txt
new file mode 100644
index 0000000000..721c24555b
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Podpora UnifiedPush a možnost používat push bez FCM.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40104270.txt b/fastlane/metadata/android/cs-CZ/changelogs/40104270.txt
new file mode 100644
index 0000000000..578549ce6c
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases

From 0d63608d6e36b97dbc0be20a68c926fa5ba73ee2 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Fri, 15 Jul 2022 12:11:40 +0000
Subject: [PATCH 27/48] Translated using Weblate (Indonesian)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
---
 fastlane/metadata/android/id/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/id/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/id/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/id/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/id/changelogs/40104260.txt b/fastlane/metadata/android/id/changelogs/40104260.txt
new file mode 100644
index 0000000000..bfd9637fda
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Dukungan UnifiedPush, memungkinkan pengguna untuk diberitahukan tanpa FCM.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/id/changelogs/40104270.txt b/fastlane/metadata/android/id/changelogs/40104270.txt
new file mode 100644
index 0000000000..1017951d47
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Banyak perbaikan kutu dan perbaikan stabilitas.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases

From e2cd75284fc6a2e1a3946fec8b35ab4a8588e320 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 18 Jul 2022 18:46:03 +0300
Subject: [PATCH 28/48] Check user power level before sharing live location.

---
 .../location/LocationSharingAction.kt         |  1 +
 .../location/LocationSharingFragment.kt       | 29 ++++++++++++-----
 .../location/LocationSharingViewEvents.kt     |  3 ++
 .../location/LocationSharingViewModel.kt      | 32 +++++++++++++++++++
 .../location/LocationSharingViewState.kt      |  3 +-
 vector/src/main/res/values/strings.xml        |  2 ++
 6 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
index d86d97e6b0..264b1f0e0b 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
@@ -23,5 +23,6 @@ sealed class LocationSharingAction : VectorViewModelAction {
     data class PinnedLocationSharing(val locationData: LocationData?) : LocationSharingAction()
     data class LocationTargetChange(val locationData: LocationData) : LocationSharingAction()
     object ZoomToUserLocation : LocationSharingAction()
+    object LiveLocationSharingRequested : LocationSharingAction()
     data class StartLiveLocationSharing(val durationMillis: Long) : LocationSharingAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index be5f0aed6f..d131ff3f74 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -104,6 +104,9 @@ class LocationSharingFragment @Inject constructor(
                 LocationSharingViewEvents.LocationNotAvailableError -> handleLocationNotAvailableError()
                 is LocationSharingViewEvents.ZoomToUserLocation -> handleZoomToUserLocationEvent(it)
                 is LocationSharingViewEvents.StartLiveLocationService -> handleStartLiveLocationService(it)
+                LocationSharingViewEvents.ChooseLiveLocationDuration -> handleChooseLiveLocationDuration()
+                LocationSharingViewEvents.ShowLabsFlagPromotion -> handleShowLabsFlagPromotion()
+                LocationSharingViewEvents.LiveLocationSharingNotEnoughPermission -> handleLiveLocationSharingNotEnoughPermission()
             }
         }
     }
@@ -168,6 +171,16 @@ class LocationSharingFragment @Inject constructor(
                 .show()
     }
 
+    private fun handleLiveLocationSharingNotEnoughPermission() {
+        MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(R.string.live_location_not_enough_permission_dialog_title)
+                .setMessage(R.string.live_location_not_enough_permission_dialog_description)
+                .setPositiveButton(R.string.ok) { dialogInterface, _ ->
+                    dialogInterface.dismiss()
+                }
+                .show()
+    }
+
     private fun initLocateButton() {
         views.mapView.locateButton.setOnClickListener {
             viewModel.handle(LocationSharingAction.ZoomToUserLocation)
@@ -201,7 +214,7 @@ class LocationSharingFragment @Inject constructor(
             viewModel.handle(LocationSharingAction.CurrentUserLocationSharing)
         }
         views.shareLocationOptionsPicker.optionUserLive.debouncedClicks {
-            tryStartLiveLocationSharing()
+            viewModel.handle(LocationSharingAction.LiveLocationSharingRequested)
         }
     }
 
@@ -212,13 +225,13 @@ class LocationSharingFragment @Inject constructor(
         }
     }
 
-    private fun tryStartLiveLocationSharing() {
-        if (vectorPreferences.labsEnableLiveLocation()) {
-            startLiveLocationSharing()
-        } else {
-            LiveLocationLabsFlagPromotionBottomSheet.newInstance()
-                    .show(requireActivity().supportFragmentManager, "DISPLAY_LIVE_LOCATION_LABS_FLAG_PROMOTION")
-        }
+    private fun handleChooseLiveLocationDuration() {
+        startLiveLocationSharing()
+    }
+
+    private fun handleShowLabsFlagPromotion() {
+        LiveLocationLabsFlagPromotionBottomSheet.newInstance()
+                .show(requireActivity().supportFragmentManager, "DISPLAY_LIVE_LOCATION_LABS_FLAG_PROMOTION")
     }
 
     private val foregroundLocationResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewEvents.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewEvents.kt
index 1116003e41..c9e411c8d7 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewEvents.kt
@@ -23,4 +23,7 @@ sealed class LocationSharingViewEvents : VectorViewEvents {
     object LocationNotAvailableError : LocationSharingViewEvents()
     data class ZoomToUserLocation(val userLocation: LocationData) : LocationSharingViewEvents()
     data class StartLiveLocationService(val sessionId: String, val roomId: String, val durationMillis: Long) : LocationSharingViewEvents()
+    object ChooseLiveLocationDuration : LocationSharingViewEvents()
+    object ShowLabsFlagPromotion : LocationSharingViewEvents()
+    object LiveLocationSharingNotEnoughPermission : LocationSharingViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index b9a2dc830c..8e166ee350 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -26,6 +26,8 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
 import im.vector.app.features.location.domain.usecase.CompareLocationsUseCase
+import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
+import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.lastOrNull
@@ -36,8 +38,10 @@ import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.getUser
+import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.util.toMatrixItem
 import timber.log.Timber
 
@@ -52,6 +56,7 @@ class LocationSharingViewModel @AssistedInject constructor(
         private val locationPinProvider: LocationPinProvider,
         private val session: Session,
         private val compareLocationsUseCase: CompareLocationsUseCase,
+        private val vectorPreferences: VectorPreferences,
 ) : VectorViewModel<LocationSharingViewState, LocationSharingAction, LocationSharingViewEvents>(initialState), LocationTracker.Callback {
 
     private val room = session.getRoom(initialState.roomId)!!
@@ -70,6 +75,22 @@ class LocationSharingViewModel @AssistedInject constructor(
         setUserItem()
         updatePin()
         compareTargetAndUserLocation()
+        checkPowerLevelsForLiveLocationSharing()
+    }
+
+    private fun checkPowerLevelsForLiveLocationSharing() {
+        PowerLevelsFlowFactory(room).createFlow()
+                .distinctUntilChanged()
+                .onEach {
+                    val powerLevelsHelper = PowerLevelsHelper(it)
+                    val canShareLiveLocation = EventType.STATE_ROOM_BEACON_INFO
+                            .map { beaconInfoType ->
+                                powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, beaconInfoType)
+                            }
+                            .all { isUserAllowed -> isUserAllowed }
+
+                    setState { copy(canShareLiveLocation = canShareLiveLocation) }
+                }.launchIn(viewModelScope)
     }
 
     private fun initLocationTracking() {
@@ -130,10 +151,21 @@ class LocationSharingViewModel @AssistedInject constructor(
             is LocationSharingAction.PinnedLocationSharing -> handlePinnedLocationSharingAction(action)
             is LocationSharingAction.LocationTargetChange -> handleLocationTargetChangeAction(action)
             LocationSharingAction.ZoomToUserLocation -> handleZoomToUserLocationAction()
+            LocationSharingAction.LiveLocationSharingRequested -> handleLiveLocationSharingRequestedAction()
             is LocationSharingAction.StartLiveLocationSharing -> handleStartLiveLocationSharingAction(action.durationMillis)
         }
     }
 
+    private fun handleLiveLocationSharingRequestedAction() = withState { state ->
+        if (!state.canShareLiveLocation) {
+            _viewEvents.post(LocationSharingViewEvents.LiveLocationSharingNotEnoughPermission)
+        } else if (vectorPreferences.labsEnableLiveLocation()) {
+            _viewEvents.post(LocationSharingViewEvents.ChooseLiveLocationDuration)
+        } else {
+            _viewEvents.post(LocationSharingViewEvents.ShowLabsFlagPromotion)
+        }
+    }
+
     private fun handleCurrentUserLocationSharingAction() = withState { state ->
         shareLocation(state.lastKnownUserLocation, isUserLocation = true)
     }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
index 64f324bc1b..d5226eacfb 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
@@ -34,7 +34,8 @@ data class LocationSharingViewState(
         val userItem: MatrixItem.UserItem? = null,
         val areTargetAndUserLocationEqual: Boolean? = null,
         val lastKnownUserLocation: LocationData? = null,
-        val locationTargetDrawable: Drawable? = null
+        val locationTargetDrawable: Drawable? = null,
+        val canShareLiveLocation: Boolean = false,
 ) : MavericksState {
 
     constructor(locationSharingArgs: LocationSharingArgs) : this(
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index ae5834c250..bd5860c1ab 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3054,6 +3054,8 @@
     <!-- TODO remove key -->
     <string name="live_location_bottom_sheet_stop_sharing" tools:ignore="UnusedResources">Stop sharing</string>
     <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
+    <string name="live_location_not_enough_permission_dialog_title">You don’t have permission to share locations</string>
+    <string name="live_location_not_enough_permission_dialog_description">You need to have the right permissions in order to share locations in this room.</string>
 
     <string name="message_bubbles">Show Message bubbles</string>
 

From 5fb10ab28760f1a330c93fc33241156181dda8e4 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 18 Jul 2022 18:52:37 +0300
Subject: [PATCH 29/48] Changelog added.

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

diff --git a/changelog.d/6587.bugfix b/changelog.d/6587.bugfix
new file mode 100644
index 0000000000..0273689cfd
--- /dev/null
+++ b/changelog.d/6587.bugfix
@@ -0,0 +1 @@
+Check user power level before sharing live location

From 493dc57a292e0ed708727d2bc1f7e2f9a2fbece6 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 19 Jul 2022 13:41:00 +0300
Subject: [PATCH 30/48] Code review fixes.

---
 .../features/location/LocationSharingFragment.kt    |  4 +---
 .../features/location/LocationSharingViewModel.kt   | 13 ++++++-------
 vector/src/main/res/values/strings.xml              |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index d131ff3f74..17e53e63d1 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -175,9 +175,7 @@ class LocationSharingFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireActivity())
                 .setTitle(R.string.live_location_not_enough_permission_dialog_title)
                 .setMessage(R.string.live_location_not_enough_permission_dialog_description)
-                .setPositiveButton(R.string.ok) { dialogInterface, _ ->
-                    dialogInterface.dismiss()
-                }
+                .setPositiveButton(R.string.ok, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index 8e166ee350..8056b72d57 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -75,22 +75,21 @@ class LocationSharingViewModel @AssistedInject constructor(
         setUserItem()
         updatePin()
         compareTargetAndUserLocation()
-        checkPowerLevelsForLiveLocationSharing()
+        observePowerLevelsForLiveLocationSharing()
     }
 
-    private fun checkPowerLevelsForLiveLocationSharing() {
+    private fun observePowerLevelsForLiveLocationSharing() {
         PowerLevelsFlowFactory(room).createFlow()
                 .distinctUntilChanged()
-                .onEach {
+                .setOnEach {
                     val powerLevelsHelper = PowerLevelsHelper(it)
                     val canShareLiveLocation = EventType.STATE_ROOM_BEACON_INFO
-                            .map { beaconInfoType ->
+                            .all { beaconInfoType ->
                                 powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, beaconInfoType)
                             }
-                            .all { isUserAllowed -> isUserAllowed }
 
-                    setState { copy(canShareLiveLocation = canShareLiveLocation) }
-                }.launchIn(viewModelScope)
+                    copy(canShareLiveLocation = canShareLiveLocation)
+                }
     }
 
     private fun initLocationTracking() {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index bd5860c1ab..69ea15ea9b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3054,8 +3054,8 @@
     <!-- TODO remove key -->
     <string name="live_location_bottom_sheet_stop_sharing" tools:ignore="UnusedResources">Stop sharing</string>
     <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
-    <string name="live_location_not_enough_permission_dialog_title">You don’t have permission to share locations</string>
-    <string name="live_location_not_enough_permission_dialog_description">You need to have the right permissions in order to share locations in this room.</string>
+    <string name="live_location_not_enough_permission_dialog_title">You don’t have permission to share live location</string>
+    <string name="live_location_not_enough_permission_dialog_description">You need to have the right permissions in order to share live location in this room.</string>
 
     <string name="message_bubbles">Show Message bubbles</string>
 

From cc1e1fe8eb56795add763aaa499e69d2045385d8 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 19 Jul 2022 14:51:07 +0200
Subject: [PATCH 31/48] Enables trailing comma editor config

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

diff --git a/.editorconfig b/.editorconfig
index 231d35cfe4..4f23d46afd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -770,7 +770,7 @@ ij_kotlin_align_multiline_extends_list = false
 ij_kotlin_align_multiline_method_parentheses = false
 ij_kotlin_align_multiline_parameters = true
 ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = false
 ij_kotlin_assignment_wrap = off
 ij_kotlin_blank_lines_after_class_header = 0

From 8c53d2f9b06b3c16e57f52608809696e134dc9a0 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Tue, 19 Jul 2022 15:11:42 +0200
Subject: [PATCH 32/48] Reformats modules

---
 .../registration/DefaultRegistrationWizard.kt | 44 +++++++++----------
 .../sdk/internal/crypto/MXOlmDevice.kt        | 22 +++++-----
 .../megolm/MXMegolmDecryptionFactory.kt       |  3 +-
 .../algorithms/megolm/MXMegolmEncryption.kt   |  6 ++-
 .../matrix/android/sdk/internal/util/fatal.kt |  2 +-
 .../analytics/extensions/SignUpExt.kt         |  6 +--
 .../app/features/home/AvatarRenderer.kt       | 12 ++---
 .../vector/app/features/home/HomeActivity.kt  |  2 +-
 .../home/room/detail/TimelineFragment.kt      |  4 +-
 .../timeline/factory/EncryptionItemFactory.kt |  4 +-
 .../home/room/list/RoomListViewModel.kt       | 22 +++++-----
 .../app/features/html/EventHtmlRenderer.kt    | 40 ++++++++---------
 ...iveLocationLabsFlagPromotionBottomSheet.kt |  2 +-
 .../onboarding/AuthenticationDescription.kt   | 14 +++---
 .../onboarding/OnboardingViewModel.kt         |  2 +-
 .../onboarding/ftueauth/FtueExtensions.kt     |  2 +-
 .../biometrics/BiometricAuthError.kt          |  2 +-
 .../lockscreen/biometrics/BiometricHelper.kt  | 30 +++++++------
 .../crypto/LockScreenKeyRepository.kt         |  2 +-
 .../pin/lockscreen/ui/LockScreenFragment.kt   |  8 ++--
 .../pin/lockscreen/ui/LockScreenViewModel.kt  |  2 +-
 .../pin/lockscreen/utils/DevicePromptCheck.kt |  8 ++--
 .../settings/font/FontScaleSettingFragment.kt |  2 +-
 .../signout/soft/SoftLogoutController.kt      | 20 ++++-----
 24 files changed, 135 insertions(+), 126 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
index 56425cbc74..46ebbb7b71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
@@ -37,9 +37,9 @@ import org.matrix.android.sdk.internal.auth.db.PendingSessionData
  * This class execute the registration request and is responsible to keep the session of interactive authentication.
  */
 internal class DefaultRegistrationWizard(
-    authAPI: AuthAPI,
-    private val sessionCreator: SessionCreator,
-    private val pendingSessionStore: PendingSessionStore
+        authAPI: AuthAPI,
+        private val sessionCreator: SessionCreator,
+        private val pendingSessionStore: PendingSessionStore
 ) : RegistrationWizard {
 
     private var pendingSessionData: PendingSessionData = pendingSessionStore.getPendingSessionData() ?: error("Pending session data should exist here")
@@ -74,20 +74,20 @@ internal class DefaultRegistrationWizard(
             initialDeviceDisplayName: String?
     ): RegistrationResult {
         val params = RegistrationParams(
-            username = userName,
-            password = password,
-            initialDeviceDisplayName = initialDeviceDisplayName
+                username = userName,
+                password = password,
+                initialDeviceDisplayName = initialDeviceDisplayName
         )
         return performRegistrationRequest(params, LoginType.PASSWORD)
-            .also {
-                pendingSessionData = pendingSessionData.copy(isRegistrationStarted = true)
-                    .also { pendingSessionStore.savePendingSessionData(it) }
-            }
+                .also {
+                    pendingSessionData = pendingSessionData.copy(isRegistrationStarted = true)
+                            .also { pendingSessionStore.savePendingSessionData(it) }
+                }
     }
 
     override suspend fun performReCaptcha(response: String): RegistrationResult {
         val safeSession = pendingSessionData.currentSession
-            ?: throw IllegalStateException("developer error, call createAccount() method first")
+                ?: throw IllegalStateException("developer error, call createAccount() method first")
 
         val params = RegistrationParams(auth = AuthParams.createForCaptcha(safeSession, response))
         return performRegistrationRequest(params, LoginType.PASSWORD)
@@ -95,7 +95,7 @@ internal class DefaultRegistrationWizard(
 
     override suspend fun acceptTerms(): RegistrationResult {
         val safeSession = pendingSessionData.currentSession
-            ?: throw IllegalStateException("developer error, call createAccount() method first")
+                ?: throw IllegalStateException("developer error, call createAccount() method first")
 
         val params = RegistrationParams(auth = AuthParams(type = LoginFlowTypes.TERMS, session = safeSession))
         return performRegistrationRequest(params, LoginType.PASSWORD)
@@ -103,14 +103,14 @@ internal class DefaultRegistrationWizard(
 
     override suspend fun addThreePid(threePid: RegisterThreePid): RegistrationResult {
         pendingSessionData = pendingSessionData.copy(currentThreePidData = null)
-            .also { pendingSessionStore.savePendingSessionData(it) }
+                .also { pendingSessionStore.savePendingSessionData(it) }
 
         return sendThreePid(threePid)
     }
 
     override suspend fun sendAgainThreePid(): RegistrationResult {
         val safeCurrentThreePid = pendingSessionData.currentThreePidData?.threePid
-            ?: throw IllegalStateException("developer error, call createAccount() method first")
+                ?: throw IllegalStateException("developer error, call createAccount() method first")
 
         return sendThreePid(safeCurrentThreePid)
     }
@@ -126,7 +126,7 @@ internal class DefaultRegistrationWizard(
         )
 
         pendingSessionData = pendingSessionData.copy(sendAttempt = pendingSessionData.sendAttempt + 1)
-            .also { pendingSessionStore.savePendingSessionData(it) }
+                .also { pendingSessionStore.savePendingSessionData(it) }
 
         val params = RegistrationParams(
                 auth = if (threePid is RegisterThreePid.Email) {
@@ -149,7 +149,7 @@ internal class DefaultRegistrationWizard(
         )
         // Store data
         pendingSessionData = pendingSessionData.copy(currentThreePidData = ThreePidData.from(threePid, response, params))
-            .also { pendingSessionStore.savePendingSessionData(it) }
+                .also { pendingSessionStore.savePendingSessionData(it) }
 
         // and send the sid a first time
         return performRegistrationRequest(params, LoginType.PASSWORD)
@@ -157,7 +157,7 @@ internal class DefaultRegistrationWizard(
 
     override suspend fun checkIfEmailHasBeenValidated(delayMillis: Long): RegistrationResult {
         val safeParam = pendingSessionData.currentThreePidData?.registrationParams
-            ?: throw IllegalStateException("developer error, no pending three pid")
+                ?: throw IllegalStateException("developer error, no pending three pid")
 
         return performRegistrationRequest(safeParam, LoginType.PASSWORD, delayMillis)
     }
@@ -168,13 +168,13 @@ internal class DefaultRegistrationWizard(
 
     private suspend fun validateThreePid(code: String): RegistrationResult {
         val registrationParams = pendingSessionData.currentThreePidData?.registrationParams
-            ?: throw IllegalStateException("developer error, no pending three pid")
+                ?: throw IllegalStateException("developer error, no pending three pid")
         val safeCurrentData = pendingSessionData.currentThreePidData ?: throw IllegalStateException("developer error, call createAccount() method first")
         val url = safeCurrentData.addThreePidRegistrationResponse.submitUrl ?: throw IllegalStateException("Missing url to send the code")
         val validationBody = ValidationCodeBody(
-            clientSecret = pendingSessionData.clientSecret,
-            sid = safeCurrentData.addThreePidRegistrationResponse.sid,
-            code = code
+                clientSecret = pendingSessionData.clientSecret,
+                sid = safeCurrentData.addThreePidRegistrationResponse.sid,
+                code = code
         )
         val validationResponse = validateCodeTask.execute(ValidateCodeTask.Params(url, validationBody))
         if (validationResponse.isSuccess()) {
@@ -189,7 +189,7 @@ internal class DefaultRegistrationWizard(
 
     override suspend fun dummy(): RegistrationResult {
         val safeSession = pendingSessionData.currentSession
-            ?: throw IllegalStateException("developer error, call createAccount() method first")
+                ?: throw IllegalStateException("developer error, call createAccount() method first")
 
         val params = RegistrationParams(auth = AuthParams(type = LoginFlowTypes.DUMMY, session = safeSession))
         return performRegistrationRequest(params, LoginType.PASSWORD)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index c4a6488258..0e511e14c2 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -604,14 +604,16 @@ internal class MXOlmDevice @Inject constructor(
      * @param sharedHistory MSC3061, this key is sharable on invite
      * @return true if the operation succeeds.
      */
-    fun addInboundGroupSession(sessionId: String,
-                               sessionKey: String,
-                               roomId: String,
-                               senderKey: String,
-                               forwardingCurve25519KeyChain: List<String>,
-                               keysClaimed: Map<String, String>,
-                               exportFormat: Boolean,
-                               sharedHistory: Boolean): AddSessionResult {
+    fun addInboundGroupSession(
+            sessionId: String,
+            sessionKey: String,
+            roomId: String,
+            senderKey: String,
+            forwardingCurve25519KeyChain: List<String>,
+            keysClaimed: Map<String, String>,
+            exportFormat: Boolean,
+            sharedHistory: Boolean
+    ): AddSessionResult {
         val candidateSession = tryOrNull("Failed to create inbound session in room $roomId") {
             if (exportFormat) {
                 OlmInboundGroupSession.importSession(sessionKey)
@@ -701,8 +703,8 @@ internal class MXOlmDevice @Inject constructor(
             val senderKey = megolmSessionData.senderKey ?: continue
             val roomId = megolmSessionData.roomId
 
-            val candidateSessionToImport =  try {
-                 MXInboundMegolmSessionWrapper.newFromMegolmData(megolmSessionData, true)
+            val candidateSessionToImport = try {
+                MXInboundMegolmSessionWrapper.newFromMegolmData(megolmSessionData, true)
             } catch (e: Throwable) {
                 Timber.tag(loggerTag.value).e(e, "## importInboundGroupSession() : Failed to import session $senderKey/$sessionId")
                 continue
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
index 414416a0f6..38edbb7430 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt
@@ -38,6 +38,7 @@ internal class MXMegolmDecryptionFactory @Inject constructor(
                 outgoingKeyRequestManager,
                 cryptoStore,
                 matrixConfiguration,
-                eventsManager)
+                eventsManager
+        )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 48a25f2a8b..ceaee582c7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -250,8 +250,10 @@ internal class MXMegolmEncryption(
      * @param sessionInfo the session info
      * @param devicesByUser the devices map
      */
-    private suspend fun shareUserDevicesKey(sessionInfo: MXOutboundSessionInfo,
-                                            devicesByUser: Map<String, List<CryptoDeviceInfo>>) {
+    private suspend fun shareUserDevicesKey(
+            sessionInfo: MXOutboundSessionInfo,
+            devicesByUser: Map<String, List<CryptoDeviceInfo>>
+    ) {
         val sessionKey = olmDevice.getSessionKey(sessionInfo.sessionId) ?: return Unit.also {
             Timber.tag(loggerTag.value).v("shareUserDevicesKey() Failed to share session, failed to export")
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/fatal.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/fatal.kt
index 323eee0b1c..7ed807d7cc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/fatal.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/util/fatal.kt
@@ -22,7 +22,7 @@ import timber.log.Timber
 /**
  * Throws in debug, only log in production.
  * As this method does not always throw, next statement should be a return.
-*/
+ */
 internal fun fatalError(message: String) {
     if (BuildConfig.DEBUG) {
         error(message)
diff --git a/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt b/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt
index e63aafbfc4..d71e52de8c 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/extensions/SignUpExt.kt
@@ -21,11 +21,11 @@ import im.vector.app.features.onboarding.AuthenticationDescription
 
 fun AuthenticationDescription.AuthenticationType.toAnalyticsType() = when (this) {
     AuthenticationDescription.AuthenticationType.Password -> Signup.AuthenticationType.Password
-    AuthenticationDescription.AuthenticationType.Apple    -> Signup.AuthenticationType.Apple
+    AuthenticationDescription.AuthenticationType.Apple -> Signup.AuthenticationType.Apple
     AuthenticationDescription.AuthenticationType.Facebook -> Signup.AuthenticationType.Facebook
     AuthenticationDescription.AuthenticationType.GitHub -> Signup.AuthenticationType.GitHub
     AuthenticationDescription.AuthenticationType.GitLab -> Signup.AuthenticationType.GitLab
     AuthenticationDescription.AuthenticationType.Google -> Signup.AuthenticationType.Google
-    AuthenticationDescription.AuthenticationType.SSO      -> Signup.AuthenticationType.SSO
-    AuthenticationDescription.AuthenticationType.Other    -> Signup.AuthenticationType.Other
+    AuthenticationDescription.AuthenticationType.SSO -> Signup.AuthenticationType.SSO
+    AuthenticationDescription.AuthenticationType.Other -> Signup.AuthenticationType.Other
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
index 4b32f3307f..f4ffbb826a 100644
--- a/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/home/AvatarRenderer.kt
@@ -70,7 +70,7 @@ class AvatarRenderer @Inject constructor(
         render(
                 GlideApp.with(imageView),
                 matrixItem,
-                DrawableImageViewTarget(imageView)
+                DrawableImageViewTarget(imageView),
         )
     }
 
@@ -103,7 +103,7 @@ class AvatarRenderer @Inject constructor(
         render(
                 glideRequests,
                 matrixItem,
-                DrawableImageViewTarget(imageView)
+                DrawableImageViewTarget(imageView),
         )
     }
 
@@ -123,7 +123,7 @@ class AvatarRenderer @Inject constructor(
         val matrixItem = MatrixItem.UserItem(
                 // Need an id starting with @
                 id = "@${mappedContact.displayName}",
-                displayName = mappedContact.displayName
+                displayName = mappedContact.displayName,
         )
 
         val placeholder = getPlaceholderDrawable(matrixItem)
@@ -140,7 +140,7 @@ class AvatarRenderer @Inject constructor(
         val matrixItem = MatrixItem.UserItem(
                 // Need an id starting with @
                 id = profileInfo.matrixId,
-                displayName = profileInfo.displayName
+                displayName = profileInfo.displayName,
         )
 
         val placeholder = getPlaceholderDrawable(matrixItem)
@@ -215,7 +215,7 @@ class AvatarRenderer @Inject constructor(
                                 .bold()
                                 .endConfig()
                                 .buildRect(matrixItem.firstLetterOfDisplayName(), avatarColor)
-                                .toBitmap(width = iconSize, height = iconSize)
+                                .toBitmap(width = iconSize, height = iconSize),
                 )
             }
         }
@@ -231,7 +231,7 @@ class AvatarRenderer @Inject constructor(
             addPlaceholder: Boolean
     ) {
         val transformations = mutableListOf<Transformation<Bitmap>>(
-                BlurTransformation(20, sampling)
+                BlurTransformation(20, sampling),
         )
         if (colorFilter != null) {
             transformations.add(ColorFilterTransformation(colorFilter))
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index d82621977f..926c1eb113 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -219,7 +219,7 @@ class HomeActivity :
                         is HomeActivitySharedAction.ShowSpaceSettings -> showSpaceSettings(sharedAction.spaceId)
                         is HomeActivitySharedAction.OpenSpaceInvite -> openSpaceInvite(sharedAction.spaceId)
                         HomeActivitySharedAction.SendSpaceFeedBack -> bugReporter.openBugReportScreen(this, ReportType.SPACE_BETA_FEEDBACK)
-                        HomeActivitySharedAction.OnCloseSpace      -> onCloseSpace()
+                        HomeActivitySharedAction.OnCloseSpace -> onCloseSpace()
                     }
                 }
                 .launchIn(lifecycleScope)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index e86a7fe227..19c946b8d7 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -1706,7 +1706,7 @@ class TimelineFragment @Inject constructor(
 
     private fun renderToolbar(roomSummary: RoomSummary?) {
         when {
-            isLocalRoom()      -> {
+            isLocalRoom() -> {
                 views.includeRoomToolbar.roomToolbarContentView.isVisible = false
                 views.includeThreadToolbar.roomToolbarThreadConstraintLayout.isVisible = false
                 setupToolbar(views.roomToolbar)
@@ -1724,7 +1724,7 @@ class TimelineFragment @Inject constructor(
                 }
                 views.includeThreadToolbar.roomToolbarThreadTitleTextView.text = resources.getText(R.string.thread_timeline_title)
             }
-            else               -> {
+            else -> {
                 views.includeRoomToolbar.roomToolbarContentView.isVisible = true
                 views.includeThreadToolbar.roomToolbarThreadConstraintLayout.isVisible = false
                 if (roomSummary == null) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
index 5f32696334..69b4f6e039 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptionItemFactory.kt
@@ -63,10 +63,10 @@ class EncryptionItemFactory @Inject constructor(
                         isDirect && RoomLocalEcho.isLocalEchoId(event.root.roomId.orEmpty()) -> {
                             R.string.direct_room_encryption_enabled_tile_description_future
                         }
-                        isDirect                                                             -> {
+                        isDirect -> {
                             R.string.direct_room_encryption_enabled_tile_description
                         }
-                        else                                                                 -> {
+                        else -> {
                             R.string.encryption_enabled_tile_description
                         }
                     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 44d61f9ed2..77f7c148d9 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -146,17 +146,17 @@ class RoomListViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<RoomListViewModel, RoomListViewState> by hiltMavericksViewModelFactory()
 
     private val roomListSectionBuilder = RoomListSectionBuilder(
-                session,
-                stringProvider,
-                appStateHandler,
-                viewModelScope,
-                autoAcceptInvites,
-                {
-                    updatableQuery = it
-                },
-                suggestedRoomJoiningState,
-                !vectorPreferences.prefSpacesShowAllRoomInHome()
-        )
+            session,
+            stringProvider,
+            appStateHandler,
+            viewModelScope,
+            autoAcceptInvites,
+            {
+                updatableQuery = it
+            },
+            suggestedRoomJoiningState,
+            !vectorPreferences.prefSpacesShowAllRoomInHome()
+    )
 
     val sections: List<RoomsSection> by lazy {
         roomListSectionBuilder.buildSections(initialState.displayMode)
diff --git a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
index 412b28862a..725f23cddd 100644
--- a/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
@@ -85,27 +85,27 @@ class EventHtmlRenderer @Inject constructor(
     } else {
         builder
     }
-        .usePlugin(
-            MarkwonInlineParserPlugin.create(
-                /* Configuring the Markwon inline formatting processor.
-                 * Default settings are all Markdown features. Turn those off, only using the
-                 * inline HTML processor and HTML entities processor.
-                 */
-                MarkwonInlineParser.factoryBuilderNoDefaults()
-                    .addInlineProcessor(HtmlInlineProcessor()) // use inline HTML processor
-                    .addInlineProcessor(EntityInlineProcessor()) // use HTML entities processor
+            .usePlugin(
+                    MarkwonInlineParserPlugin.create(
+                            /* Configuring the Markwon inline formatting processor.
+                             * Default settings are all Markdown features. Turn those off, only using the
+                             * inline HTML processor and HTML entities processor.
+                             */
+                            MarkwonInlineParser.factoryBuilderNoDefaults()
+                                    .addInlineProcessor(HtmlInlineProcessor()) // use inline HTML processor
+                                    .addInlineProcessor(EntityInlineProcessor()) // use HTML entities processor
+                    )
             )
-        )
-        .usePlugin(object : AbstractMarkwonPlugin() {
-            override fun configureParser(builder: Parser.Builder) {
-                /* Configuring the Markwon block formatting processor.
-                 * Default settings are all Markdown blocks. Turn those off.
-                 */
-                builder.enabledBlockTypes(kotlin.collections.emptySet())
-            }
-        })
-        .textSetter(PrecomputedFutureTextSetterCompat.create())
-        .build()
+            .usePlugin(object : AbstractMarkwonPlugin() {
+                override fun configureParser(builder: Parser.Builder) {
+                    /* Configuring the Markwon block formatting processor.
+                     * Default settings are all Markdown blocks. Turn those off.
+                     */
+                    builder.enabledBlockTypes(kotlin.collections.emptySet())
+                }
+            })
+            .textSetter(PrecomputedFutureTextSetterCompat.create())
+            .build()
 
     val plugins: List<MarkwonPlugin> = markwon.plugins
 
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
index cf360ec277..be8e774ad0 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
@@ -29,7 +29,7 @@ import im.vector.app.databinding.BottomSheetLiveLocationLabsFlagPromotionBinding
  * This should not be shown if the user already enabled the labs flag.
  */
 class LiveLocationLabsFlagPromotionBottomSheet :
-    VectorBaseBottomSheetDialogFragment<BottomSheetLiveLocationLabsFlagPromotionBinding>() {
+        VectorBaseBottomSheetDialogFragment<BottomSheetLiveLocationLabsFlagPromotionBinding>() {
 
     override val showExpanded = true
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt b/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt
index 3672b8eef3..c540871ab7 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/AuthenticationDescription.kt
@@ -41,12 +41,12 @@ sealed interface AuthenticationDescription : Parcelable {
 }
 
 fun SsoIdentityProvider?.toAuthenticationType() = when (this?.brand) {
-    SsoIdentityProvider.BRAND_GOOGLE   -> AuthenticationType.Google
-    SsoIdentityProvider.BRAND_GITHUB   -> AuthenticationType.GitHub
-    SsoIdentityProvider.BRAND_APPLE    -> AuthenticationType.Apple
+    SsoIdentityProvider.BRAND_GOOGLE -> AuthenticationType.Google
+    SsoIdentityProvider.BRAND_GITHUB -> AuthenticationType.GitHub
+    SsoIdentityProvider.BRAND_APPLE -> AuthenticationType.Apple
     SsoIdentityProvider.BRAND_FACEBOOK -> AuthenticationType.Facebook
-    SsoIdentityProvider.BRAND_GITLAB   -> AuthenticationType.GitLab
-    SsoIdentityProvider.BRAND_TWITTER  -> AuthenticationType.SSO
-    null                               -> AuthenticationType.SSO
-    else                               -> AuthenticationType.SSO
+    SsoIdentityProvider.BRAND_GITLAB -> AuthenticationType.GitLab
+    SsoIdentityProvider.BRAND_TWITTER -> AuthenticationType.SSO
+    null -> AuthenticationType.SSO
+    else -> AuthenticationType.SSO
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 27c501176e..a7316584b2 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -511,7 +511,7 @@ class OnboardingViewModel @AssistedInject constructor(
                     setState { copy(isLoading = false, resetState = ResetState()) }
                     val nextEvent = when {
                         vectorFeatures.isOnboardingCombinedLoginEnabled() -> OnboardingViewEvents.OnResetPasswordComplete
-                        else                                              -> OnboardingViewEvents.OpenResetPasswordComplete
+                        else -> OnboardingViewEvents.OpenResetPasswordComplete
                     }
                     _viewEvents.post(nextEvent)
                 },
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
index 8deb10b7b8..074b6be88d 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueExtensions.kt
@@ -53,6 +53,6 @@ fun observeContentChangesAndResetErrors(username: TextInputLayout, password: Tex
 }
 
 fun ThemeProvider.ftueBreakerBackground() = when (isLightTheme()) {
-    true  -> R.drawable.bg_gradient_ftue_breaker
+    true -> R.drawable.bg_gradient_ftue_breaker
     false -> R.drawable.bg_color_background
 }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricAuthError.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricAuthError.kt
index 1b7d35879e..7a293d022e 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricAuthError.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricAuthError.kt
@@ -33,6 +33,6 @@ class BiometricAuthError(val code: Int, message: String) : Throwable(message) {
     val isAuthPermanentlyDisabledError: Boolean get() = code == BiometricPrompt.ERROR_LOCKOUT_PERMANENT
 
     companion object {
-       private val LOCKOUT_ERROR_CODES = arrayOf(BiometricPrompt.ERROR_LOCKOUT, BiometricPrompt.ERROR_LOCKOUT_PERMANENT)
+        private val LOCKOUT_ERROR_CODES = arrayOf(BiometricPrompt.ERROR_LOCKOUT, BiometricPrompt.ERROR_LOCKOUT_PERMANENT)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
index 1b510f5983..a34b284193 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
@@ -73,26 +73,30 @@ class BiometricHelper @Inject constructor(
     /**
      * Returns true if a weak biometric method (i.e.: some face or iris unlock implementations) can be used.
      */
-    val canUseWeakBiometricAuth: Boolean get() =
-        configuration.isWeakBiometricsEnabled && biometricManager.canAuthenticate(BIOMETRIC_WEAK) == BIOMETRIC_SUCCESS
+    val canUseWeakBiometricAuth: Boolean
+        get() =
+            configuration.isWeakBiometricsEnabled && biometricManager.canAuthenticate(BIOMETRIC_WEAK) == BIOMETRIC_SUCCESS
 
     /**
      * Returns true if a strong biometric method (i.e.: fingerprint, some face or iris unlock implementations) can be used.
      */
-    val canUseStrongBiometricAuth: Boolean get() =
-        configuration.isStrongBiometricsEnabled && biometricManager.canAuthenticate(BIOMETRIC_STRONG) == BIOMETRIC_SUCCESS
+    val canUseStrongBiometricAuth: Boolean
+        get() =
+            configuration.isStrongBiometricsEnabled && biometricManager.canAuthenticate(BIOMETRIC_STRONG) == BIOMETRIC_SUCCESS
 
     /**
      * Returns true if the device credentials can be used to unlock (system pin code, password, pattern, etc.).
      */
-    val canUseDeviceCredentialsAuth: Boolean get() =
-        configuration.isDeviceCredentialUnlockEnabled && biometricManager.canAuthenticate(DEVICE_CREDENTIAL) == BIOMETRIC_SUCCESS
+    val canUseDeviceCredentialsAuth: Boolean
+        get() =
+            configuration.isDeviceCredentialUnlockEnabled && biometricManager.canAuthenticate(DEVICE_CREDENTIAL) == BIOMETRIC_SUCCESS
 
     /**
      * Returns true if any system authentication method (biometric weak/strong or device credentials) can be used.
      */
     @VisibleForTesting(otherwise = PRIVATE)
-    internal val canUseAnySystemAuth: Boolean get() = canUseWeakBiometricAuth || canUseStrongBiometricAuth || canUseDeviceCredentialsAuth
+    internal val canUseAnySystemAuth: Boolean
+        get() = canUseWeakBiometricAuth || canUseStrongBiometricAuth || canUseDeviceCredentialsAuth
 
     /**
      * Returns true if any system authentication method and there is a valid associated key.
@@ -153,9 +157,9 @@ class BiometricHelper @Inject constructor(
     @SuppressLint("NewApi")
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun authenticateInternal(
-        activity: FragmentActivity,
-        checkSystemKeyExists: Boolean,
-        cryptoObject: BiometricPrompt.CryptoObject? = null,
+            activity: FragmentActivity,
+            checkSystemKeyExists: Boolean,
+            cryptoObject: BiometricPrompt.CryptoObject? = null,
     ): Flow<Boolean> {
         if (checkSystemKeyExists && !isSystemAuthEnabledAndValid) return flowOf(false)
 
@@ -189,9 +193,9 @@ class BiometricHelper @Inject constructor(
 
     @VisibleForTesting(otherwise = PRIVATE)
     internal fun authenticateWithPromptInternal(
-        activity: FragmentActivity,
-        cryptoObject: BiometricPrompt.CryptoObject? = null,
-        channel: Channel<Boolean>,
+            activity: FragmentActivity,
+            cryptoObject: BiometricPrompt.CryptoObject? = null,
+            channel: Channel<Boolean>,
     ): BiometricPrompt {
         val executor = ContextCompat.getMainExecutor(context)
         val callback = createSuspendingAuthCallback(channel, executor.asCoroutineDispatcher())
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepository.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepository.kt
index a8690f69d2..4a7bce8a52 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepository.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepository.kt
@@ -36,7 +36,7 @@ class LockScreenKeyRepository(
     private val systemKeyAlias = "$baseName.system"
 
     private val pinCodeCrypto: KeyStoreCrypto by lazy {
-        keyStoreCryptoFactory.provide(pinCodeKeyAlias,  keyNeedsUserAuthentication = false)
+        keyStoreCryptoFactory.provide(pinCodeKeyAlias, keyNeedsUserAuthentication = false)
     }
     private val systemKeyCrypto: KeyStoreCrypto by lazy {
         keyStoreCryptoFactory.provide(systemKeyAlias, keyNeedsUserAuthentication = true)
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
index 764da8cceb..0e6fdfb61e 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
@@ -114,15 +114,15 @@ class LockScreenFragment : VectorBaseFragment<FragmentLockScreenBinding>() {
     private fun handleEvent(viewEvent: LockScreenViewEvent) {
         when (viewEvent) {
             is LockScreenViewEvent.CodeCreationComplete -> lockScreenListener?.onPinCodeCreated()
-            is LockScreenViewEvent.ClearPinCode         -> {
+            is LockScreenViewEvent.ClearPinCode -> {
                 if (viewEvent.confirmationFailed) {
                     lockScreenListener?.onNewCodeValidationFailed()
                 }
                 views.codeView.clearCode()
             }
-            is LockScreenViewEvent.AuthSuccessful       -> lockScreenListener?.onAuthenticationSuccess(viewEvent.method)
-            is LockScreenViewEvent.AuthFailure          -> onAuthFailure(viewEvent.method)
-            is LockScreenViewEvent.AuthError            -> onAuthError(viewEvent.method, viewEvent.throwable)
+            is LockScreenViewEvent.AuthSuccessful -> lockScreenListener?.onAuthenticationSuccess(viewEvent.method)
+            is LockScreenViewEvent.AuthFailure -> onAuthFailure(viewEvent.method)
+            is LockScreenViewEvent.AuthError -> onAuthError(viewEvent.method, viewEvent.throwable)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
index a240af243a..39d0937323 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
@@ -94,7 +94,7 @@ class LockScreenViewModel @AssistedInject constructor(
 
     override fun handle(action: LockScreenAction) {
         when (action) {
-            is LockScreenAction.PinCodeEntered      -> onPinCodeEntered(action.value)
+            is LockScreenAction.PinCodeEntered -> onPinCodeEntered(action.value)
             is LockScreenAction.ShowBiometricPrompt -> showBiometricPrompt(action.callingActivity)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/utils/DevicePromptCheck.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/utils/DevicePromptCheck.kt
index fa1d7d5559..1760cd6c80 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/utils/DevicePromptCheck.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/utils/DevicePromptCheck.kt
@@ -48,15 +48,15 @@ object DevicePromptCheck {
      * See [this OP forum thread](https://forums.oneplus.com/threads/oneplus-7-pro-fingerprint-biometricprompt-does-not-show.1035821/).
      */
     private val isOnePlusDeviceWithNoBiometricUI: Boolean =
-        Build.BRAND.equals("OnePlus", ignoreCase = true) &&
-                !onePlusModelsWithWorkingBiometricUI.contains(Build.MODEL) &&
-                Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+            Build.BRAND.equals("OnePlus", ignoreCase = true) &&
+                    !onePlusModelsWithWorkingBiometricUI.contains(Build.MODEL) &&
+                    Build.VERSION.SDK_INT < Build.VERSION_CODES.R
 
     /**
      * Some LG models don't seem to have a system biometric prompt at all.
      */
     private val isLGDeviceWithNoBiometricUI: Boolean =
-        Build.BRAND.equals("LG", ignoreCase = true) && lgModelsWithoutBiometricUI.contains(Build.MODEL)
+            Build.BRAND.equals("LG", ignoreCase = true) && lgModelsWithoutBiometricUI.contains(Build.MODEL)
 
     /**
      * Check if this device is included in the list of devices with known Biometric Prompt issues.
diff --git a/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt b/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt
index d553c1a8ce..78c06d5969 100644
--- a/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/font/FontScaleSettingFragment.kt
@@ -31,7 +31,7 @@ import javax.inject.Inject
 
 class FontScaleSettingFragment @Inject constructor(
         private val fontListController: FontScaleSettingController
-)  : VectorBaseFragment<FragmentSettingsFontScalingBinding>(), FontScaleSettingController.Callback {
+) : VectorBaseFragment<FragmentSettingsFontScalingBinding>(), FontScaleSettingController.Callback {
 
     private val viewModel: FontScaleSettingViewModel by fragmentViewModel()
 
diff --git a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
index 265cf3199e..b1a240e942 100644
--- a/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
+++ b/vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
@@ -94,10 +94,10 @@ class SoftLogoutController @Inject constructor(
     }
 
     private fun buildForm(state: SoftLogoutViewState) = when (state.asyncHomeServerLoginFlowRequest) {
-        is Fail                   -> buildLoginErrorWithRetryItem(state.asyncHomeServerLoginFlowRequest.error)
-        is Success                -> buildLoginSuccessItem(state)
+        is Fail -> buildLoginErrorWithRetryItem(state.asyncHomeServerLoginFlowRequest.error)
+        is Success -> buildLoginSuccessItem(state)
         is Loading, Uninitialized -> buildLoadingItem()
-        is Incomplete             -> Unit
+        is Incomplete -> Unit
     }
 
     private fun buildLoadingItem() {
@@ -116,11 +116,11 @@ class SoftLogoutController @Inject constructor(
     }
 
     private fun buildLoginSuccessItem(state: SoftLogoutViewState) = when (state.asyncHomeServerLoginFlowRequest.invoke()) {
-        LoginMode.Password          -> buildLoginPasswordForm(state)
-        is LoginMode.Sso            -> buildLoginSSOForm()
+        LoginMode.Password -> buildLoginPasswordForm(state)
+        is LoginMode.Sso -> buildLoginSSOForm()
         is LoginMode.SsoAndPassword -> disambiguateLoginSSOAndPasswordForm(state)
-        LoginMode.Unsupported       -> buildLoginUnsupportedForm()
-        LoginMode.Unknown, null     -> Unit // Should not happen
+        LoginMode.Unsupported -> buildLoginUnsupportedForm()
+        LoginMode.Unknown, null -> Unit // Should not happen
     }
 
     private fun buildLoginPasswordForm(state: SoftLogoutViewState) {
@@ -148,12 +148,12 @@ class SoftLogoutController @Inject constructor(
 
     private fun disambiguateLoginSSOAndPasswordForm(state: SoftLogoutViewState) {
         when (state.loginType) {
-            LoginType.PASSWORD    -> buildLoginPasswordForm(state)
-            LoginType.SSO         -> buildLoginSSOForm()
+            LoginType.PASSWORD -> buildLoginPasswordForm(state)
+            LoginType.SSO -> buildLoginSSOForm()
             LoginType.DIRECT,
             LoginType.CUSTOM,
             LoginType.UNSUPPORTED -> buildLoginUnsupportedForm()
-            LoginType.UNKNOWN     -> Unit
+            LoginType.UNKNOWN -> Unit
         }
     }
 

From 6332668b8ce4b0c9a6374549f16cd216dc26b82c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Jul 2022 23:06:00 +0000
Subject: [PATCH 33/48] Bump libphonenumber from 8.12.51 to 8.12.52

Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.51 to 8.12.52.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.51...v8.12.52)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 6f1646ec53..ee58db748c 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -199,7 +199,7 @@ dependencies {
     implementation libs.apache.commonsImaging
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.51'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.52'
 
     testImplementation libs.tests.junit
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
diff --git a/vector/build.gradle b/vector/build.gradle
index aba53bf89c..e4313770c4 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -437,7 +437,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.51'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.52'
 
     // FlowBinding
     implementation libs.github.flowBinding

From 309642845e2ee0f9ce790ea70a89c6c196a52ea7 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 18 Jul 2022 17:16:37 +0200
Subject: [PATCH 34/48] fix backup looping same keys

---
 .../crypto/keysbackup/KeysBackupTest.kt       |  2 --
 .../crypto/InboundGroupSessionStore.kt        | 32 ++-----------------
 .../keysbackup/DefaultKeysBackupService.kt    |  2 ++
 .../crypto/store/db/RealmCryptoStore.kt       |  8 ++++-
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index e160938721..2439119f01 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -24,7 +24,6 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -56,7 +55,6 @@ import java.util.concurrent.CountDownLatch
 @RunWith(AndroidJUnit4::class)
 @FixMethodOrder(MethodSorters.JVM)
 @LargeTest
-@Ignore
 class KeysBackupTest : InstrumentedTest {
 
     @get:Rule val rule = RetryTestRule(3)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
index ab7cbb74b1..39dfb72149 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/InboundGroupSessionStore.kt
@@ -21,13 +21,10 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
-import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.internal.crypto.model.MXInboundMegolmSessionWrapper
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import timber.log.Timber
-import java.util.Timer
-import java.util.TimerTask
 import javax.inject.Inject
 
 internal data class InboundGroupSessionHolder(
@@ -57,18 +54,13 @@ internal class InboundGroupSessionStore @Inject constructor(
             if (oldValue != null) {
                 cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
                     Timber.tag(loggerTag.value).v("## Inbound: entryRemoved ${oldValue.wrapper.roomId}-${oldValue.wrapper.senderKey}")
-                    store.storeInboundGroupSessions(listOf(oldValue).map { it.wrapper })
+                    // store.storeInboundGroupSessions(listOf(oldValue).map { it.wrapper })
                     oldValue.wrapper.session.releaseSession()
                 }
             }
         }
     }
 
-    private val timer = Timer()
-    private var timerTask: TimerTask? = null
-
-    private val dirtySession = mutableListOf<InboundGroupSessionHolder>()
-
     @Synchronized
     fun clear() {
         sessionCache.evictAll()
@@ -90,7 +82,6 @@ internal class InboundGroupSessionStore @Inject constructor(
     @Synchronized
     fun replaceGroupSession(old: InboundGroupSessionHolder, new: InboundGroupSessionHolder, sessionId: String, senderKey: String) {
         Timber.tag(loggerTag.value).v("## Replacing outdated session ${old.wrapper.roomId}-${old.wrapper.senderKey}")
-        dirtySession.remove(old)
         store.removeInboundGroupSession(sessionId, senderKey)
         sessionCache.remove(CacheKey(sessionId, senderKey))
 
@@ -107,33 +98,14 @@ internal class InboundGroupSessionStore @Inject constructor(
 
     private fun internalStoreGroupSession(holder: InboundGroupSessionHolder, sessionId: String, senderKey: String) {
         Timber.tag(loggerTag.value).v("## Inbound: getInboundGroupSession mark as dirty ${holder.wrapper.roomId}-${holder.wrapper.senderKey}")
-        // We want to batch this a bit for performances
-        dirtySession.add(holder)
 
         if (sessionCache[CacheKey(sessionId, senderKey)] == null) {
             // first time seen, put it in memory cache while waiting for batch insert
             // If it's already known, no need to update cache it's already there
             sessionCache.put(CacheKey(sessionId, senderKey), holder)
         }
-
-        timerTask?.cancel()
-        timerTask = object : TimerTask() {
-            override fun run() {
-                batchSave()
-            }
-        }
-        timer.schedule(timerTask!!, 300)
-    }
-
-    @Synchronized
-    private fun batchSave() {
-        val toSave = mutableListOf<InboundGroupSessionHolder>().apply { addAll(dirtySession) }
-        dirtySession.clear()
         cryptoCoroutineScope.launch(coroutineDispatchers.crypto) {
-            Timber.tag(loggerTag.value).v("## Inbound: getInboundGroupSession batching save of ${toSave.size}")
-            tryOrNull {
-                store.storeInboundGroupSessions(toSave.map { it.wrapper })
-            }
+            store.storeInboundGroupSessions(listOf(holder.wrapper))
         }
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
index 49cf60d051..8691c08779 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
@@ -1349,6 +1349,8 @@ internal class DefaultKeysBackupService @Inject constructor(
 
                                         // Mark keys as backed up
                                         cryptoStore.markBackupDoneForInboundGroupSessions(olmInboundGroupSessionWrappers)
+                                        // we can release the sessions now
+                                        olmInboundGroupSessionWrappers.onEach { it.session.releaseSession() }
 
                                         if (olmInboundGroupSessionWrappers.size < KEY_BACKUP_SEND_KEYS_MAX_COUNT) {
                                             Timber.v("backupKeys: All keys have been backed up")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
index 20ca357d1a..f5468634cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
@@ -763,11 +763,17 @@ internal class RealmCryptoStore @Inject constructor(
 //                    } ?: false
                 val key = OlmInboundGroupSessionEntity.createPrimaryKey(sessionIdentifier, wrapper.sessionData.senderKey)
 
+                val existing = realm.where<OlmInboundGroupSessionEntity>()
+                        .equalTo(OlmInboundGroupSessionEntityFields.PRIMARY_KEY, key)
+                        .findFirst()
+
                 val realmOlmInboundGroupSession = OlmInboundGroupSessionEntity().apply {
                     primaryKey = key
                     store(wrapper)
+                    backedUp = existing?.backedUp ?: false
                 }
-                Timber.i("## CRYPTO | shouldShareHistory: ${wrapper.sessionData.sharedHistory} for $key")
+
+                Timber.v("## CRYPTO | shouldShareHistory: ${wrapper.sessionData.sharedHistory} for $key")
                 realm.insertOrUpdate(realmOlmInboundGroupSession)
             }
         }

From 51376cc202c3f1e12aea00f0f3694f8c4111128b Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 18 Jul 2022 17:21:41 +0200
Subject: [PATCH 35/48] add change log

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

diff --git a/changelog.d/6585.bugfix b/changelog.d/6585.bugfix
new file mode 100644
index 0000000000..63bf5a0af6
--- /dev/null
+++ b/changelog.d/6585.bugfix
@@ -0,0 +1 @@
+Fix backup saving several times the same keys

From 78afa3f100f2d4da8f9d22150d4713369e9eba0d Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Tue, 19 Jul 2022 09:22:20 +0200
Subject: [PATCH 36/48] no need to store inbound after decrypt

---
 .../java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
index c4a6488258..a4575cf593 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
@@ -806,7 +806,6 @@ internal class MXOlmDevice @Inject constructor(
             }
             replayAttackMap[messageIndexKey] = eventId
         }
-        inboundGroupSessionStore.storeInBoundGroupSession(sessionHolder, sessionId, senderKey)
         val payload = try {
             val adapter = MoshiProvider.providesMoshi().adapter<JsonDict>(JSON_DICT_PARAMETERIZED_TYPE)
             val payloadString = convertFromUTF8(decryptResult.mDecryptedMessage)

From 3ad754e732cdc9b17cf2baa5ca4de1525a40bb7d Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 19 Jul 2022 14:51:44 +0200
Subject: [PATCH 37/48] Adding start of live timestamp threshold when
 deactivating previous beacons

---
 .../LiveLocationShareAggregatedSummaryEntity.kt    |  2 ++
 ...iveLocationShareAggregatedSummaryEntityQuery.kt |  2 ++
 .../LiveLocationAggregationProcessor.kt            | 14 +++++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
index 08ea06bb1e..ca793ffd8e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/livelocation/LiveLocationShareAggregatedSummaryEntity.kt
@@ -44,6 +44,8 @@ internal open class LiveLocationShareAggregatedSummaryEntity(
          */
         var isActive: Boolean? = null,
 
+        var startOfLiveTimestampMillis: Long? = null,
+
         var endOfLiveTimestampMillis: Long? = null,
 
         /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
index fbf7e963a7..a1179ccdce 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt
@@ -92,12 +92,14 @@ internal fun LiveLocationShareAggregatedSummaryEntity.Companion.findActiveLiveIn
         roomId: String,
         userId: String,
         ignoredEventId: String,
+        startOfLiveTimestampThreshold: Long,
 ): List<LiveLocationShareAggregatedSummaryEntity> {
     return LiveLocationShareAggregatedSummaryEntity
             .whereRoomId(realm, roomId = roomId)
             .equalTo(LiveLocationShareAggregatedSummaryEntityFields.USER_ID, userId)
             .equalTo(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
             .notEqualTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, ignoredEventId)
+            .lessThan(LiveLocationShareAggregatedSummaryEntityFields.START_OF_LIVE_TIMESTAMP_MILLIS, startOfLiveTimestampThreshold)
             .findAll()
             .toList()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
index 3f5b1e1360..510c20497b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt
@@ -84,11 +84,12 @@ internal class LiveLocationAggregationProcessor @Inject constructor(
         val endOfLiveTimestampMillis = content.getBestTimestampMillis()?.let { it + (content.timeout ?: 0) }
         Timber.d("updating summary of id=$targetEventId with isActive=$isActive and endTimestamp=$endOfLiveTimestampMillis")
 
+        aggregatedSummary.startOfLiveTimestampMillis = content.getBestTimestampMillis()
         aggregatedSummary.endOfLiveTimestampMillis = endOfLiveTimestampMillis
         aggregatedSummary.isActive = isActive
         aggregatedSummary.userId = event.senderId
 
-        deactivateAllPreviousBeacons(realm, roomId, event.senderId, targetEventId)
+        deactivateAllPreviousBeacons(realm, roomId, event.senderId, targetEventId, content.getBestTimestampMillis() ?: 0)
 
         if (isActive) {
             scheduleDeactivationAfterTimeout(targetEventId, roomId, endOfLiveTimestampMillis)
@@ -182,13 +183,20 @@ internal class LiveLocationAggregationProcessor @Inject constructor(
         aggregatedSummary.relatedEventIds = RealmList(*updatedEventIds.toTypedArray())
     }
 
-    private fun deactivateAllPreviousBeacons(realm: Realm, roomId: String, userId: String, currentEventId: String) {
+    private fun deactivateAllPreviousBeacons(
+            realm: Realm,
+            roomId: String,
+            userId: String,
+            currentEventId: String,
+            currentEventTimestamp: Long
+    ) {
         LiveLocationShareAggregatedSummaryEntity
                 .findActiveLiveInRoomForUser(
                         realm = realm,
                         roomId = roomId,
                         userId = userId,
-                        ignoredEventId = currentEventId
+                        ignoredEventId = currentEventId,
+                        startOfLiveTimestampThreshold = currentEventTimestamp
                 )
                 .forEach { it.isActive = false }
     }

From a48d33dc3c17cd156ca021ff0e531b85ad92db13 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 19 Jul 2022 15:43:10 +0200
Subject: [PATCH 38/48] Adding changelog entry

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

diff --git a/changelog.d/6596.bugfix b/changelog.d/6596.bugfix
new file mode 100644
index 0000000000..8cf97778c8
--- /dev/null
+++ b/changelog.d/6596.bugfix
@@ -0,0 +1 @@
+[Location Share] - Live is considered as ended while still active

From ca8e4f51e95c4244b627f291a6779ac09758f6fe Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 19 Jul 2022 16:20:16 +0200
Subject: [PATCH 39/48] Updating unit tests of aggregation process

---
 .../livelocation/LiveLocationAggregationProcessorTest.kt  | 3 +++
 .../java/org/matrix/android/sdk/test/fakes/FakeRealm.kt   | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessorTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessorTest.kt
index a5e91714b7..25d441ef5c 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessorTest.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessorTest.kt
@@ -36,6 +36,7 @@ import org.matrix.android.sdk.test.fakes.FakeWorkManagerProvider
 import org.matrix.android.sdk.test.fakes.givenEqualTo
 import org.matrix.android.sdk.test.fakes.givenFindAll
 import org.matrix.android.sdk.test.fakes.givenFindFirst
+import org.matrix.android.sdk.test.fakes.givenLessThan
 import org.matrix.android.sdk.test.fakes.givenNotEqualTo
 
 private const val A_SESSION_ID = "session_id"
@@ -183,6 +184,7 @@ internal class LiveLocationAggregationProcessorTest {
         aggregatedEntity.roomId shouldBeEqualTo A_ROOM_ID
         aggregatedEntity.userId shouldBeEqualTo A_SENDER_ID
         aggregatedEntity.isActive shouldBeEqualTo true
+        aggregatedEntity.startOfLiveTimestampMillis shouldBeEqualTo A_TIMESTAMP
         aggregatedEntity.endOfLiveTimestampMillis shouldBeEqualTo A_TIMESTAMP + A_TIMEOUT_MILLIS
         aggregatedEntity.lastLocationContent shouldBeEqualTo null
         previousEntities.forEach { entity ->
@@ -404,6 +406,7 @@ internal class LiveLocationAggregationProcessorTest {
                 .givenNotEqualTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, AN_EVENT_ID)
                 .givenEqualTo(LiveLocationShareAggregatedSummaryEntityFields.USER_ID, A_SENDER_ID)
                 .givenEqualTo(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
+                .givenLessThan(LiveLocationShareAggregatedSummaryEntityFields.START_OF_LIVE_TIMESTAMP_MILLIS, A_TIMESTAMP)
                 .givenFindAll(summaryList)
         return summaryList
     }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt
index cb40889fb7..afdcf111f8 100644
--- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt
+++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeRealm.kt
@@ -101,6 +101,14 @@ inline fun <reified T : RealmModel> RealmQuery<T>.givenIsNotNull(
     return this
 }
 
+inline fun <reified T : RealmModel> RealmQuery<T>.givenLessThan(
+        fieldName: String,
+        value: Long
+): RealmQuery<T> {
+    every { lessThan(fieldName, value) } returns this
+    return this
+}
+
 /**
  * Should be called on a mocked RealmObject and not on a real RealmObject so that the underlying final method is mocked.
  */

From a5fffdfc1b1f042e7b122e243c09f053907925e8 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 20 Jul 2022 10:00:19 +0200
Subject: [PATCH 40/48] DB migration

---
 .../database/RealmSessionStoreMigration.kt    |  4 ++-
 .../database/migration/MigrateSessionTo034.kt | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt

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 9784412761..64e69bb3e9 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
@@ -50,6 +50,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo030
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo031
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo032
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo033
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo034
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import javax.inject.Inject
@@ -58,7 +59,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : MatrixRealmMigration(
         dbName = "Session",
-        schemaVersion = 33L,
+        schemaVersion = 34L,
 ) {
     /**
      * Forces all RealmSessionStoreMigration instances to be equal.
@@ -101,5 +102,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 31) MigrateSessionTo031(realm).perform()
         if (oldVersion < 32) MigrateSessionTo032(realm).perform()
         if (oldVersion < 33) MigrateSessionTo033(realm).perform()
+        if (oldVersion < 34) MigrateSessionTo034(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
new file mode 100644
index 0000000000..b23e84706f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 The Matrix.org Foundation C.I.C.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.android.sdk.internal.database.migration
+
+import io.realm.DynamicRealm
+import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+/**
+ * Migrating to:
+ * Live location sharing aggregated summary: adding new field startOfLiveTimestampMillis.
+ */
+internal class MigrateSessionTo034(realm: DynamicRealm) : RealmMigrator(realm, 34) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("LiveLocationShareAggregatedSummaryEntity")
+                ?.addField(LiveLocationShareAggregatedSummaryEntityFields.START_OF_LIVE_TIMESTAMP_MILLIS, Long::class.java)
+                ?.setNullable(LiveLocationShareAggregatedSummaryEntityFields.START_OF_LIVE_TIMESTAMP_MILLIS, true)
+    }
+}

From 79ba60c10dd86866d28c5bf1522d01027ef122ab Mon Sep 17 00:00:00 2001
From: ssnfcmux <wissamalnoimy@hotmail.com>
Date: Tue, 19 Jul 2022 20:47:03 +0000
Subject: [PATCH 41/48] Translated using Weblate (Arabic)

Currently translated at 43.2% (979 of 2265 strings)

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

diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index 9c436d24f0..044653f4ba 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -97,14 +97,14 @@
     <string name="notice_room_server_acl_updated_was_banned">• الخوادِم المُطابقة لـ %s أُزيلت مِن قائمة الحظر.</string>
     <string name="notice_room_server_acl_updated_banned">• الخوادِم المُطابقة لـ %s محظورة الآن.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• خوادِم مُطابقة IP الحرفية مسموحة الآن.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">يَّرتَ خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_updated_title">غيَّرَ %s خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخوادِم المطابقة للقيم الحرفية للـIP محظورة.</string>
-    <string name="notice_room_server_acl_set_allowed">• الخوادِم المُطابقة لـ %s مسموحة.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">لقد قمت بتغيير قائمة الوصول لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_updated_title">قام %s بتغيير قائمة الوصول (ACL) لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخوادِم المتطابقة من حيث بروتوكول الإنترنت (IP) المستخدم محظورة.</string>
+    <string name="notice_room_server_acl_set_allowed">• الخوادِم المُطابقة لـِ %s مسموحة.</string>
     <string name="notice_room_server_acl_set_banned">• الخوادِم المُطابقة لـ %s محظورة.</string>
-    <string name="notice_room_server_acl_set_ip_literals_allowed">• الخوادِم المطابقة للقيم الحرفية للـIP مسموحة.</string>
-    <string name="notice_room_server_acl_set_title_by_you">عيَّنتَ خادِم الـACLs لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_set_title">عيَّنَ %s خادِم الـACLs لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_ip_literals_allowed">الخوادِم المتطابقة من حيث بروتوكول الإنترنت (IP) المستخدم مسموحة.</string>
+    <string name="notice_room_server_acl_set_title_by_you">لقد قمت بتعيين قائمة التحكم بالوصول لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_title">%s قام بتعيين قائمة التحكم بالوصول لهذه الغرفة.</string>
     <string name="notice_direct_room_update_by_you">رقيتَ هُنا.</string>
     <string name="notice_direct_room_update">رقّى %s هُنا.</string>
     <string name="notice_made_future_direct_room_visibility_by_you">جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>

From 9a86ae670c9e5f614b920dd666ba3c8072a5b74e Mon Sep 17 00:00:00 2001
From: notramo <notramo@protonmail.com>
Date: Tue, 19 Jul 2022 17:32:35 +0000
Subject: [PATCH 42/48] Translated using Weblate (Hungarian)

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

diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 99caed9211..1867cd29d8 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -2318,7 +2318,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="restart_the_application_to_apply_changes">A változások életbelépéséhez indítsd újra az alkalmazást.</string>
     <string name="labs_enable_latex_maths">LaTeX matematikai szintaxis engedélyezése</string>
     <string name="room_error_access_unauthorized">Nem léphetsz be ebbe a szobába</string>
-    <string name="ftue_auth_carousel_secure_title">Az ön beszélgetései csak az öné.</string>
+    <string name="ftue_auth_carousel_secure_title">Birtokold a beszélgetéseid.</string>
     <string name="labs_auto_report_uisi_desc">Titkosítás visszafejtési hiba esemény alkalmával a rendszer automatikusan elküldi a logokat</string>
     <string name="labs_auto_report_uisi">Titkosítás visszafejtési hibák automatikus jelentése.</string>
     <string name="tooltip_attachment_poll">Szavazás létrehozása</string>
@@ -2436,7 +2436,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="ftue_display_name_title">Válassz egy megjelenítési nevet</string>
     <string name="ftue_account_created_subtitle">A fiókod elkészült: %s.</string>
     <string name="ftue_account_created_congratulations_title">Gratulálunk!</string>
-    <string name="ftue_account_created_take_me_home">Vigyél haza</string>
+    <string name="ftue_account_created_take_me_home">A kezdőlapra</string>
     <string name="ftue_account_created_personalize">Profil személyre szabása</string>
     <string name="action_disable">Tiltás</string>
     <string name="location_share_live_started">Élő földrajzi helyzet meghatározás betöltése…</string>
@@ -2499,4 +2499,4 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="time_unit_second_short">mperc</string>
     <string name="time_unit_minute_short">perc</string>
     <string name="time_unit_hour_short">ó</string>
-</resources>
+</resources>
\ No newline at end of file

From b500fcd3d0855146af10431726bd45b6a0555452 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 18 Jul 2022 14:58:24 +0000
Subject: [PATCH 43/48] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2265 of 2265 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 | 38 ++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 1867cd29d8..dc9e17fc75 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1607,7 +1607,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="settings_emails_empty">Még nem adtál hozzá a fiókodhoz email címet</string>
     <string name="settings_emails">Email címek</string>
     <string name="settings_phone_number_empty">Még nem adtál hozzá telefonszámot a fiókodhoz</string>
-    <string name="direct_room_encryption_enabled_tile_description">Az üzenetek ebben a szobában végpontok közötti titkosítással védettek.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Az üzenetek ebben a beszélgetésben végpontok közötti titkosítással védettek.</string>
     <string name="attachment_type_dialog_title">Kép hozzáadása</string>
     <string name="add_a_topic_link_text">Adj meg egy témát</string>
     <string name="room_created_summary_no_topic_creation_text">%s, hogy a többiek tudják, miről van szó ebben a szobában!</string>
@@ -2499,4 +2499,40 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="time_unit_second_short">mperc</string>
     <string name="time_unit_minute_short">perc</string>
     <string name="time_unit_hour_short">ó</string>
+    <string name="live_location_labs_promotion_switch_title">Földrajzi hely megosztás engedélyezése</string>
+    <string name="live_location_labs_promotion_description">Figyelem: ez a labor lehetőség egy átmeneti megvalósítás. Ez azt jelenti, hogy a szobába már elküldött helyadatok az élő hely megosztás leállítása után is hozzáférhetők maradnak a szobában.</string>
+    <string name="live_location_labs_promotion_title">Élő földrajzi hely megosztása</string>
+    <string name="settings_troubleshoot_test_current_gateway">Jelenlegi átjáró: %s</string>
+    <string name="settings_troubleshoot_test_current_gateway_title">Átjáró (gateway)</string>
+    <string name="settings_troubleshoot_test_current_endpoint_failed">Nem található végpont.</string>
+    <string name="settings_troubleshoot_test_current_endpoint_success">Jelenlegi végpont: %s</string>
+    <string name="settings_troubleshoot_test_current_endpoint_title">Végpont</string>
+    <string name="settings_troubleshoot_test_current_distributor">Jelenleg használatban: %s.</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Metódus</string>
+    <plurals name="settings_troubleshoot_test_distributors_many">
+        <item quantity="one">%d beállítás található.</item>
+        <item quantity="other">%d beállítás található.</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_distributors_fdroid">A háttér szinkronizációs szolgáltatástól eltérő beállítási lehetőség nem érhető el.</string>
+    <string name="settings_troubleshoot_test_distributors_gplay">A Google Play szolgáltatástól eltérő beállítási lehetőség nem érhető el.</string>
+    <string name="settings_troubleshoot_test_distributors_title">Elérhető beállítások</string>
+    <string name="settings_notification_method">Értesítési beállítások</string>
+    <string name="unifiedpush_distributor_background_sync">Szinkronizálás a háttérben</string>
+    <string name="unifiedpush_distributor_fcm_fallback">Google szolgáltatások</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Válaszd ki, hogyan szeretnél értesítéseket kapni</string>
+    <string name="poll_undisclosed_not_ended">Az eredmény a szavazás végeztével válik láthatóvá</string>
+    <string name="labs_enable_msc3061_share_history_desc">Ha olyan titkosított szobába hívsz meg valakit ahol a régi üzenetek megosztása engedélyezett a régi titkosított üzenetek is láthatóak lesznek a meghívott számára.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Szoba kulcsok megosztása a régi üzenetekhez</string>
+    <string name="settings_security_pin_code_use_biometrics_error">A biometrikus azonosítást nem lehet engedélyezni.</string>
+    <string name="auth_biometric_key_invalidated_message">A biometrikus azonosítás kikapcsolásra került mivel egy új biometrikus azonosítási metódus került hozzáadásra. Újra engedélyezheted a Beállításokban.</string>
+    <string name="send_your_first_msg_to_invite">Az első üzeneteddel hívd meg ide őt: %s</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Az üzenetek ebben a beszélgetésben végpontok közötti titkosítással lesznek védve.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Értesítési metódus visszaállítása</string>
+    <string name="push_gateway_item_profile_tag">Profil címke:</string>
+    <string name="create_room_action_go">Menj</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_failed">Végpont token regisztrációja sikertelen a Matrix-kiszolgálón:
+\n%1$s</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_success">Végpont sikeresen regisztrálva lett a matrix szerveren.</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_title">Végpont regisztráció</string>
+    <string name="action_next">Következő</string>
 </resources>
\ No newline at end of file

From 653f699c28086f3df07de9505b5c0a25bde373e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 18 Jul 2022 13:23:32 +0000
Subject: [PATCH 44/48] Translated using Weblate (Icelandic)

Currently translated at 82.1% (1861 of 2265 strings)

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

diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml
index 88234a6364..53af7bff5c 100644
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@@ -764,7 +764,7 @@
     <string name="upgrade_security">Uppfærsla dulritunar tiltæk</string>
     <string name="command_description_plain">Sendir skilaboð sem óbreyttur texti án þess að túlka það sem markdown</string>
     <string name="encryption_not_enabled">Dulritun ekki virk</string>
-    <string name="direct_room_encryption_enabled_tile_description">Skilaboð í þessari spjallrás eru enda-í-enda dulrituð.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Skilaboð í þessu spjalli eru enda-í-enda dulrituð.</string>
     <string name="settings_hs_admin_e2e_disabled">Kerfisstjóri netþjónsins þíns hefur lokað á sjálfvirka dulritun í einkaspjallrásum og beinum skilaboðum.</string>
     <string name="room_profile_section_more_settings">Stillingar spjallrásar</string>
     <string name="room_profile_not_encrypted_subtitle">Skilaboð í þessari spjallrás eru ekki enda-í-enda dulrituð.</string>
@@ -1292,7 +1292,7 @@
     <string name="keys_backup_setup_step3_button_title">Lokið</string>
     <string name="keys_backup_setup_step3_success_title">Tókst !</string>
     <string name="keys_backup_setup_step1_advanced">(Ítarlegt)</string>
-    <string name="x_plus">%d+</string>
+    <string name="x_plus">+%d</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
     <string name="merged_events_collapse">fella saman</string>
     <string name="merged_events_expand">fletta út</string>
@@ -2017,4 +2017,4 @@
     <string name="action_try_it_out">Prófaðu það</string>
     <string name="action_disable">Gera óvirkt</string>
     <string name="initial_sync_request_title">Upphafleg samstillingarbeiðni</string>
-</resources>
+</resources>
\ No newline at end of file

From 3eb590ebe8d963ac259d27b9590e257f22f72df7 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Mon, 18 Jul 2022 19:00:49 +0000
Subject: [PATCH 45/48] Translated using Weblate (Swedish)

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

diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml
index 84e90da44b..29ecdfe895 100644
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@@ -1706,7 +1706,7 @@
     <string name="direct_room_profile_section_more_leave">Lämna</string>
     <string name="secure_backup_reset_all">Återställ allt</string>
     <string name="direct_room_created_summary_item_by_you">Du gick med.</string>
-    <string name="direct_room_encryption_enabled_tile_description">Meddelanden i det här rummet är totalsträckskrypterade.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Meddelanden i den här chatten är totalsträckskrypterade.</string>
     <string name="direct_room_profile_section_more_settings">Inställningar</string>
     <string name="direct_room_profile_encrypted_subtitle">Meddelanden här är totalsträckskrypterade.
 \n
@@ -2529,4 +2529,10 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_endpoint_registration_success">Lyckades registrera ändpunkten hos hemservern.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Ändpunktsregistrering</string>
-</resources>
+    <string name="poll_undisclosed_not_ended">Resultat kommer att synas när omröstningen avslutas</string>
+    <string name="labs_enable_msc3061_share_history_desc">När du bjuder in i ett krypterat rum som delar historik, så kommer krypterad historik att vara synlig.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Delar rumsnycklar för tidigare meddelanden</string>
+    <string name="send_your_first_msg_to_invite">Skicka ditt första meddelande för att bjuda in %s att chatta</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Meddelanden i den här chatten kommer att vara totalsträckskrypterade.</string>
+    <string name="create_room_action_go">Gå</string>
+</resources>
\ No newline at end of file

From c02dc7b962412325e1ce5447f6ac7f08e99c0f37 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Mon, 18 Jul 2022 19:01:58 +0000
Subject: [PATCH 46/48] Translated using Weblate (Swedish)

Currently translated at 100.0% (70 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sv/
---
 fastlane/metadata/android/sv-SE/changelogs/40104260.txt | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/40104270.txt | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/40104270.txt

diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104260.txt b/fastlane/metadata/android/sv-SE/changelogs/40104260.txt
new file mode 100644
index 0000000000..99185d8562
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Använd UnifiedPush och tillåt användare att ha push utan FCM.
+Full ändringslogg: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/sv-SE/changelogs/40104270.txt b/fastlane/metadata/android/sv-SE/changelogs/40104270.txt
new file mode 100644
index 0000000000..d8db452b51
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Diverse buggfixar och stabilitetsförbättringar.
+Full ändringslogg: https://github.com/vector-im/element-android/releases

From e52d35127320badafa1034db3e957887f46ec745 Mon Sep 17 00:00:00 2001
From: ssnfcmux <wissamalnoimy@hotmail.com>
Date: Tue, 19 Jul 2022 14:53:22 +0000
Subject: [PATCH 47/48] Translated using Weblate (Arabic)

Currently translated at 15.7% (11 of 70 strings)

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

diff --git a/fastlane/metadata/android/ar/short_description.txt b/fastlane/metadata/android/ar/short_description.txt
index 48df6f2b0c..2b0789b376 100644
--- a/fastlane/metadata/android/ar/short_description.txt
+++ b/fastlane/metadata/android/ar/short_description.txt
@@ -1 +1 @@
-مُحادثة آمنة لا مركزية و VoIP. حافظ على بياناتك آمنة من الأطراف الثالثة.
+برنامج المراسلة الجماعية - الرسائل المشفرة والدردشة الجماعية ومكالمات الفيديو
diff --git a/fastlane/metadata/android/ar/title.txt b/fastlane/metadata/android/ar/title.txt
index 11992d355d..c2ac1b2876 100644
--- a/fastlane/metadata/android/ar/title.txt
+++ b/fastlane/metadata/android/ar/title.txt
@@ -1 +1 @@
-‏Element (‏Riot.im سابقًا)
+إيليمنت - تطبيق محادثات أمن

From a8a5c6b883bf71c269c26327f9df20949bffb923 Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Tue, 19 Jul 2022 12:37:42 +0000
Subject: [PATCH 48/48] Translated using Weblate (Galician)

Currently translated at 18.5% (13 of 70 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/gl/
---
 .../android/gl/changelogs/40104160.txt        |  2 +
 .../android/gl/changelogs/40104180.txt        |  2 +
 .../android/gl/changelogs/40104190.txt        |  2 +
 .../android/gl/changelogs/40104200.txt        |  2 +
 .../android/gl/changelogs/40104220.txt        |  2 +
 .../android/gl/changelogs/40104230.txt        |  2 +
 .../android/gl/changelogs/40104240.txt        |  2 +
 .../android/gl/changelogs/40104250.txt        |  2 +
 .../android/gl/changelogs/40104260.txt        |  2 +
 .../android/gl/changelogs/40104270.txt        |  2 +
 .../metadata/android/gl/full_description.txt  | 42 +++++++++++++++++++
 .../metadata/android/gl/short_description.txt |  1 +
 fastlane/metadata/android/gl/title.txt        |  1 +
 13 files changed, 64 insertions(+)
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104160.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104180.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104190.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104200.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104220.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104230.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104240.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104250.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104260.txt
 create mode 100644 fastlane/metadata/android/gl/changelogs/40104270.txt
 create mode 100644 fastlane/metadata/android/gl/full_description.txt
 create mode 100644 fastlane/metadata/android/gl/short_description.txt
 create mode 100644 fastlane/metadata/android/gl/title.txt

diff --git a/fastlane/metadata/android/gl/changelogs/40104160.txt b/fastlane/metadata/android/gl/changelogs/40104160.txt
new file mode 100644
index 0000000000..ee2cde15ad
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104160.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: melloras na xestión das mensaxes cifradas. Varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104180.txt b/fastlane/metadata/android/gl/changelogs/40104180.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104180.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104190.txt b/fastlane/metadata/android/gl/changelogs/40104190.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104190.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104200.txt b/fastlane/metadata/android/gl/changelogs/40104200.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104200.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104220.txt b/fastlane/metadata/android/gl/changelogs/40104220.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104220.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104230.txt b/fastlane/metadata/android/gl/changelogs/40104230.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104230.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104240.txt b/fastlane/metadata/android/gl/changelogs/40104240.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104240.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104250.txt b/fastlane/metadata/android/gl/changelogs/40104250.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104250.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104260.txt b/fastlane/metadata/android/gl/changelogs/40104260.txt
new file mode 100644
index 0000000000..a863d73cc4
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: Utiliza UnifiedPush e permite á usuaria obter notificacións sen FCM.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/changelogs/40104270.txt b/fastlane/metadata/android/gl/changelogs/40104270.txt
new file mode 100644
index 0000000000..532464f402
--- /dev/null
+++ b/fastlane/metadata/android/gl/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Principais cambios nesta versión: varios arranxos e melloras na estabilidade.
+Rexistro completo dos cambios: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/gl/full_description.txt b/fastlane/metadata/android/gl/full_description.txt
new file mode 100644
index 0000000000..3502e3ba58
--- /dev/null
+++ b/fastlane/metadata/android/gl/full_description.txt
@@ -0,0 +1,42 @@
+Element é tanto unha mensaxería segura e unha app de productividade para o traballo en equipo, perfecta para conversas de grupos con traballo remoto. Esta app de chat usa cifrado de extremo-a-extremo para proporcionar video conferencias seguras, compartición de ficheiros e chamadas de voz.
+
+<b>Características de Element incluídas:</b>
+- Ferramentas avanzadas para a comunicación en liña
+- Mensaxes completamente cifradas para permitir a comunicación corporativa, incluso para traballo remoto
+- Chat descentralizado baseado no sistema de código aberto Matrix
+- Compartición segura de ficheiros con datos cifrados na xestión de proxectos
+- Chats de vídeo con Voz sobre IP en compartición de pantalla
+- Integración doada con outras ferramentas de colaboración en liña, ferramentas de xestión de proxectos, servizos VoIP e outras apps de mensaxería para equipos
+
+Element é completamente diferente a outras apps de mensaxería e traballo en equipo. Funciona grazas a Matrix, unha rede aberta para mensaxería segura e descentralizada. Permite a hospedaxe na infraestructura propia para proporcionar o maior grao de propiedade e control sobre os teus datos e mensaxes.
+
+<b>Mensaxería privada e cifrada</b>
+Element protéxete da publicidade non solicitada, minería de datos e burbullas de contido. Tamén protexe os teus datos, chamadas de vídeo e voz cifradas de extremo-a-extremo así como verificación con sinatura dos dispositivos.
+
+Element pon baixo o teu control a túa privacidade permitíndoche comunicarte de xeito seguro con calquera a través da rede Matrix, ou en outras ferramentas de colaboración para empresas ao estar integrada en apps como Slack.
+
+<b>Element na túa infraestructura</b>
+Para un maior control sobre os teus datos sensibles e comunicacións, podes hospedar Element ou elexir calquera hóspede baseado en Matrix - un estándar para comunicación descentralizado e de código aberto. Element proporciona privacidade e seguridade así como flexibilidade para a integración.
+
+<b>Os teus datos</b>
+Ti decides onde gardas os teus datos e mensaxes. Sen o risco da minería de datos ou acceso por terceiras partes.
+
+Element ponte ao mando de varios xeitos:
+1. Consigue unha conta gratuíta no servidor público matrix.org hospedado polos desenvolvedores de Matrix, ou elixe entre miles de servidores públicos xestionados por voluntarias
+2. Hospeda a túa conta na túa propia infraestructura IT
+3. Crea unha conta nun servidor personalizado simplemente subscribíndote á plataforma de hospedaxe Element Matrix Services
+
+<b>Mensaxería e Colaboración abertas</b>
+Podes conversar con calquera na rede Matrix, tanto se usan Element ou outra app Matrix ou incluso unha mensaxería diferente.
+
+<b>Super segura</b>
+Cifrado real de extremo-a-extremo (só quen participa na conversa pode descifrar as mensaxes), e verificación con sinatura cruzada dos dispositivos.
+
+<b>Comunicación e integración completas</b>
+Mensaxería, chamadas de voz e vídeo, compartición de ficheiros, compartición de pantalla e moitas máis integracións, bots e widgets. Crea salas, comunidades, mantén o contacto e saca adiante o traballo.
+
+<b>Continúa onde o deixaches</b>
+Sigue en contacto alá onde estés grazas ao historial sincronizado de mensaxería entre tódolos dispositivos e na web https://app.element.io
+
+<b>Código aberto</b>
+Element Android é un proxecto de código aberto, hospedado en GitHub. Informa de fallos e/ou contribúe ao seu desenvolvemento en https://github.com/vector-im/element-android
diff --git a/fastlane/metadata/android/gl/short_description.txt b/fastlane/metadata/android/gl/short_description.txt
new file mode 100644
index 0000000000..7c7f65bf61
--- /dev/null
+++ b/fastlane/metadata/android/gl/short_description.txt
@@ -0,0 +1 @@
+Mensaxería en grupo - mensaxería cifrada, chat en grupo e videochamadas
diff --git a/fastlane/metadata/android/gl/title.txt b/fastlane/metadata/android/gl/title.txt
new file mode 100644
index 0000000000..0fb73bc324
--- /dev/null
+++ b/fastlane/metadata/android/gl/title.txt
@@ -0,0 +1 @@
+Element - Mensaxería Segura