From 00bfbe9bc6a3f3c6576cc161d8144dc22d23ba5e Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Fri, 7 Oct 2022 11:16:41 -0400
Subject: [PATCH 001/300] Adds API parsing of unread threads notifications

---
 .../sdk/api/session/sync/model/RoomSync.kt    |  6 ++++
 .../RoomSyncUnreadThreadNotifications.kt      | 33 +++++++++++++++++++
 .../internal/session/filter/FilterFactory.kt  | 12 ++++---
 .../session/filter/RoomEventFilter.kt         | 10 ++++--
 .../room/summary/RoomSummaryUpdater.kt        |  4 +++
 .../sync/handler/room/RoomSyncHandler.kt      |  4 ++-
 6 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
index e5ac0a39b2..472121269f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
@@ -47,6 +47,12 @@ data class RoomSync(
          */
         @Json(name = "unread_notifications") val unreadNotifications: RoomSyncUnreadNotifications? = null,
 
+
+        /**
+         * The count of threads with unread notifications (not the total # of notifications in all threads)
+         */
+        @Json(name = "org.matrix.msc3773.unread_thread_notifications") val unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
+
         /**
          * The room summary.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt
new file mode 100644
index 0000000000..70524d299a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSyncUnreadThreadNotifications.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright 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.api.session.sync.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class RoomSyncUnreadThreadNotifications(
+        /**
+         * The number of threads with unread messages that match the push notification rules.
+         */
+        @Json(name = "notification_count") val notificationCount: Int? = null,
+
+        /**
+         * The number of threads with highlighted unread messages (subset of notifications).
+         */
+        @Json(name = "highlight_count") val highlightCount: Int? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 676a4f6a38..141144acd8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -28,7 +28,8 @@ internal object FilterFactory {
                 limit = numberOfEvents,
 //                senders = listOf(userId),
 //                relationSenders = userId?.let { listOf(it) },
-                relationTypes = listOf(RelationType.THREAD)
+                relationTypes = listOf(RelationType.THREAD),
+                enableUnreadThreadNotifications = true,
         )
     }
 
@@ -37,7 +38,8 @@ internal object FilterFactory {
                 limit = numberOfEvents,
                 containsUrl = true,
                 types = listOf(EventType.MESSAGE),
-                lazyLoadMembers = true
+                lazyLoadMembers = true,
+                enableUnreadThreadNotifications = true,
         )
     }
 
@@ -62,7 +64,8 @@ internal object FilterFactory {
 
     fun createElementRoomFilter(): RoomEventFilter {
         return RoomEventFilter(
-                lazyLoadMembers = true
+                lazyLoadMembers = true,
+                enableUnreadThreadNotifications = true,
                 // TODO Enable this for optimization
                 // types = (listOfSupportedEventTypes + listOfSupportedStateEventTypes).toMutableList()
         )
@@ -77,7 +80,8 @@ internal object FilterFactory {
 
     private fun createElementStateFilter(): RoomEventFilter {
         return RoomEventFilter(
-                lazyLoadMembers = true
+                lazyLoadMembers = true,
+                enableUnreadThreadNotifications = true,
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index 220c401137..81d1c04261 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -17,6 +17,7 @@ package org.matrix.android.sdk.internal.session.filter
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.session.sync.model.RoomSync
 import org.matrix.android.sdk.internal.di.MoshiProvider
 
 /**
@@ -76,7 +77,11 @@ internal data class RoomEventFilter(
         /**
          * If true, enables lazy-loading of membership events. See Lazy-loading room members for more information. Defaults to false.
          */
-        @Json(name = "lazy_load_members") val lazyLoadMembers: Boolean? = null
+        @Json(name = "lazy_load_members") val lazyLoadMembers: Boolean? = null,
+        /**
+         * If true, this will opt-in for the server to return unread threads notifications in [RoomSync]
+         */
+        @Json(name = "org.matrix.msc3773.unread_thread_notifications") val enableUnreadThreadNotifications: Boolean? = null,
 ) {
 
     fun toJSONString(): String {
@@ -92,6 +97,7 @@ internal data class RoomEventFilter(
                 rooms != null ||
                 notRooms != null ||
                 containsUrl != null ||
-                lazyLoadMembers != null)
+                lazyLoadMembers != null ||
+                enableUnreadThreadNotifications != null)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 6979d42827..537483193a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.api.session.room.powerlevels.PowerLevelsHelper
 import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.sync.model.RoomSyncSummary
 import org.matrix.android.sdk.api.session.sync.model.RoomSyncUnreadNotifications
+import org.matrix.android.sdk.api.session.sync.model.RoomSyncUnreadThreadNotifications
 import org.matrix.android.sdk.internal.crypto.EventDecryptor
 import org.matrix.android.sdk.internal.crypto.crosssigning.DefaultCrossSigningService
 import org.matrix.android.sdk.internal.database.mapper.ContentMapper
@@ -91,6 +92,7 @@ internal class RoomSummaryUpdater @Inject constructor(
             membership: Membership? = null,
             roomSummary: RoomSyncSummary? = null,
             unreadNotifications: RoomSyncUnreadNotifications? = null,
+            unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
             updateMembers: Boolean = false,
             inviterId: String? = null,
             aggregator: SyncResponsePostTreatmentAggregator? = null
@@ -111,6 +113,8 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.highlightCount = unreadNotifications?.highlightCount ?: 0
         roomSummaryEntity.notificationCount = unreadNotifications?.notificationCount ?: 0
 
+        // TODO: Handle unreadThreadNotifications
+
         if (membership != null) {
             roomSummaryEntity.membership = membership
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
index a2f2251b70..2825be8291 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
@@ -287,6 +287,7 @@ internal class RoomSyncHandler @Inject constructor(
                 Membership.JOIN,
                 roomSync.summary,
                 roomSync.unreadNotifications,
+                roomSync.unreadThreadNotifications,
                 updateMembers = hasRoomMember,
                 aggregator = aggregator
         )
@@ -372,7 +373,8 @@ internal class RoomSyncHandler @Inject constructor(
         roomEntity.chunks.clearWith { it.deleteOnCascade(deleteStateEvents = true, canDeleteRoot = true) }
         roomTypingUsersHandler.handle(realm, roomId, null)
         roomChangeMembershipStateDataSource.setMembershipFromSync(roomId, Membership.LEAVE)
-        roomSummaryUpdater.update(realm, roomId, membership, roomSync.summary, roomSync.unreadNotifications, aggregator = aggregator)
+        roomSummaryUpdater.update(realm, roomId, membership, roomSync.summary,
+                roomSync.unreadNotifications, roomSync.unreadThreadNotifications, aggregator = aggregator)
         return roomEntity
     }
 

From ebd8461724430f9a51b1927653ab37ea9d62ad95 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Fri, 7 Oct 2022 11:42:18 -0400
Subject: [PATCH 002/300] Adds thread notifications and highlights to
 RoomSummaryEntity

---
 .../sdk/internal/database/model/RoomSummaryEntity.kt   | 10 ++++++++++
 .../session/room/summary/RoomSummaryUpdater.kt         | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
index 471bec59af..650dd3c5cb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
@@ -115,6 +115,16 @@ internal open class RoomSummaryEntity(
             if (value != field) field = value
         }
 
+    var threadNotificationCount: Int = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
+    var threadHighlightCount: Int = 0
+        set(value) {
+            if (value != field) field = value
+        }
+
     var readMarkerId: String? = null
         set(value) {
             if (value != field) field = value
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 537483193a..185b7d35d6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -113,7 +113,15 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.highlightCount = unreadNotifications?.highlightCount ?: 0
         roomSummaryEntity.notificationCount = unreadNotifications?.notificationCount ?: 0
 
-        // TODO: Handle unreadThreadNotifications
+        roomSummaryEntity.threadHighlightCount = unreadThreadNotifications
+                ?.mapNotNull { it.value.highlightCount }
+                ?.sum()
+                ?: 0
+        roomSummaryEntity.threadNotificationCount = unreadThreadNotifications
+                ?.mapNotNull { it.value.notificationCount }
+                ?.sum()
+                ?: 0
+
 
         if (membership != null) {
             roomSummaryEntity.membership = membership

From c2ae75d9bdbdbdf3ba9d180ea24f0c382a16c404 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Fri, 7 Oct 2022 11:45:58 -0400
Subject: [PATCH 003/300] Changes thread notifications saved to entity from sum
 to size

---
 .../internal/session/room/summary/RoomSummaryUpdater.kt   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 185b7d35d6..c740e07257 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -114,12 +114,12 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.notificationCount = unreadNotifications?.notificationCount ?: 0
 
         roomSummaryEntity.threadHighlightCount = unreadThreadNotifications
-                ?.mapNotNull { it.value.highlightCount }
-                ?.sum()
+                ?.map { it.value.highlightCount.takeIf { count -> (count ?: 0) > 0 } }
+                ?.size
                 ?: 0
         roomSummaryEntity.threadNotificationCount = unreadThreadNotifications
-                ?.mapNotNull { it.value.notificationCount }
-                ?.sum()
+                ?.map { it.value.notificationCount.takeIf { count -> (count ?: 0) > 0 } }
+                ?.size
                 ?: 0
 
 

From a2382c6a0157ada1b8129f906b340bdc7c8893bb Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Fri, 7 Oct 2022 11:47:18 -0400
Subject: [PATCH 004/300] Adds thread notification fields to RoomSummary

---
 .../android/sdk/api/session/room/model/RoomSummary.kt     | 8 ++++++++
 .../sdk/internal/database/mapper/RoomSummaryMapper.kt     | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index ff4977491f..6058564b78 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -97,6 +97,14 @@ data class RoomSummary(
          * Number of unread and highlighted message in this room.
          */
         val highlightCount: Int = 0,
+        /**
+         * Number of threads with unread messages in this room
+         */
+        val threadNotificationCount: Int = 0,
+        /**
+         * Number of threads with highlighted messages in this room
+         */
+        val threadHighlightCount: Int = 0,
         /**
          * True if this room has unread messages.
          */
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
index 72b0f7a043..6e9fff78e1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/RoomSummaryMapper.kt
@@ -61,6 +61,8 @@ internal class RoomSummaryMapper @Inject constructor(
                 otherMemberIds = roomSummaryEntity.otherMemberIds.toList(),
                 highlightCount = roomSummaryEntity.highlightCount,
                 notificationCount = roomSummaryEntity.notificationCount,
+                threadHighlightCount = roomSummaryEntity.threadHighlightCount,
+                threadNotificationCount = roomSummaryEntity.threadNotificationCount,
                 hasUnreadMessages = roomSummaryEntity.hasUnreadMessages,
                 tags = tags,
                 typingUsers = typingUsers,

From 1db6b7be1ffab1f1fd8491de102dfd8ba533dc46 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 23:05:08 +0000
Subject: [PATCH 005/300] Bump danger/danger-js from 11.1.3 to 11.1.4

Bumps [danger/danger-js](https://github.com/danger/danger-js) from 11.1.3 to 11.1.4.
- [Release notes](https://github.com/danger/danger-js/releases)
- [Changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/danger/danger-js/compare/11.1.3...11.1.4)

---
updated-dependencies:
- dependency-name: danger/danger-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/danger.yml  | 2 +-
 .github/workflows/quality.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 5698a696b6..30b6600c94 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -11,7 +11,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@11.1.3
+        uses: danger/danger-js@11.1.4
         with:
           args: "--dangerfile tools/danger/dangerfile.js"
         env:
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 1692e2e281..9d9e8e76e8 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -66,7 +66,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@11.1.3
+        uses: danger/danger-js@11.1.4
         with:
           args: "--dangerfile tools/danger/dangerfile-lint.js"
         env:

From 4feb60145b8d6a56f7c8d7d106f568f762008fa2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 23:06:56 +0000
Subject: [PATCH 006/300] Bump appDistribution from 16.0.0-beta04 to
 16.0.0-beta05

Bumps `appDistribution` from 16.0.0-beta04 to 16.0.0-beta05.

Updates `firebase-appdistribution-api-ktx` from 16.0.0-beta04 to 16.0.0-beta05

Updates `firebase-appdistribution` from 16.0.0-beta04 to 16.0.0-beta05

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-api-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.firebase:firebase-appdistribution
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/dependencies.gradle b/dependencies.gradle
index edff769070..30bd576c21 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -12,7 +12,7 @@ def gradle = "7.2.2"
 def kotlin = "1.7.20"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.44"
-def appDistribution = "16.0.0-beta04"
+def appDistribution = "16.0.0-beta05"
 def retrofit = "2.9.0"
 def markwon = "4.6.2"
 def moshi = "1.14.0"

From 9198cc7ac072c11fb5d038b0d232ade2102ca2ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 23:07:54 +0000
Subject: [PATCH 007/300] Bump android-connector from 2.1.0 to 2.1.1

Bumps [android-connector](https://github.com/UnifiedPush/android-connector) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/UnifiedPush/android-connector/releases)
- [Commits](https://github.com/UnifiedPush/android-connector/compare/2.1.0...2.1.1)

---
updated-dependencies:
- dependency-name: com.github.UnifiedPush:android-connector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/vector/build.gradle b/vector/build.gradle
index c59e1a3028..32579d0ccc 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -236,7 +236,7 @@ dependencies {
     implementation libs.sentry.sentryAndroid
 
     // UnifiedPush
-    implementation 'com.github.UnifiedPush:android-connector:2.1.0'
+    implementation 'com.github.UnifiedPush:android-connector:2.1.1'
 
     implementation "androidx.emoji2:emoji2:1.2.0"
 

From e875d9d329e5131881166465fc31a51d1051541a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 13 Oct 2022 11:52:35 +0200
Subject: [PATCH 008/300] Ensure the latest paparazzi version is used, when
 updated by Dependabot. Dependabot can update the plugin version, but not the
 library we add manually.

---
 build.gradle        | 4 ++--
 dependencies.gradle | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index e474b68531..486da53e98 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
-        classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0'
+        classpath libs.squareup.paparazziPlugin
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -322,7 +322,7 @@ ext.initScreenshotTests = { project ->
     if (hasScreenshots) {
         project.apply plugin: 'app.cash.paparazzi'
     }
-    project.dependencies { testCompileOnly "app.cash.paparazzi:paparazzi:1.0.0" }
+    project.dependencies { testCompileOnly libs.squareup.paparazzi }
     project.android.testOptions.unitTests.all {
         def screenshotTestCapture = "**/*ScreenshotTest*"
         if (hasScreenshots) {
diff --git a/dependencies.gradle b/dependencies.gradle
index edff769070..3b39f72965 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,5 +1,4 @@
 ext.versions = [
-
         'minSdk'            : 21,
         'compileSdk'        : 32,
         'targetSdk'         : 32,
@@ -27,22 +26,20 @@ def jjwt = "0.11.5"
 // Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
 // the whole commit which set version 0.16.0-SNAPSHOT
 def vanniktechEmoji = "0.16.0-SNAPSHOT"
-
 def sentry = "6.4.3"
-
 def fragment = "1.5.3"
-
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
 def androidxOrchestrator = "1.4.1"
+def paparazzi = "1.1.0"
+
 ext.libs = [
         gradle      : [
                 'gradlePlugin'            : "com.android.tools.build:gradle:$gradle",
                 'kotlinPlugin'            : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin",
                 'hiltPlugin'              : "com.google.dagger:hilt-android-gradle-plugin:$dagger"
-
         ],
         jetbrains   : [
                 'coroutinesCore'          : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
@@ -108,6 +105,8 @@ ext.libs = [
                 'moshiKt'                : "com.squareup.moshi:moshi-kotlin:$moshi",
                 'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
                 'moshiAdapters'          : "com.squareup.moshi:moshi-adapters:$moshi",
+                'paparazzi'              : "app.cash.paparazzi:paparazzi:$paparazzi",
+                'paparazziPlugin'        : "app.cash.paparazzi:paparazzi-gradle-plugin:$paparazzi",
                 'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
         ],

From 21ae4c6ddbf29bd33f3888788717f0cbd06d74b5 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:11:15 +0100
Subject: [PATCH 009/300] Support for login by m.login.token during QR code
 sign in

---
 .../sdk/api/auth/AuthenticationService.kt     | 14 +++
 .../matrix/android/sdk/api/auth/LoginType.kt  |  4 +-
 .../auth/DefaultAuthenticationService.kt      | 15 +++-
 .../sdk/internal/auth/data/LoginParams.kt     |  2 +
 .../internal/auth/data/PasswordLoginParams.kt |  4 +-
 .../internal/auth/data/TokenLoginParams.kt    |  4 +-
 .../internal/auth/login/QrLoginTokenTask.kt   | 88 +++++++++++++++++++
 7 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 5ae70e1978..8f2a784d49 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -124,4 +124,18 @@ interface AuthenticationService {
             initialDeviceName: String,
             deviceId: String? = null
     ): Session
+
+    /**
+     * Authenticate using m.login.token method during sign in with QR code.
+     * @param homeServerConnectionConfig the information about the homeserver and other configuration
+     * @param loginToken the m.login.token
+     * @param initialDeviceName the initial device name
+     * @param deviceId the device id, optional. If not provided or null, the server will generate one.
+     */
+    suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String,
+            deviceId: String? = null
+    ): Session
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
index 627a825679..991b7b654d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
@@ -22,7 +22,8 @@ enum class LoginType {
     UNSUPPORTED,
     CUSTOM,
     DIRECT,
-    UNKNOWN;
+    UNKNOWN,
+    QR;
 
     companion object {
 
@@ -32,6 +33,7 @@ enum class LoginType {
             UNSUPPORTED.name -> UNSUPPORTED
             CUSTOM.name -> CUSTOM
             DIRECT.name -> DIRECT
+            QR.name -> QR
             else -> UNKNOWN
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 446f931847..90dc57b4f0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -39,6 +39,7 @@ import org.matrix.android.sdk.internal.auth.data.WebClientConfig
 import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.auth.login.DefaultLoginWizard
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.registration.DefaultRegistrationWizard
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
@@ -62,7 +63,8 @@ internal class DefaultAuthenticationService @Inject constructor(
         private val sessionCreator: SessionCreator,
         private val pendingSessionStore: PendingSessionStore,
         private val getWellknownTask: GetWellknownTask,
-        private val directLoginTask: DirectLoginTask
+        private val directLoginTask: DirectLoginTask,
+        private val loginTokenAuthTask: QrLoginTokenTask
 ) : AuthenticationService {
 
     private var pendingSessionData: PendingSessionData? = pendingSessionStore.getPendingSessionData()
@@ -404,6 +406,17 @@ internal class DefaultAuthenticationService @Inject constructor(
         )
     }
 
+    override suspend fun loginUsingQrLoginToken(homeServerConnectionConfig: HomeServerConnectionConfig, loginToken: String, initialDeviceName: String, deviceId: String?): Session {
+        return loginTokenAuthTask.execute(
+                QrLoginTokenTask.Params(
+                        homeServerConnectionConfig = homeServerConnectionConfig,
+                        loginToken = loginToken,
+                        deviceName = initialDeviceName,
+                        deviceId = deviceId
+                )
+        )
+    }
+
     private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
         val retrofit = retrofitFactory.create(buildClient(homeServerConnectionConfig), homeServerConnectionConfig.homeServerUriBase.toString())
         return retrofit.create(AuthAPI::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
index ea8578ed8c..8646752083 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
@@ -18,4 +18,6 @@ package org.matrix.android.sdk.internal.auth.data
 
 internal interface LoginParams {
     val type: String
+    val deviceDisplayName: String?
+    val deviceId: String?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
index 5f0a2298cb..062b2466e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
@@ -30,8 +30,8 @@ internal data class PasswordLoginParams(
         @Json(name = "identifier") val identifier: Map<String, String>,
         @Json(name = "password") val password: String,
         @Json(name = "type") override val type: String,
-        @Json(name = "initial_device_display_name") val deviceDisplayName: String?,
-        @Json(name = "device_id") val deviceId: String?
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
+        @Json(name = "device_id") override val deviceId: String?
 ) : LoginParams {
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index 0c6fb45e78..22cc185fa7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -23,5 +23,7 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 @JsonClass(generateAdapter = true)
 internal data class TokenLoginParams(
         @Json(name = "type") override val type: String = LoginFlowTypes.TOKEN,
-        @Json(name = "token") val token: String
+        @Json(name = "token") val token: String,
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
+        @Json(name = "device_id") override val deviceId: String?
 ) : LoginParams
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt
new file mode 100644
index 0000000000..477719f607
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 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.auth.login
+
+import dagger.Lazy
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.auth.LoginType
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface QrLoginTokenTask : Task<QrLoginTokenTask.Params, Session> {
+    data class Params(
+            val homeServerConnectionConfig: HomeServerConnectionConfig,
+            val loginToken: String,
+            val deviceName: String?,
+            val deviceId: String?
+    )
+}
+
+internal class DefaultQrLoginTokenTask @Inject constructor(
+        @Unauthenticated
+        private val okHttpClient: Lazy<OkHttpClient>,
+        private val retrofitFactory: RetrofitFactory,
+        private val sessionCreator: SessionCreator,
+) : QrLoginTokenTask {
+
+    override suspend fun execute(params: QrLoginTokenTask.Params): Session {
+        val client = buildClient(params.homeServerConnectionConfig)
+        val homeServerUrl = params.homeServerConnectionConfig.homeServerUriBase.toString()
+
+        val authAPI = retrofitFactory.create(client, homeServerUrl)
+                .create(AuthAPI::class.java)
+
+        val loginParams = TokenLoginParams(
+                token = params.loginToken,
+                deviceDisplayName = params.deviceName,
+                deviceId = params.deviceId
+        )
+
+        val credentials = try {
+            executeRequest(null) {
+                authAPI.login(loginParams)
+            }
+        } catch (throwable: Throwable) {
+            throw when (throwable) {
+                is UnrecognizedCertificateException -> Failure.UnrecognizedCertificateFailure(
+                        homeServerUrl,
+                        throwable.fingerprint
+                )
+                else -> throwable
+            }
+        }
+
+        return sessionCreator.createSession(credentials, params.homeServerConnectionConfig, LoginType.QR)
+    }
+
+    private fun buildClient(homeServerConnectionConfig: HomeServerConnectionConfig): OkHttpClient {
+        return okHttpClient.get()
+                .newBuilder()
+                .addSocketFactory(homeServerConnectionConfig)
+                .build()
+    }
+}

From 098c268af3c348ce8ce7ef088047e907cd1efe83 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:18:31 +0100
Subject: [PATCH 010/300] Changelog

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

diff --git a/changelog.d/7358.sdk b/changelog.d/7358.sdk
new file mode 100644
index 0000000000..3d17076a44
--- /dev/null
+++ b/changelog.d/7358.sdk
@@ -0,0 +1 @@
+Add support for `m.login.token` auth during QR code based sign in

From a71ecee44a5b39d1ac13faa0078e0349d0bbf901 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:19:39 +0100
Subject: [PATCH 011/300] Linting

---
 .../sdk/internal/auth/DefaultAuthenticationService.kt      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 90dc57b4f0..7fd730bece 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -406,7 +406,12 @@ internal class DefaultAuthenticationService @Inject constructor(
         )
     }
 
-    override suspend fun loginUsingQrLoginToken(homeServerConnectionConfig: HomeServerConnectionConfig, loginToken: String, initialDeviceName: String, deviceId: String?): Session {
+    override suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String,
+            deviceId: String?,
+    ): Session {
         return loginTokenAuthTask.execute(
                 QrLoginTokenTask.Params(
                         homeServerConnectionConfig = homeServerConnectionConfig,

From b192fdb0a89b1aa922440ae3dda3bf288a8b7611 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 11 Oct 2022 23:34:05 +0100
Subject: [PATCH 014/300] Partial implementation of QR login logic

---
 .../features/login/qr/QrCodeLoginViewModel.kt |  2 +-
 .../voicebroadcast/VoiceBroadcastConstants.kt | 20 -------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index f97a59b432..d0c34b83af 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -85,8 +85,8 @@ class QrCodeLoginViewModel @AssistedInject constructor(
             Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
             confirmationCode ?.let {
                 onConnectionEstablished(it)
-                rendezvous.completeOnNewDevice()
             }
+            rendezvous.completeOnNewDevice()
         }
     //        if (isValidQrCode(action.qrCode)) {
 //            setState {
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
deleted file mode 100644
index d7d74b08e9..0000000000
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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 im.vector.app.features.voicebroadcast
-
-/** Voice Broadcast State Event. */
-const val STATE_ROOM_VOICE_BROADCAST_INFO = "io.element.voice_broadcast_info"

From 6e09d900070319b356a2b10a1769af8da97a2aef Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 12 Oct 2022 14:32:09 +0300
Subject: [PATCH 015/300] Merge branch 'develop' into
 feature/ons/qr_code_login_ui

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
---
 .../voicebroadcast/VoiceBroadcastConstants.kt | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
new file mode 100644
index 0000000000..d7d74b08e9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
@@ -0,0 +1,20 @@
+/*
+ * 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 im.vector.app.features.voicebroadcast
+
+/** Voice Broadcast State Event. */
+const val STATE_ROOM_VOICE_BROADCAST_INFO = "io.element.voice_broadcast_info"

From 86090086b1344a8e80f8bd3accb1cbbf26a2eab2 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Wed, 12 Oct 2022 13:08:01 +0100
Subject: [PATCH 016/300] Only do completeOnNewDevice if we received a
 confirmation code

---
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index d0c34b83af..f97a59b432 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -85,8 +85,8 @@ class QrCodeLoginViewModel @AssistedInject constructor(
             Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
             confirmationCode ?.let {
                 onConnectionEstablished(it)
+                rendezvous.completeOnNewDevice()
             }
-            rendezvous.completeOnNewDevice()
         }
     //        if (isValidQrCode(action.qrCode)) {
 //            setState {

From ebb3d201c18efba47ec546d778c2f311f266ff9e Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:35:45 +0100
Subject: [PATCH 017/300] Make initialDeviceName optional

---
 .../org/matrix/android/sdk/api/auth/AuthenticationService.kt    | 2 +-
 .../android/sdk/internal/auth/DefaultAuthenticationService.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 8f2a784d49..c8065e4524 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -135,7 +135,7 @@ interface AuthenticationService {
     suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,
-            initialDeviceName: String,
+            initialDeviceName: String?,
             deviceId: String? = null
     ): Session
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 7fd730bece..6c3622ed5d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -409,7 +409,7 @@ internal class DefaultAuthenticationService @Inject constructor(
     override suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,
-            initialDeviceName: String,
+            initialDeviceName: String?,
             deviceId: String?,
     ): Session {
         return loginTokenAuthTask.execute(

From 5843c3832b6e654a813dde273c75cf9e68497e63 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:58:19 +0100
Subject: [PATCH 018/300] Use correct var name

---
 .../android/sdk/internal/auth/DefaultAuthenticationService.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 6c3622ed5d..5b12e3bdc3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -64,7 +64,7 @@ internal class DefaultAuthenticationService @Inject constructor(
         private val pendingSessionStore: PendingSessionStore,
         private val getWellknownTask: GetWellknownTask,
         private val directLoginTask: DirectLoginTask,
-        private val loginTokenAuthTask: QrLoginTokenTask
+        private val qrLoginTokenTask: QrLoginTokenTask
 ) : AuthenticationService {
 
     private var pendingSessionData: PendingSessionData? = pendingSessionStore.getPendingSessionData()
@@ -412,7 +412,7 @@ internal class DefaultAuthenticationService @Inject constructor(
             initialDeviceName: String?,
             deviceId: String?,
     ): Session {
-        return loginTokenAuthTask.execute(
+        return qrLoginTokenTask.execute(
                 QrLoginTokenTask.Params(
                         homeServerConnectionConfig = homeServerConnectionConfig,
                         loginToken = loginToken,

From 579df742579f19fda49913d031759f26ea61c841 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:02:57 +0100
Subject: [PATCH 019/300] Add missing binding

---
 .../java/org/matrix/android/sdk/internal/auth/AuthModule.kt  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
index 463692e574..b1f65194f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
@@ -29,7 +29,9 @@ import org.matrix.android.sdk.internal.auth.db.AuthRealmModule
 import org.matrix.android.sdk.internal.auth.db.RealmPendingSessionStore
 import org.matrix.android.sdk.internal.auth.db.RealmSessionParamsStore
 import org.matrix.android.sdk.internal.auth.login.DefaultDirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.DefaultQrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.database.RealmKeysUtils
 import org.matrix.android.sdk.internal.di.AuthDatabase
 import org.matrix.android.sdk.internal.legacy.DefaultLegacySessionImporter
@@ -94,4 +96,7 @@ internal abstract class AuthModule {
 
     @Binds
     abstract fun bindHomeServerHistoryService(service: DefaultHomeServerHistoryService): HomeServerHistoryService
+
+    @Binds
+    abstract fun bindQrLoginTokenTask(task: DefaultQrLoginTokenTask): QrLoginTokenTask
 }

From b5e81d27d65bb8dc5819250c29035e004c24121f Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:08:50 +0100
Subject: [PATCH 020/300] Set default value for optional params

---
 .../matrix/android/sdk/internal/auth/data/TokenLoginParams.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index 22cc185fa7..52045a1d7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -24,6 +24,6 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 internal data class TokenLoginParams(
         @Json(name = "type") override val type: String = LoginFlowTypes.TOKEN,
         @Json(name = "token") val token: String,
-        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
-        @Json(name = "device_id") override val deviceId: String?
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String? = null,
+        @Json(name = "device_id") override val deviceId: String? = null
 ) : LoginParams

From 22b344c43a224a52d45be8087a7ead5678d6b38f Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:11:41 +0100
Subject: [PATCH 021/300] Another default value fix

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

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index c8065e4524..e490311b91 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -135,7 +135,7 @@ interface AuthenticationService {
     suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,
-            initialDeviceName: String?,
+            initialDeviceName: String? = null,
             deviceId: String? = null
     ): Session
 }

From 8dbb1b830ef8c508190b0367501a1ef441c717c6 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:28:47 +0100
Subject: [PATCH 022/300] Map for soft logout

---
 .../im/vector/app/features/signout/soft/SoftLogoutController.kt  | 1 +
 1 file changed, 1 insertion(+)

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 b1a240e942..a1ed27df1d 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
@@ -152,6 +152,7 @@ class SoftLogoutController @Inject constructor(
             LoginType.SSO -> buildLoginSSOForm()
             LoginType.DIRECT,
             LoginType.CUSTOM,
+            LoginType.QR,
             LoginType.UNSUPPORTED -> buildLoginUnsupportedForm()
             LoginType.UNKNOWN -> Unit
         }

From 6a653c33ae053d73e2d55e640a4b4bfccc74e648 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Thu, 13 Oct 2022 17:09:11 +0100
Subject: [PATCH 023/300] Add issue automation for PS feature teams

---
 .github/workflows/triage-labelled.yml | 78 +++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 174e3c54c0..4031e9d571 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -246,3 +246,81 @@ jobs:
         env:
           PROJECT_ID: "PN_kwDOAM0swc4ABTXY"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features1:
+    name: Add labelled issues to PS features team 1
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
+      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
+        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
+      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
+        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features2:
+    name: Add labelled issues to PS features team 2
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
+      contains(github.event.issue.labels.*.name, 'A-Broadcast')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  ps_features3:
+    name: Add labelled issues to PS features team 3
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'A-Composer-WYSIWYG')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

From 0111b932dea08e98362182165a23d717bea68592 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:08:45 +0100
Subject: [PATCH 024/300] Support for navigation to home screen

---
 .../im/vector/app/features/login/qr/QrCodeLoginActivity.kt | 7 +++++++
 .../vector/app/features/login/qr/QrCodeLoginViewEvents.kt  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
index e0323fdc2d..3c7b0a4729 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
@@ -26,6 +26,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.extensions.addFragmentToBackstack
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.home.HomeActivity
 import org.matrix.android.sdk.api.extensions.orFalse
 import timber.log.Timber
 
@@ -75,6 +76,7 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
             when (it) {
                 QrCodeLoginViewEvents.NavigateToStatusScreen -> handleNavigateToStatusScreen()
                 QrCodeLoginViewEvents.NavigateToShowQrCodeScreen -> handleNavigateToShowQrCodeScreen()
+                QrCodeLoginViewEvents.NavigateToHomeScreen -> handleNavigateToHomeScreen()
             }
         }
     }
@@ -95,6 +97,11 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
         )
     }
 
+    private fun handleNavigateToHomeScreen() {
+        val intent = HomeActivity.newIntent(this, firstStartMainActivity = false, existingSession = true)
+        startActivity(intent)
+    }
+
     companion object {
 
         private const val FRAGMENT_QR_CODE_INSTRUCTIONS_TAG = "FRAGMENT_QR_CODE_INSTRUCTIONS_TAG"
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
index dc258408e7..0f282fee38 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
@@ -21,4 +21,5 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class QrCodeLoginViewEvents : VectorViewEvents {
     object NavigateToStatusScreen : QrCodeLoginViewEvents()
     object NavigateToShowQrCodeScreen : QrCodeLoginViewEvents()
+    object NavigateToHomeScreen : QrCodeLoginViewEvents()
 }

From 1ed082d3cb16943a15664dbb862126942f5539d3 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:15:52 +0100
Subject: [PATCH 025/300] QR login + E2EE set up

---
 .../sdk/internal/rendezvous/Rendezvous.kt     | 95 +++++++++----------
 .../features/login/qr/QrCodeLoginViewModel.kt | 73 ++++++--------
 2 files changed, 74 insertions(+), 94 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
index dd7b91582b..2f85a97c55 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
@@ -16,8 +16,11 @@
 
 package org.matrix.android.sdk.internal.rendezvous
 
+import android.net.Uri
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
@@ -56,9 +59,12 @@ internal data class Payload(
 
 private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
 
-data class Rendezvous(
+/**
+ * Implementation of MSC3906 to sign in + E2EE set up using a QR code.
+ */
+class Rendezvous(
         val channel: RendezvousChannel,
-        val theirIntent: RendezvousIntent
+        val theirIntent: RendezvousIntent,
 ) {
     companion object {
         fun buildChannelFromCode(code: String, onCancelled: (reason: RendezvousFailureReason) -> Unit): Rendezvous {
@@ -116,7 +122,7 @@ data class Rendezvous(
         return checksum
     }
 
-    suspend fun completeOnNewDevice(): Session? {
+    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? {
         Timber.tag(TAG).i("Waiting for login_token");
 
         val loginToken = receive()
@@ -143,59 +149,46 @@ data class Rendezvous(
 
         Timber.tag(TAG).i("Got login_token: $login_token for $homeserver");
 
-        // TODO: set view to be state logging in?
+        val hsConfig = HomeServerConnectionConfig(homeServerUri = Uri.parse(homeserver))
+        return authenticationService.loginUsingQrLoginToken(hsConfig, login_token)
+    }
 
-        // use token to login
-//        const login = await sendLoginRequest(homeserver, undefined, "m.login.token", { token: login_token });
-//
-//        await setLoggedIn(login);
-//
-//        const { deviceId, userId } = login;
-//
-//        const client = MatrixClientPeg.get();
-//
+    suspend fun completeVerificationOnNewDevice(session: Session) {
+        val userId = session.myUserId
+        val crypto = session.cryptoService()
+        val deviceId = crypto.getMyDevice().deviceId
+        val deviceKey = crypto.getMyDevice().fingerprint()
+        send(Payload(PayloadType.Progress, outcome = "success", device_id = deviceId, device_key = deviceKey))
 
-        val newSession: Session? = null
+        // await confirmation of verification
 
-        newSession ?.let {
-            session ->
-            val userId = session.myUserId
-            val crypto = session.cryptoService()
-            val deviceId = crypto.getMyDevice().deviceId
-            val deviceKey = crypto.getMyDevice().fingerprint()
-            send(Payload(PayloadType.Progress, outcome = "success", device_id = deviceId, device_key = deviceKey))
-
-            // await confirmation of verification
-
-            val verificationResponse = receive()
-            val verifyingDeviceId = verificationResponse?.verifying_device_id ?: throw RuntimeException("No verifying device id returned")
-            val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
-            if (verifyingDeviceFromServer?.fingerprint() == verificationResponse.verifying_device_key) {
-                // set other device as verified
-                Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified");
-                crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
-
-                verificationResponse.master_key ?.let {
-                    // set master key as trusted
-                    crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, it)
-
-                }
-
-                // request secrets from the verifying device
-                Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
-
-                session.sharedSecretStorageService() .let {
-                    it.requestSecret(verifyingDeviceId, MASTER_KEY_SSSS_NAME)
-                    it.requestSecret(verifyingDeviceId, SELF_SIGNING_KEY_SSSS_NAME)
-                    it.requestSecret(verifyingDeviceId, USER_SIGNING_KEY_SSSS_NAME)
-                    it.requestSecret(verifyingDeviceId, KEYBACKUP_SECRET_SSSS_NAME)
-                }
-            } else {
-                Timber.tag(TAG).i("Verifying device $verifyingDeviceId doesn't match: $verifyingDeviceFromServer")
-            }
+        val verificationResponse = receive()
+        val verifyingDeviceId = verificationResponse?.verifying_device_id ?: throw RuntimeException("No verifying device id returned")
+        val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
+        if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifying_device_key) {
+            Timber.tag(TAG).w("Verifying device $verifyingDeviceId doesn't match: $verifyingDeviceFromServer")
+            return;
         }
 
-        return newSession
+        // set other device as verified
+        Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified");
+        crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+
+        // TODO: what do we do with the master key?
+//        verificationResponse.master_key ?.let {
+//            // set master key as trusted
+//            crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, it)
+//        }
+
+        // request secrets from the verifying device
+        Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
+
+        session.sharedSecretStorageService() .let {
+            it.requestSecret(MASTER_KEY_SSSS_NAME, verifyingDeviceId)
+            it.requestSecret(SELF_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+            it.requestSecret(USER_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+            it.requestSecret(KEYBACKUP_SECRET_SSSS_NAME, verifyingDeviceId)
+        }
     }
 
     private suspend fun receive(): Payload? {
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index f97a59b432..c729152e44 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -16,24 +16,31 @@
 
 package im.vector.app.features.login.qr
 
+import android.content.Context
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.home.HomeActivity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.internal.rendezvous.Rendezvous
 import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
 import timber.log.Timber
 
 class QrCodeLoginViewModel @AssistedInject constructor(
-        @Assisted private val initialState: QrCodeLoginViewState
+        @Assisted private val initialState: QrCodeLoginViewState,
+        private val applicationContext: Context,
+        private val authenticationService: AuthenticationService,
+        private val activeSessionHolder: ActiveSessionHolder,
 ) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
-
     val TAG: String = QrCodeLoginViewModel::class.java.simpleName
 
     @AssistedFactory
@@ -81,44 +88,31 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
 
         viewModelScope.launch(Dispatchers.IO) {
-            val confirmationCode = rendezvous.startAfterScanningCode()
-            Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
-            confirmationCode ?.let {
-                onConnectionEstablished(it)
-                rendezvous.completeOnNewDevice()
+            try {
+                val confirmationCode = rendezvous.startAfterScanningCode()
+                Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
+                confirmationCode?.let {
+                    onConnectionEstablished(it)
+                    val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
+                    onSigningIn()
+                    session?.let {
+                        activeSessionHolder.setActiveSession(session)
+                        authenticationService.reset()
+
+                        session.configureAndStart(applicationContext)
+
+                        rendezvous.completeVerificationOnNewDevice(session)
+
+                        _viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
+                    }
+                }
+            } catch (failure: Throwable) {
+                Timber.tag(TAG).e(failure, "Error occurred during sign in")
+                onFailed(RendezvousFailureReason.Unknown)
             }
         }
-    //        if (isValidQrCode(action.qrCode)) {
-//            setState {
-//                copy(
-//                        connectionStatus = QrCodeLoginConnectionStatus.ConnectingToDevice
-//                )
-//            }
-//            _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
-//        }
-//
-
-//        // TODO. UI test purpose. Fixme remove!
-//        viewModelScope.launch {
-//            delay(3000)
-//            onFailed(QrCodeLoginErrorType.TIMEOUT, true)
-//            delay(3000)
-//            onConnectionEstablished("1234-ABCD-5678-EFGH")
-//            delay(3000)
-//            onSigningIn()
-//            delay(3000)
-//            onFailed(QrCodeLoginErrorType.DEVICE_IS_NOT_SUPPORTED, false)
-//        }
-//        // TODO. UI test purpose. Fixme remove!
-//        viewModelScope.launch {
-//            delay(3000)
-//            onConnectionEstablished("1234-ABCD-5678-EFGH")
-//            delay(3000)
-//            onSigningIn()
-//        }
     }
 
-
     private fun onFailed(reason: RendezvousFailureReason) {
         setState {
             copy(
@@ -144,13 +138,6 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         }
     }
 
-    /**
-     * TODO. UI test purpose. Fixme accordingly.
-     */
-    private fun isValidQrCode(qrCode: String): Boolean {
-        return qrCode.startsWith("http")
-    }
-
     /**
      * TODO. UI test purpose. Fixme accordingly.
      */

From 560fda51d163695d1c4878751d9f2f0ab92014b7 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:26:22 +0100
Subject: [PATCH 026/300] Reduce logging

---
 .../rendezvous/channels/ECDHRendezvousChannel.kt | 16 ++++++++--------
 .../transports/SimpleHttpRendezvousTransport.kt  |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
index 33837bc425..cced29aab4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -94,7 +94,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         val isInitiator = theirPublicKey == null
 
         if (isInitiator) {
-            Timber.tag(TAG).i("Waiting for other device to send their public key")
+//            Timber.tag(TAG).i("Waiting for other device to send their public key")
             val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
 
             if (res.key == null) {
@@ -106,7 +106,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
             theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
         } else {
             // send our public key unencrypted
-            Timber.tag(TAG).i("Sending public key")
+//            Timber.tag(TAG).i("Sending public key")
             send(ECDHPayload(
                     algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
                     key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
@@ -121,10 +121,10 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
         aesKey = olmSAS!!.generateShortCode(aesInfo, 32)
 
-        Timber.tag(TAG).i("Our public key: ${Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)}")
-        Timber.tag(TAG).i("Their public key: ${Base64.encodeToString(theirPublicKey, Base64.NO_WRAP)}")
-        Timber.tag(TAG).i("AES info: $aesInfo")
-        Timber.tag(TAG).i("AES key: ${Base64.encodeToString(aesKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("Our public key: ${Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("Their public key: ${Base64.encodeToString(theirPublicKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("AES info: $aesInfo")
+//        Timber.tag(TAG).i("AES key: ${Base64.encodeToString(aesKey, Base64.NO_WRAP)}")
 
         val rawChecksum = olmSAS!!.generateShortCode(aesInfo, 5)
         return getDecimalCodeRepresentation(rawChecksum)
@@ -180,7 +180,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     private fun encrypt(plainText: ByteArray): ECDHPayload {
-        Timber.tag(TAG).i("Encrypting: ${plainText.toString(Charsets.UTF_8)}")
+//        Timber.tag(TAG).d("Encrypting: ${plainText.toString(Charsets.UTF_8)}")
         val iv = ByteArray(16)
         SecureRandom().nextBytes(iv)
 
@@ -212,7 +212,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
         val plainTextBytes = plainText.toByteArray()
 
-        Timber.tag(TAG).i("Decrypted: ${plainTextBytes.toString(Charsets.UTF_8)}")
+//        Timber.tag(TAG).d("Decrypted: ${plainTextBytes.toString(Charsets.UTF_8)}")
         return plainTextBytes
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 3e5e1121ea..cc4346d55e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -67,7 +67,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         // TODO: properly determine endpoint
         val uri = if (uri != null) uri!! else "https://rendezvous.lab.element.dev"
 
-        Timber.tag(TAG).i("Sending data: ${data.toString(Charsets.UTF_8)} to $uri")
+//        Timber.tag(TAG).i("Sending data: ${data.toString(Charsets.UTF_8)} to $uri")
 
         val httpClient = okhttp3.OkHttpClient.Builder().build()
 
@@ -123,8 +123,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
             val response = httpClient.newCall(request.build()).execute()
 
             try {
-
-                Timber.tag(TAG).i("Received polling response: ${response.code} from $uri")
+//                Timber.tag(TAG).d("Received polling response: ${response.code} from $uri")
 
                 if (response.code == 404) {
                     cancel(RendezvousFailureReason.Unknown)
@@ -142,7 +141,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
                         etag = it
                     }
                     val data = response.body?.bytes()
-                    Timber.tag(TAG).i("Received data: ${data?.toString(Charsets.UTF_8)} from $uri with etag $etag")
+//                    Timber.tag(TAG).d("Received data: ${data?.toString(Charsets.UTF_8)} from $uri with etag $etag")
                     return data
                 }
 
@@ -158,6 +157,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
 
     override suspend fun cancel(reason: RendezvousFailureReason) {
         var mappedReason = reason
+        Timber.tag(TAG).i("$expiresAt")
         if (mappedReason == RendezvousFailureReason.Unknown &&
                 expiresAt != null && Date() > expiresAt) {
             mappedReason = RendezvousFailureReason.Expired

From 88238c0f04648a7468c2ee33d86068fa79e4fe5f Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:11:15 +0100
Subject: [PATCH 027/300] Support for login by m.login.token during QR code
 sign in

---
 .../sdk/api/auth/AuthenticationService.kt     | 13 +++
 .../matrix/android/sdk/api/auth/LoginType.kt  |  4 +-
 .../auth/DefaultAuthenticationService.kt      | 15 +++-
 .../sdk/internal/auth/data/LoginParams.kt     |  2 +
 .../internal/auth/data/PasswordLoginParams.kt |  4 +-
 .../internal/auth/data/TokenLoginParams.kt    |  4 +-
 .../internal/auth/login/QrLoginTokenTask.kt   | 88 +++++++++++++++++++
 7 files changed, 125 insertions(+), 5 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index d040f9c67b..6bb47dda5b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -130,4 +130,17 @@ interface AuthenticationService {
      * Return true if qr code login is supported by the server, false otherwise.
      */
     suspend fun isQrLoginSupported(homeServerConnectionConfig: HomeServerConnectionConfig): Boolean
+     * Authenticate using m.login.token method during sign in with QR code.
+     * @param homeServerConnectionConfig the information about the homeserver and other configuration
+     * @param loginToken the m.login.token
+     * @param initialDeviceName the initial device name
+     * @param deviceId the device id, optional. If not provided or null, the server will generate one.
+     */
+
+    suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String,
+            deviceId: String? = null
+    ): Session
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
index 627a825679..991b7b654d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
@@ -22,7 +22,8 @@ enum class LoginType {
     UNSUPPORTED,
     CUSTOM,
     DIRECT,
-    UNKNOWN;
+    UNKNOWN,
+    QR;
 
     companion object {
 
@@ -32,6 +33,7 @@ enum class LoginType {
             UNSUPPORTED.name -> UNSUPPORTED
             CUSTOM.name -> CUSTOM
             DIRECT.name -> DIRECT
+            QR.name -> QR
             else -> UNKNOWN
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 4f45f807df..5b6f0686c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -40,6 +40,7 @@ import org.matrix.android.sdk.internal.auth.data.WebClientConfig
 import org.matrix.android.sdk.internal.auth.db.PendingSessionData
 import org.matrix.android.sdk.internal.auth.login.DefaultLoginWizard
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.registration.DefaultRegistrationWizard
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
@@ -64,7 +65,8 @@ internal class DefaultAuthenticationService @Inject constructor(
         private val sessionCreator: SessionCreator,
         private val pendingSessionStore: PendingSessionStore,
         private val getWellknownTask: GetWellknownTask,
-        private val directLoginTask: DirectLoginTask
+        private val directLoginTask: DirectLoginTask,
+        private val loginTokenAuthTask: QrLoginTokenTask
 ) : AuthenticationService {
 
     private var pendingSessionData: PendingSessionData? = pendingSessionStore.getPendingSessionData()
@@ -420,6 +422,17 @@ internal class DefaultAuthenticationService @Inject constructor(
         }
     }
 
+    override suspend fun loginUsingQrLoginToken(homeServerConnectionConfig: HomeServerConnectionConfig, loginToken: String, initialDeviceName: String, deviceId: String?): Session {
+        return loginTokenAuthTask.execute(
+                QrLoginTokenTask.Params(
+                        homeServerConnectionConfig = homeServerConnectionConfig,
+                        loginToken = loginToken,
+                        deviceName = initialDeviceName,
+                        deviceId = deviceId
+                )
+        )
+    }
+
     private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {
         val retrofit = retrofitFactory.create(buildClient(homeServerConnectionConfig), homeServerConnectionConfig.homeServerUriBase.toString())
         return retrofit.create(AuthAPI::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
index ea8578ed8c..8646752083 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/LoginParams.kt
@@ -18,4 +18,6 @@ package org.matrix.android.sdk.internal.auth.data
 
 internal interface LoginParams {
     val type: String
+    val deviceDisplayName: String?
+    val deviceId: String?
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
index 5f0a2298cb..062b2466e5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/PasswordLoginParams.kt
@@ -30,8 +30,8 @@ internal data class PasswordLoginParams(
         @Json(name = "identifier") val identifier: Map<String, String>,
         @Json(name = "password") val password: String,
         @Json(name = "type") override val type: String,
-        @Json(name = "initial_device_display_name") val deviceDisplayName: String?,
-        @Json(name = "device_id") val deviceId: String?
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
+        @Json(name = "device_id") override val deviceId: String?
 ) : LoginParams {
 
     companion object {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index 0c6fb45e78..22cc185fa7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -23,5 +23,7 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 @JsonClass(generateAdapter = true)
 internal data class TokenLoginParams(
         @Json(name = "type") override val type: String = LoginFlowTypes.TOKEN,
-        @Json(name = "token") val token: String
+        @Json(name = "token") val token: String,
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
+        @Json(name = "device_id") override val deviceId: String?
 ) : LoginParams
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt
new file mode 100644
index 0000000000..477719f607
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/login/QrLoginTokenTask.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 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.auth.login
+
+import dagger.Lazy
+import okhttp3.OkHttpClient
+import org.matrix.android.sdk.api.auth.LoginType
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.failure.Failure
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.auth.AuthAPI
+import org.matrix.android.sdk.internal.auth.SessionCreator
+import org.matrix.android.sdk.internal.auth.data.TokenLoginParams
+import org.matrix.android.sdk.internal.di.Unauthenticated
+import org.matrix.android.sdk.internal.network.RetrofitFactory
+import org.matrix.android.sdk.internal.network.executeRequest
+import org.matrix.android.sdk.internal.network.httpclient.addSocketFactory
+import org.matrix.android.sdk.internal.network.ssl.UnrecognizedCertificateException
+import org.matrix.android.sdk.internal.task.Task
+import javax.inject.Inject
+
+internal interface QrLoginTokenTask : Task<QrLoginTokenTask.Params, Session> {
+    data class Params(
+            val homeServerConnectionConfig: HomeServerConnectionConfig,
+            val loginToken: String,
+            val deviceName: String?,
+            val deviceId: String?
+    )
+}
+
+internal class DefaultQrLoginTokenTask @Inject constructor(
+        @Unauthenticated
+        private val okHttpClient: Lazy<OkHttpClient>,
+        private val retrofitFactory: RetrofitFactory,
+        private val sessionCreator: SessionCreator,
+) : QrLoginTokenTask {
+
+    override suspend fun execute(params: QrLoginTokenTask.Params): Session {
+        val client = buildClient(params.homeServerConnectionConfig)
+        val homeServerUrl = params.homeServerConnectionConfig.homeServerUriBase.toString()
+
+        val authAPI = retrofitFactory.create(client, homeServerUrl)
+                .create(AuthAPI::class.java)
+
+        val loginParams = TokenLoginParams(
+                token = params.loginToken,
+                deviceDisplayName = params.deviceName,
+                deviceId = params.deviceId
+        )
+
+        val credentials = try {
+            executeRequest(null) {
+                authAPI.login(loginParams)
+            }
+        } catch (throwable: Throwable) {
+            throw when (throwable) {
+                is UnrecognizedCertificateException -> Failure.UnrecognizedCertificateFailure(
+                        homeServerUrl,
+                        throwable.fingerprint
+                )
+                else -> throwable
+            }
+        }
+
+        return sessionCreator.createSession(credentials, params.homeServerConnectionConfig, LoginType.QR)
+    }
+
+    private fun buildClient(homeServerConnectionConfig: HomeServerConnectionConfig): OkHttpClient {
+        return okHttpClient.get()
+                .newBuilder()
+                .addSocketFactory(homeServerConnectionConfig)
+                .build()
+    }
+}

From 282825db7952fd6516a3b1531fb709ca6831cd78 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:18:31 +0100
Subject: [PATCH 028/300] Changelog

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

diff --git a/changelog.d/7358.sdk b/changelog.d/7358.sdk
new file mode 100644
index 0000000000..3d17076a44
--- /dev/null
+++ b/changelog.d/7358.sdk
@@ -0,0 +1 @@
+Add support for `m.login.token` auth during QR code based sign in

From d0898a2b89e7ff0c2858fece93656a2b0427a19e Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:19:39 +0100
Subject: [PATCH 029/300] Linting

---
 .../sdk/internal/auth/DefaultAuthenticationService.kt      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 5b6f0686c4..773f2118b1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -422,7 +422,12 @@ internal class DefaultAuthenticationService @Inject constructor(
         }
     }
 
-    override suspend fun loginUsingQrLoginToken(homeServerConnectionConfig: HomeServerConnectionConfig, loginToken: String, initialDeviceName: String, deviceId: String?): Session {
+    override suspend fun loginUsingQrLoginToken(
+            homeServerConnectionConfig: HomeServerConnectionConfig,
+            loginToken: String,
+            initialDeviceName: String,
+            deviceId: String?,
+    ): Session {
         return loginTokenAuthTask.execute(
                 QrLoginTokenTask.Params(
                         homeServerConnectionConfig = homeServerConnectionConfig,

From bfab07d716bddf91b2e7cab707dd2fe8e5ffb982 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 11 Oct 2022 23:34:05 +0100
Subject: [PATCH 032/300] Partial implementation of QR login logic

---
 .../features/login/qr/QrCodeLoginViewModel.kt | 27 ++++++++++++++-----
 .../voicebroadcast/VoiceBroadcastConstants.kt | 20 --------------
 2 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index da3348653c..05344f0a67 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -59,13 +59,28 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     }
 
     private fun handleOnQrCodeScanned(action: QrCodeLoginAction.OnQrCodeScanned) {
-        if (isValidQrCode(action.qrCode)) {
-            setState {
-                copy(
-                        connectionStatus = QrCodeLoginConnectionStatus.ConnectingToDevice
-                )
+        Timber.tag(TAG).d("Scanned code: ${action.qrCode}")
+
+        val rendezvous = Rendezvous.buildChannelFromCode(action.qrCode) { reason ->
+            Timber.tag(TAG).d("Rendezvous cancelled: $reason")
+            onFailed(reason)
+        }
+
+        setState {
+            copy(
+                    connectionStatus = QrCodeLoginConnectionStatus.ConnectingToDevice
+            )
+        }
+
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
+
+        viewModelScope.launch(Dispatchers.IO) {
+            val confirmationCode = rendezvous.startAfterScanningCode()
+            Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
+            confirmationCode ?.let {
+                onConnectionEstablished(it)
             }
-            _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
+            rendezvous.completeOnNewDevice()
         }
 
         // TODO. UI test purpose. Fixme remove!
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
deleted file mode 100644
index d7d74b08e9..0000000000
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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 im.vector.app.features.voicebroadcast
-
-/** Voice Broadcast State Event. */
-const val STATE_ROOM_VOICE_BROADCAST_INFO = "io.element.voice_broadcast_info"

From ef574bd82fbc5e33f0d4da51958158de9773a45c Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Wed, 12 Oct 2022 14:32:09 +0300
Subject: [PATCH 033/300] Merge branch 'develop' into
 feature/ons/qr_code_login_ui

# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	library/ui-styles/src/main/res/values/stylable_sessions_list_header_view.xml
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
#	vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/VectorFeatures.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_other_sessions.xml
#	vector/src/main/res/layout/fragment_settings_devices.xml
---
 .../voicebroadcast/VoiceBroadcastConstants.kt | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
new file mode 100644
index 0000000000..d7d74b08e9
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastConstants.kt
@@ -0,0 +1,20 @@
+/*
+ * 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 im.vector.app.features.voicebroadcast
+
+/** Voice Broadcast State Event. */
+const val STATE_ROOM_VOICE_BROADCAST_INFO = "io.element.voice_broadcast_info"

From b03240330d9905fc422a2fd3d166376c5d80f3a7 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Wed, 12 Oct 2022 13:08:01 +0100
Subject: [PATCH 034/300] Only do completeOnNewDevice if we received a
 confirmation code

---
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 05344f0a67..877d32a11d 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -79,8 +79,8 @@ class QrCodeLoginViewModel @AssistedInject constructor(
             Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
             confirmationCode ?.let {
                 onConnectionEstablished(it)
+                rendezvous.completeOnNewDevice()
             }
-            rendezvous.completeOnNewDevice()
         }
 
         // TODO. UI test purpose. Fixme remove!

From 1e60f3c25b457e2cb40e5c8770e673c25f2fa941 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:35:45 +0100
Subject: [PATCH 035/300] Make initialDeviceName optional

---
 .../org/matrix/android/sdk/api/auth/AuthenticationService.kt    | 2 +-
 .../android/sdk/internal/auth/DefaultAuthenticationService.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 6bb47dda5b..9fde6d9326 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -140,7 +140,7 @@ interface AuthenticationService {
     suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,
-            initialDeviceName: String,
+            initialDeviceName: String?,
             deviceId: String? = null
     ): Session
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 773f2118b1..7aeeacd10b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -425,7 +425,7 @@ internal class DefaultAuthenticationService @Inject constructor(
     override suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,
-            initialDeviceName: String,
+            initialDeviceName: String?,
             deviceId: String?,
     ): Session {
         return loginTokenAuthTask.execute(

From e2f3dde5c1579c88521ae7b2e16b725f7e7c48e5 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 15:58:19 +0100
Subject: [PATCH 036/300] Use correct var name

---
 .../android/sdk/internal/auth/DefaultAuthenticationService.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
index 7aeeacd10b..5449c0a735 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
@@ -66,7 +66,7 @@ internal class DefaultAuthenticationService @Inject constructor(
         private val pendingSessionStore: PendingSessionStore,
         private val getWellknownTask: GetWellknownTask,
         private val directLoginTask: DirectLoginTask,
-        private val loginTokenAuthTask: QrLoginTokenTask
+        private val qrLoginTokenTask: QrLoginTokenTask
 ) : AuthenticationService {
 
     private var pendingSessionData: PendingSessionData? = pendingSessionStore.getPendingSessionData()
@@ -428,7 +428,7 @@ internal class DefaultAuthenticationService @Inject constructor(
             initialDeviceName: String?,
             deviceId: String?,
     ): Session {
-        return loginTokenAuthTask.execute(
+        return qrLoginTokenTask.execute(
                 QrLoginTokenTask.Params(
                         homeServerConnectionConfig = homeServerConnectionConfig,
                         loginToken = loginToken,

From ca7a6efadee7430c4ac431a7cb89733db7486cc6 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:02:57 +0100
Subject: [PATCH 037/300] Add missing binding

---
 .../java/org/matrix/android/sdk/internal/auth/AuthModule.kt  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
index 463692e574..b1f65194f1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/AuthModule.kt
@@ -29,7 +29,9 @@ import org.matrix.android.sdk.internal.auth.db.AuthRealmModule
 import org.matrix.android.sdk.internal.auth.db.RealmPendingSessionStore
 import org.matrix.android.sdk.internal.auth.db.RealmSessionParamsStore
 import org.matrix.android.sdk.internal.auth.login.DefaultDirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.DefaultQrLoginTokenTask
 import org.matrix.android.sdk.internal.auth.login.DirectLoginTask
+import org.matrix.android.sdk.internal.auth.login.QrLoginTokenTask
 import org.matrix.android.sdk.internal.database.RealmKeysUtils
 import org.matrix.android.sdk.internal.di.AuthDatabase
 import org.matrix.android.sdk.internal.legacy.DefaultLegacySessionImporter
@@ -94,4 +96,7 @@ internal abstract class AuthModule {
 
     @Binds
     abstract fun bindHomeServerHistoryService(service: DefaultHomeServerHistoryService): HomeServerHistoryService
+
+    @Binds
+    abstract fun bindQrLoginTokenTask(task: DefaultQrLoginTokenTask): QrLoginTokenTask
 }

From ac80ae5632c4543b199189b90662ed4c971373eb Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:08:50 +0100
Subject: [PATCH 038/300] Set default value for optional params

---
 .../matrix/android/sdk/internal/auth/data/TokenLoginParams.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
index 22cc185fa7..52045a1d7a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/data/TokenLoginParams.kt
@@ -24,6 +24,6 @@ import org.matrix.android.sdk.api.auth.data.LoginFlowTypes
 internal data class TokenLoginParams(
         @Json(name = "type") override val type: String = LoginFlowTypes.TOKEN,
         @Json(name = "token") val token: String,
-        @Json(name = "initial_device_display_name") override val deviceDisplayName: String?,
-        @Json(name = "device_id") override val deviceId: String?
+        @Json(name = "initial_device_display_name") override val deviceDisplayName: String? = null,
+        @Json(name = "device_id") override val deviceId: String? = null
 ) : LoginParams

From bc0843eddf1712983dd4990ac6835dd68fc0bbb5 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:11:41 +0100
Subject: [PATCH 039/300] Another default value fix

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

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 9fde6d9326..1cc53b311c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -140,7 +140,7 @@ interface AuthenticationService {
     suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,
-            initialDeviceName: String?,
+            initialDeviceName: String? = null,
             deviceId: String? = null
     ): Session
 }

From 991eeb1de6c29515aa43d4c551b8cf12580f5f53 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 16:28:47 +0100
Subject: [PATCH 040/300] Map for soft logout

---
 .../im/vector/app/features/signout/soft/SoftLogoutController.kt  | 1 +
 1 file changed, 1 insertion(+)

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 b1a240e942..a1ed27df1d 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
@@ -152,6 +152,7 @@ class SoftLogoutController @Inject constructor(
             LoginType.SSO -> buildLoginSSOForm()
             LoginType.DIRECT,
             LoginType.CUSTOM,
+            LoginType.QR,
             LoginType.UNSUPPORTED -> buildLoginUnsupportedForm()
             LoginType.UNKNOWN -> Unit
         }

From 9a72d6529b0a76bc83c28ed217f79c8a69c6acc4 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:08:45 +0100
Subject: [PATCH 041/300] Support for navigation to home screen

---
 .../im/vector/app/features/login/qr/QrCodeLoginActivity.kt | 7 +++++++
 .../vector/app/features/login/qr/QrCodeLoginViewEvents.kt  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
index 042f885231..fac31ce4e3 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
@@ -25,6 +25,7 @@ import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.features.home.HomeActivity
 import org.matrix.android.sdk.api.extensions.orFalse
 import timber.log.Timber
 
@@ -74,6 +75,7 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
             when (it) {
                 QrCodeLoginViewEvents.NavigateToStatusScreen -> handleNavigateToStatusScreen()
                 QrCodeLoginViewEvents.NavigateToShowQrCodeScreen -> handleNavigateToShowQrCodeScreen()
+                QrCodeLoginViewEvents.NavigateToHomeScreen -> handleNavigateToHomeScreen()
             }
         }
     }
@@ -94,6 +96,11 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
         )
     }
 
+    private fun handleNavigateToHomeScreen() {
+        val intent = HomeActivity.newIntent(this, firstStartMainActivity = false, existingSession = true)
+        startActivity(intent)
+    }
+
     companion object {
 
         private const val FRAGMENT_QR_CODE_INSTRUCTIONS_TAG = "FRAGMENT_QR_CODE_INSTRUCTIONS_TAG"
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
index dc258408e7..0f282fee38 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
@@ -21,4 +21,5 @@ import im.vector.app.core.platform.VectorViewEvents
 sealed class QrCodeLoginViewEvents : VectorViewEvents {
     object NavigateToStatusScreen : QrCodeLoginViewEvents()
     object NavigateToShowQrCodeScreen : QrCodeLoginViewEvents()
+    object NavigateToHomeScreen : QrCodeLoginViewEvents()
 }

From dd47297dfd4bc774c509d06ccc1316fbb70e6514 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:15:52 +0100
Subject: [PATCH 042/300] QR login + E2EE set up

---
 .../sdk/internal/rendezvous/Rendezvous.kt     | 210 ++++++++++++++++++
 .../features/login/qr/QrCodeLoginViewModel.kt |  62 +++---
 2 files changed, 246 insertions(+), 26 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
new file mode 100644
index 0000000000..2f85a97c55
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
@@ -0,0 +1,210 @@
+/*
+ * 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.internal.rendezvous
+
+import android.net.Uri
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
+import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
+import org.matrix.android.sdk.api.util.MatrixJsonParser
+import org.matrix.android.sdk.internal.rendezvous.channels.ECDHRendezvousChannel
+import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.internal.rendezvous.transports.SimpleHttpRendezvousTransport
+import timber.log.Timber
+
+internal enum class PayloadType(val value: String) {
+    @Json(name = "m.login.start") Start("m.login.start"),
+    @Json(name = "m.login.finish") Finish("m.login.finish"),
+    @Json(name = "m.login.progress") Progress("m.login.progress")
+}
+
+@JsonClass(generateAdapter = true)
+internal data class Payload(
+        @Json val type: PayloadType,
+        @Json val intent: RendezvousIntent? = null,
+        @Json val outcome: String? = null,
+        @Json val protocols: List<String>? = null,
+        @Json val protocol: String? = null,
+        @Json val homeserver: String? = null,
+        @Json val login_token: String? = null,
+        @Json val device_id: String? = null,
+        @Json val device_key: String? = null,
+        @Json val verifying_device_id: String? = null,
+        @Json val verifying_device_key: String? = null,
+        @Json val master_key: String? = null
+)
+
+private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+
+/**
+ * Implementation of MSC3906 to sign in + E2EE set up using a QR code.
+ */
+class Rendezvous(
+        val channel: RendezvousChannel,
+        val theirIntent: RendezvousIntent,
+) {
+    companion object {
+        fun buildChannelFromCode(code: String, onCancelled: (reason: RendezvousFailureReason) -> Unit): Rendezvous {
+            val parsed = MatrixJsonParser.getMoshi().adapter(ECDHRendezvousCode::class.java).fromJson(code) ?: throw RuntimeException("Invalid code")
+
+            val transport = SimpleHttpRendezvousTransport(onCancelled, parsed.rendezvous.transport.uri)
+
+            return Rendezvous(
+                    ECDHRendezvousChannel(transport, parsed.rendezvous.key),
+                    parsed.intent
+            )
+        }
+    }
+
+    private val adapter = MatrixJsonParser.getMoshi().adapter(Payload::class.java)
+    // not yet implemented: RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
+    val ourIntent: RendezvousIntent = RendezvousIntent.LOGIN_ON_NEW_DEVICE
+
+    private suspend fun areIntentsIncompatible(): Boolean {
+        val incompatible = theirIntent == ourIntent
+
+        Timber.tag(TAG).d("ourIntent: $ourIntent, theirIntent: $theirIntent, incompatible: $incompatible")
+
+        if (incompatible) {
+            send(Payload(PayloadType.Finish, intent = ourIntent))
+            val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) RendezvousFailureReason.OtherDeviceNotSignedIn else RendezvousFailureReason.OtherDeviceAlreadySignedIn
+            channel.cancel(reason)
+        }
+
+        return incompatible
+    }
+
+    suspend fun startAfterScanningCode(): String? {
+        val checksum = channel.connect();
+
+        Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
+
+        if (areIntentsIncompatible()) {
+            return null
+        }
+
+        // get protocols
+        Timber.tag(TAG).i("Waiting for protocols");
+        val protocolsResponse = receive()
+
+        if (protocolsResponse?.protocols == null || !protocolsResponse.protocols.contains("login_token")) {
+            send(Payload(PayloadType.Finish, outcome = "unsupported"))
+            Timber.tag(TAG).i("No supported protocol")
+            cancel(RendezvousFailureReason.Unknown)
+            return null
+        }
+
+        send(Payload(PayloadType.Progress, protocol = "login_token"))
+
+        return checksum
+    }
+
+    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? {
+        Timber.tag(TAG).i("Waiting for login_token");
+
+        val loginToken = receive()
+
+        if (loginToken?.type == PayloadType.Finish) {
+            when (loginToken.outcome) {
+                "declined" -> {
+                    Timber.tag(TAG).i("Login declined by other device")
+                    channel.cancel(RendezvousFailureReason.UserDeclined)
+                    return null
+                }
+                "unsupported" -> {
+                    Timber.tag(TAG).i("Not supported")
+                    channel.cancel(RendezvousFailureReason.HomeserverLacksSupport)
+                    return null
+                }
+            }
+            channel.cancel(RendezvousFailureReason.Unknown)
+            return null
+        }
+
+        val homeserver = loginToken?.homeserver ?: throw RuntimeException("No homeserver returned")
+        val login_token = loginToken.login_token ?: throw RuntimeException("No login token returned")
+
+        Timber.tag(TAG).i("Got login_token: $login_token for $homeserver");
+
+        val hsConfig = HomeServerConnectionConfig(homeServerUri = Uri.parse(homeserver))
+        return authenticationService.loginUsingQrLoginToken(hsConfig, login_token)
+    }
+
+    suspend fun completeVerificationOnNewDevice(session: Session) {
+        val userId = session.myUserId
+        val crypto = session.cryptoService()
+        val deviceId = crypto.getMyDevice().deviceId
+        val deviceKey = crypto.getMyDevice().fingerprint()
+        send(Payload(PayloadType.Progress, outcome = "success", device_id = deviceId, device_key = deviceKey))
+
+        // await confirmation of verification
+
+        val verificationResponse = receive()
+        val verifyingDeviceId = verificationResponse?.verifying_device_id ?: throw RuntimeException("No verifying device id returned")
+        val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
+        if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifying_device_key) {
+            Timber.tag(TAG).w("Verifying device $verifyingDeviceId doesn't match: $verifyingDeviceFromServer")
+            return;
+        }
+
+        // set other device as verified
+        Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified");
+        crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+
+        // TODO: what do we do with the master key?
+//        verificationResponse.master_key ?.let {
+//            // set master key as trusted
+//            crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, it)
+//        }
+
+        // request secrets from the verifying device
+        Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
+
+        session.sharedSecretStorageService() .let {
+            it.requestSecret(MASTER_KEY_SSSS_NAME, verifyingDeviceId)
+            it.requestSecret(SELF_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+            it.requestSecret(USER_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+            it.requestSecret(KEYBACKUP_SECRET_SSSS_NAME, verifyingDeviceId)
+        }
+    }
+
+    private suspend fun receive(): Payload? {
+        val data = channel.receive()?: return null
+        return adapter.fromJson(data.toString(Charsets.UTF_8))
+    }
+
+    private suspend fun send(payload: Payload) {
+        channel.send(adapter.toJson(payload).toByteArray(Charsets.UTF_8));
+    }
+
+    suspend fun cancel(reason: RendezvousFailureReason) {
+        channel.cancel(reason)
+    }
+
+    suspend fun close() {
+        channel.close()
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 877d32a11d..d9c30690a7 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -16,19 +16,32 @@
 
 package im.vector.app.features.login.qr
 
+import android.content.Context
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.platform.VectorViewModel
-import kotlinx.coroutines.delay
+import im.vector.app.features.home.HomeActivity
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.internal.rendezvous.Rendezvous
+import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import timber.log.Timber
 
 class QrCodeLoginViewModel @AssistedInject constructor(
         @Assisted private val initialState: QrCodeLoginViewState,
+        private val applicationContext: Context,
+        private val authenticationService: AuthenticationService,
+        private val activeSessionHolder: ActiveSessionHolder,
 ) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
+    val TAG: String = QrCodeLoginViewModel::class.java.simpleName
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<QrCodeLoginViewModel, QrCodeLoginViewState> {
@@ -75,28 +88,32 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
 
         viewModelScope.launch(Dispatchers.IO) {
-            val confirmationCode = rendezvous.startAfterScanningCode()
-            Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
-            confirmationCode ?.let {
-                onConnectionEstablished(it)
-                rendezvous.completeOnNewDevice()
-            }
-        }
+            try {
+                val confirmationCode = rendezvous.startAfterScanningCode()
+                Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
+                confirmationCode?.let {
+                    onConnectionEstablished(it)
+                    val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
+                    onSigningIn()
+                    session?.let {
+                        activeSessionHolder.setActiveSession(session)
+                        authenticationService.reset()
 
-        // TODO. UI test purpose. Fixme remove!
-        viewModelScope.launch {
-            delay(3000)
-            onFailed(QrCodeLoginErrorType.TIMEOUT, true)
-            delay(3000)
-            onConnectionEstablished("1234-ABCD-5678-EFGH")
-            delay(3000)
-            onSigningIn()
-            delay(3000)
-            onFailed(QrCodeLoginErrorType.DEVICE_IS_NOT_SUPPORTED, false)
+                        session.configureAndStart(applicationContext)
+
+                        rendezvous.completeVerificationOnNewDevice(session)
+
+                        _viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
+                    }
+                }
+            } catch (failure: Throwable) {
+                Timber.tag(TAG).e(failure, "Error occurred during sign in")
+                onFailed(RendezvousFailureReason.Unknown)
+            }
         }
     }
 
-    private fun onFailed(errorType: QrCodeLoginErrorType, canTryAgain: Boolean) {
+    private fun onFailed(reason: RendezvousFailureReason) {
         setState {
             copy(
                     connectionStatus = QrCodeLoginConnectionStatus.Failed(errorType, canTryAgain)
@@ -121,13 +138,6 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         }
     }
 
-    /**
-     * TODO. UI test purpose. Fixme accordingly.
-     */
-    private fun isValidQrCode(qrCode: String): Boolean {
-        return qrCode.startsWith("http")
-    }
-
     /**
      * TODO. UI test purpose. Fixme accordingly.
      */

From 7bc0bd3b57d1db71742051fe65d6b1003ad2037e Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:26:22 +0100
Subject: [PATCH 043/300] Reduce logging

---
 .../channels/ECDHRendezvousChannel.kt         | 218 ++++++++++++++++++
 .../SimpleHttpRendezvousTransport.kt          | 185 +++++++++++++++
 2 files changed, 403 insertions(+)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
new file mode 100644
index 0000000000..cced29aab4
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -0,0 +1,218 @@
+/*
+ * 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.internal.rendezvous.channels
+
+import android.util.Base64
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import okhttp3.MediaType.Companion.toMediaType
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.util.MatrixJsonParser
+import org.matrix.android.sdk.internal.extensions.toUnsignedInt
+import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.internal.rendezvous.RendezvousChannel
+import org.matrix.android.sdk.internal.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvous
+import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousError
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.internal.rendezvous.model.SecureRendezvousChannelAlgorithm
+import org.matrix.android.sdk.internal.rendezvous.transports.SimpleHttpRendezvousTransportDetails
+import org.matrix.olm.OlmSAS
+import timber.log.Timber
+import java.security.SecureRandom
+import java.util.LinkedList
+import javax.crypto.Cipher
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+@JsonClass(generateAdapter = true)
+data class ECDHPayload(
+        @Json val algorithm: SecureRendezvousChannelAlgorithm? = null,
+        @Json val key: String? = null,
+        @Json val ciphertext: String? = null,
+        @Json val iv: String? = null
+)
+
+private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+
+fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
+    val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
+    val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
+    val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
+    val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
+    val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
+    // (B0 << 5 | B1 >> 3) + 1000
+    val first = (b0.shl(5) or b1.shr(3)) + 1000
+    // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
+    val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
+    // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
+    val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
+    return "$first-$second-$third"
+}
+
+const val ALGORITHM_SPEC = "AES/GCM/NoPadding"
+const val KEY_SPEC = "AES"
+
+/**
+ *  Implements X25519 ECDH key agreement and AES-256-GCM encryption channel as per MSC3903:
+ *  https://github.com/matrix-org/matrix-spec-proposals/pull/3903
+ */
+class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPublicKeyBase64: String?): RendezvousChannel {
+    private var olmSAS: OlmSAS?
+    private val ourPublicKey: ByteArray
+    private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
+    private var theirPublicKey: ByteArray? = null
+    private var aesKey: ByteArray? = null
+
+    init {
+        theirPublicKeyBase64 ?.let {
+            theirPublicKey = Base64.decode(it, Base64.NO_WRAP)
+        }
+        olmSAS = OlmSAS()
+        ourPublicKey = Base64.decode(olmSAS!!.publicKey, Base64.NO_WRAP)
+    }
+
+    override suspend fun connect(): String {
+        if (olmSAS == null) {
+            throw RuntimeException("Channel closed")
+        }
+        val isInitiator = theirPublicKey == null
+
+        if (isInitiator) {
+//            Timber.tag(TAG).i("Waiting for other device to send their public key")
+            val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
+
+            if (res.key == null) {
+                throw RendezvousError(
+                        "Unsupported algorithm: ${res.algorithm}",
+                        RendezvousFailureReason.UnsupportedAlgorithm,
+                )
+            }
+            theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
+        } else {
+            // send our public key unencrypted
+//            Timber.tag(TAG).i("Sending public key")
+            send(ECDHPayload(
+                    algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
+                    key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
+            ))
+        }
+
+        olmSAS!!.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+
+        val initiatorKey = Base64.encodeToString(if (isInitiator) ourPublicKey else theirPublicKey, Base64.NO_WRAP)
+        val recipientKey = Base64.encodeToString(if (isInitiator) theirPublicKey else ourPublicKey, Base64.NO_WRAP)
+        val aesInfo = "${SecureRendezvousChannelAlgorithm.ECDH_V1.value}|$initiatorKey|$recipientKey"
+
+        aesKey = olmSAS!!.generateShortCode(aesInfo, 32)
+
+//        Timber.tag(TAG).i("Our public key: ${Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("Their public key: ${Base64.encodeToString(theirPublicKey, Base64.NO_WRAP)}")
+//        Timber.tag(TAG).i("AES info: $aesInfo")
+//        Timber.tag(TAG).i("AES key: ${Base64.encodeToString(aesKey, Base64.NO_WRAP)}")
+
+        val rawChecksum = olmSAS!!.generateShortCode(aesInfo, 5)
+        return getDecimalCodeRepresentation(rawChecksum)
+    }
+
+    private suspend fun send(payload: ECDHPayload) {
+        transport.send("application/json".toMediaType(), ecdhAdapter.toJson(payload).toByteArray(Charsets.UTF_8))
+    }
+
+    override suspend fun send(data: ByteArray) {
+        if (aesKey == null) {
+            throw RuntimeException("Shared secret not established")
+        }
+        send(encrypt(data))
+    }
+
+    private suspend fun receiveAsPayload(): ECDHPayload? {
+        transport.receive()?.toString(Charsets.UTF_8) ?.let {
+            return ecdhAdapter.fromJson(it)
+        } ?: return null
+    }
+
+    override suspend fun receive(): ByteArray? {
+        if (aesKey == null) {
+            throw RuntimeException("Shared secret not established")
+        }
+        val payload = receiveAsPayload() ?: return null
+        return decrypt(payload)
+    }
+
+    override suspend fun generateCode(intent: RendezvousIntent): ECDHRendezvousCode {
+        return ECDHRendezvousCode(
+                intent,
+                rendezvous = ECDHRendezvous(
+                        transport.details() as SimpleHttpRendezvousTransportDetails,
+                        SecureRendezvousChannelAlgorithm.ECDH_V1,
+                        key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
+                )
+        )
+    }
+
+    override suspend fun cancel(reason: RendezvousFailureReason) {
+        try {
+            transport.cancel(reason)
+        } finally {
+            close()
+        }
+    }
+
+    override suspend fun close() {
+        olmSAS?.releaseSas()
+        olmSAS = null
+    }
+
+    private fun encrypt(plainText: ByteArray): ECDHPayload {
+//        Timber.tag(TAG).d("Encrypting: ${plainText.toString(Charsets.UTF_8)}")
+        val iv = ByteArray(16)
+        SecureRandom().nextBytes(iv)
+
+        val cipherText = LinkedList<Byte>()
+
+        val encryptCipher = Cipher.getInstance(ALGORITHM_SPEC)
+        val secretKeySpec = SecretKeySpec(aesKey, KEY_SPEC)
+        val ivParameterSpec = IvParameterSpec(iv)
+        encryptCipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec)
+        cipherText.addAll(encryptCipher.update(plainText).toList())
+        cipherText.addAll(encryptCipher.doFinal().toList())
+
+        return ECDHPayload(
+                ciphertext = Base64.encodeToString(cipherText.toByteArray(), Base64.NO_WRAP),
+                iv = Base64.encodeToString(iv, Base64.NO_WRAP)
+        )
+    }
+
+    private fun decrypt(payload: ECDHPayload): ByteArray {
+        val iv = Base64.decode(payload.iv, Base64.NO_WRAP)
+        val encryptCipher = Cipher.getInstance(ALGORITHM_SPEC)
+        val secretKeySpec = SecretKeySpec(aesKey, KEY_SPEC)
+        val ivParameterSpec = IvParameterSpec(iv)
+        encryptCipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec)
+
+        val plainText = LinkedList<Byte>()
+        plainText.addAll(encryptCipher.update(Base64.decode(payload.ciphertext, Base64.NO_WRAP)).toList())
+        plainText.addAll(encryptCipher.doFinal().toList())
+
+        val plainTextBytes = plainText.toByteArray()
+
+//        Timber.tag(TAG).d("Decrypted: ${plainTextBytes.toString(Charsets.UTF_8)}")
+        return plainTextBytes
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
new file mode 100644
index 0000000000..cc4346d55e
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -0,0 +1,185 @@
+/*
+ * 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.internal.rendezvous.transports
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import kotlinx.coroutines.delay
+import okhttp3.MediaType
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.toRequestBody
+import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.internal.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousTransportDetails
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousTransportType
+import timber.log.Timber
+import java.text.SimpleDateFormat
+import java.util.Date
+
+private val TAG = LoggerTag(SimpleHttpRendezvousTransport::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+
+@JsonClass(generateAdapter = true)
+data class SimpleHttpRendezvousTransportDetails(
+        @Json val uri: String
+): RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)
+
+/**
+ * Implementation of the Simple HTTP transport MSC3886: https://github.com/matrix-org/matrix-spec-proposals/pull/3886
+ */
+class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?, rendezvousUri: String?) : RendezvousTransport {
+    override var ready = false
+    private var cancelled = false
+    private var uri: String?
+    private var etag: String? = null
+    private var expiresAt: Date? = null
+
+    init {
+        uri = rendezvousUri
+    }
+
+    override suspend fun details(): RendezvousTransportDetails {
+        val uri = uri ?: throw IllegalStateException("Rendezvous not set up")
+
+        return SimpleHttpRendezvousTransportDetails(uri)
+    }
+
+    override suspend fun send(contentType: MediaType, data: ByteArray) {
+        if (cancelled) {
+            return
+        }
+
+        val method = if (uri != null) "PUT" else "POST"
+        // TODO: properly determine endpoint
+        val uri = if (uri != null) uri!! else "https://rendezvous.lab.element.dev"
+
+//        Timber.tag(TAG).i("Sending data: ${data.toString(Charsets.UTF_8)} to $uri")
+
+        val httpClient = okhttp3.OkHttpClient.Builder().build()
+
+        val request = Request.Builder()
+                .url(uri)
+                .method(method, data.toRequestBody())
+                .header("content-type", contentType.toString())
+
+        etag ?.let {
+            request.header("if-match", it)
+        }
+
+        val response = httpClient.newCall(request.build()).execute()
+
+        if (response.code == 404) {
+            cancel(RendezvousFailureReason.Unknown)
+        }
+        etag = response.header("etag")
+
+        Timber.tag(TAG).i("Sent data to $uri new etag $etag")
+
+        if (method == "POST") {
+            val location = response.header("location") ?: throw RuntimeException("No rendezvous URI found in response")
+
+            response.header("expires") ?.let {
+                val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz")
+                expiresAt = format.parse(it)
+            }
+
+            // resolve location header which could be relative or absolute
+            this.uri = response.request.url.toUri().resolve(location).toString()
+            ready = true
+        }
+    }
+
+    override suspend fun receive(): ByteArray? {
+        val uri = uri ?: throw IllegalStateException("Rendezvous not set up")
+        var done = false
+        val httpClient = okhttp3.OkHttpClient.Builder().build()
+        while (!done) {
+            if (cancelled) {
+                return null
+            }
+            Timber.tag(TAG).i("Polling: $uri after etag $etag")
+            val request = Request.Builder()
+                    .url(uri)
+                    .get()
+
+            etag ?.let {
+                request.header("if-none-match", it)
+            }
+
+            val response = httpClient.newCall(request.build()).execute()
+
+            try {
+//                Timber.tag(TAG).d("Received polling response: ${response.code} from $uri")
+
+                if (response.code == 404) {
+                    cancel(RendezvousFailureReason.Unknown)
+                    return null
+                }
+
+                // rely on server expiring the channel rather than checking ourselves
+
+                if (response.header("content-type") != "application/json") {
+                    response.header("etag")?.let {
+                        etag = it
+                    }
+                } else if (response.code == 200) {
+                    response.header("etag")?.let {
+                        etag = it
+                    }
+                    val data = response.body?.bytes()
+//                    Timber.tag(TAG).d("Received data: ${data?.toString(Charsets.UTF_8)} from $uri with etag $etag")
+                    return data
+                }
+
+                done = false
+                delay(1000)
+            } finally {
+                response.close()
+            }
+        }
+
+        return null
+    }
+
+    override suspend fun cancel(reason: RendezvousFailureReason) {
+        var mappedReason = reason
+        Timber.tag(TAG).i("$expiresAt")
+        if (mappedReason == RendezvousFailureReason.Unknown &&
+                expiresAt != null && Date() > expiresAt) {
+            mappedReason = RendezvousFailureReason.Expired
+        }
+
+        cancelled = true
+        ready = false
+        onCancelled ?.let { it(mappedReason) }
+
+        if (mappedReason == RendezvousFailureReason.UserDeclined) {
+            uri ?.let {
+                try {
+                    val httpClient = okhttp3.OkHttpClient.Builder().build()
+                    val request = Request.Builder()
+                            .url(it)
+                            .delete()
+                            .build()
+                    httpClient.newCall(request).execute()
+                } catch (e: Exception) {
+                    Timber.tag(TAG).w(e, "Failed to delete channel")
+                }
+            }
+        }
+    }
+}

From 6399032312c743793fc79ec1f7863c95aec0db1a Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 22:23:26 +0100
Subject: [PATCH 044/300] Fix bad merge

---
 .../org/matrix/android/sdk/api/auth/AuthenticationService.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
index 1cc53b311c..252c33a8c4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/AuthenticationService.kt
@@ -130,13 +130,14 @@ interface AuthenticationService {
      * Return true if qr code login is supported by the server, false otherwise.
      */
     suspend fun isQrLoginSupported(homeServerConnectionConfig: HomeServerConnectionConfig): Boolean
+
+    /**
      * Authenticate using m.login.token method during sign in with QR code.
      * @param homeServerConnectionConfig the information about the homeserver and other configuration
      * @param loginToken the m.login.token
      * @param initialDeviceName the initial device name
      * @param deviceId the device id, optional. If not provided or null, the server will generate one.
      */
-
     suspend fun loginUsingQrLoginToken(
             homeServerConnectionConfig: HomeServerConnectionConfig,
             loginToken: String,

From 958ee2d3561fb4b871ba83c6cb3be2ce4fbeb943 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 22:32:02 +0100
Subject: [PATCH 045/300] Revert "Revert "Retry scanning if not a QR code""

This reverts commit 9429a4f22aabfbff23ffc223c3b090626be553dc.
---
 .../app/features/login/qr/QrCodeLoginInstructionsFragment.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
index ae3ba9574b..17b4ff2409 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
@@ -83,6 +83,7 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
         if (activityResult.resultCode == Activity.RESULT_OK) {
             val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data)
             val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
+            Timber.d("Scanned QR code: $scannedQrCode $wasQrCode")
 
             if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
                 onQrCodeScanned(scannedQrCode)
@@ -98,5 +99,6 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
 
     private fun onQrCodeScannerFailed() {
         Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed")
+        QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
     }
 }

From 370652c04b684b5436d3e03a94ed41913efc6523 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 22:37:19 +0100
Subject: [PATCH 046/300] Revert "Revert "Implementations of MSC3886 and
 MSC3903""

This reverts commit 489dfd73546a78246b1f18faf97e7a36bb4e0241.
---
 .../android/sdk/api/logger/LoggerTag.kt       |  1 +
 .../internal/rendezvous/RendezvousChannel.kt  | 45 +++++++++++++++++++
 .../rendezvous/RendezvousFailureReason.kt     | 31 +++++++++++++
 .../rendezvous/RendezvousTransport.kt         | 29 ++++++++++++
 .../rendezvous/model/ECDHRendezvous.kt        | 34 ++++++++++++++
 .../rendezvous/model/EmbeddedRendezvous.kt    | 26 +++++++++++
 .../rendezvous/model/RendezvousError.kt       | 22 +++++++++
 .../rendezvous/model/RendezvousIntent.kt      | 24 ++++++++++
 .../model/RendezvousTransportDetails.kt       | 25 +++++++++++
 .../model/RendezvousTransportType.kt          | 23 ++++++++++
 .../model/SecureRendezvousChannelAlgorithm.kt | 23 ++++++++++
 11 files changed, 283 insertions(+)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
index ae65963f37..22af8cebbd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/logger/LoggerTag.kt
@@ -27,6 +27,7 @@ open class LoggerTag(name: String, parentTag: LoggerTag? = null) {
     object SYNC : LoggerTag("SYNC")
     object VOIP : LoggerTag("VOIP")
     object CRYPTO : LoggerTag("CRYPTO")
+    object RENDEZVOUS : LoggerTag("RZ")
 
     val value: String = if (parentTag == null) {
         name
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
new file mode 100644
index 0000000000..43552f46be
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.internal.rendezvous
+
+import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousIntent
+
+interface RendezvousChannel {
+    var transport: RendezvousTransport;
+    /**
+     * @returns the checksum/confirmation digits to be shown to the user
+     */
+    suspend fun connect(): String
+    /**
+     * Send a payload via the channel.
+     * @param data payload to send
+     */
+    suspend fun send(data: ByteArray)
+    /**
+     * Receive a payload from the channel.
+     * @returns the received payload
+     */
+    suspend fun receive(): ByteArray?
+    /**
+     * @returns a representation of the channel that can be encoded in a QR or similar
+     */
+    suspend fun close()
+    // TODO: this should be transport independent in the future
+    suspend fun generateCode(intent: RendezvousIntent): ECDHRendezvousCode
+    suspend fun cancel(reason: RendezvousFailureReason)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
new file mode 100644
index 0000000000..0e2ea8c758
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
@@ -0,0 +1,31 @@
+/*
+ * 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.internal.rendezvous
+
+enum class RendezvousFailureReason(val value: String, val canRetry: Boolean = true) {
+    UserDeclined("user_declined"),
+    OtherDeviceNotSignedIn("other_device_not_signed_in"),
+    OtherDeviceAlreadySignedIn("other_device_already_signed_in"),
+    Unknown("unknown"),
+    Expired("expired"),
+    UserCancelled("user_cancelled"),
+    InvalidCode("invalid_code"),
+    UnsupportedAlgorithm("unsupported_algorithm", false),
+    DataMismatch("data_mismatch"),
+    UnsupportedTransport("unsupported_transport", false),
+    HomeserverLacksSupport("homeserver_lacks_support", false)
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
new file mode 100644
index 0000000000..753b0bc6fa
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
@@ -0,0 +1,29 @@
+/*
+ * 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.internal.rendezvous
+
+import okhttp3.MediaType
+import org.matrix.android.sdk.internal.rendezvous.model.RendezvousTransportDetails
+
+interface RendezvousTransport {
+    var ready: Boolean;
+    var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?;
+    suspend fun details(): RendezvousTransportDetails;
+    suspend fun send(contentType: MediaType, data: ByteArray);
+    suspend fun receive(): ByteArray?;
+    suspend fun cancel(reason: RendezvousFailureReason);
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
new file mode 100644
index 0000000000..e296dce09d
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
@@ -0,0 +1,34 @@
+/*
+ * 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.internal.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import org.matrix.android.sdk.internal.rendezvous.transports.SimpleHttpRendezvousTransportDetails
+
+@JsonClass(generateAdapter = true)
+data class ECDHRendezvous(
+        @Json val transport: SimpleHttpRendezvousTransportDetails,
+        @Json val algorithm: SecureRendezvousChannelAlgorithm,
+        @Json val key: String
+)
+
+@JsonClass(generateAdapter = true)
+data class ECDHRendezvousCode(
+        @Json val intent: RendezvousIntent,
+        @Json val rendezvous: ECDHRendezvous
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
new file mode 100644
index 0000000000..d490de0133
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.internal.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+open class EmbeddedRendezvous(
+    @Json(name = "transport") val transport: RendezvousTransportDetails,
+    @Json(name = "algorithm") val algorithm: SecureRendezvousChannelAlgorithm
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
new file mode 100644
index 0000000000..ead273e8ce
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.internal.rendezvous.model
+
+import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+
+class RendezvousError(val description: String, val reason: RendezvousFailureReason): RuntimeException(description) {
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
new file mode 100644
index 0000000000..6285c1e57a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.internal.rendezvous.model
+
+import com.squareup.moshi.Json
+
+enum class RendezvousIntent {
+    @Json(name = "login.start") LOGIN_ON_NEW_DEVICE,
+    @Json(name = "login.reciprocate") RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
new file mode 100644
index 0000000000..1b1826194f
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.internal.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+open class RendezvousTransportDetails(
+    @Json val type: RendezvousTransportType
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
new file mode 100644
index 0000000000..c3b6ba7ac8
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.internal.rendezvous.model
+
+import com.squareup.moshi.Json
+
+enum class RendezvousTransportType(val value: String) {
+    @Json(name = "http.v1") MSC3886_SIMPLE_HTTP_V1("http.v1")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
new file mode 100644
index 0000000000..ddc0ae20e7
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.internal.rendezvous.model
+
+import com.squareup.moshi.Json
+
+enum class SecureRendezvousChannelAlgorithm(val value: String) {
+    @Json(name = "m.rendezvous.v1.curve25519-aes-sha256") ECDH_V1("m.rendezvous.v1.curve25519-aes-sha256")
+}

From f04f0e6fac25345b7cdc39181e0ac4743fdb37c5 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 22:42:58 +0100
Subject: [PATCH 047/300] Revert "Revert "Partial implementation of QR login
 logic""

This reverts commit e305478ddabf39c6e2a272485a1b154b3ad12263.
---
 .../src/main/res/values/strings.xml           |  1 +
 .../login/qr/QrCodeLoginConnectionStatus.kt   |  4 +++-
 .../features/login/qr/QrCodeLoginErrorType.kt | 23 -------------------
 .../login/qr/QrCodeLoginStatusFragment.kt     | 12 ++++++----
 .../features/login/qr/QrCodeLoginViewModel.kt |  4 ++--
 5 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginErrorType.kt

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 822e9d3865..108fe7db7c 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3368,6 +3368,7 @@
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Linking with this device is not supported.</string>
     <string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
     <string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
+    <string name="qr_code_login_header_failed_other_description">The request failed.</string>
     <string name="qr_code_login_new_device_instruction_1">Open ${app_name} on your other device</string>
     <string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security &amp; Privacy -> Show All Sessions</string>
     <string name="qr_code_login_new_device_instruction_3">Select \'Show QR code\'</string>
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
index 330562b874..4de191f863 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
@@ -16,9 +16,11 @@
 
 package im.vector.app.features.login.qr
 
+import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+
 sealed class QrCodeLoginConnectionStatus {
     object ConnectingToDevice : QrCodeLoginConnectionStatus()
     data class Connected(val securityCode: String, val canConfirmSecurityCode: Boolean) : QrCodeLoginConnectionStatus()
     object SigningIn : QrCodeLoginConnectionStatus()
-    data class Failed(val errorType: QrCodeLoginErrorType, val canTryAgain: Boolean) : QrCodeLoginConnectionStatus()
+    data class Failed(val errorType: RendezvousFailureReason, val canTryAgain: Boolean) : QrCodeLoginConnectionStatus()
 }
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginErrorType.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginErrorType.kt
deleted file mode 100644
index 9a6cc13de0..0000000000
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginErrorType.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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 im.vector.app.features.login.qr
-
-enum class QrCodeLoginErrorType {
-    DEVICE_IS_NOT_SUPPORTED,
-    TIMEOUT,
-    REQUEST_WAS_DENIED,
-}
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index 1c0841aa11..fb372cbb2f 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -27,6 +27,7 @@ import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentQrCodeLoginStatusBinding
 import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
 
 @AndroidEntryPoint
 class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBinding>() {
@@ -77,11 +78,12 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
         )
     }
 
-    private fun getErrorCode(errorType: QrCodeLoginErrorType): String {
-        return when (errorType) {
-            QrCodeLoginErrorType.DEVICE_IS_NOT_SUPPORTED -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)
-            QrCodeLoginErrorType.TIMEOUT -> getString(R.string.qr_code_login_header_failed_timeout_description)
-            QrCodeLoginErrorType.REQUEST_WAS_DENIED -> getString(R.string.qr_code_login_header_failed_denied_description)
+    private fun getErrorCode(reason: RendezvousFailureReason): String {
+        return when (reason) {
+            RendezvousFailureReason.UnsupportedAlgorithm, RendezvousFailureReason.UnsupportedTransport -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)
+            RendezvousFailureReason.Expired -> getString(R.string.qr_code_login_header_failed_timeout_description)
+            RendezvousFailureReason.UserDeclined -> getString(R.string.qr_code_login_header_failed_denied_description)
+            else -> getString(R.string.qr_code_login_header_failed_other_description)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index d9c30690a7..8461d8d88f 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -39,7 +39,7 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         @Assisted private val initialState: QrCodeLoginViewState,
         private val applicationContext: Context,
         private val authenticationService: AuthenticationService,
-        private val activeSessionHolder: ActiveSessionHolder,
+        private val activeSessionHolder: ActiveSessionHolder
 ) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
     val TAG: String = QrCodeLoginViewModel::class.java.simpleName
 
@@ -116,7 +116,7 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     private fun onFailed(reason: RendezvousFailureReason) {
         setState {
             copy(
-                    connectionStatus = QrCodeLoginConnectionStatus.Failed(errorType, canTryAgain)
+                    connectionStatus = QrCodeLoginConnectionStatus.Failed(reason, reason.canRetry)
             )
         }
     }

From f2d76be20c724f461d4b4c86bba767f52857a553 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:06:43 +0000
Subject: [PATCH 048/300] Bump com.google.devtools.ksp from 1.7.20-1.0.6 to
 1.7.20-1.0.7

Bumps [com.google.devtools.ksp](https://github.com/google/ksp) from 1.7.20-1.0.6 to 1.7.20-1.0.7.
- [Release notes](https://github.com/google/ksp/releases)
- [Commits](https://github.com/google/ksp/compare/1.7.20-1.0.6...1.7.20-1.0.7)

---
updated-dependencies:
- dependency-name: com.google.devtools.ksp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/build.gradle b/build.gradle
index e474b68531..32a7c2c26f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ plugins {
     // Detekt
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
     // Ksp
-    id "com.google.devtools.ksp" version "1.7.20-1.0.6"
+    id "com.google.devtools.ksp" version "1.7.20-1.0.7"
 
     // Dependency Analysis
     id 'com.autonomousapps.dependency-analysis' version "1.13.1"

From 5abb786b6b792ea70f38ca616bd5925a329af719 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 00:59:31 +0100
Subject: [PATCH 049/300] Fix copyright on SDK

---
 .../org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt    | 2 +-
 .../matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt | 2 +-
 .../android/sdk/internal/rendezvous/RendezvousFailureReason.kt  | 2 +-
 .../android/sdk/internal/rendezvous/RendezvousTransport.kt      | 2 +-
 .../sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt   | 2 +-
 .../android/sdk/internal/rendezvous/model/ECDHRendezvous.kt     | 2 +-
 .../android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt | 2 +-
 .../android/sdk/internal/rendezvous/model/RendezvousError.kt    | 2 +-
 .../android/sdk/internal/rendezvous/model/RendezvousIntent.kt   | 2 +-
 .../sdk/internal/rendezvous/model/RendezvousTransportDetails.kt | 2 +-
 .../sdk/internal/rendezvous/model/RendezvousTransportType.kt    | 2 +-
 .../rendezvous/model/SecureRendezvousChannelAlgorithm.kt        | 2 +-
 .../rendezvous/transports/SimpleHttpRendezvousTransport.kt      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
index 2f85a97c55..d8fd323056 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
index 43552f46be..6655468808 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
index 0e2ea8c758..0920bf224f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
index 753b0bc6fa..f054b7cb73 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
index cced29aab4..9f347b8536 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
index e296dce09d..14976ec836 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
index d490de0133..5a609d497e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
index ead273e8ce..feb7d0cf35 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
index 6285c1e57a..d317531835 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
index 1b1826194f..ee9058daa3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
index c3b6ba7ac8..51371ddb2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
index ddc0ae20e7..122b6ede82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index cc4346d55e..7918946d75 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 New Vector Ltd
+ * Copyright 2020 The Matrix.org Foundation C.I.C.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From c18439f99b7056619fcf1d7f7df3697d1ee5b63c Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 01:07:19 +0100
Subject: [PATCH 050/300] Refactor code into api from internal

---
 .../rendezvous/Rendezvous.kt                  | 12 ++++----
 .../rendezvous/RendezvousChannel.kt           |  8 +++---
 .../rendezvous/RendezvousFailureReason.kt     |  4 +--
 .../rendezvous/RendezvousTransport.kt         |  6 ++--
 .../channels/ECDHRendezvousChannel.kt         | 28 ++++++++++---------
 .../rendezvous/model/ECDHRendezvous.kt        |  6 ++--
 .../rendezvous/model/EmbeddedRendezvous.kt    |  8 +++---
 .../rendezvous/model/RendezvousError.kt       |  6 ++--
 .../rendezvous/model/RendezvousIntent.kt      |  4 +--
 .../model/RendezvousTransportDetails.kt       |  4 +--
 .../model/RendezvousTransportType.kt          |  4 +--
 .../model/SecureRendezvousChannelAlgorithm.kt |  4 +--
 .../SimpleHttpRendezvousTransport.kt          | 12 ++++----
 .../login/qr/QrCodeLoginConnectionStatus.kt   |  2 +-
 .../login/qr/QrCodeLoginStatusFragment.kt     |  2 +-
 .../features/login/qr/QrCodeLoginViewModel.kt |  4 +--
 16 files changed, 58 insertions(+), 56 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/Rendezvous.kt (95%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/RendezvousChannel.kt (84%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/RendezvousFailureReason.kt (91%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/RendezvousTransport.kt (83%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/channels/ECDHRendezvousChannel.kt (90%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/ECDHRendezvous.kt (83%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/EmbeddedRendezvous.kt (72%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/RendezvousError.kt (79%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/RendezvousIntent.kt (87%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/RendezvousTransportDetails.kt (87%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/RendezvousTransportType.kt (86%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/model/SecureRendezvousChannelAlgorithm.kt (87%)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/{internal => api}/rendezvous/transports/SimpleHttpRendezvousTransport.kt (93%)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
similarity index 95%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index d8fd323056..534d5df1ca 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous
+package org.matrix.android.sdk.api.rendezvous
 
 import android.net.Uri
 import com.squareup.moshi.Json
@@ -29,10 +29,10 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NA
 import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.util.MatrixJsonParser
-import org.matrix.android.sdk.internal.rendezvous.channels.ECDHRendezvousChannel
-import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvousCode
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousIntent
-import org.matrix.android.sdk.internal.rendezvous.transports.SimpleHttpRendezvousTransport
+import org.matrix.android.sdk.api.rendezvous.channels.ECDHRendezvousChannel
+import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
 import timber.log.Timber
 
 internal enum class PayloadType(val value: String) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
similarity index 84%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index 6655468808..2a73e8f112 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous
+package org.matrix.android.sdk.api.rendezvous
 
-import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvousCode
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 
 interface RendezvousChannel {
     var transport: RendezvousTransport;
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
similarity index 91%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
index 0920bf224f..a607dc7f38 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousFailureReason.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous
+package org.matrix.android.sdk.api.rendezvous
 
 enum class RendezvousFailureReason(val value: String, val canRetry: Boolean = true) {
     UserDeclined("user_declined"),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
index f054b7cb73..11471288f6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/RendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous
+package org.matrix.android.sdk.api.rendezvous
 
 import okhttp3.MediaType
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousTransportDetails
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
 
 interface RendezvousTransport {
     var ready: Boolean;
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
similarity index 90%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 9f347b8536..0f69bd7eda 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.channels
+package org.matrix.android.sdk.api.rendezvous.channels
 
 import android.util.Base64
 import com.squareup.moshi.Json
@@ -23,15 +23,15 @@ import okhttp3.MediaType.Companion.toMediaType
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import org.matrix.android.sdk.internal.extensions.toUnsignedInt
-import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
-import org.matrix.android.sdk.internal.rendezvous.RendezvousChannel
-import org.matrix.android.sdk.internal.rendezvous.RendezvousTransport
-import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvous
-import org.matrix.android.sdk.internal.rendezvous.model.ECDHRendezvousCode
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousError
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousIntent
-import org.matrix.android.sdk.internal.rendezvous.model.SecureRendezvousChannelAlgorithm
-import org.matrix.android.sdk.internal.rendezvous.transports.SimpleHttpRendezvousTransportDetails
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousChannel
+import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvous
+import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.api.rendezvous.model.SecureRendezvousChannelAlgorithm
+import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransportDetails
 import org.matrix.olm.OlmSAS
 import timber.log.Timber
 import java.security.SecureRandom
@@ -107,10 +107,12 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         } else {
             // send our public key unencrypted
 //            Timber.tag(TAG).i("Sending public key")
-            send(ECDHPayload(
+            send(
+                    ECDHPayload(
                     algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
                     key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
-            ))
+            )
+            )
         }
 
         olmSAS!!.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
similarity index 83%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
index 14976ec836..b203101b66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/ECDHRendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.internal.rendezvous.transports.SimpleHttpRendezvousTransportDetails
+import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransportDetails
 
 @JsonClass(generateAdapter = true)
 data class ECDHRendezvous(
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt
similarity index 72%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt
index 5a609d497e..785ce1fed7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/EmbeddedRendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 open class EmbeddedRendezvous(
-    @Json(name = "transport") val transport: RendezvousTransportDetails,
-    @Json(name = "algorithm") val algorithm: SecureRendezvousChannelAlgorithm
+        @Json(name = "transport") val transport: RendezvousTransportDetails,
+        @Json(name = "algorithm") val algorithm: SecureRendezvousChannelAlgorithm
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
similarity index 79%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
index feb7d0cf35..f731c89649 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
-import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 
 class RendezvousError(val description: String, val reason: RendezvousFailureReason): RuntimeException(description) {
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
index d317531835..1c070599b0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousIntent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
index ee9058daa3..55b3bbb5d9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportDetails.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
similarity index 86%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
index 51371ddb2f..9c3e44f25b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/RendezvousTransportType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
similarity index 87%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
index 122b6ede82..9a9db58a41 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.model
+package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
similarity index 93%
rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 7918946d75..ba60459544 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Matrix.org Foundation C.I.C.
+ * Copyright 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.matrix.android.sdk.internal.rendezvous.transports
+package org.matrix.android.sdk.api.rendezvous.transports
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
@@ -23,10 +23,10 @@ import okhttp3.MediaType
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.matrix.android.sdk.api.logger.LoggerTag
-import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
-import org.matrix.android.sdk.internal.rendezvous.RendezvousTransport
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousTransportDetails
-import org.matrix.android.sdk.internal.rendezvous.model.RendezvousTransportType
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportType
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
index 4de191f863..4bef41b6c1 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginConnectionStatus.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.login.qr
 
-import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 
 sealed class QrCodeLoginConnectionStatus {
     object ConnectingToDevice : QrCodeLoginConnectionStatus()
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index fb372cbb2f..5451a16b44 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -27,7 +27,7 @@ import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentQrCodeLoginStatusBinding
 import im.vector.app.features.themes.ThemeUtils
-import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 
 @AndroidEntryPoint
 class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBinding>() {
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 8461d8d88f..276cedad43 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -31,8 +31,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.session.Session
-import org.matrix.android.sdk.internal.rendezvous.Rendezvous
-import org.matrix.android.sdk.internal.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.Rendezvous
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import timber.log.Timber
 
 class QrCodeLoginViewModel @AssistedInject constructor(

From c00ce91214cea1a0308d7885d46b5ea5224f5aea Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 01:11:25 +0100
Subject: [PATCH 051/300] Linting

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 27 ++++++++++---------
 .../sdk/api/rendezvous/RendezvousChannel.kt   |  7 ++++-
 .../sdk/api/rendezvous/RendezvousTransport.kt | 12 ++++-----
 .../channels/ECDHRendezvousChannel.kt         |  9 +++----
 .../api/rendezvous/model/RendezvousError.kt   |  3 +--
 .../SimpleHttpRendezvousTransport.kt          |  2 +-
 .../features/login/qr/QrCodeLoginViewModel.kt |  2 --
 7 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 534d5df1ca..e33130e529 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -22,6 +22,10 @@ import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.logger.LoggerTag
+import org.matrix.android.sdk.api.rendezvous.channels.ECDHRendezvousChannel
+import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
@@ -29,10 +33,6 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NA
 import org.matrix.android.sdk.api.session.crypto.crosssigning.SELF_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_SSSS_NAME
 import org.matrix.android.sdk.api.util.MatrixJsonParser
-import org.matrix.android.sdk.api.rendezvous.channels.ECDHRendezvousChannel
-import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
-import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
-import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
 import timber.log.Timber
 
 internal enum class PayloadType(val value: String) {
@@ -80,6 +80,7 @@ class Rendezvous(
     }
 
     private val adapter = MatrixJsonParser.getMoshi().adapter(Payload::class.java)
+
     // not yet implemented: RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
     val ourIntent: RendezvousIntent = RendezvousIntent.LOGIN_ON_NEW_DEVICE
 
@@ -98,7 +99,7 @@ class Rendezvous(
     }
 
     suspend fun startAfterScanningCode(): String? {
-        val checksum = channel.connect();
+        val checksum = channel.connect()
 
         Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
 
@@ -107,7 +108,7 @@ class Rendezvous(
         }
 
         // get protocols
-        Timber.tag(TAG).i("Waiting for protocols");
+        Timber.tag(TAG).i("Waiting for protocols")
         val protocolsResponse = receive()
 
         if (protocolsResponse?.protocols == null || !protocolsResponse.protocols.contains("login_token")) {
@@ -123,7 +124,7 @@ class Rendezvous(
     }
 
     suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? {
-        Timber.tag(TAG).i("Waiting for login_token");
+        Timber.tag(TAG).i("Waiting for login_token")
 
         val loginToken = receive()
 
@@ -147,7 +148,7 @@ class Rendezvous(
         val homeserver = loginToken?.homeserver ?: throw RuntimeException("No homeserver returned")
         val login_token = loginToken.login_token ?: throw RuntimeException("No login token returned")
 
-        Timber.tag(TAG).i("Got login_token: $login_token for $homeserver");
+        Timber.tag(TAG).i("Got login_token: $login_token for $homeserver")
 
         val hsConfig = HomeServerConnectionConfig(homeServerUri = Uri.parse(homeserver))
         return authenticationService.loginUsingQrLoginToken(hsConfig, login_token)
@@ -167,11 +168,11 @@ class Rendezvous(
         val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
         if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifying_device_key) {
             Timber.tag(TAG).w("Verifying device $verifyingDeviceId doesn't match: $verifyingDeviceFromServer")
-            return;
+            return
         }
 
         // set other device as verified
-        Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified");
+        Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
         crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
 
         // TODO: what do we do with the master key?
@@ -183,7 +184,7 @@ class Rendezvous(
         // request secrets from the verifying device
         Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
 
-        session.sharedSecretStorageService() .let {
+        session.sharedSecretStorageService().let {
             it.requestSecret(MASTER_KEY_SSSS_NAME, verifyingDeviceId)
             it.requestSecret(SELF_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
             it.requestSecret(USER_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
@@ -192,12 +193,12 @@ class Rendezvous(
     }
 
     private suspend fun receive(): Payload? {
-        val data = channel.receive()?: return null
+        val data = channel.receive() ?: return null
         return adapter.fromJson(data.toString(Charsets.UTF_8))
     }
 
     private suspend fun send(payload: Payload) {
-        channel.send(adapter.toJson(payload).toByteArray(Charsets.UTF_8));
+        channel.send(adapter.toJson(payload).toByteArray(Charsets.UTF_8))
     }
 
     suspend fun cancel(reason: RendezvousFailureReason) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index 2a73e8f112..588d034f10 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -20,25 +20,30 @@ import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 
 interface RendezvousChannel {
-    var transport: RendezvousTransport;
+    var transport: RendezvousTransport
+
     /**
      * @returns the checksum/confirmation digits to be shown to the user
      */
     suspend fun connect(): String
+
     /**
      * Send a payload via the channel.
      * @param data payload to send
      */
     suspend fun send(data: ByteArray)
+
     /**
      * Receive a payload from the channel.
      * @returns the received payload
      */
     suspend fun receive(): ByteArray?
+
     /**
      * @returns a representation of the channel that can be encoded in a QR or similar
      */
     suspend fun close()
+
     // TODO: this should be transport independent in the future
     suspend fun generateCode(intent: RendezvousIntent): ECDHRendezvousCode
     suspend fun cancel(reason: RendezvousFailureReason)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
index 11471288f6..de0aed7efc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
@@ -20,10 +20,10 @@ import okhttp3.MediaType
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
 
 interface RendezvousTransport {
-    var ready: Boolean;
-    var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?;
-    suspend fun details(): RendezvousTransportDetails;
-    suspend fun send(contentType: MediaType, data: ByteArray);
-    suspend fun receive(): ByteArray?;
-    suspend fun cancel(reason: RendezvousFailureReason);
+    var ready: Boolean
+    var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?
+    suspend fun details(): RendezvousTransportDetails
+    suspend fun send(contentType: MediaType, data: ByteArray)
+    suspend fun receive(): ByteArray?
+    suspend fun cancel(reason: RendezvousFailureReason)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 0f69bd7eda..1c8bca5d1c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -21,10 +21,8 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import okhttp3.MediaType.Companion.toMediaType
 import org.matrix.android.sdk.api.logger.LoggerTag
-import org.matrix.android.sdk.api.util.MatrixJsonParser
-import org.matrix.android.sdk.internal.extensions.toUnsignedInt
-import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import org.matrix.android.sdk.api.rendezvous.RendezvousChannel
+import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
 import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvous
 import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
@@ -32,8 +30,9 @@ import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 import org.matrix.android.sdk.api.rendezvous.model.SecureRendezvousChannelAlgorithm
 import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransportDetails
+import org.matrix.android.sdk.api.util.MatrixJsonParser
+import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 import org.matrix.olm.OlmSAS
-import timber.log.Timber
 import java.security.SecureRandom
 import java.util.LinkedList
 import javax.crypto.Cipher
@@ -72,7 +71,7 @@ const val KEY_SPEC = "AES"
  *  Implements X25519 ECDH key agreement and AES-256-GCM encryption channel as per MSC3903:
  *  https://github.com/matrix-org/matrix-spec-proposals/pull/3903
  */
-class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPublicKeyBase64: String?): RendezvousChannel {
+class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPublicKeyBase64: String?) : RendezvousChannel {
     private var olmSAS: OlmSAS?
     private val ourPublicKey: ByteArray
     private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
index f731c89649..fec55ffb67 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
@@ -18,5 +18,4 @@ package org.matrix.android.sdk.api.rendezvous.model
 
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 
-class RendezvousError(val description: String, val reason: RendezvousFailureReason): RuntimeException(description) {
-}
+class RendezvousError(val description: String, val reason: RendezvousFailureReason) : RuntimeException(description)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index ba60459544..475a4fbe6c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -36,7 +36,7 @@ private val TAG = LoggerTag(SimpleHttpRendezvousTransport::class.java.simpleName
 @JsonClass(generateAdapter = true)
 data class SimpleHttpRendezvousTransportDetails(
         @Json val uri: String
-): RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)
+) : RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)
 
 /**
  * Implementation of the Simple HTTP transport MSC3886: https://github.com/matrix-org/matrix-spec-proposals/pull/3886
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 276cedad43..7a51098439 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -26,11 +26,9 @@ import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.home.HomeActivity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
-import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.rendezvous.Rendezvous
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import timber.log.Timber

From efa70fa0ff92b56d15f638dbd240a050f9b3ff25 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Thu, 13 Oct 2022 21:48:33 +0100
Subject: [PATCH 052/300] Revert "Retry scanning if not a QR code"

This reverts commit 87956e943897333f3f7e9be9a6e59d9a7f0c4547.
---
 .../app/features/login/qr/QrCodeLoginInstructionsFragment.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
index 17b4ff2409..ae3ba9574b 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
@@ -83,7 +83,6 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
         if (activityResult.resultCode == Activity.RESULT_OK) {
             val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data)
             val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
-            Timber.d("Scanned QR code: $scannedQrCode $wasQrCode")
 
             if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
                 onQrCodeScanned(scannedQrCode)
@@ -99,6 +98,5 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
 
     private fun onQrCodeScannerFailed() {
         Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed")
-        QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
     }
 }

From d72371906e08b040e57020dc63eabac48eaf73e6 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 01:45:03 +0100
Subject: [PATCH 053/300] Add flag to allow QR login on all servers + split
 flag for showing in device manager

---
 .../debug/features/DebugFeaturesStateFactory.kt        | 10 ++++++++++
 .../app/features/debug/features/DebugVectorFeatures.kt |  8 ++++++++
 .../main/java/im/vector/app/features/VectorFeatures.kt |  4 ++++
 .../app/features/onboarding/OnboardingViewModel.kt     |  9 +++++++++
 .../devices/v2/VectorSettingsDevicesFragment.kt        |  2 +-
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index 3a302feba0..1d8171a9e5 100644
--- a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -95,6 +95,16 @@ class DebugFeaturesStateFactory @Inject constructor(
                                 key = DebugFeatureKeys.qrCodeLoginEnabled,
                                 factory = VectorFeatures::isQrCodeLoginEnabled
                         ),
+                        createBooleanFeature(
+                                label = "Allow QR Code Login for all servers",
+                                key = DebugFeatureKeys.allowQrCodeLoginForAllServers,
+                                factory = VectorFeatures::allowQrCodeLoginForAllServers
+                        ),
+                        createBooleanFeature(
+                                label = "Show QR Code Login in Device Manager",
+                                key = DebugFeatureKeys.allowReciprocateQrCodeLogin,
+                                factory = VectorFeatures::allowReciprocateQrCodeLogin
+                        ),
                         createBooleanFeature(
                                 label = "Enable Voice Broadcast",
                                 key = DebugFeatureKeys.voiceBroadcastEnabled,
diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
index b5ffa28db7..701f2dcab8 100644
--- a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -82,6 +82,12 @@ class DebugVectorFeatures(
     override fun isQrCodeLoginEnabled() = read(DebugFeatureKeys.qrCodeLoginEnabled)
             ?: vectorFeatures.isQrCodeLoginEnabled()
 
+    override fun allowQrCodeLoginForAllServers() = read(DebugFeatureKeys.allowQrCodeLoginForAllServers)
+            ?: vectorFeatures.allowQrCodeLoginForAllServers()
+
+    override fun allowReciprocateQrCodeLogin() = read(DebugFeatureKeys.allowReciprocateQrCodeLogin)
+            ?: vectorFeatures.allowReciprocateQrCodeLogin()
+
     override fun isVoiceBroadcastEnabled(): Boolean = read(DebugFeatureKeys.voiceBroadcastEnabled)
             ?: vectorFeatures.isVoiceBroadcastEnabled()
 
@@ -147,5 +153,7 @@ object DebugFeatureKeys {
     val newAppLayoutEnabled = booleanPreferencesKey("new-app-layout-enabled")
     val newDeviceManagementEnabled = booleanPreferencesKey("new-device-management-enabled")
     val qrCodeLoginEnabled = booleanPreferencesKey("qr-code-login-enabled")
+    val allowQrCodeLoginForAllServers = booleanPreferencesKey("allow-qr-code-login-for-all-servers")
+    val allowReciprocateQrCodeLogin = booleanPreferencesKey("allow-reciprocate-qr-code-login")
     val voiceBroadcastEnabled = booleanPreferencesKey("voice-broadcast-enabled")
 }
diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
index 62eb0523b0..061276ba21 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -42,6 +42,8 @@ interface VectorFeatures {
     fun isNewAppLayoutFeatureEnabled(): Boolean
     fun isNewDeviceManagementEnabled(): Boolean
     fun isQrCodeLoginEnabled(): Boolean
+    fun allowQrCodeLoginForAllServers(): Boolean
+    fun allowReciprocateQrCodeLogin(): Boolean
     fun isVoiceBroadcastEnabled(): Boolean
 }
 
@@ -60,5 +62,7 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isNewAppLayoutFeatureEnabled(): Boolean = true
     override fun isNewDeviceManagementEnabled(): Boolean = false
     override fun isQrCodeLoginEnabled(): Boolean = false
+    override fun allowQrCodeLoginForAllServers(): Boolean = false
+    override fun allowReciprocateQrCodeLogin(): Boolean = false
     override fun isVoiceBroadcastEnabled(): Boolean = false
 }
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 03cf2f43e6..8e64948c6a 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
@@ -124,7 +124,16 @@ class OnboardingViewModel @AssistedInject constructor(
                         canLoginWithQrCode = false
                 )
             }
+        } else if (vectorFeatures.allowQrCodeLoginForAllServers()) {
+            // allow for all servers
+            setState {
+                copy(
+                        canLoginWithQrCode = true
+                )
+            }
         } else {
+            // check if selected server supports MSC3882 first
+            // FIXME: this should be checking the selected homeserver not defaultHomeserverUrl
             homeServerConnectionConfigFactory.create(defaultHomeserverUrl)?.let {
                 val canLoginWithQrCode = authenticationService.isQrLoginSupported(it)
                 setState {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 48f66cfc75..7e6da851dd 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -158,7 +158,7 @@ class VectorSettingsDevicesFragment :
     }
 
     private fun initQrLoginView() {
-        if (!vectorFeatures.isQrCodeLoginEnabled()) {
+        if (!vectorFeatures.allowReciprocateQrCodeLogin()) {
             views.deviceListHeaderSignInWithQrCode.isVisible = false
             views.deviceListHeaderScanQrCodeButton.isVisible = false
             views.deviceListHeaderShowQrCodeButton.isVisible = false

From de4232dff519b05063e0e671789802bbd96830cd Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 02:04:08 +0100
Subject: [PATCH 054/300] Fix logic for showing confirm button

---
 .../vector/app/features/login/qr/QrCodeLoginStatusFragment.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index 5451a16b44..05ed070915 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -115,7 +115,7 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
     }
 
     private fun handleConnectionEstablished(connectionStatus: QrCodeLoginConnectionStatus.Connected, loginType: QrCodeLoginType) {
-        views.qrCodeLoginConfirmSecurityCodeLayout.isVisible = true
+        views.qrCodeLoginConfirmSecurityCodeLayout.isVisible = loginType == QrCodeLoginType.LINK_A_DEVICE
         views.qrCodeLoginStatusLoadingLayout.isVisible = false
         views.qrCodeLoginStatusHeaderView.isVisible = true
         views.qrCodeLoginStatusSecurityCode.isVisible = true

From fd2814ea183a823ba5a7091f2723e96d3b695ba7 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Fri, 14 Oct 2022 11:49:24 +0100
Subject: [PATCH 055/300] Update issue automation for design

Put only high priority issues in front of the design team, all of which the design team will aim to action to keep the queue at zero
---
 .github/workflows/triage-labelled.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 174e3c54c0..18ce26171c 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -48,7 +48,13 @@ jobs:
     # Skip in forks
     if: >
       github.repository == 'vector-im/element-android' &&
-      contains(github.event.issue.labels.*.name, 'X-Needs-Design')
+      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
+      (contains(github.event.issue.labels.*.name, 'S-Critical') &&
+       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
+       contains(github.event.issue.labels.*.name, 'S-Major') &&
+       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       contains(github.event.issue.labels.*.name, 'A11y'))
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project

From e439b72e48170c9bfcd0b57157c60816655d52e8 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 13:46:57 +0100
Subject: [PATCH 056/300] Handle master key trust during E2EE set up

---
 .../android/sdk/api/rendezvous/Rendezvous.kt      | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index e33130e529..17f3a73181 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -176,10 +176,17 @@ class Rendezvous(
         crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
 
         // TODO: what do we do with the master key?
-//        verificationResponse.master_key ?.let {
-//            // set master key as trusted
-//            crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, it)
-//        }
+        verificationResponse.master_key ?.let { masterKeyFromVerifyingDevice ->
+            // set master key as trusted
+            crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->
+                if (localMasterKey.unpaddedBase64PublicKey == masterKeyFromVerifyingDevice) {
+                    Timber.tag(TAG).i("Setting master key as trusted")
+                    crypto.crossSigningService().markMyMasterKeyAsTrusted()
+                } else {
+                    Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
+                }
+            } ?: Timber.tag(TAG).i("No local master key")
+        } ?: Timber.tag(TAG).i("No master key given by verifying device")
 
         // request secrets from the verifying device
         Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")

From f999e7275952633a87d9cff123a4211546e7e735 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 14:01:13 +0100
Subject: [PATCH 057/300] Changelog

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

diff --git a/changelog.d/7369.feature b/changelog.d/7369.feature
new file mode 100644
index 0000000000..240fac3516
--- /dev/null
+++ b/changelog.d/7369.feature
@@ -0,0 +1 @@
+Add logic for sign in with QR code

From 411b766890ab33722b10be177bb1f3e64d963e75 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 14:17:19 +0100
Subject: [PATCH 058/300] Refactor to camelcase

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 17f3a73181..67bdeb2235 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -49,12 +49,12 @@ internal data class Payload(
         @Json val protocols: List<String>? = null,
         @Json val protocol: String? = null,
         @Json val homeserver: String? = null,
-        @Json val login_token: String? = null,
-        @Json val device_id: String? = null,
-        @Json val device_key: String? = null,
-        @Json val verifying_device_id: String? = null,
-        @Json val verifying_device_key: String? = null,
-        @Json val master_key: String? = null
+        @Json(name = "login_token") val loginToken: String? = null,
+        @Json(name = "device_id") val deviceId: String? = null,
+        @Json(name = "device_key") val deviceKey: String? = null,
+        @Json(name = "verifying_device_id") val verifyingDeviceId: String? = null,
+        @Json(name = "verifying_device_key") val verifyingDeviceKey: String? = null,
+        @Json(name = "master_key") val masterKey: String? = null
 )
 
 private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
@@ -146,7 +146,7 @@ class Rendezvous(
         }
 
         val homeserver = loginToken?.homeserver ?: throw RuntimeException("No homeserver returned")
-        val login_token = loginToken.login_token ?: throw RuntimeException("No login token returned")
+        val login_token = loginToken.loginToken ?: throw RuntimeException("No login token returned")
 
         Timber.tag(TAG).i("Got login_token: $login_token for $homeserver")
 
@@ -159,14 +159,14 @@ class Rendezvous(
         val crypto = session.cryptoService()
         val deviceId = crypto.getMyDevice().deviceId
         val deviceKey = crypto.getMyDevice().fingerprint()
-        send(Payload(PayloadType.Progress, outcome = "success", device_id = deviceId, device_key = deviceKey))
+        send(Payload(PayloadType.Progress, outcome = "success", deviceId = deviceId, deviceKey = deviceKey))
 
         // await confirmation of verification
 
         val verificationResponse = receive()
-        val verifyingDeviceId = verificationResponse?.verifying_device_id ?: throw RuntimeException("No verifying device id returned")
+        val verifyingDeviceId = verificationResponse?.verifyingDeviceId ?: throw RuntimeException("No verifying device id returned")
         val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
-        if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifying_device_key) {
+        if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
             Timber.tag(TAG).w("Verifying device $verifyingDeviceId doesn't match: $verifyingDeviceFromServer")
             return
         }
@@ -176,7 +176,7 @@ class Rendezvous(
         crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
 
         // TODO: what do we do with the master key?
-        verificationResponse.master_key ?.let { masterKeyFromVerifyingDevice ->
+        verificationResponse.masterKey ?.let { masterKeyFromVerifyingDevice ->
             // set master key as trusted
             crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->
                 if (localMasterKey.unpaddedBase64PublicKey == masterKeyFromVerifyingDevice) {

From 6426ff40d351396741ebf8aa71da1b87d9661673 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 14:18:50 +0100
Subject: [PATCH 059/300] Linting

---
 .../org/matrix/android/sdk/api/rendezvous/Rendezvous.kt    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 67bdeb2235..6403d17031 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -91,7 +91,11 @@ class Rendezvous(
 
         if (incompatible) {
             send(Payload(PayloadType.Finish, intent = ourIntent))
-            val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) RendezvousFailureReason.OtherDeviceNotSignedIn else RendezvousFailureReason.OtherDeviceAlreadySignedIn
+            val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) {
+                RendezvousFailureReason.OtherDeviceNotSignedIn
+            } else {
+                RendezvousFailureReason.OtherDeviceAlreadySignedIn
+            }
             channel.cancel(reason)
         }
 
@@ -175,7 +179,6 @@ class Rendezvous(
         Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
         crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
 
-        // TODO: what do we do with the master key?
         verificationResponse.masterKey ?.let { masterKeyFromVerifyingDevice ->
             // set master key as trusted
             crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->

From fdc55965ca0e3328d6ed4f32b00bde97f00941b9 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 17:23:26 +0100
Subject: [PATCH 060/300] Linting

---
 .../matrix/android/sdk/api/rendezvous/RendezvousChannel.kt   | 5 ++++-
 .../app/features/login/qr/QrCodeLoginStatusFragment.kt       | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index 588d034f10..9d2843ce66 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -19,6 +19,9 @@ package org.matrix.android.sdk.api.rendezvous
 import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 
+/**
+ * Representation of a rendezvous channel such as that described by MSC3903
+ */
 interface RendezvousChannel {
     var transport: RendezvousTransport
 
@@ -44,7 +47,7 @@ interface RendezvousChannel {
      */
     suspend fun close()
 
-    // TODO: this should be transport independent in the future
+    // In future we probably want this to be a more generic RendezvousCode but it is suffice for now
     suspend fun generateCode(intent: RendezvousIntent): ECDHRendezvousCode
     suspend fun cancel(reason: RendezvousFailureReason)
 }
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index 556be3af4d..f0030d6763 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -80,7 +80,8 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
 
     private fun getErrorCode(reason: RendezvousFailureReason): String {
         return when (reason) {
-            RendezvousFailureReason.UnsupportedAlgorithm, RendezvousFailureReason.UnsupportedTransport -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)
+            RendezvousFailureReason.UnsupportedAlgorithm,
+            RendezvousFailureReason.UnsupportedTransport -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)
             RendezvousFailureReason.Expired -> getString(R.string.qr_code_login_header_failed_timeout_description)
             RendezvousFailureReason.UserDeclined -> getString(R.string.qr_code_login_header_failed_denied_description)
             else -> getString(R.string.qr_code_login_header_failed_other_description)

From bfe3daa37fda9cd42bc541b5c13c4f75bb58e221 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 17:25:06 +0100
Subject: [PATCH 061/300] Fix compile error from bad merge

---
 .../vector/app/features/login/qr/QrCodeLoginViewModel.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 7a51098439..af0df22ca3 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -24,8 +24,8 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.session.ConfigureAndStartSessionUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
@@ -37,7 +37,8 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         @Assisted private val initialState: QrCodeLoginViewState,
         private val applicationContext: Context,
         private val authenticationService: AuthenticationService,
-        private val activeSessionHolder: ActiveSessionHolder
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase
 ) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
     val TAG: String = QrCodeLoginViewModel::class.java.simpleName
 
@@ -97,7 +98,7 @@ class QrCodeLoginViewModel @AssistedInject constructor(
                         activeSessionHolder.setActiveSession(session)
                         authenticationService.reset()
 
-                        session.configureAndStart(applicationContext)
+                        configureAndStartSessionUseCase.execute(session, startSyncing)
 
                         rendezvous.completeVerificationOnNewDevice(session)
 

From a3fc78594502953d86944d3f1ec0509c13921e7d Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Fri, 14 Oct 2022 18:52:42 +0100
Subject: [PATCH 062/300] Fix missing param

---
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index af0df22ca3..81a00cf548 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -98,7 +98,7 @@ class QrCodeLoginViewModel @AssistedInject constructor(
                         activeSessionHolder.setActiveSession(session)
                         authenticationService.reset()
 
-                        configureAndStartSessionUseCase.execute(session, startSyncing)
+                        configureAndStartSessionUseCase.execute(session)
 
                         rendezvous.completeVerificationOnNewDevice(session)
 

From d979b50b2cd8b098b5bd3e353264e7e76be5dabe Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 10:52:24 +0100
Subject: [PATCH 063/300] Logging cleanup

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 22 ++++++++++++-------
 .../channels/ECDHRendezvousChannel.kt         | 16 ++++----------
 .../SimpleHttpRendezvousTransport.kt          | 11 +++-------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 6403d17031..b43b122cba 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -36,9 +36,14 @@ import org.matrix.android.sdk.api.util.MatrixJsonParser
 import timber.log.Timber
 
 internal enum class PayloadType(val value: String) {
-    @Json(name = "m.login.start") Start("m.login.start"),
-    @Json(name = "m.login.finish") Finish("m.login.finish"),
-    @Json(name = "m.login.progress") Progress("m.login.progress")
+    @Json(name = "m.login.start")
+    Start("m.login.start"),
+
+    @Json(name = "m.login.finish")
+    Finish("m.login.finish"),
+
+    @Json(name = "m.login.progress")
+    Progress("m.login.progress")
 }
 
 @JsonClass(generateAdapter = true)
@@ -150,12 +155,12 @@ class Rendezvous(
         }
 
         val homeserver = loginToken?.homeserver ?: throw RuntimeException("No homeserver returned")
-        val login_token = loginToken.loginToken ?: throw RuntimeException("No login token returned")
+        val token = loginToken.loginToken ?: throw RuntimeException("No login token returned")
 
-        Timber.tag(TAG).i("Got login_token: $login_token for $homeserver")
+        Timber.tag(TAG).i("Got login_token now attempting to sign in with $homeserver")
 
         val hsConfig = HomeServerConnectionConfig(homeServerUri = Uri.parse(homeserver))
-        return authenticationService.loginUsingQrLoginToken(hsConfig, login_token)
+        return authenticationService.loginUsingQrLoginToken(hsConfig, token)
     }
 
     suspend fun completeVerificationOnNewDevice(session: Session) {
@@ -171,8 +176,8 @@ class Rendezvous(
         val verifyingDeviceId = verificationResponse?.verifyingDeviceId ?: throw RuntimeException("No verifying device id returned")
         val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
         if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
-            Timber.tag(TAG).w("Verifying device $verifyingDeviceId doesn't match: $verifyingDeviceFromServer")
-            return
+            Timber.tag(TAG).w("Verifying device $verifyingDeviceId key doesn't match: ${verifyingDeviceFromServer?.fingerprint()} vs ${verificationResponse.verifyingDeviceKey})")
+            throw RuntimeException("Key from verifying device doesn't match")
         }
 
         // set other device as verified
@@ -187,6 +192,7 @@ class Rendezvous(
                     crypto.crossSigningService().markMyMasterKeyAsTrusted()
                 } else {
                     Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
+                    throw RuntimeException("Master key from verifying device doesn't match")
                 }
             } ?: Timber.tag(TAG).i("No local master key")
         } ?: Timber.tag(TAG).i("No master key given by verifying device")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 1c8bca5d1c..4d5ed30ac5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTran
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 import org.matrix.olm.OlmSAS
+import timber.log.Timber
 import java.security.SecureRandom
 import java.util.LinkedList
 import javax.crypto.Cipher
@@ -93,7 +94,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         val isInitiator = theirPublicKey == null
 
         if (isInitiator) {
-//            Timber.tag(TAG).i("Waiting for other device to send their public key")
+            Timber.tag(TAG).i("Waiting for other device to send their public key")
             val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
 
             if (res.key == null) {
@@ -105,7 +106,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
             theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
         } else {
             // send our public key unencrypted
-//            Timber.tag(TAG).i("Sending public key")
+            Timber.tag(TAG).i("Sending public key")
             send(
                     ECDHPayload(
                     algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
@@ -122,11 +123,6 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
         aesKey = olmSAS!!.generateShortCode(aesInfo, 32)
 
-//        Timber.tag(TAG).i("Our public key: ${Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)}")
-//        Timber.tag(TAG).i("Their public key: ${Base64.encodeToString(theirPublicKey, Base64.NO_WRAP)}")
-//        Timber.tag(TAG).i("AES info: $aesInfo")
-//        Timber.tag(TAG).i("AES key: ${Base64.encodeToString(aesKey, Base64.NO_WRAP)}")
-
         val rawChecksum = olmSAS!!.generateShortCode(aesInfo, 5)
         return getDecimalCodeRepresentation(rawChecksum)
     }
@@ -181,7 +177,6 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     private fun encrypt(plainText: ByteArray): ECDHPayload {
-//        Timber.tag(TAG).d("Encrypting: ${plainText.toString(Charsets.UTF_8)}")
         val iv = ByteArray(16)
         SecureRandom().nextBytes(iv)
 
@@ -211,9 +206,6 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         plainText.addAll(encryptCipher.update(Base64.decode(payload.ciphertext, Base64.NO_WRAP)).toList())
         plainText.addAll(encryptCipher.doFinal().toList())
 
-        val plainTextBytes = plainText.toByteArray()
-
-//        Timber.tag(TAG).d("Decrypted: ${plainTextBytes.toString(Charsets.UTF_8)}")
-        return plainTextBytes
+        return plainText.toByteArray()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 475a4fbe6c..004cf38e24 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -67,8 +67,6 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         // TODO: properly determine endpoint
         val uri = if (uri != null) uri!! else "https://rendezvous.lab.element.dev"
 
-//        Timber.tag(TAG).i("Sending data: ${data.toString(Charsets.UTF_8)} to $uri")
-
         val httpClient = okhttp3.OkHttpClient.Builder().build()
 
         val request = Request.Builder()
@@ -123,8 +121,6 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
             val response = httpClient.newCall(request.build()).execute()
 
             try {
-//                Timber.tag(TAG).d("Received polling response: ${response.code} from $uri")
-
                 if (response.code == 404) {
                     cancel(RendezvousFailureReason.Unknown)
                     return null
@@ -140,9 +136,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
                     response.header("etag")?.let {
                         etag = it
                     }
-                    val data = response.body?.bytes()
-//                    Timber.tag(TAG).d("Received data: ${data?.toString(Charsets.UTF_8)} from $uri with etag $etag")
-                    return data
+                    return response.body?.bytes()
                 }
 
                 done = false
@@ -159,7 +153,8 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         var mappedReason = reason
         Timber.tag(TAG).i("$expiresAt")
         if (mappedReason == RendezvousFailureReason.Unknown &&
-                expiresAt != null && Date() > expiresAt) {
+                expiresAt != null && Date() > expiresAt
+        ) {
             mappedReason = RendezvousFailureReason.Expired
         }
 

From ed6bc01bef48b4266dbe34e600f8038b0dcc6a3a Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 10:54:28 +0100
Subject: [PATCH 064/300] Resolve TODO

---
 .../api/rendezvous/transports/SimpleHttpRendezvousTransport.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 004cf38e24..dde5edcb93 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -64,8 +64,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         }
 
         val method = if (uri != null) "PUT" else "POST"
-        // TODO: properly determine endpoint
-        val uri = if (uri != null) uri!! else "https://rendezvous.lab.element.dev"
+        val uri = this.uri ?: throw RuntimeException("No rendezvous URI")
 
         val httpClient = okhttp3.OkHttpClient.Builder().build()
 

From 33be5c257dcaa8c674486a77c5851d1a6a626f7e Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 11:24:48 +0100
Subject: [PATCH 065/300] Refactor into dedicated files and companion objects

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 39 +++---------
 .../channels/ECDHRendezvousChannel.kt         | 59 ++++++++++---------
 .../api/rendezvous/model/ECDHRendezvous.kt    |  7 ---
 .../rendezvous/model/ECDHRendezvousCode.kt    | 26 ++++++++
 .../sdk/api/rendezvous/model/Payload.kt       | 36 +++++++++++
 .../sdk/api/rendezvous/model/PayloadType.kt   | 30 ++++++++++
 .../SimpleHttpRendezvousTransportDetails.kt   | 25 ++++++++
 .../SimpleHttpRendezvousTransport.kt          | 13 ++--
 8 files changed, 159 insertions(+), 76 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index b43b122cba..4270d4a09c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -17,13 +17,13 @@
 package org.matrix.android.sdk.api.rendezvous
 
 import android.net.Uri
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.rendezvous.channels.ECDHRendezvousChannel
 import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.Payload
+import org.matrix.android.sdk.api.rendezvous.model.PayloadType
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
 import org.matrix.android.sdk.api.session.Session
@@ -35,35 +35,6 @@ import org.matrix.android.sdk.api.session.crypto.crosssigning.USER_SIGNING_KEY_S
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import timber.log.Timber
 
-internal enum class PayloadType(val value: String) {
-    @Json(name = "m.login.start")
-    Start("m.login.start"),
-
-    @Json(name = "m.login.finish")
-    Finish("m.login.finish"),
-
-    @Json(name = "m.login.progress")
-    Progress("m.login.progress")
-}
-
-@JsonClass(generateAdapter = true)
-internal data class Payload(
-        @Json val type: PayloadType,
-        @Json val intent: RendezvousIntent? = null,
-        @Json val outcome: String? = null,
-        @Json val protocols: List<String>? = null,
-        @Json val protocol: String? = null,
-        @Json val homeserver: String? = null,
-        @Json(name = "login_token") val loginToken: String? = null,
-        @Json(name = "device_id") val deviceId: String? = null,
-        @Json(name = "device_key") val deviceKey: String? = null,
-        @Json(name = "verifying_device_id") val verifyingDeviceId: String? = null,
-        @Json(name = "verifying_device_key") val verifyingDeviceKey: String? = null,
-        @Json(name = "master_key") val masterKey: String? = null
-)
-
-private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
-
 /**
  * Implementation of MSC3906 to sign in + E2EE set up using a QR code.
  */
@@ -72,6 +43,8 @@ class Rendezvous(
         val theirIntent: RendezvousIntent,
 ) {
     companion object {
+        private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+
         fun buildChannelFromCode(code: String, onCancelled: (reason: RendezvousFailureReason) -> Unit): Rendezvous {
             val parsed = MatrixJsonParser.getMoshi().adapter(ECDHRendezvousCode::class.java).fromJson(code) ?: throw RuntimeException("Invalid code")
 
@@ -176,7 +149,9 @@ class Rendezvous(
         val verifyingDeviceId = verificationResponse?.verifyingDeviceId ?: throw RuntimeException("No verifying device id returned")
         val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
         if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
-            Timber.tag(TAG).w("Verifying device $verifyingDeviceId key doesn't match: ${verifyingDeviceFromServer?.fingerprint()} vs ${verificationResponse.verifyingDeviceKey})")
+            Timber.tag(TAG).w("Verifying device $verifyingDeviceId key doesn't match: ${
+                verifyingDeviceFromServer?.fingerprint()} vs ${verificationResponse.verifyingDeviceKey})"
+            )
             throw RuntimeException("Key from verifying device doesn't match")
         }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 4d5ed30ac5..5dbac894ae 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -29,7 +29,7 @@ import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 import org.matrix.android.sdk.api.rendezvous.model.SecureRendezvousChannelAlgorithm
-import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransportDetails
+import org.matrix.android.sdk.api.rendezvous.model.SimpleHttpRendezvousTransportDetails
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 import org.matrix.olm.OlmSAS
@@ -40,39 +40,40 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
-@JsonClass(generateAdapter = true)
-data class ECDHPayload(
-        @Json val algorithm: SecureRendezvousChannelAlgorithm? = null,
-        @Json val key: String? = null,
-        @Json val ciphertext: String? = null,
-        @Json val iv: String? = null
-)
-
-private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
-
-fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
-    val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
-    val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
-    val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
-    val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
-    val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
-    // (B0 << 5 | B1 >> 3) + 1000
-    val first = (b0.shl(5) or b1.shr(3)) + 1000
-    // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
-    val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
-    // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
-    val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
-    return "$first-$second-$third"
-}
-
-const val ALGORITHM_SPEC = "AES/GCM/NoPadding"
-const val KEY_SPEC = "AES"
-
 /**
  *  Implements X25519 ECDH key agreement and AES-256-GCM encryption channel as per MSC3903:
  *  https://github.com/matrix-org/matrix-spec-proposals/pull/3903
  */
 class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPublicKeyBase64: String?) : RendezvousChannel {
+    companion object {
+        private const val ALGORITHM_SPEC = "AES/GCM/NoPadding"
+        private const val KEY_SPEC = "AES"
+        private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+
+        private fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
+            val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
+            val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
+            val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
+            val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
+            val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
+            // (B0 << 5 | B1 >> 3) + 1000
+            val first = (b0.shl(5) or b1.shr(3)) + 1000
+            // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
+            val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
+            // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
+            val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
+            return "$first-$second-$third"
+        }
+    }
+
+    @JsonClass(generateAdapter = true)
+    internal data class ECDHPayload(
+            @Json val algorithm: SecureRendezvousChannelAlgorithm? = null,
+            @Json val key: String? = null,
+            @Json val ciphertext: String? = null,
+            @Json val iv: String? = null
+    )
+
     private var olmSAS: OlmSAS?
     private val ourPublicKey: ByteArray
     private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
index b203101b66..0840e1ca2e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
@@ -18,7 +18,6 @@ package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransportDetails
 
 @JsonClass(generateAdapter = true)
 data class ECDHRendezvous(
@@ -26,9 +25,3 @@ data class ECDHRendezvous(
         @Json val algorithm: SecureRendezvousChannelAlgorithm,
         @Json val key: String
 )
-
-@JsonClass(generateAdapter = true)
-data class ECDHRendezvousCode(
-        @Json val intent: RendezvousIntent,
-        @Json val rendezvous: ECDHRendezvous
-)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
new file mode 100644
index 0000000000..410c5c1036
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 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.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ECDHRendezvousCode(
+        @Json val intent: RendezvousIntent,
+        @Json val rendezvous: ECDHRendezvous
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
new file mode 100644
index 0000000000..5627452232
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright 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.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class Payload(
+        @Json val type: PayloadType,
+        @Json val intent: RendezvousIntent? = null,
+        @Json val outcome: String? = null,
+        @Json val protocols: List<String>? = null,
+        @Json val protocol: String? = null,
+        @Json val homeserver: String? = null,
+        @Json(name = "login_token") val loginToken: String? = null,
+        @Json(name = "device_id") val deviceId: String? = null,
+        @Json(name = "device_key") val deviceKey: String? = null,
+        @Json(name = "verifying_device_id") val verifyingDeviceId: String? = null,
+        @Json(name = "verifying_device_key") val verifyingDeviceKey: String? = null,
+        @Json(name = "master_key") val masterKey: String? = null
+)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
new file mode 100644
index 0000000000..9854e7c070
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 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.api.rendezvous.model
+
+import com.squareup.moshi.Json
+
+internal enum class PayloadType(val value: String) {
+    @Json(name = "m.login.start")
+    Start("m.login.start"),
+
+    @Json(name = "m.login.finish")
+    Finish("m.login.finish"),
+
+    @Json(name = "m.login.progress")
+    Progress("m.login.progress")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
new file mode 100644
index 0000000000..70a441d760
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 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.api.rendezvous.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SimpleHttpRendezvousTransportDetails(
+        @Json val uri: String
+) : RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index dde5edcb93..03e8b0cda7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -26,22 +26,19 @@ import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
-import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportType
+import org.matrix.android.sdk.api.rendezvous.model.SimpleHttpRendezvousTransportDetails
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
 
-private val TAG = LoggerTag(SimpleHttpRendezvousTransport::class.java.simpleName, LoggerTag.RENDEZVOUS).value
-
-@JsonClass(generateAdapter = true)
-data class SimpleHttpRendezvousTransportDetails(
-        @Json val uri: String
-) : RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)
-
 /**
  * Implementation of the Simple HTTP transport MSC3886: https://github.com/matrix-org/matrix-spec-proposals/pull/3886
  */
 class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?, rendezvousUri: String?) : RendezvousTransport {
+    companion object {
+        private val TAG = LoggerTag(SimpleHttpRendezvousTransport::class.java.simpleName, LoggerTag.RENDEZVOUS).value
+    }
+
     override var ready = false
     private var cancelled = false
     private var uri: String?

From 3be4a0ca2137c339b66b9b5aa12bb0617c15d935 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 11:25:09 +0100
Subject: [PATCH 066/300] Remove unused val

---
 .../java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 81a00cf548..8b70f61e80 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -35,7 +35,6 @@ import timber.log.Timber
 
 class QrCodeLoginViewModel @AssistedInject constructor(
         @Assisted private val initialState: QrCodeLoginViewState,
-        private val applicationContext: Context,
         private val authenticationService: AuthenticationService,
         private val activeSessionHolder: ActiveSessionHolder,
         private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase

From 48de8f4e345105668298ec238bbad5600c057ab9 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 11:48:35 +0100
Subject: [PATCH 067/300] Fix bad merge

---
 .../session/homeserver/GetHomeServerCapabilitiesTask.kt         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index d65e629b71..42bba5fe88 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -133,6 +133,8 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
                 homeServerCapabilitiesEntity.roomVersionsJson = capabilities?.roomVersions?.let {
                     MoshiProvider.providesMoshi().adapter(RoomVersions::class.java).toJson(it)
                 }
+                homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
+                        getVersionResult?.doesServerSupportThreads().orFalse()
             }
 
             if (getMediaConfigResult != null) {

From 506fa729ea8f9d77357cc0f1347d3227e6b51702 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 11:50:56 +0100
Subject: [PATCH 068/300] Cleanup

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 29 ++++++++++--------
 .../channels/ECDHRendezvousChannel.kt         |  1 +
 .../sdk/api/rendezvous/model/Outcome.kt       | 30 +++++++++++++++++++
 .../sdk/api/rendezvous/model/Payload.kt       |  6 ++--
 .../sdk/api/rendezvous/model/PayloadType.kt   |  6 ++--
 .../sdk/api/rendezvous/model/Protocol.kt      | 24 +++++++++++++++
 6 files changed, 78 insertions(+), 18 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 4270d4a09c..e467ff06e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -22,8 +22,10 @@ import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.rendezvous.channels.ECDHRendezvousChannel
 import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
+import org.matrix.android.sdk.api.rendezvous.model.Outcome
 import org.matrix.android.sdk.api.rendezvous.model.Payload
 import org.matrix.android.sdk.api.rendezvous.model.PayloadType
+import org.matrix.android.sdk.api.rendezvous.model.Protocol
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
 import org.matrix.android.sdk.api.session.Session
@@ -68,7 +70,7 @@ class Rendezvous(
         Timber.tag(TAG).d("ourIntent: $ourIntent, theirIntent: $theirIntent, incompatible: $incompatible")
 
         if (incompatible) {
-            send(Payload(PayloadType.Finish, intent = ourIntent))
+            send(Payload(PayloadType.FINISH, intent = ourIntent))
             val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) {
                 RendezvousFailureReason.OtherDeviceNotSignedIn
             } else {
@@ -93,14 +95,14 @@ class Rendezvous(
         Timber.tag(TAG).i("Waiting for protocols")
         val protocolsResponse = receive()
 
-        if (protocolsResponse?.protocols == null || !protocolsResponse.protocols.contains("login_token")) {
-            send(Payload(PayloadType.Finish, outcome = "unsupported"))
+        if (protocolsResponse?.protocols == null || !protocolsResponse.protocols.contains(Protocol.LOGIN_TOKEN)) {
+            send(Payload(PayloadType.FINISH, outcome = Outcome.UNSUPPORTED))
             Timber.tag(TAG).i("No supported protocol")
             cancel(RendezvousFailureReason.Unknown)
             return null
         }
 
-        send(Payload(PayloadType.Progress, protocol = "login_token"))
+        send(Payload(PayloadType.PROGRESS, protocol = Protocol.LOGIN_TOKEN))
 
         return checksum
     }
@@ -110,21 +112,23 @@ class Rendezvous(
 
         val loginToken = receive()
 
-        if (loginToken?.type == PayloadType.Finish) {
+        if (loginToken?.type == PayloadType.FINISH) {
             when (loginToken.outcome) {
-                "declined" -> {
+                Outcome.DECLINED -> {
                     Timber.tag(TAG).i("Login declined by other device")
                     channel.cancel(RendezvousFailureReason.UserDeclined)
                     return null
                 }
-                "unsupported" -> {
+                Outcome.UNSUPPORTED -> {
                     Timber.tag(TAG).i("Not supported")
                     channel.cancel(RendezvousFailureReason.HomeserverLacksSupport)
                     return null
                 }
+                else -> {
+                    channel.cancel(RendezvousFailureReason.Unknown)
+                    return null
+                }
             }
-            channel.cancel(RendezvousFailureReason.Unknown)
-            return null
         }
 
         val homeserver = loginToken?.homeserver ?: throw RuntimeException("No homeserver returned")
@@ -141,7 +145,7 @@ class Rendezvous(
         val crypto = session.cryptoService()
         val deviceId = crypto.getMyDevice().deviceId
         val deviceKey = crypto.getMyDevice().fingerprint()
-        send(Payload(PayloadType.Progress, outcome = "success", deviceId = deviceId, deviceKey = deviceKey))
+        send(Payload(PayloadType.PROGRESS, outcome = Outcome.SUCCESS, deviceId = deviceId, deviceKey = deviceKey))
 
         // await confirmation of verification
 
@@ -149,8 +153,9 @@ class Rendezvous(
         val verifyingDeviceId = verificationResponse?.verifyingDeviceId ?: throw RuntimeException("No verifying device id returned")
         val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
         if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
-            Timber.tag(TAG).w("Verifying device $verifyingDeviceId key doesn't match: ${
-                verifyingDeviceFromServer?.fingerprint()} vs ${verificationResponse.verifyingDeviceKey})"
+            Timber.tag(TAG).w(
+                    "Verifying device $verifyingDeviceId key doesn't match: ${
+                        verifyingDeviceFromServer?.fingerprint()} vs ${verificationResponse.verifyingDeviceKey})"
             )
             throw RuntimeException("Key from verifying device doesn't match")
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 5dbac894ae..489d20e588 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -50,6 +50,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         private const val KEY_SPEC = "AES"
         private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
 
+        // n.b. we are only aver processing byte array that we have generated, so we can make assumptions about the length
         private fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
             val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
             val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
new file mode 100644
index 0000000000..2dd6e7be28
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 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.api.rendezvous.model
+
+import com.squareup.moshi.Json
+
+enum class Outcome(val value: String) {
+    @Json(name = "success")
+    SUCCESS("success"),
+
+    @Json(name = "declined")
+    DECLINED("declined"),
+
+    @Json(name = "unsupported")
+    UNSUPPORTED("unsupported")
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
index 5627452232..593177e625 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
@@ -23,9 +23,9 @@ import com.squareup.moshi.JsonClass
 internal data class Payload(
         @Json val type: PayloadType,
         @Json val intent: RendezvousIntent? = null,
-        @Json val outcome: String? = null,
-        @Json val protocols: List<String>? = null,
-        @Json val protocol: String? = null,
+        @Json val outcome: Outcome? = null,
+        @Json val protocols: List<Protocol>? = null,
+        @Json val protocol: Protocol? = null,
         @Json val homeserver: String? = null,
         @Json(name = "login_token") val loginToken: String? = null,
         @Json(name = "device_id") val deviceId: String? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
index 9854e7c070..5ff4cd7cfa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
@@ -20,11 +20,11 @@ import com.squareup.moshi.Json
 
 internal enum class PayloadType(val value: String) {
     @Json(name = "m.login.start")
-    Start("m.login.start"),
+    START("m.login.start"),
 
     @Json(name = "m.login.finish")
-    Finish("m.login.finish"),
+    FINISH("m.login.finish"),
 
     @Json(name = "m.login.progress")
-    Progress("m.login.progress")
+    PROGRESS("m.login.progress")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
new file mode 100644
index 0000000000..18381984a5
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 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.api.rendezvous.model
+
+import com.squareup.moshi.Json
+
+enum class Protocol(val value: String) {
+    @Json(name = "login_token")
+    LOGIN_TOKEN("login_token")
+}

From 4306c57236dccd50531bf20e8732031a84d6bb0e Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 12:01:12 +0100
Subject: [PATCH 069/300] Thread safe use of OlmSAS

---
 .../channels/ECDHRendezvousChannel.kt         | 69 ++++++++++---------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 489d20e588..ca7083b297 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -90,43 +90,45 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     override suspend fun connect(): String {
-        if (olmSAS == null) {
-            throw RuntimeException("Channel closed")
-        }
-        val isInitiator = theirPublicKey == null
+        olmSAS ?.let { olmSAS ->
+            val isInitiator = theirPublicKey == null
 
-        if (isInitiator) {
-            Timber.tag(TAG).i("Waiting for other device to send their public key")
-            val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
+            if (isInitiator) {
+                Timber.tag(TAG).i("Waiting for other device to send their public key")
+                val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
 
-            if (res.key == null) {
-                throw RendezvousError(
-                        "Unsupported algorithm: ${res.algorithm}",
-                        RendezvousFailureReason.UnsupportedAlgorithm,
+                if (res.key == null) {
+                    throw RendezvousError(
+                            "Unsupported algorithm: ${res.algorithm}",
+                            RendezvousFailureReason.UnsupportedAlgorithm,
+                    )
+                }
+                theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
+            } else {
+                // send our public key unencrypted
+                Timber.tag(TAG).i("Sending public key")
+                send(
+                        ECDHPayload(
+                                algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
+                                key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
+                        )
                 )
             }
-            theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
-        } else {
-            // send our public key unencrypted
-            Timber.tag(TAG).i("Sending public key")
-            send(
-                    ECDHPayload(
-                    algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
-                    key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
-            )
-            )
-        }
 
-        olmSAS!!.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+            synchronized(olmSAS) {
+                olmSAS.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+                olmSAS.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
 
-        val initiatorKey = Base64.encodeToString(if (isInitiator) ourPublicKey else theirPublicKey, Base64.NO_WRAP)
-        val recipientKey = Base64.encodeToString(if (isInitiator) theirPublicKey else ourPublicKey, Base64.NO_WRAP)
-        val aesInfo = "${SecureRendezvousChannelAlgorithm.ECDH_V1.value}|$initiatorKey|$recipientKey"
+                val initiatorKey = Base64.encodeToString(if (isInitiator) ourPublicKey else theirPublicKey, Base64.NO_WRAP)
+                val recipientKey = Base64.encodeToString(if (isInitiator) theirPublicKey else ourPublicKey, Base64.NO_WRAP)
+                val aesInfo = "${SecureRendezvousChannelAlgorithm.ECDH_V1.value}|$initiatorKey|$recipientKey"
 
-        aesKey = olmSAS!!.generateShortCode(aesInfo, 32)
+                aesKey = olmSAS.generateShortCode(aesInfo, 32)
 
-        val rawChecksum = olmSAS!!.generateShortCode(aesInfo, 5)
-        return getDecimalCodeRepresentation(rawChecksum)
+                val rawChecksum = olmSAS.generateShortCode(aesInfo, 5)
+                return getDecimalCodeRepresentation(rawChecksum)
+            }
+        } ?: throw RuntimeException("Channel closed")
     }
 
     private suspend fun send(payload: ECDHPayload) {
@@ -174,8 +176,13 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     override suspend fun close() {
-        olmSAS?.releaseSas()
-        olmSAS = null
+        olmSAS ?.let {
+            synchronized(it) {
+                // this does a double release check already so we don't re-check ourselves
+                it.releaseSas()
+                olmSAS = null
+            }
+        }
     }
 
     private fun encrypt(plainText: ByteArray): ECDHPayload {

From fb86ab70a270e124b15b3e7af888381f32b78dd8 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 12:05:32 +0100
Subject: [PATCH 070/300] Comments and error mapping

---
 .../transports/SimpleHttpRendezvousTransport.kt          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 03e8b0cda7..e899a64e99 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -99,9 +99,8 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
 
     override suspend fun receive(): ByteArray? {
         val uri = uri ?: throw IllegalStateException("Rendezvous not set up")
-        var done = false
         val httpClient = okhttp3.OkHttpClient.Builder().build()
-        while (!done) {
+        while (true) {
             if (cancelled) {
                 return null
             }
@@ -117,8 +116,9 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
             val response = httpClient.newCall(request.build()).execute()
 
             try {
+                // expired
                 if (response.code == 404) {
-                    cancel(RendezvousFailureReason.Unknown)
+                    cancel(RendezvousFailureReason.Expired)
                     return null
                 }
 
@@ -135,7 +135,8 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
                     return response.body?.bytes()
                 }
 
-                done = false
+                // sleep for a second before polling again
+                // we rely on the server expiring the channel rather than checking it ourselves
                 delay(1000)
             } finally {
                 response.close()

From 1976451c8164ee15b88186ae1fc6291513d158ec Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 12:23:14 +0100
Subject: [PATCH 071/300] Lint

---
 .../matrix/android/sdk/api/rendezvous/RendezvousChannel.kt    | 2 +-
 .../rendezvous/transports/SimpleHttpRendezvousTransport.kt    | 4 ----
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt   | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index 9d2843ce66..31014e392d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -20,7 +20,7 @@ import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 
 /**
- * Representation of a rendezvous channel such as that described by MSC3903
+ * Representation of a rendezvous channel such as that described by MSC3903.
  */
 interface RendezvousChannel {
     var transport: RendezvousTransport
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index e899a64e99..3e9b11a68b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -16,8 +16,6 @@
 
 package org.matrix.android.sdk.api.rendezvous.transports
 
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
 import kotlinx.coroutines.delay
 import okhttp3.MediaType
 import okhttp3.Request
@@ -142,8 +140,6 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
                 response.close()
             }
         }
-
-        return null
     }
 
     override suspend fun cancel(reason: RendezvousFailureReason) {
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 8b70f61e80..36e88b284c 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.login.qr
 
-import android.content.Context
 import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

From eb30ef166acff6fca015b321c71ce1b10a811c49 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 12:32:40 +0100
Subject: [PATCH 072/300] Improve 404 handling

---
 .../rendezvous/transports/SimpleHttpRendezvousTransport.kt   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 3e9b11a68b..ca2a3425cd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -75,7 +75,9 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         val response = httpClient.newCall(request.build()).execute()
 
         if (response.code == 404) {
+            // we set to unknown and the cancel method will rewrite the reason to expired if applicable
             cancel(RendezvousFailureReason.Unknown)
+            return
         }
         etag = response.header("etag")
 
@@ -116,7 +118,8 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
             try {
                 // expired
                 if (response.code == 404) {
-                    cancel(RendezvousFailureReason.Expired)
+                    // we set to unknown and the cancel method will rewrite the reason to expired if applicable
+                    cancel(RendezvousFailureReason.Unknown)
                     return null
                 }
 

From d616251f260515548f8b699514247b6e0a8ee9bc Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 13:41:27 +0100
Subject: [PATCH 073/300] Fix merge

---
 .../session/homeserver/GetHomeServerCapabilitiesTask.kt         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 9147c4e1cd..2c3cb440b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -132,8 +132,6 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
                 homeServerCapabilitiesEntity.roomVersionsJson = capabilities?.roomVersions?.let {
                     MoshiProvider.providesMoshi().adapter(RoomVersions::class.java).toJson(it)
                 }
-                homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
-                        getVersionResult?.doesServerSupportThreads().orFalse()
             }
 
             if (getMediaConfigResult != null) {

From e01ee619d3bb59d5bec0c1d0ee1bef9829584f40 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:02:25 +0100
Subject: [PATCH 074/300] Refactor error handling and report E2EE errors

---
 .../src/main/res/values/strings.xml           |   6 +
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 140 ++++++++++--------
 .../sdk/api/rendezvous/RendezvousChannel.kt   |  12 +-
 .../api/rendezvous/RendezvousFailureReason.kt |  25 ++--
 .../sdk/api/rendezvous/RendezvousTransport.kt |   7 +-
 .../channels/ECDHRendezvousChannel.kt         |  27 +---
 .../sdk/api/rendezvous/model/Outcome.kt       |   8 +-
 .../api/rendezvous/model/RendezvousError.kt   |   2 +-
 .../SimpleHttpRendezvousTransport.kt          |  57 ++++---
 .../login/qr/QrCodeLoginStatusFragment.kt     |   6 +
 .../features/login/qr/QrCodeLoginViewModel.kt |  27 +++-
 11 files changed, 171 insertions(+), 146 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 7d0173f341..e28ebb31c6 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3383,6 +3383,12 @@
     <string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
     <string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
     <string name="qr_code_login_header_failed_other_description">The request failed.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your intent connection(s); Your device(s);</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">The other device is already signed in.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">The other device must be signed in.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">The QR code scanned is invalid.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">The sign in was cancelled on the other device.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">The homeserver doesn\'t support sign in with QR code.</string>
     <string name="qr_code_login_new_device_instruction_1">Open ${app_name} on your other device</string>
     <string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security &amp; Privacy -> Show All Sessions</string>
     <string name="qr_code_login_new_device_instruction_3">Select \'Show QR code in this device\'</string>
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index e467ff06e3..9ad889fca0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -26,6 +26,7 @@ import org.matrix.android.sdk.api.rendezvous.model.Outcome
 import org.matrix.android.sdk.api.rendezvous.model.Payload
 import org.matrix.android.sdk.api.rendezvous.model.PayloadType
 import org.matrix.android.sdk.api.rendezvous.model.Protocol
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 import org.matrix.android.sdk.api.rendezvous.transports.SimpleHttpRendezvousTransport
 import org.matrix.android.sdk.api.session.Session
@@ -47,10 +48,16 @@ class Rendezvous(
     companion object {
         private val TAG = LoggerTag(Rendezvous::class.java.simpleName, LoggerTag.RENDEZVOUS).value
 
-        fun buildChannelFromCode(code: String, onCancelled: (reason: RendezvousFailureReason) -> Unit): Rendezvous {
-            val parsed = MatrixJsonParser.getMoshi().adapter(ECDHRendezvousCode::class.java).fromJson(code) ?: throw RuntimeException("Invalid code")
+        @Throws(RendezvousError::class)
+        fun buildChannelFromCode(code: String): Rendezvous {
+            val parsed = try {
+                // we rely on moshi validating the code and throwing exception if invalid JSON or doesn't
+                MatrixJsonParser.getMoshi().adapter(ECDHRendezvousCode::class.java).fromJson(code)
+            } catch (a: Throwable) {
+                throw RendezvousError("Invalid code", RendezvousFailureReason.InvalidCode)
+            } ?: throw RendezvousError("Invalid code", RendezvousFailureReason.InvalidCode)
 
-            val transport = SimpleHttpRendezvousTransport(onCancelled, parsed.rendezvous.transport.uri)
+            val transport = SimpleHttpRendezvousTransport(parsed.rendezvous.transport.uri)
 
             return Rendezvous(
                     ECDHRendezvousChannel(transport, parsed.rendezvous.key),
@@ -64,32 +71,30 @@ class Rendezvous(
     // not yet implemented: RendezvousIntent.RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
     val ourIntent: RendezvousIntent = RendezvousIntent.LOGIN_ON_NEW_DEVICE
 
-    private suspend fun areIntentsIncompatible(): Boolean {
+    @Throws(RendezvousError::class)
+    private suspend fun checkCompatibility() {
         val incompatible = theirIntent == ourIntent
 
         Timber.tag(TAG).d("ourIntent: $ourIntent, theirIntent: $theirIntent, incompatible: $incompatible")
 
         if (incompatible) {
+            // inform the other side
             send(Payload(PayloadType.FINISH, intent = ourIntent))
-            val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) {
-                RendezvousFailureReason.OtherDeviceNotSignedIn
+            if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) {
+                throw RendezvousError("The other device isn't signed in", RendezvousFailureReason.OtherDeviceNotSignedIn)
             } else {
-                RendezvousFailureReason.OtherDeviceAlreadySignedIn
+                throw RendezvousError("The other device is already signed in", RendezvousFailureReason.OtherDeviceAlreadySignedIn)
             }
-            channel.cancel(reason)
         }
-
-        return incompatible
     }
 
+    @Throws(RendezvousError::class)
     suspend fun startAfterScanningCode(): String? {
         val checksum = channel.connect()
 
         Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
 
-        if (areIntentsIncompatible()) {
-            return null
-        }
+        checkCompatibility()
 
         // get protocols
         Timber.tag(TAG).i("Waiting for protocols")
@@ -97,9 +102,7 @@ class Rendezvous(
 
         if (protocolsResponse?.protocols == null || !protocolsResponse.protocols.contains(Protocol.LOGIN_TOKEN)) {
             send(Payload(PayloadType.FINISH, outcome = Outcome.UNSUPPORTED))
-            Timber.tag(TAG).i("No supported protocol")
-            cancel(RendezvousFailureReason.Unknown)
-            return null
+            throw RendezvousError("Unsupported protocols", RendezvousFailureReason.UnsupportedHomeserver)
         }
 
         send(Payload(PayloadType.PROGRESS, protocol = Protocol.LOGIN_TOKEN))
@@ -107,6 +110,7 @@ class Rendezvous(
         return checksum
     }
 
+    @Throws(RendezvousError::class)
     suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? {
         Timber.tag(TAG).i("Waiting for login_token")
 
@@ -115,24 +119,19 @@ class Rendezvous(
         if (loginToken?.type == PayloadType.FINISH) {
             when (loginToken.outcome) {
                 Outcome.DECLINED -> {
-                    Timber.tag(TAG).i("Login declined by other device")
-                    channel.cancel(RendezvousFailureReason.UserDeclined)
-                    return null
+                    throw RendezvousError("Login declined by other device", RendezvousFailureReason.UserDeclined)
                 }
                 Outcome.UNSUPPORTED -> {
-                    Timber.tag(TAG).i("Not supported")
-                    channel.cancel(RendezvousFailureReason.HomeserverLacksSupport)
-                    return null
+                    throw RendezvousError("Homeserver lacks support", RendezvousFailureReason.UnsupportedHomeserver)
                 }
                 else -> {
-                    channel.cancel(RendezvousFailureReason.Unknown)
-                    return null
+                    throw RendezvousError("Unknown error", RendezvousFailureReason.Unknown)
                 }
             }
         }
 
-        val homeserver = loginToken?.homeserver ?: throw RuntimeException("No homeserver returned")
-        val token = loginToken.loginToken ?: throw RuntimeException("No login token returned")
+        val homeserver = loginToken?.homeserver ?: throw RendezvousError("No homeserver returned", RendezvousFailureReason.ProtocolError)
+        val token = loginToken.loginToken ?: throw RendezvousError("No login token returned", RendezvousFailureReason.ProtocolError)
 
         Timber.tag(TAG).i("Got login_token now attempting to sign in with $homeserver")
 
@@ -140,6 +139,7 @@ class Rendezvous(
         return authenticationService.loginUsingQrLoginToken(hsConfig, token)
     }
 
+    @Throws(RendezvousError::class)
     suspend fun completeVerificationOnNewDevice(session: Session) {
         val userId = session.myUserId
         val crypto = session.cryptoService()
@@ -148,59 +148,77 @@ class Rendezvous(
         send(Payload(PayloadType.PROGRESS, outcome = Outcome.SUCCESS, deviceId = deviceId, deviceKey = deviceKey))
 
         // await confirmation of verification
-
         val verificationResponse = receive()
-        val verifyingDeviceId = verificationResponse?.verifyingDeviceId ?: throw RuntimeException("No verifying device id returned")
-        val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
-        if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
-            Timber.tag(TAG).w(
-                    "Verifying device $verifyingDeviceId key doesn't match: ${
-                        verifyingDeviceFromServer?.fingerprint()} vs ${verificationResponse.verifyingDeviceKey})"
-            )
-            throw RuntimeException("Key from verifying device doesn't match")
-        }
+        if (verificationResponse?.outcome == Outcome.VERIFIED) {
+            val verifyingDeviceId = verificationResponse.verifyingDeviceId
+                    ?: throw RendezvousError("No verifying device id returned", RendezvousFailureReason.ProtocolError)
+            val verifyingDeviceFromServer = crypto.getCryptoDeviceInfo(userId, verifyingDeviceId)
+            if (verifyingDeviceFromServer?.fingerprint() != verificationResponse.verifyingDeviceKey) {
+                Timber.tag(TAG).w(
+                        "Verifying device $verifyingDeviceId key doesn't match: ${
+                            verifyingDeviceFromServer?.fingerprint()
+                        } vs ${verificationResponse.verifyingDeviceKey})"
+                )
+                // inform the other side
+                send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
+                throw RendezvousError("Key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
+            }
 
-        // set other device as verified
-        Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
-        crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+            verificationResponse.masterKey?.let { masterKeyFromVerifyingDevice ->
+                // check master key againt what the homeserver told us
+                crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->
+                    if (localMasterKey.unpaddedBase64PublicKey != masterKeyFromVerifyingDevice) {
+                        Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
+                        // inform the other side
+                        send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
+                        throw RendezvousError("Master key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
+                    }
+                    // set other device as verified
+                    Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
+                    crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
 
-        verificationResponse.masterKey ?.let { masterKeyFromVerifyingDevice ->
-            // set master key as trusted
-            crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->
-                if (localMasterKey.unpaddedBase64PublicKey == masterKeyFromVerifyingDevice) {
                     Timber.tag(TAG).i("Setting master key as trusted")
                     crypto.crossSigningService().markMyMasterKeyAsTrusted()
-                } else {
-                    Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
-                    throw RuntimeException("Master key from verifying device doesn't match")
-                }
-            } ?: Timber.tag(TAG).i("No local master key")
-        } ?: Timber.tag(TAG).i("No master key given by verifying device")
+                } ?: Timber.tag(TAG).w("No local master key so not verifying")
+            } ?: run {
+                // set other device as verified anyway
+                Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
+                crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
 
-        // request secrets from the verifying device
-        Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
+                Timber.tag(TAG).i("No master key given by verifying device")
+            }
 
-        session.sharedSecretStorageService().let {
-            it.requestSecret(MASTER_KEY_SSSS_NAME, verifyingDeviceId)
-            it.requestSecret(SELF_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
-            it.requestSecret(USER_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
-            it.requestSecret(KEYBACKUP_SECRET_SSSS_NAME, verifyingDeviceId)
+            // request secrets from the verifying device
+            Timber.tag(TAG).i("Requesting secrets from $verifyingDeviceId")
+
+            session.sharedSecretStorageService().let {
+                it.requestSecret(MASTER_KEY_SSSS_NAME, verifyingDeviceId)
+                it.requestSecret(SELF_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+                it.requestSecret(USER_SIGNING_KEY_SSSS_NAME, verifyingDeviceId)
+                it.requestSecret(KEYBACKUP_SECRET_SSSS_NAME, verifyingDeviceId)
+            }
+        } else {
+            Timber.tag(TAG).i("Not doing verification")
         }
     }
 
+    @Throws(RendezvousError::class)
     private suspend fun receive(): Payload? {
         val data = channel.receive() ?: return null
-        return adapter.fromJson(data.toString(Charsets.UTF_8))
+        val payload = try {
+            adapter.fromJson(data.toString(Charsets.UTF_8))
+        } catch (e: Exception) {
+            Timber.tag(TAG).w(e, "Failed to parse payload")
+            throw RendezvousError("Invalid payload received", RendezvousFailureReason.Unknown)
+        }
+
+        return payload
     }
 
     private suspend fun send(payload: Payload) {
         channel.send(adapter.toJson(payload).toByteArray(Charsets.UTF_8))
     }
 
-    suspend fun cancel(reason: RendezvousFailureReason) {
-        channel.cancel(reason)
-    }
-
     suspend fun close() {
         channel.close()
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index 31014e392d..be79569164 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -16,8 +16,7 @@
 
 package org.matrix.android.sdk.api.rendezvous
 
-import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
-import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 
 /**
  * Representation of a rendezvous channel such as that described by MSC3903.
@@ -28,26 +27,25 @@ interface RendezvousChannel {
     /**
      * @returns the checksum/confirmation digits to be shown to the user
      */
+    @Throws(RendezvousError::class)
     suspend fun connect(): String
 
     /**
      * Send a payload via the channel.
      * @param data payload to send
      */
+    @Throws(RendezvousError::class)
     suspend fun send(data: ByteArray)
 
     /**
      * Receive a payload from the channel.
      * @returns the received payload
      */
+    @Throws(RendezvousError::class)
     suspend fun receive(): ByteArray?
 
     /**
-     * @returns a representation of the channel that can be encoded in a QR or similar
+     * @returns closes the channel and cleans up
      */
     suspend fun close()
-
-    // In future we probably want this to be a more generic RendezvousCode but it is suffice for now
-    suspend fun generateCode(intent: RendezvousIntent): ECDHRendezvousCode
-    suspend fun cancel(reason: RendezvousFailureReason)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
index a607dc7f38..18e625d825 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousFailureReason.kt
@@ -16,16 +16,17 @@
 
 package org.matrix.android.sdk.api.rendezvous
 
-enum class RendezvousFailureReason(val value: String, val canRetry: Boolean = true) {
-    UserDeclined("user_declined"),
-    OtherDeviceNotSignedIn("other_device_not_signed_in"),
-    OtherDeviceAlreadySignedIn("other_device_already_signed_in"),
-    Unknown("unknown"),
-    Expired("expired"),
-    UserCancelled("user_cancelled"),
-    InvalidCode("invalid_code"),
-    UnsupportedAlgorithm("unsupported_algorithm", false),
-    DataMismatch("data_mismatch"),
-    UnsupportedTransport("unsupported_transport", false),
-    HomeserverLacksSupport("homeserver_lacks_support", false)
+enum class RendezvousFailureReason(val canRetry: Boolean = true) {
+    UserDeclined,
+    OtherDeviceNotSignedIn,
+    OtherDeviceAlreadySignedIn,
+    Unknown,
+    Expired,
+    UserCancelled,
+    InvalidCode,
+    UnsupportedAlgorithm(false),
+    UnsupportedTransport(false),
+    UnsupportedHomeserver(false),
+    ProtocolError,
+    E2EESecurityIssue(false)
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
index de0aed7efc..5daf906930 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
@@ -17,13 +17,16 @@
 package org.matrix.android.sdk.api.rendezvous
 
 import okhttp3.MediaType
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
 
 interface RendezvousTransport {
     var ready: Boolean
-    var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?
+    @Throws(RendezvousError::class)
     suspend fun details(): RendezvousTransportDetails
+    @Throws(RendezvousError::class)
     suspend fun send(contentType: MediaType, data: ByteArray)
+    @Throws(RendezvousError::class)
     suspend fun receive(): ByteArray?
-    suspend fun cancel(reason: RendezvousFailureReason)
+    suspend fun close()
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index ca7083b297..9a5c5e865a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -89,13 +89,14 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         ourPublicKey = Base64.decode(olmSAS!!.publicKey, Base64.NO_WRAP)
     }
 
+    @Throws(RendezvousError::class)
     override suspend fun connect(): String {
         olmSAS ?.let { olmSAS ->
             val isInitiator = theirPublicKey == null
 
             if (isInitiator) {
                 Timber.tag(TAG).i("Waiting for other device to send their public key")
-                val res = this.receiveAsPayload() ?: throw RuntimeException("No reply from other device")
+                val res = this.receiveAsPayload() ?: throw RendezvousError("No reply from other device", RendezvousFailureReason.ProtocolError)
 
                 if (res.key == null) {
                     throw RendezvousError(
@@ -137,7 +138,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
     override suspend fun send(data: ByteArray) {
         if (aesKey == null) {
-            throw RuntimeException("Shared secret not established")
+            throw IllegalStateException("Shared secret not established")
         }
         send(encrypt(data))
     }
@@ -150,31 +151,12 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
     override suspend fun receive(): ByteArray? {
         if (aesKey == null) {
-            throw RuntimeException("Shared secret not established")
+            throw IllegalStateException("Shared secret not established")
         }
         val payload = receiveAsPayload() ?: return null
         return decrypt(payload)
     }
 
-    override suspend fun generateCode(intent: RendezvousIntent): ECDHRendezvousCode {
-        return ECDHRendezvousCode(
-                intent,
-                rendezvous = ECDHRendezvous(
-                        transport.details() as SimpleHttpRendezvousTransportDetails,
-                        SecureRendezvousChannelAlgorithm.ECDH_V1,
-                        key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
-                )
-        )
-    }
-
-    override suspend fun cancel(reason: RendezvousFailureReason) {
-        try {
-            transport.cancel(reason)
-        } finally {
-            close()
-        }
-    }
-
     override suspend fun close() {
         olmSAS ?.let {
             synchronized(it) {
@@ -183,6 +165,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
                 olmSAS = null
             }
         }
+        transport.close()
     }
 
     private fun encrypt(plainText: ByteArray): ECDHPayload {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
index 2dd6e7be28..2ef24e9cb7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
@@ -26,5 +26,11 @@ enum class Outcome(val value: String) {
     DECLINED("declined"),
 
     @Json(name = "unsupported")
-    UNSUPPORTED("unsupported")
+    UNSUPPORTED("unsupported"),
+
+    @Json(name = "verified")
+    VERIFIED("verified"),
+
+    @Json(name = "e2ee_security_error")
+    E2EE_SECURITY_ERROR("e2ee_security_error")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
index fec55ffb67..c52b11a322 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousError.kt
@@ -18,4 +18,4 @@ package org.matrix.android.sdk.api.rendezvous.model
 
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 
-class RendezvousError(val description: String, val reason: RendezvousFailureReason) : RuntimeException(description)
+class RendezvousError(val description: String, val reason: RendezvousFailureReason) : Exception(description)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index ca2a3425cd..fa0e5d8e2a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -23,6 +23,7 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
 import org.matrix.android.sdk.api.rendezvous.model.SimpleHttpRendezvousTransportDetails
 import timber.log.Timber
@@ -32,7 +33,7 @@ import java.util.Date
 /**
  * Implementation of the Simple HTTP transport MSC3886: https://github.com/matrix-org/matrix-spec-proposals/pull/3886
  */
-class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: RendezvousFailureReason) -> Unit)?, rendezvousUri: String?) : RendezvousTransport {
+class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTransport {
     companion object {
         private val TAG = LoggerTag(SimpleHttpRendezvousTransport::class.java.simpleName, LoggerTag.RENDEZVOUS).value
     }
@@ -55,7 +56,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
 
     override suspend fun send(contentType: MediaType, data: ByteArray) {
         if (cancelled) {
-            return
+            throw IllegalStateException("Rendezvous cancelled")
         }
 
         val method = if (uri != null) "PUT" else "POST"
@@ -75,9 +76,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         val response = httpClient.newCall(request.build()).execute()
 
         if (response.code == 404) {
-            // we set to unknown and the cancel method will rewrite the reason to expired if applicable
-            cancel(RendezvousFailureReason.Unknown)
-            return
+            throw get404Error()
         }
         etag = response.header("etag")
 
@@ -98,12 +97,12 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
     }
 
     override suspend fun receive(): ByteArray? {
+        if (cancelled) {
+            throw IllegalStateException("Rendezvous cancelled")
+        }
         val uri = uri ?: throw IllegalStateException("Rendezvous not set up")
         val httpClient = okhttp3.OkHttpClient.Builder().build()
         while (true) {
-            if (cancelled) {
-                return null
-            }
             Timber.tag(TAG).i("Polling: $uri after etag $etag")
             val request = Request.Builder()
                     .url(uri)
@@ -118,9 +117,7 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
             try {
                 // expired
                 if (response.code == 404) {
-                    // we set to unknown and the cancel method will rewrite the reason to expired if applicable
-                    cancel(RendezvousFailureReason.Unknown)
-                    return null
+                    throw get404Error()
                 }
 
                 // rely on server expiring the channel rather than checking ourselves
@@ -145,31 +142,27 @@ class SimpleHttpRendezvousTransport(override var onCancelled: ((reason: Rendezvo
         }
     }
 
-    override suspend fun cancel(reason: RendezvousFailureReason) {
-        var mappedReason = reason
-        Timber.tag(TAG).i("$expiresAt")
-        if (mappedReason == RendezvousFailureReason.Unknown &&
-                expiresAt != null && Date() > expiresAt
-        ) {
-            mappedReason = RendezvousFailureReason.Expired
-        }
+    private fun get404Error(): RendezvousError {
+        return if (expiresAt != null && Date() > expiresAt)
+            RendezvousError("Expired", RendezvousFailureReason.Expired)
+        else
+            RendezvousError("Received unexpected 404", RendezvousFailureReason.Unknown)
+    }
 
+    override suspend fun close() {
         cancelled = true
         ready = false
-        onCancelled ?.let { it(mappedReason) }
 
-        if (mappedReason == RendezvousFailureReason.UserDeclined) {
-            uri ?.let {
-                try {
-                    val httpClient = okhttp3.OkHttpClient.Builder().build()
-                    val request = Request.Builder()
-                            .url(it)
-                            .delete()
-                            .build()
-                    httpClient.newCall(request).execute()
-                } catch (e: Exception) {
-                    Timber.tag(TAG).w(e, "Failed to delete channel")
-                }
+        uri ?.let {
+            try {
+                val httpClient = okhttp3.OkHttpClient.Builder().build()
+                val request = Request.Builder()
+                        .url(it)
+                        .delete()
+                        .build()
+                httpClient.newCall(request).execute()
+            } catch (e: Throwable) {
+                Timber.tag(TAG).w(e, "Failed to delete channel")
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index 0691e2367e..617d620c27 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -70,8 +70,14 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
         return when (reason) {
             RendezvousFailureReason.UnsupportedAlgorithm,
             RendezvousFailureReason.UnsupportedTransport -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)
+            RendezvousFailureReason.UnsupportedHomeserver -> getString(R.string.qr_code_login_header_failed_homeserver_is_not_supported_description)
             RendezvousFailureReason.Expired -> getString(R.string.qr_code_login_header_failed_timeout_description)
             RendezvousFailureReason.UserDeclined -> getString(R.string.qr_code_login_header_failed_denied_description)
+            RendezvousFailureReason.E2EESecurityIssue -> getString(R.string.qr_code_login_header_failed_e2ee_security_issue_description)
+            RendezvousFailureReason.OtherDeviceAlreadySignedIn -> getString(R.string.qr_code_login_header_failed_other_device_already_signed_in_description)
+            RendezvousFailureReason.OtherDeviceNotSignedIn -> getString(R.string.qr_code_login_header_failed_other_device_not_signed_in_description)
+            RendezvousFailureReason.InvalidCode -> getString(R.string.qr_code_login_header_failed_invalid_qr_code_description)
+            RendezvousFailureReason.UserCancelled -> getString(R.string.qr_code_login_header_failed_user_cancelled_description)
             else -> getString(R.string.qr_code_login_header_failed_other_description)
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 9d4e5e9870..7f95fad485 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -30,6 +30,7 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.rendezvous.Rendezvous
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
+import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import timber.log.Timber
 
 class QrCodeLoginViewModel @AssistedInject constructor(
@@ -38,14 +39,15 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         private val activeSessionHolder: ActiveSessionHolder,
         private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase
 ) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
-    val TAG: String = QrCodeLoginViewModel::class.java.simpleName
 
     @AssistedFactory
     interface Factory : MavericksAssistedViewModelFactory<QrCodeLoginViewModel, QrCodeLoginViewState> {
         override fun create(initialState: QrCodeLoginViewState): QrCodeLoginViewModel
     }
 
-    companion object : MavericksViewModelFactory<QrCodeLoginViewModel, QrCodeLoginViewState> by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<QrCodeLoginViewModel, QrCodeLoginViewState> by hiltMavericksViewModelFactory() {
+        val TAG: String = QrCodeLoginViewModel::class.java.simpleName
+    }
 
     override fun handle(action: QrCodeLoginAction) {
         when (action) {
@@ -71,9 +73,14 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     private fun handleOnQrCodeScanned(action: QrCodeLoginAction.OnQrCodeScanned) {
         Timber.tag(TAG).d("Scanned code: ${action.qrCode}")
 
-        val rendezvous = Rendezvous.buildChannelFromCode(action.qrCode) { reason ->
-            Timber.tag(TAG).d("Rendezvous cancelled: $reason")
-            onFailed(reason)
+        val rendezvous = try { Rendezvous.buildChannelFromCode(action.qrCode) } catch (t: Throwable) {
+            Timber.tag(TAG).e(t, "Error occurred during sign in")
+            if (t is RendezvousError) {
+                onFailed(t.reason)
+            } else {
+                onFailed(RendezvousFailureReason.Unknown)
+            }
+            return
         }
 
         setState {
@@ -103,9 +110,13 @@ class QrCodeLoginViewModel @AssistedInject constructor(
                         _viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
                     }
                 }
-            } catch (failure: Throwable) {
-                Timber.tag(TAG).e(failure, "Error occurred during sign in")
-                onFailed(RendezvousFailureReason.Unknown)
+            } catch (t: Throwable) {
+                Timber.tag(TAG).e(t, "Error occurred during sign in")
+                if (t is RendezvousError) {
+                    onFailed(t.reason)
+                } else {
+                    onFailed(RendezvousFailureReason.Unknown)
+                }
             }
         }
     }

From 29065b819f6be245a9e78ca3ba7666766d0ce28a Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:03:47 +0100
Subject: [PATCH 075/300] Remove unused class

---
 .../rendezvous/model/EmbeddedRendezvous.kt    | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt
deleted file mode 100644
index 785ce1fed7..0000000000
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/EmbeddedRendezvous.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 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.api.rendezvous.model
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-open class EmbeddedRendezvous(
-        @Json(name = "transport") val transport: RendezvousTransportDetails,
-        @Json(name = "algorithm") val algorithm: SecureRendezvousChannelAlgorithm
-)

From e877feed6eedc22792a24188e3fa37099d5f1f93 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:06:08 +0100
Subject: [PATCH 076/300] Add @JsonClass to all enums

---
 .../java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt | 2 ++
 .../org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt  | 2 ++
 .../org/matrix/android/sdk/api/rendezvous/model/Protocol.kt     | 2 ++
 .../matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt | 2 ++
 .../android/sdk/api/rendezvous/model/RendezvousTransportType.kt | 2 ++
 .../api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt    | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
index 2ef24e9cb7..a0b2cb31b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
@@ -17,7 +17,9 @@
 package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 enum class Outcome(val value: String) {
     @Json(name = "success")
     SUCCESS("success"),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
index 5ff4cd7cfa..9e0dbd9562 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
@@ -17,7 +17,9 @@
 package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 internal enum class PayloadType(val value: String) {
     @Json(name = "m.login.start")
     START("m.login.start"),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
index 18381984a5..3442d4abf4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
@@ -17,7 +17,9 @@
 package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 enum class Protocol(val value: String) {
     @Json(name = "login_token")
     LOGIN_TOKEN("login_token")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
index 1c070599b0..8ce6430212 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
@@ -17,7 +17,9 @@
 package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 enum class RendezvousIntent {
     @Json(name = "login.start") LOGIN_ON_NEW_DEVICE,
     @Json(name = "login.reciprocate") RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
index 9c3e44f25b..2814cad77c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
@@ -17,7 +17,9 @@
 package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 enum class RendezvousTransportType(val value: String) {
     @Json(name = "http.v1") MSC3886_SIMPLE_HTTP_V1("http.v1")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
index 9a9db58a41..d9f73a0b99 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -17,7 +17,9 @@
 package org.matrix.android.sdk.api.rendezvous.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = true)
 enum class SecureRendezvousChannelAlgorithm(val value: String) {
     @Json(name = "m.rendezvous.v1.curve25519-aes-sha256") ECDH_V1("m.rendezvous.v1.curve25519-aes-sha256")
 }

From 623277e31ff94a4deac05b3bc297b95f52c85441 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:13:49 +0100
Subject: [PATCH 077/300] Lint

---
 .../sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt | 4 ----
 .../transports/SimpleHttpRendezvousTransport.kt          | 9 +++++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 9a5c5e865a..2f368d6520 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -24,12 +24,8 @@ import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.rendezvous.RendezvousChannel
 import org.matrix.android.sdk.api.rendezvous.RendezvousFailureReason
 import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
-import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvous
-import org.matrix.android.sdk.api.rendezvous.model.ECDHRendezvousCode
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
-import org.matrix.android.sdk.api.rendezvous.model.RendezvousIntent
 import org.matrix.android.sdk.api.rendezvous.model.SecureRendezvousChannelAlgorithm
-import org.matrix.android.sdk.api.rendezvous.model.SimpleHttpRendezvousTransportDetails
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import org.matrix.android.sdk.internal.extensions.toUnsignedInt
 import org.matrix.olm.OlmSAS
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index fa0e5d8e2a..50cebae12d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -143,10 +143,11 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
     }
 
     private fun get404Error(): RendezvousError {
-        return if (expiresAt != null && Date() > expiresAt)
-            RendezvousError("Expired", RendezvousFailureReason.Expired)
-        else
-            RendezvousError("Received unexpected 404", RendezvousFailureReason.Unknown)
+        if (expiresAt != null && Date() > expiresAt) {
+            return RendezvousError("Expired", RendezvousFailureReason.Expired)
+        }
+
+        return RendezvousError("Received unexpected 404", RendezvousFailureReason.Unknown)
     }
 
     override suspend fun close() {

From 3d37e0b2a557cf121efe01935a5a2980c9177ff2 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:19:03 +0100
Subject: [PATCH 078/300] Fix enum JsonClass generateAdapter = false

---
 .../java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt | 2 +-
 .../org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt  | 2 +-
 .../org/matrix/android/sdk/api/rendezvous/model/Protocol.kt     | 2 +-
 .../matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt | 2 +-
 .../android/sdk/api/rendezvous/model/RendezvousTransportType.kt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
index a0b2cb31b4..0ebd1f88b3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Outcome.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.rendezvous.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = false)
 enum class Outcome(val value: String) {
     @Json(name = "success")
     SUCCESS("success"),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
index 9e0dbd9562..33beb1f525 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/PayloadType.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.rendezvous.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = false)
 internal enum class PayloadType(val value: String) {
     @Json(name = "m.login.start")
     START("m.login.start"),
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
index 3442d4abf4..7c020da641 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.rendezvous.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = false)
 enum class Protocol(val value: String) {
     @Json(name = "login_token")
     LOGIN_TOKEN("login_token")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
index 8ce6430212..65037e1252 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousIntent.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.rendezvous.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = false)
 enum class RendezvousIntent {
     @Json(name = "login.start") LOGIN_ON_NEW_DEVICE,
     @Json(name = "login.reciprocate") RECIPROCATE_LOGIN_ON_EXISTING_DEVICE
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
index 2814cad77c..aa578e3660 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.rendezvous.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = false)
 enum class RendezvousTransportType(val value: String) {
     @Json(name = "http.v1") MSC3886_SIMPLE_HTTP_V1("http.v1")
 }

From 552fb9de9a30d8295256329f0c63fc525d1031cb Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:24:01 +0100
Subject: [PATCH 079/300] Improved comment around QR generation

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

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 7f95fad485..69deb44c70 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -147,9 +147,10 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     }
 
     /**
-     * TODO. UI test purpose. Fixme accordingly.
+     * QR code generation is not currently supported and this is a placeholder for future
+     * functionality.
      */
     private fun generateQrCodeData(): String {
-        return "TODO"
+        return "NOT SUPPORTED"
     }
 }

From b2dc0b33b5fb07bf47a5cc697589479d138e5515 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 17 Oct 2022 18:32:35 +0300
Subject: [PATCH 080/300] Implement try again button action.

---
 .../GetHomeServerCapabilitiesTask.kt          |  1 +
 .../features/login/qr/QrCodeLoginAction.kt    |  1 +
 .../features/login/qr/QrCodeLoginActivity.kt  | 44 +++++++++++--------
 .../login/qr/QrCodeLoginStatusFragment.kt     |  7 +++
 .../login/qr/QrCodeLoginViewEvents.kt         |  1 +
 .../features/login/qr/QrCodeLoginViewModel.kt |  5 +++
 6 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 2c3cb440b6..4b56d8e756 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -20,6 +20,7 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixPatterns.getServerName
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
+import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.auth.version.Versions
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt
index 8854d0720f..5ea46d3dcd 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginAction.kt
@@ -22,4 +22,5 @@ sealed class QrCodeLoginAction : VectorViewModelAction {
     data class OnQrCodeScanned(val qrCode: String) : QrCodeLoginAction()
     object GenerateQrCode : QrCodeLoginAction()
     object ShowQrCode : QrCodeLoginAction()
+    object TryAgain : QrCodeLoginAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
index 2f30261890..c9b8ae0080 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
@@ -38,30 +38,33 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
         super.onCreate(savedInstanceState)
         views.toolbar.visibility = View.GONE
 
-        val qrCodeLoginArgs: QrCodeLoginArgs? = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG)
         if (isFirstCreation()) {
-            when (qrCodeLoginArgs?.loginType) {
-                QrCodeLoginType.LOGIN -> {
-                    showInstructionsFragment(qrCodeLoginArgs)
-                }
-                QrCodeLoginType.LINK_A_DEVICE -> {
-                    if (qrCodeLoginArgs.showQrCodeImmediately) {
-                        handleNavigateToShowQrCodeScreen()
-                    } else {
-                        showInstructionsFragment(qrCodeLoginArgs)
-                    }
-                }
-                null -> {
-                    Timber.i("QrCodeLoginArgs is null. This is not expected.")
-                    finish()
-                    return
-                }
-            }
+           navigateToInitialFragment()
         }
 
         observeViewEvents()
     }
 
+    private fun navigateToInitialFragment() {
+        val qrCodeLoginArgs: QrCodeLoginArgs? = intent?.extras?.getParcelableCompat(Mavericks.KEY_ARG)
+        when (qrCodeLoginArgs?.loginType) {
+            QrCodeLoginType.LOGIN -> {
+                showInstructionsFragment(qrCodeLoginArgs)
+            }
+            QrCodeLoginType.LINK_A_DEVICE -> {
+                if (qrCodeLoginArgs.showQrCodeImmediately) {
+                    handleNavigateToShowQrCodeScreen()
+                } else {
+                    showInstructionsFragment(qrCodeLoginArgs)
+                }
+            }
+            null -> {
+                Timber.i("QrCodeLoginArgs is null. This is not expected.")
+                finish()
+            }
+        }
+    }
+
     private fun showInstructionsFragment(qrCodeLoginArgs: QrCodeLoginArgs) {
         addFragment(
                 views.container,
@@ -77,10 +80,15 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
                 QrCodeLoginViewEvents.NavigateToStatusScreen -> handleNavigateToStatusScreen()
                 QrCodeLoginViewEvents.NavigateToShowQrCodeScreen -> handleNavigateToShowQrCodeScreen()
                 QrCodeLoginViewEvents.NavigateToHomeScreen -> handleNavigateToHomeScreen()
+                QrCodeLoginViewEvents.NavigateToInitialScreen -> handleNavigateToInitialScreen()
             }
         }
     }
 
+    private fun handleNavigateToInitialScreen() {
+        navigateToInitialFragment()
+    }
+
     private fun handleNavigateToShowQrCodeScreen() {
         addFragment(
                 views.container,
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index 617d620c27..097c956f2c 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -42,6 +42,13 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         initCancelButton()
+        initTryAgainButton()
+    }
+
+    private fun initTryAgainButton() {
+        views.qrCodeLoginStatusTryAgainButton.debouncedClicks {
+            viewModel.handle(QrCodeLoginAction.TryAgain)
+        }
     }
 
     private fun initCancelButton() {
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
index 0f282fee38..e20ea6b2e8 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewEvents.kt
@@ -22,4 +22,5 @@ sealed class QrCodeLoginViewEvents : VectorViewEvents {
     object NavigateToStatusScreen : QrCodeLoginViewEvents()
     object NavigateToShowQrCodeScreen : QrCodeLoginViewEvents()
     object NavigateToHomeScreen : QrCodeLoginViewEvents()
+    object NavigateToInitialScreen : QrCodeLoginViewEvents()
 }
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 69deb44c70..ed2fb6e0f5 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -54,9 +54,14 @@ class QrCodeLoginViewModel @AssistedInject constructor(
             is QrCodeLoginAction.OnQrCodeScanned -> handleOnQrCodeScanned(action)
             QrCodeLoginAction.GenerateQrCode -> handleQrCodeViewStarted()
             QrCodeLoginAction.ShowQrCode -> handleShowQrCode()
+            QrCodeLoginAction.TryAgain -> handleTryAgain()
         }
     }
 
+    private fun handleTryAgain() {
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToInitialScreen)
+    }
+
     private fun handleShowQrCode() {
         _viewEvents.post(QrCodeLoginViewEvents.NavigateToShowQrCodeScreen)
     }

From 1863e4c3efe867faa0e30d001fadf33885fbe08d Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 16:34:51 +0100
Subject: [PATCH 081/300] Use unstable prefixes

---
 .../org/matrix/android/sdk/api/rendezvous/model/Protocol.kt   | 4 ++--
 .../sdk/api/rendezvous/model/RendezvousTransportType.kt       | 3 ++-
 .../api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
index 7c020da641..6fce2fa11c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Protocol.kt
@@ -21,6 +21,6 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = false)
 enum class Protocol(val value: String) {
-    @Json(name = "login_token")
-    LOGIN_TOKEN("login_token")
+    @Json(name = "org.matrix.msc3906.login_token")
+    LOGIN_TOKEN("org.matrix.msc3906.login_token")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
index aa578e3660..6fca7efa71 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportType.kt
@@ -21,5 +21,6 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = false)
 enum class RendezvousTransportType(val value: String) {
-    @Json(name = "http.v1") MSC3886_SIMPLE_HTTP_V1("http.v1")
+    @Json(name = "org.matrix.msc3886.http.v1")
+    MSC3886_SIMPLE_HTTP_V1("org.matrix.msc3886.http.v1")
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
index d9f73a0b99..ab58179f5a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -21,5 +21,6 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 enum class SecureRendezvousChannelAlgorithm(val value: String) {
-    @Json(name = "m.rendezvous.v1.curve25519-aes-sha256") ECDH_V1("m.rendezvous.v1.curve25519-aes-sha256")
+    @Json(name = "org.matrix.msc3903.rendezvous.v1.curve25519-aes-sha256")
+    ECDH_V1("org.matrix.msc3903.rendezvous.v1.curve25519-aes-sha256")
 }

From eec99e65bde304e5da4882799188c4f3d6776b72 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Mon, 17 Oct 2022 16:48:02 +0200
Subject: [PATCH 082/300] thread read receipts and unread notifications support
 is added to homeserver capatibilities

---
 .../homeserver/HomeServerCapabilities.kt      |  5 +++
 .../auth/version/HomeServerVersion.kt         |  1 +
 .../sdk/internal/auth/version/Versions.kt     | 12 +++++++
 .../database/RealmSessionStoreMigration.kt    |  4 ++-
 .../mapper/HomeServerCapabilitiesMapper.kt    |  1 +
 .../database/migration/MigrateSessionTo040.kt | 34 +++++++++++++++++++
 .../model/HomeServerCapabilitiesEntity.kt     |  1 +
 .../GetHomeServerCapabilitiesTask.kt          |  3 ++
 8 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index 8c14ca892a..773e870ffd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -65,6 +65,11 @@ data class HomeServerCapabilities(
          * True if the home server supports login via qr code, false otherwise.
          */
         val canLoginWithQrCode: Boolean = false,
+
+        /**
+         * True if the home server supports threaded read receipts and unread notifications.
+         */
+        val canUseThreadReadReceiptsAndNotifications: Boolean = false,
 ) {
 
     enum class RoomCapabilitySupport {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
index 75639c6a21..d443d6e3c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@@ -60,5 +60,6 @@ internal data class HomeServerVersion(
         val r0_6_0 = HomeServerVersion(major = 0, minor = 6, patch = 0)
         val r0_6_1 = HomeServerVersion(major = 0, minor = 6, patch = 1)
         val v1_3_0 = HomeServerVersion(major = 1, minor = 3, patch = 0)
+        val v1_4_0 = HomeServerVersion(major = 1, minor = 4, patch = 0)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index 5e133fab9c..9ed8901683 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -54,6 +54,8 @@ private const val FEATURE_SEPARATE_ADD_AND_BIND = "m.separate_add_and_bind"
 private const val FEATURE_THREADS_MSC3440 = "org.matrix.msc3440"
 private const val FEATURE_THREADS_MSC3440_STABLE = "org.matrix.msc3440.stable"
 private const val FEATURE_QR_CODE_LOGIN = "org.matrix.msc3882"
+private const val FEATURE_THREADS_MSC3771 = "org.matrix.msc3771"
+private const val FEATURE_THREADS_MSC3773 = "org.matrix.msc3773"
 
 /**
  * Return true if the SDK supports this homeserver version.
@@ -79,6 +81,16 @@ internal fun Versions.doesServerSupportThreads(): Boolean {
     return unstableFeatures?.get(FEATURE_THREADS_MSC3440_STABLE) ?: false
 }
 
+/**
+ * Indicate if the homeserver support MSC3771 and MSC3773 for threaded read receipts and unread notifications.
+ */
+internal fun Versions.doesServerSupportThreadUnreadNotifications(): Boolean {
+    val msc3771 = unstableFeatures?.get(FEATURE_THREADS_MSC3771) ?: false
+    val msc3773 = unstableFeatures?.get(FEATURE_THREADS_MSC3773) ?: false
+    return getMaxVersion() >= HomeServerVersion.v1_4_0 || (msc3771 && msc3773)
+
+}
+
 internal fun Versions.doesServerSupportQrCodeLogin(): Boolean {
     return unstableFeatures?.get(FEATURE_QR_CODE_LOGIN) ?: false
 }
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 9a2c32f97c..def0f6de7a 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
@@ -56,6 +56,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo036
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo037
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo038
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo039
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo040
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import javax.inject.Inject
@@ -64,7 +65,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : MatrixRealmMigration(
         dbName = "Session",
-        schemaVersion = 39L,
+        schemaVersion = 40L,
 ) {
     /**
      * Forces all RealmSessionStoreMigration instances to be equal.
@@ -113,5 +114,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 37) MigrateSessionTo037(realm).perform()
         if (oldVersion < 38) MigrateSessionTo038(realm).perform()
         if (oldVersion < 39) MigrateSessionTo039(realm).perform()
+        if (oldVersion < 40) MigrateSessionTo040(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
index 63fa101c45..3528ca0051 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -45,6 +45,7 @@ internal object HomeServerCapabilitiesMapper {
                 canUseThreading = entity.canUseThreading,
                 canControlLogoutDevices = entity.canControlLogoutDevices,
                 canLoginWithQrCode = entity.canLoginWithQrCode,
+                canUseThreadReadReceiptsAndNotifications = entity.canUseThreadReadReceiptsAndNotifications
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt
new file mode 100644
index 0000000000..b3e02342dd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.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.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo040(realm: DynamicRealm) : RealmMigrator(realm, 40) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, Boolean::class.java)
+                ?.transform { obj ->
+                    obj.set(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, false)
+                }
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
index cfa02b2c74..89f1e50b30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -32,6 +32,7 @@ internal open class HomeServerCapabilitiesEntity(
         var canUseThreading: Boolean = false,
         var canControlLogoutDevices: Boolean = false,
         var canLoginWithQrCode: Boolean = false,
+        var canUseThreadReadReceiptsAndNotifications: Boolean = false,
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 2c3cb440b6..a5953d870c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreadUnreadNotifications
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreads
 import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
@@ -144,6 +145,8 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
                 homeServerCapabilitiesEntity.canControlLogoutDevices = getVersionResult.doesServerSupportLogoutDevices()
                 homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
                         getVersionResult.doesServerSupportThreads()
+                homeServerCapabilitiesEntity.canUseThreadReadReceiptsAndNotifications =
+                        getVersionResult.doesServerSupportThreadUnreadNotifications()
                 homeServerCapabilitiesEntity.canLoginWithQrCode = getVersionResult.doesServerSupportQrCodeLogin()
             }
 

From d3e61a23a9a23ea75fe57f5b4c01cf25ea642558 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 17:29:45 +0100
Subject: [PATCH 083/300] Fix generator

---
 .../api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
index ab58179f5a..75f0024fda 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SecureRendezvousChannelAlgorithm.kt
@@ -19,7 +19,7 @@ package org.matrix.android.sdk.api.rendezvous.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
-@JsonClass(generateAdapter = true)
+@JsonClass(generateAdapter = false)
 enum class SecureRendezvousChannelAlgorithm(val value: String) {
     @Json(name = "org.matrix.msc3903.rendezvous.v1.curve25519-aes-sha256")
     ECDH_V1("org.matrix.msc3903.rendezvous.v1.curve25519-aes-sha256")

From 41dbdbcd7bc5c492620612f4e7f3bcd05c89e7e1 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 17:30:54 +0100
Subject: [PATCH 084/300] Lint

---
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index ed2fb6e0f5..2647c5974d 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -37,7 +37,7 @@ class QrCodeLoginViewModel @AssistedInject constructor(
         @Assisted private val initialState: QrCodeLoginViewState,
         private val authenticationService: AuthenticationService,
         private val activeSessionHolder: ActiveSessionHolder,
-        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase
+        private val configureAndStartSessionUseCase: ConfigureAndStartSessionUseCase,
 ) : VectorViewModel<QrCodeLoginViewState, QrCodeLoginAction, QrCodeLoginViewEvents>(initialState) {
 
     @AssistedFactory

From 8c8190202f9792b708d623ef5944016220edc69c Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 17:31:14 +0100
Subject: [PATCH 085/300] Better function name

---
 .../vector/app/features/login/qr/QrCodeLoginStatusFragment.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
index 097c956f2c..6ef261e6d9 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginStatusFragment.kt
@@ -66,14 +66,14 @@ class QrCodeLoginStatusFragment : VectorBaseFragment<FragmentQrCodeLoginStatusBi
         views.qrCodeLoginStatusCancelButton.isVisible = true
         views.qrCodeLoginStatusTryAgainButton.isVisible = connectionStatus.canTryAgain
         views.qrCodeLoginStatusHeaderView.setTitle(getString(R.string.qr_code_login_header_failed_title))
-        views.qrCodeLoginStatusHeaderView.setDescription(getErrorCode(connectionStatus.errorType))
+        views.qrCodeLoginStatusHeaderView.setDescription(getErrorDescription(connectionStatus.errorType))
         views.qrCodeLoginStatusHeaderView.setImage(
                 imageResource = R.drawable.ic_qr_code_login_failed,
                 backgroundTintColor = ThemeUtils.getColor(requireContext(), R.attr.colorError)
         )
     }
 
-    private fun getErrorCode(reason: RendezvousFailureReason): String {
+    private fun getErrorDescription(reason: RendezvousFailureReason): String {
         return when (reason) {
             RendezvousFailureReason.UnsupportedAlgorithm,
             RendezvousFailureReason.UnsupportedTransport -> getString(R.string.qr_code_login_header_failed_device_is_not_supported_description)

From 8f4d998362d4a89ea0aed78d4abe7c7e2738e9f2 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 17:33:43 +0100
Subject: [PATCH 086/300] Lint

---
 .../internal/session/homeserver/GetHomeServerCapabilitiesTask.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 4b56d8e756..2c3cb440b6 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -20,7 +20,6 @@ import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.api.MatrixPatterns.getServerName
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.wellknown.WellknownResult
-import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.extensions.orTrue
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.auth.version.Versions

From 6d17d51fe9e7a5483288f833106f4e572fafcb46 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 17:36:35 +0100
Subject: [PATCH 087/300] remove nullability

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  |  4 ++--
 .../features/login/qr/QrCodeLoginViewModel.kt | 22 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 9ad889fca0..e41a72db94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -89,7 +89,7 @@ class Rendezvous(
     }
 
     @Throws(RendezvousError::class)
-    suspend fun startAfterScanningCode(): String? {
+    suspend fun startAfterScanningCode(): String {
         val checksum = channel.connect()
 
         Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
@@ -111,7 +111,7 @@ class Rendezvous(
     }
 
     @Throws(RendezvousError::class)
-    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? {
+    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session {
         Timber.tag(TAG).i("Waiting for login_token")
 
         val loginToken = receive()
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 2647c5974d..4134dc8ab2 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -100,21 +100,19 @@ class QrCodeLoginViewModel @AssistedInject constructor(
             try {
                 val confirmationCode = rendezvous.startAfterScanningCode()
                 Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
-                confirmationCode?.let {
-                    onConnectionEstablished(it)
-                    val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
-                    onSigningIn()
-                    session?.let {
-                        activeSessionHolder.setActiveSession(session)
-                        authenticationService.reset()
 
-                        configureAndStartSessionUseCase.execute(session)
+                onConnectionEstablished(confirmationCode)
 
-                        rendezvous.completeVerificationOnNewDevice(session)
+                val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
+                onSigningIn()
 
-                        _viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
-                    }
-                }
+                activeSessionHolder.setActiveSession(session)
+                authenticationService.reset()
+                configureAndStartSessionUseCase.execute(session)
+
+                rendezvous.completeVerificationOnNewDevice(session)
+
+                _viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
             } catch (t: Throwable) {
                 Timber.tag(TAG).e(t, "Error occurred during sign in")
                 if (t is RendezvousError) {

From 8cfe6b13639158011e63b40e2592aa770316e5a0 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 23:46:28 +0100
Subject: [PATCH 088/300] Wording updates

---
 library/ui-strings/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index e28ebb31c6..7fe8dd8d08 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3386,12 +3386,12 @@
     <string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your intent connection(s); Your device(s);</string>
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">The other device is already signed in.</string>
     <string name="qr_code_login_header_failed_other_device_not_signed_in_description">The other device must be signed in.</string>
-    <string name="qr_code_login_header_failed_invalid_qr_code_description">The QR code scanned is invalid.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">That QR code is invalid.</string>
     <string name="qr_code_login_header_failed_user_cancelled_description">The sign in was cancelled on the other device.</string>
     <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">The homeserver doesn\'t support sign in with QR code.</string>
-    <string name="qr_code_login_new_device_instruction_1">Open ${app_name} on your other device</string>
-    <string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security &amp; Privacy -> Show All Sessions</string>
-    <string name="qr_code_login_new_device_instruction_3">Select \'Show QR code in this device\'</string>
+    <string name="qr_code_login_new_device_instruction_1">Open the app on your other device</string>
+    <string name="qr_code_login_new_device_instruction_2">Go to Settings -> Security &amp; Privacy</string>
+    <string name="qr_code_login_new_device_instruction_3">Select \'Show QR code\'</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Start at the sign in screen</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Select \'Sign in with QR code\'</string>
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Start at the sign in screen</string>

From 7017cb97e94d10ebdfa5cfa4ce47a1b0f1c21173 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 23:04:02 +0000
Subject: [PATCH 089/300] Bump michaelkaye/setup-matrix-synapse from 1.0.3 to
 1.0.4

Bumps [michaelkaye/setup-matrix-synapse](https://github.com/michaelkaye/setup-matrix-synapse) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/michaelkaye/setup-matrix-synapse/releases)
- [Commits](https://github.com/michaelkaye/setup-matrix-synapse/compare/v1.0.3...v1.0.4)

---
updated-dependencies:
- dependency-name: michaelkaye/setup-matrix-synapse
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/post-pr.yml | 2 +-
 .github/workflows/tests.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/post-pr.yml b/.github/workflows/post-pr.yml
index bf948064ed..628e12593c 100644
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@@ -52,7 +52,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.3
+        uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1816fe3a78..bb16d8abe8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: michaelkaye/setup-matrix-synapse@v1.0.3
+      - uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080

From cf1c7515fb87283915412c7718917a0d9902221f Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 00:35:13 +0100
Subject: [PATCH 090/300] Automatically try again on partial failed QR scan

---
 .../features/login/qr/QrCodeLoginInstructionsFragment.kt   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
index efd23f2530..40fcbbbb85 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginInstructionsFragment.kt
@@ -63,6 +63,7 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
             val scannedQrCode = QrCodeScannerActivity.getResultText(activityResult.data)
             val wasQrCode = QrCodeScannerActivity.getResultIsQrCode(activityResult.data)
 
+            Timber.d("Scanned QR code: $scannedQrCode, was QR code: $wasQrCode")
             if (wasQrCode && !scannedQrCode.isNullOrBlank()) {
                 onQrCodeScanned(scannedQrCode)
             } else {
@@ -76,7 +77,11 @@ class QrCodeLoginInstructionsFragment : VectorBaseFragment<FragmentQrCodeLoginIn
     }
 
     private fun onQrCodeScannerFailed() {
-        Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed")
+        // The user scanned something unexpected, so we try scanning again.
+        // This seems to happen particularly with the large QRs needed for rendezvous
+        // especially when the QR is partially off the screen
+        Timber.d("QrCodeLoginInstructionsFragment.onQrCodeScannerFailed - showing scanner again")
+        QrCodeScannerActivity.startForResult(requireActivity(), scanActivityResultLauncher)
     }
 
     override fun invalidate() = withState(viewModel) { state ->

From a3126b0026dc70ad6c9e2cf12a11fe3ba0944179 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 00:35:35 +0100
Subject: [PATCH 091/300] Progress to status screen on failure

---
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 4134dc8ab2..1a8ed945c0 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -125,6 +125,8 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     }
 
     private fun onFailed(reason: RendezvousFailureReason) {
+        _viewEvents.post(QrCodeLoginViewEvents.NavigateToStatusScreen)
+
         setState {
             copy(
                     connectionStatus = QrCodeLoginConnectionStatus.Failed(reason, reason.canRetry)

From 8a62dfb34aca1c3ab52d05d240ea74cc2b5a6d54 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 00:35:43 +0100
Subject: [PATCH 092/300] Lint

---
 .../matrix/android/sdk/api/rendezvous/RendezvousTransport.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
index 5daf906930..81632e951a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousTransport.kt
@@ -22,11 +22,15 @@ import org.matrix.android.sdk.api.rendezvous.model.RendezvousTransportDetails
 
 interface RendezvousTransport {
     var ready: Boolean
+
     @Throws(RendezvousError::class)
     suspend fun details(): RendezvousTransportDetails
+
     @Throws(RendezvousError::class)
     suspend fun send(contentType: MediaType, data: ByteArray)
+
     @Throws(RendezvousError::class)
     suspend fun receive(): ByteArray?
+
     suspend fun close()
 }

From afa55649c53e31511758cd09030d98b92869f540 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 00:52:02 +0000
Subject: [PATCH 093/300] Bump play-services-location from 20.0.0 to 21.0.0

Bumps play-services-location from 20.0.0 to 21.0.0.

---
updated-dependencies:
- dependency-name: com.google.android.gms:play-services-location
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index ca77e4b86f..66fdf3fbf4 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -372,7 +372,7 @@ dependencies {
     debugImplementation 'com.facebook.soloader:soloader:0.10.4'
     debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
 
-    gplayImplementation "com.google.android.gms:play-services-location:20.0.0"
+    gplayImplementation "com.google.android.gms:play-services-location:21.0.0"
     // UnifiedPush gplay flavor only
     gplayImplementation('com.google.firebase:firebase-messaging:23.1.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'

From f297117df2fe66c61e8589e73bc88cf7a99586bb Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 08:48:28 +0100
Subject: [PATCH 094/300] Use mutex

---
 .../channels/ECDHRendezvousChannel.kt         | 75 ++++++++++---------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 2f368d6520..19c46db34d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -19,6 +19,8 @@ package org.matrix.android.sdk.api.rendezvous.channels
 import android.util.Base64
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import okhttp3.MediaType.Companion.toMediaType
 import org.matrix.android.sdk.api.logger.LoggerTag
 import org.matrix.android.sdk.api.rendezvous.RendezvousChannel
@@ -71,6 +73,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
             @Json val iv: String? = null
     )
 
+    private var olmSASMutex = Mutex()
     private var olmSAS: OlmSAS?
     private val ourPublicKey: ByteArray
     private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
@@ -87,45 +90,44 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
     @Throws(RendezvousError::class)
     override suspend fun connect(): String {
-        olmSAS ?.let { olmSAS ->
-            val isInitiator = theirPublicKey == null
+        val sas = olmSAS ?: throw RendezvousError("Channel closed", RendezvousFailureReason.Unknown)
+        val isInitiator = theirPublicKey == null
 
-            if (isInitiator) {
-                Timber.tag(TAG).i("Waiting for other device to send their public key")
-                val res = this.receiveAsPayload() ?: throw RendezvousError("No reply from other device", RendezvousFailureReason.ProtocolError)
+        if (isInitiator) {
+            Timber.tag(TAG).i("Waiting for other device to send their public key")
+            val res = this.receiveAsPayload() ?: throw RendezvousError("No reply from other device", RendezvousFailureReason.ProtocolError)
 
-                if (res.key == null) {
-                    throw RendezvousError(
-                            "Unsupported algorithm: ${res.algorithm}",
-                            RendezvousFailureReason.UnsupportedAlgorithm,
-                    )
-                }
-                theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
-            } else {
-                // send our public key unencrypted
-                Timber.tag(TAG).i("Sending public key")
-                send(
-                        ECDHPayload(
-                                algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
-                                key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
-                        )
+            if (res.key == null) {
+                throw RendezvousError(
+                        "Unsupported algorithm: ${res.algorithm}",
+                        RendezvousFailureReason.UnsupportedAlgorithm,
                 )
             }
+            theirPublicKey = Base64.decode(res.key, Base64.NO_WRAP)
+        } else {
+            // send our public key unencrypted
+            Timber.tag(TAG).i("Sending public key")
+            send(
+                    ECDHPayload(
+                            algorithm = SecureRendezvousChannelAlgorithm.ECDH_V1,
+                            key = Base64.encodeToString(ourPublicKey, Base64.NO_WRAP)
+                    )
+            )
+        }
 
-            synchronized(olmSAS) {
-                olmSAS.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
-                olmSAS.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+        olmSASMutex.withLock {
+            sas.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
+            sas.setTheirPublicKey(Base64.encodeToString(theirPublicKey, Base64.NO_WRAP))
 
-                val initiatorKey = Base64.encodeToString(if (isInitiator) ourPublicKey else theirPublicKey, Base64.NO_WRAP)
-                val recipientKey = Base64.encodeToString(if (isInitiator) theirPublicKey else ourPublicKey, Base64.NO_WRAP)
-                val aesInfo = "${SecureRendezvousChannelAlgorithm.ECDH_V1.value}|$initiatorKey|$recipientKey"
+            val initiatorKey = Base64.encodeToString(if (isInitiator) ourPublicKey else theirPublicKey, Base64.NO_WRAP)
+            val recipientKey = Base64.encodeToString(if (isInitiator) theirPublicKey else ourPublicKey, Base64.NO_WRAP)
+            val aesInfo = "${SecureRendezvousChannelAlgorithm.ECDH_V1.value}|$initiatorKey|$recipientKey"
 
-                aesKey = olmSAS.generateShortCode(aesInfo, 32)
+            aesKey = sas.generateShortCode(aesInfo, 32)
 
-                val rawChecksum = olmSAS.generateShortCode(aesInfo, 5)
-                return getDecimalCodeRepresentation(rawChecksum)
-            }
-        } ?: throw RuntimeException("Channel closed")
+            val rawChecksum = sas.generateShortCode(aesInfo, 5)
+            return getDecimalCodeRepresentation(rawChecksum)
+        }
     }
 
     private suspend fun send(payload: ECDHPayload) {
@@ -154,12 +156,11 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     override suspend fun close() {
-        olmSAS ?.let {
-            synchronized(it) {
-                // this does a double release check already so we don't re-check ourselves
-                it.releaseSas()
-                olmSAS = null
-            }
+        val sas = olmSAS ?: throw IllegalStateException("Channel already closed")
+        olmSASMutex.withLock {
+            // this does a double release check already so we don't re-check ourselves
+            sas.releaseSas()
+            olmSAS = null
         }
         transport.close()
     }

From a1d2944c324c37bdcf9c92e0ec02864ce6781d71 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 09:08:40 +0100
Subject: [PATCH 095/300] Always check master key when provided by verifying
 device

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index e41a72db94..f724ac4b62 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -165,21 +165,25 @@ class Rendezvous(
             }
 
             verificationResponse.masterKey?.let { masterKeyFromVerifyingDevice ->
-                // check master key againt what the homeserver told us
-                crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->
-                    if (localMasterKey.unpaddedBase64PublicKey != masterKeyFromVerifyingDevice) {
-                        Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
-                        // inform the other side
-                        send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
-                        throw RendezvousError("Master key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
-                    }
-                    // set other device as verified
-                    Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
-                    crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+                // verifying device provided us with a master key, so use it to check integrity
 
-                    Timber.tag(TAG).i("Setting master key as trusted")
-                    crypto.crossSigningService().markMyMasterKeyAsTrusted()
-                } ?: Timber.tag(TAG).w("No local master key so not verifying")
+                // see what the homeserver told us
+                val localMasterKey = crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()
+
+                // n.b. if no local master key this is a problem, as well as it not matching
+                if (localMasterKey?.unpaddedBase64PublicKey != masterKeyFromVerifyingDevice) {
+                    Timber.tag(TAG).w("Master key from verifying device doesn't match: $masterKeyFromVerifyingDevice vs $localMasterKey")
+                    // inform the other side
+                    send(Payload(PayloadType.FINISH, outcome = Outcome.E2EE_SECURITY_ERROR))
+                    throw RendezvousError("Master key from verifying device doesn't match", RendezvousFailureReason.E2EESecurityIssue)
+                }
+
+                // set other device as verified
+                Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
+                crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
+
+                Timber.tag(TAG).i("Setting master key as trusted")
+                crypto.crossSigningService().markMyMasterKeyAsTrusted()
             } ?: run {
                 // set other device as verified anyway
                 Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")

From 57a8dd4a1f61b50e180830d96264d5c3b1f1fe72 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 09:31:13 +0100
Subject: [PATCH 096/300] Whitespce

---
 .../sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt  | 4 ++--
 .../transports/SimpleHttpRendezvousTransport.kt           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 19c46db34d..f7da0efa92 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -81,7 +81,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     private var aesKey: ByteArray? = null
 
     init {
-        theirPublicKeyBase64 ?.let {
+        theirPublicKeyBase64?.let {
             theirPublicKey = Base64.decode(it, Base64.NO_WRAP)
         }
         olmSAS = OlmSAS()
@@ -142,7 +142,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
     }
 
     private suspend fun receiveAsPayload(): ECDHPayload? {
-        transport.receive()?.toString(Charsets.UTF_8) ?.let {
+        transport.receive()?.toString(Charsets.UTF_8)?.let {
             return ecdhAdapter.fromJson(it)
         } ?: return null
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 50cebae12d..3f7cfe786e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -69,7 +69,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
                 .method(method, data.toRequestBody())
                 .header("content-type", contentType.toString())
 
-        etag ?.let {
+        etag?.let {
             request.header("if-match", it)
         }
 
@@ -85,7 +85,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
         if (method == "POST") {
             val location = response.header("location") ?: throw RuntimeException("No rendezvous URI found in response")
 
-            response.header("expires") ?.let {
+            response.header("expires")?.let {
                 val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz")
                 expiresAt = format.parse(it)
             }
@@ -108,7 +108,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
                     .url(uri)
                     .get()
 
-            etag ?.let {
+            etag?.let {
                 request.header("if-none-match", it)
             }
 
@@ -154,7 +154,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
         cancelled = true
         ready = false
 
-        uri ?.let {
+        uri?.let {
             try {
                 val httpClient = okhttp3.OkHttpClient.Builder().build()
                 val request = Request.Builder()

From 376cd1cb367c8fa3d3b9f9f2da898a56e0f3636e Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 09:34:28 +0100
Subject: [PATCH 097/300] Missing throws

---
 .../api/rendezvous/transports/SimpleHttpRendezvousTransport.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 3f7cfe786e..7a5cbe5424 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -54,6 +54,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
         return SimpleHttpRendezvousTransportDetails(uri)
     }
 
+    @Throws(RendezvousError::class)
     override suspend fun send(contentType: MediaType, data: ByteArray) {
         if (cancelled) {
             throw IllegalStateException("Rendezvous cancelled")
@@ -96,6 +97,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
         }
     }
 
+    @Throws(RendezvousError::class)
     override suspend fun receive(): ByteArray? {
         if (cancelled) {
             throw IllegalStateException("Rendezvous cancelled")

From 6f5fefba56389896ef7bb5b4d0e2e786fb957e1f Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Tue, 18 Oct 2022 10:44:20 +0200
Subject: [PATCH 098/300] lint

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

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index 9ed8901683..1245d8df4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -88,7 +88,6 @@ internal fun Versions.doesServerSupportThreadUnreadNotifications(): Boolean {
     val msc3771 = unstableFeatures?.get(FEATURE_THREADS_MSC3771) ?: false
     val msc3773 = unstableFeatures?.get(FEATURE_THREADS_MSC3773) ?: false
     return getMaxVersion() >= HomeServerVersion.v1_4_0 || (msc3771 && msc3773)
-
 }
 
 internal fun Versions.doesServerSupportQrCodeLogin(): Boolean {

From 9fb0db3129ff6521ac86aba4bee29c12e6d45d5b Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:07:12 +0100
Subject: [PATCH 099/300] Update
 library/ui-strings/src/main/res/values/strings.xml

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 library/ui-strings/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 7fe8dd8d08..7b6b9b914d 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3383,7 +3383,7 @@
     <string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
     <string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
     <string name="qr_code_login_header_failed_other_description">The request failed.</string>
-    <string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your intent connection(s); Your device(s);</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your internet connection(s); Your device(s);</string>
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">The other device is already signed in.</string>
     <string name="qr_code_login_header_failed_other_device_not_signed_in_description">The other device must be signed in.</string>
     <string name="qr_code_login_header_failed_invalid_qr_code_description">That QR code is invalid.</string>

From 0d1df3f66e5587ba299b909183fa464673694489 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:08:09 +0100
Subject: [PATCH 100/300] Update
 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 .../org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index be79569164..9976c7a8e4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -45,7 +45,7 @@ interface RendezvousChannel {
     suspend fun receive(): ByteArray?
 
     /**
-     * @returns closes the channel and cleans up
+     * Closes the channel and cleans up.
      */
     suspend fun close()
 }

From 8530f8f28049dae1be38c2cf0503e8cfac04f2f6 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:09:06 +0100
Subject: [PATCH 101/300] Update
 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 .../sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index f7da0efa92..b21d89059b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -73,7 +73,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
             @Json val iv: String? = null
     )
 
-    private var olmSASMutex = Mutex()
+    private val olmSASMutex = Mutex()
     private var olmSAS: OlmSAS?
     private val ourPublicKey: ByteArray
     private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)

From a83fb8bf83c10759c1e25e126e1fae5319cc4dad Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:09:17 +0100
Subject: [PATCH 102/300] Update
 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt

Co-authored-by: Benoit Marty <benoitm@matrix.org>
---
 .../org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
index 9976c7a8e4..0956a5b0a0 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/RendezvousChannel.kt
@@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
  * Representation of a rendezvous channel such as that described by MSC3903.
  */
 interface RendezvousChannel {
-    var transport: RendezvousTransport
+    val transport: RendezvousTransport
 
     /**
      * @returns the checksum/confirmation digits to be shown to the user

From 916ae654e790bc001a1f5f86ef30d32657da952d Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 12:11:41 +0100
Subject: [PATCH 103/300] Don't log whole QR code

---
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 1a8ed945c0..9bf3e955d3 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -76,7 +76,7 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     }
 
     private fun handleOnQrCodeScanned(action: QrCodeLoginAction.OnQrCodeScanned) {
-        Timber.tag(TAG).d("Scanned code: ${action.qrCode}")
+        Timber.tag(TAG).d("Scanned code of length ${action.qrCode.length}")
 
         val rendezvous = try { Rendezvous.buildChannelFromCode(action.qrCode) } catch (t: Throwable) {
             Timber.tag(TAG).e(t, "Error occurred during sign in")

From 811d6d87ae50595726494abe772a8931d27da0c2 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 12:23:21 +0100
Subject: [PATCH 104/300] Reuse getDecimalCodeRepresentation from SAS instead
 of duplicating code

---
 .../channels/ECDHRendezvousChannel.kt         | 17 ++----
 .../SASDefaultVerificationTransaction.kt      | 54 +++++++++----------
 2 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index b21d89059b..6c45aacfaa 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -29,7 +29,7 @@ import org.matrix.android.sdk.api.rendezvous.RendezvousTransport
 import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
 import org.matrix.android.sdk.api.rendezvous.model.SecureRendezvousChannelAlgorithm
 import org.matrix.android.sdk.api.util.MatrixJsonParser
-import org.matrix.android.sdk.internal.extensions.toUnsignedInt
+import org.matrix.android.sdk.internal.crypto.verification.SASDefaultVerificationTransaction
 import org.matrix.olm.OlmSAS
 import timber.log.Timber
 import java.security.SecureRandom
@@ -48,20 +48,9 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         private const val KEY_SPEC = "AES"
         private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
 
-        // n.b. we are only aver processing byte array that we have generated, so we can make assumptions about the length
+        // this is the same representation as for SAS but we delimit by dashes instead of spaces for readability
         private fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
-            val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
-            val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
-            val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
-            val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
-            val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
-            // (B0 << 5 | B1 >> 3) + 1000
-            val first = (b0.shl(5) or b1.shr(3)) + 1000
-            // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
-            val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
-            // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
-            val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
-            return "$first-$second-$third"
+            return SASDefaultVerificationTransaction.getDecimalCodeRepresentation(byteArray).replace(" ", "-")
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index 1cbaff059a..b306288c5e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -82,6 +82,33 @@ internal abstract class SASDefaultVerificationTransaction(
         // older devices have limited support of emoji but SDK offers images for the 64 verification emojis
         // so always send that we support EMOJI
         val KNOWN_SHORT_CODES = listOf(SasMode.EMOJI, SasMode.DECIMAL)
+
+        /**
+         * decimal: generate five bytes by using HKDF.
+         * Take the first 13 bits and convert it to a decimal number (which will be a number between 0 and 8191 inclusive),
+         * and add 1000 (resulting in a number between 1000 and 9191 inclusive).
+         * Do the same with the second 13 bits, and the third 13 bits, giving three 4-digit numbers.
+         * In other words, if the five bytes are B0, B1, B2, B3, and B4, then the first number is (B0 << 5 | B1 >> 3) + 1000,
+         * the second number is ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000, and the third number is ((B3 & 0x3f) << 7 | B4 >> 1) + 1000.
+         * (This method of converting 13 bits at a time is used to avoid requiring 32-bit clients to do big-number arithmetic,
+         * and adding 1000 to the number avoids having clients to worry about properly zero-padding the number when displaying to the user.)
+         * The three 4-digit numbers are displayed to the user either with dashes (or another appropriate separator) separating the three numbers,
+         * or with the three numbers on separate lines.
+         */
+        fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
+            val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
+            val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
+            val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
+            val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
+            val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
+            // (B0 << 5 | B1 >> 3) + 1000
+            val first = (b0.shl(5) or b1.shr(3)) + 1000
+            // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
+            val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
+            // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
+            val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
+            return "$first $second $third"
+        }
     }
 
     override var state: VerificationTxState = VerificationTxState.None
@@ -371,33 +398,6 @@ internal abstract class SASDefaultVerificationTransaction(
         return getDecimalCodeRepresentation(shortCodeBytes!!)
     }
 
-    /**
-     * decimal: generate five bytes by using HKDF.
-     * Take the first 13 bits and convert it to a decimal number (which will be a number between 0 and 8191 inclusive),
-     * and add 1000 (resulting in a number between 1000 and 9191 inclusive).
-     * Do the same with the second 13 bits, and the third 13 bits, giving three 4-digit numbers.
-     * In other words, if the five bytes are B0, B1, B2, B3, and B4, then the first number is (B0 << 5 | B1 >> 3) + 1000,
-     * the second number is ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000, and the third number is ((B3 & 0x3f) << 7 | B4 >> 1) + 1000.
-     * (This method of converting 13 bits at a time is used to avoid requiring 32-bit clients to do big-number arithmetic,
-     * and adding 1000 to the number avoids having clients to worry about properly zero-padding the number when displaying to the user.)
-     * The three 4-digit numbers are displayed to the user either with dashes (or another appropriate separator) separating the three numbers,
-     * or with the three numbers on separate lines.
-     */
-    fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
-        val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
-        val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
-        val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
-        val b3 = byteArray[3].toUnsignedInt() // need unsigned byte
-        val b4 = byteArray[4].toUnsignedInt() // need unsigned byte
-        // (B0 << 5 | B1 >> 3) + 1000
-        val first = (b0.shl(5) or b1.shr(3)) + 1000
-        // ((B1 & 0x7) << 10 | B2 << 2 | B3 >> 6) + 1000
-        val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
-        // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
-        val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
-        return "$first $second $third"
-    }
-
     override fun getEmojiCodeRepresentation(): List<EmojiRepresentation> {
         return getEmojiCodeRepresentation(shortCodeBytes!!)
     }

From f7e0a198335b9830af68404d522c834319adb784 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 12:29:48 +0100
Subject: [PATCH 105/300] Remove redundant annotations

---
 .../api/rendezvous/channels/ECDHRendezvousChannel.kt |  8 ++++----
 .../sdk/api/rendezvous/model/ECDHRendezvous.kt       |  7 +++----
 .../sdk/api/rendezvous/model/ECDHRendezvousCode.kt   |  5 ++---
 .../android/sdk/api/rendezvous/model/Payload.kt      | 12 ++++++------
 .../rendezvous/model/RendezvousTransportDetails.kt   |  3 +--
 .../model/SimpleHttpRendezvousTransportDetails.kt    |  3 +--
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 6c45aacfaa..4bbf34280c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -56,10 +56,10 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
 
     @JsonClass(generateAdapter = true)
     internal data class ECDHPayload(
-            @Json val algorithm: SecureRendezvousChannelAlgorithm? = null,
-            @Json val key: String? = null,
-            @Json val ciphertext: String? = null,
-            @Json val iv: String? = null
+            val algorithm: SecureRendezvousChannelAlgorithm? = null,
+            val key: String? = null,
+            val ciphertext: String? = null,
+            val iv: String? = null
     )
 
     private val olmSASMutex = Mutex()
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
index 0840e1ca2e..55bac6397e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvous.kt
@@ -16,12 +16,11 @@
 
 package org.matrix.android.sdk.api.rendezvous.model
 
-import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class ECDHRendezvous(
-        @Json val transport: SimpleHttpRendezvousTransportDetails,
-        @Json val algorithm: SecureRendezvousChannelAlgorithm,
-        @Json val key: String
+        val transport: SimpleHttpRendezvousTransportDetails,
+        val algorithm: SecureRendezvousChannelAlgorithm,
+        val key: String
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
index 410c5c1036..575b5d4bfd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/ECDHRendezvousCode.kt
@@ -16,11 +16,10 @@
 
 package org.matrix.android.sdk.api.rendezvous.model
 
-import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class ECDHRendezvousCode(
-        @Json val intent: RendezvousIntent,
-        @Json val rendezvous: ECDHRendezvous
+        val intent: RendezvousIntent,
+        val rendezvous: ECDHRendezvous
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
index 593177e625..04631ce959 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/Payload.kt
@@ -21,12 +21,12 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 internal data class Payload(
-        @Json val type: PayloadType,
-        @Json val intent: RendezvousIntent? = null,
-        @Json val outcome: Outcome? = null,
-        @Json val protocols: List<Protocol>? = null,
-        @Json val protocol: Protocol? = null,
-        @Json val homeserver: String? = null,
+        val type: PayloadType,
+        val intent: RendezvousIntent? = null,
+        val outcome: Outcome? = null,
+        val protocols: List<Protocol>? = null,
+        val protocol: Protocol? = null,
+        val homeserver: String? = null,
         @Json(name = "login_token") val loginToken: String? = null,
         @Json(name = "device_id") val deviceId: String? = null,
         @Json(name = "device_key") val deviceKey: String? = null,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
index 55b3bbb5d9..1bde43ab7e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/RendezvousTransportDetails.kt
@@ -16,10 +16,9 @@
 
 package org.matrix.android.sdk.api.rendezvous.model
 
-import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 open class RendezvousTransportDetails(
-    @Json val type: RendezvousTransportType
+    val type: RendezvousTransportType
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
index 70a441d760..049aa8b756 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/model/SimpleHttpRendezvousTransportDetails.kt
@@ -16,10 +16,9 @@
 
 package org.matrix.android.sdk.api.rendezvous.model
 
-import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class SimpleHttpRendezvousTransportDetails(
-        @Json val uri: String
+        val uri: String
 ) : RendezvousTransportDetails(type = RendezvousTransportType.MSC3886_SIMPLE_HTTP_V1)

From 67be8c3c40f06a88345436abaf129ce3c4e52344 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Tue, 18 Oct 2022 12:44:05 +0100
Subject: [PATCH 106/300] The one that got away

---
 .../android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index 4bbf34280c..e844143889 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -17,7 +17,6 @@
 package org.matrix.android.sdk.api.rendezvous.channels
 
 import android.util.Base64
-import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock

From 0c52a7ed040c5637d81c408e2ec41197de4b2563 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Tue, 18 Oct 2022 15:45:39 +0300
Subject: [PATCH 107/300] Fix layout after try again button is clicked.

---
 .../im/vector/app/features/login/qr/QrCodeLoginActivity.kt   | 3 ++-
 .../im/vector/app/features/login/qr/QrCodeLoginViewModel.kt  | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
index c9b8ae0080..a0c113224d 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginActivity.kt
@@ -24,6 +24,7 @@ import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.SimpleFragmentActivity
 import im.vector.app.features.home.HomeActivity
 import im.vector.lib.core.utils.compat.getParcelableCompat
@@ -66,7 +67,7 @@ class QrCodeLoginActivity : SimpleFragmentActivity() {
     }
 
     private fun showInstructionsFragment(qrCodeLoginArgs: QrCodeLoginArgs) {
-        addFragment(
+        replaceFragment(
                 views.container,
                 QrCodeLoginInstructionsFragment::class.java,
                 qrCodeLoginArgs,
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 9bf3e955d3..97cca9d791 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -59,6 +59,11 @@ class QrCodeLoginViewModel @AssistedInject constructor(
     }
 
     private fun handleTryAgain() {
+        setState {
+            copy(
+                    connectionStatus = null
+            )
+        }
         _viewEvents.post(QrCodeLoginViewEvents.NavigateToInitialScreen)
     }
 

From 4f652f102676e8bd2364149d00009f9d0f1ea656 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Wed, 19 Oct 2022 09:12:09 +0100
Subject: [PATCH 108/300] Request changes from review

---
 .../sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt   | 7 +------
 .../rendezvous/transports/SimpleHttpRendezvousTransport.kt | 3 ++-
 .../verification/SASDefaultVerificationTransaction.kt      | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
index e844143889..c1d6b1b70e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/channels/ECDHRendezvousChannel.kt
@@ -46,11 +46,6 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
         private const val ALGORITHM_SPEC = "AES/GCM/NoPadding"
         private const val KEY_SPEC = "AES"
         private val TAG = LoggerTag(ECDHRendezvousChannel::class.java.simpleName, LoggerTag.RENDEZVOUS).value
-
-        // this is the same representation as for SAS but we delimit by dashes instead of spaces for readability
-        private fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
-            return SASDefaultVerificationTransaction.getDecimalCodeRepresentation(byteArray).replace(" ", "-")
-        }
     }
 
     @JsonClass(generateAdapter = true)
@@ -114,7 +109,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
             aesKey = sas.generateShortCode(aesInfo, 32)
 
             val rawChecksum = sas.generateShortCode(aesInfo, 5)
-            return getDecimalCodeRepresentation(rawChecksum)
+            return SASDefaultVerificationTransaction.getDecimalCodeRepresentation(rawChecksum, separator = "-")
         }
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
index 7a5cbe5424..620b599e3d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/transports/SimpleHttpRendezvousTransport.kt
@@ -29,6 +29,7 @@ import org.matrix.android.sdk.api.rendezvous.model.SimpleHttpRendezvousTransport
 import timber.log.Timber
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 
 /**
  * Implementation of the Simple HTTP transport MSC3886: https://github.com/matrix-org/matrix-spec-proposals/pull/3886
@@ -87,7 +88,7 @@ class SimpleHttpRendezvousTransport(rendezvousUri: String?) : RendezvousTranspor
             val location = response.header("location") ?: throw RuntimeException("No rendezvous URI found in response")
 
             response.header("expires")?.let {
-                val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz")
+                val format = SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US)
                 expiresAt = format.parse(it)
             }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
index b306288c5e..29b416bb82 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/SASDefaultVerificationTransaction.kt
@@ -95,7 +95,7 @@ internal abstract class SASDefaultVerificationTransaction(
          * The three 4-digit numbers are displayed to the user either with dashes (or another appropriate separator) separating the three numbers,
          * or with the three numbers on separate lines.
          */
-        fun getDecimalCodeRepresentation(byteArray: ByteArray): String {
+        fun getDecimalCodeRepresentation(byteArray: ByteArray, separator: String = " "): String {
             val b0 = byteArray[0].toUnsignedInt() // need unsigned byte
             val b1 = byteArray[1].toUnsignedInt() // need unsigned byte
             val b2 = byteArray[2].toUnsignedInt() // need unsigned byte
@@ -107,7 +107,7 @@ internal abstract class SASDefaultVerificationTransaction(
             val second = ((b1 and 0x7).shl(10) or b2.shl(2) or b3.shr(6)) + 1000
             // ((B3 & 0x3f) << 7 | B4 >> 1) + 1000
             val third = ((b3 and 0x3f).shl(7) or b4.shr(1)) + 1000
-            return "$first $second $third"
+            return "$first$separator$second$separator$third"
         }
     }
 

From 9d412ed6ad1689263f9b42e2c2a1864a760ad5c8 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 19 Oct 2022 12:48:37 +0000
Subject: [PATCH 109/300] Translated using Weblate (Czech)

Currently translated at 100.0% (2505 of 2505 strings)

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

diff --git a/library/ui-strings/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
index 3410858988..398b7f7b35 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -2859,4 +2859,6 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Pomocí tohoto zařízení se můžete přihlásit do mobilního nebo webového zařízení pomocí QR kódu. Můžete to provést dvěma způsoby:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Přihlásit se pomocí QR kódu</string>
     <string name="login_scan_qr_code">Naskenovat QR kód</string>
+    <string name="labs_enable_voice_broadcast_summary">Možnost nahrávat a odesílat hlasové vysílání na časové ose místnosti.</string>
+    <string name="labs_enable_voice_broadcast_title">Povolit hlasové vysílání (v aktivním vývoji)</string>
 </resources>
\ No newline at end of file

From 3598d27dfbdaf9bff2bc5e4e25c233e2a51668bc Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Wed, 19 Oct 2022 13:24:48 +0000
Subject: [PATCH 110/300] Translated using Weblate (German)

Currently translated at 100.0% (2505 of 2505 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index fe849a1ddf..57adb82d3a 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2797,11 +2797,13 @@
     <string name="qr_code_login_header_show_qr_code_new_device_description">Benutze dein angemeldetes Gerät um den unten angezeigten QR-Code einzulesen:</string>
     <string name="qr_code_login_header_show_qr_code_title">Mit QR-Code anmelden</string>
     <string name="qr_code_login_header_scan_qr_code_description">Benutze die Kamera auf diesem Gerät um den vom anderen Gerät angezeigten QR-Code zu scannen:</string>
-    <string name="qr_code_login_header_scan_qr_code_title">QR-Code scannen</string>
+    <string name="qr_code_login_header_scan_qr_code_title">QR-Code einlesen</string>
     <string name="three">3</string>
     <string name="two">2</string>
     <string name="one">1</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Du kannst dieses Gerät benutzen um ein anderes Gerät per QR-Code anzumelden. Dafür gibt es zwei Wege:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Mit QR-Code anmelden</string>
-    <string name="login_scan_qr_code">QR-Code scannen</string>
+    <string name="login_scan_qr_code">QR-Code einlesen</string>
+    <string name="labs_enable_voice_broadcast_summary">Zeichne Sprachnachrichten auf, während du sie in Echtzeit in den Raumverlauf sendest.</string>
+    <string name="labs_enable_voice_broadcast_title">Sprachübertragung aktivieren (in aktiver Entwicklung)</string>
 </resources>
\ No newline at end of file

From 54baf13b8299a0333d130e6e19703a40835a2067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 19 Oct 2022 13:42:54 +0000
Subject: [PATCH 111/300] Translated using Weblate (Estonian)

Currently translated at 99.6% (2497 of 2505 strings)

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

diff --git a/library/ui-strings/src/main/res/values-et/strings.xml b/library/ui-strings/src/main/res/values-et/strings.xml
index 7ead21394c..3ad6feec53 100644
--- a/library/ui-strings/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -2796,4 +2796,6 @@
     <string name="permissions_rationale_msg_notification">${app_name} vajab teavituste näitamiseks õigusi. Teavituste sisuks võivad olla sulle saadetud sõnumid, kutsed ja muud olulist.
 \n
 \nJärgmistes vaadetes palun anna sellele rakendusele teavituste kuvamiseks vajalikud õigused.</string>
+    <string name="labs_enable_voice_broadcast_summary">Võimalus salvestada ja postitada ringhäälingukõnesid jututoa ajajoonele.</string>
+    <string name="labs_enable_voice_broadcast_title">Võta kasutusele ringhäälingukõned (aktiivses arenduses)</string>
 </resources>
\ No newline at end of file

From 90e8028c5a61b3451cfa6d96a010354594916741 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 19 Oct 2022 12:36:10 +0000
Subject: [PATCH 112/300] Translated using Weblate (Italian)

Currently translated at 100.0% (2505 of 2505 strings)

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

diff --git a/library/ui-strings/src/main/res/values-it/strings.xml b/library/ui-strings/src/main/res/values-it/strings.xml
index cea69030bc..be542cab88 100644
--- a/library/ui-strings/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -2796,4 +2796,6 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Puoi usare questo dispositivo per accedere in un dispositivo mobile o web con un codice QR. Ci sono due modi:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Accedi con codice QR</string>
     <string name="login_scan_qr_code">Scansiona codice QR</string>
+    <string name="labs_enable_voice_broadcast_summary">Registra e invia broadcast vocali nella linea temporale della stanza.</string>
+    <string name="labs_enable_voice_broadcast_title">Attiva broadcast voce (in sviluppo attivo)</string>
 </resources>
\ No newline at end of file

From 7daa2f7281c8bcefe2e9888a32424972ab08f5e2 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Wed, 19 Oct 2022 14:14:55 +0000
Subject: [PATCH 113/300] Translated using Weblate (Russian)

Currently translated at 95.6% (2396 of 2505 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index 0349acedd1..e3edf65720 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -367,8 +367,8 @@
     <string name="settings_add_phone_number">Добавить телефон</string>
     <string name="settings_app_info_link_summary">Системные настройки приложения.</string>
     <string name="settings_app_info_link_title">Сведения о приложении</string>
-    <string name="settings_enable_all_notif">Включить уведомления для этой учетной записи</string>
-    <string name="settings_enable_this_device">Включить уведомления для этой сессии</string>
+    <string name="settings_enable_all_notif">Уведомления для этой учётной записи</string>
+    <string name="settings_enable_this_device">Уведомления для этой сессии</string>
     <string name="settings_messages_in_one_to_one">В персональных чатах</string>
     <string name="settings_messages_in_group_chat">В групповых чатах</string>
     <string name="settings_invited_to_room">Когда меня приглашают в комнату</string>
@@ -663,7 +663,7 @@
     <string name="settings_troubleshoot_test_account_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_device_settings_title">Настройки сессии.</string>
     <string name="settings_troubleshoot_test_device_settings_success">Уведомления включены для этой сессии.</string>
-    <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включено для этой сессии.
+    <string name="settings_troubleshoot_test_device_settings_failed">Уведомления не включены для этой сессии.
 \nПожалуйста, проверьте настройки ${app_name}.</string>
     <string name="settings_troubleshoot_test_device_settings_quickfix">Включить</string>
     <string name="settings_troubleshoot_test_play_services_title">Проверка сервисов Play</string>
@@ -1572,8 +1572,8 @@
     <string name="or_other_mx_capable_client">или другой клиент Matrix поддерживающий перекрестную подпись</string>
     <string name="command_description_discard_session">Принудительно отбрасывает текущую групповую сессию для отправки сообщений в зашифрованную комнату</string>
     <string name="enter_secret_storage_passphrase_or_key">Чтобы продолжить, используйте %1$s или %2$s.</string>
-    <string name="use_recovery_key">Используйте ключ восстановления</string>
-    <string name="enter_secret_storage_input_key">Выберите ключ восстановления или введите его вручную, введя или вставив из буфера обмена</string>
+    <string name="use_recovery_key">Используйте бумажный ключ</string>
+    <string name="enter_secret_storage_input_key">Выберите бумажный ключ или введите его вручную, введя или вставив из буфера обмена</string>
     <string name="failed_to_access_secure_storage">Не удалось получить доступ к защищенному хранилищу данных</string>
     <string name="unencrypted">Не зашифровано</string>
     <string name="encrypted_unverified">Зашифровано неподтверждённой сессией</string>

From 36eb538a9348c5e6028954eb4cb7164f2639595d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 19 Oct 2022 17:17:21 +0200
Subject: [PATCH 114/300] Version++

---
 matrix-sdk-android/build.gradle | 2 +-
 vector-app/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 4a6c0edf10..968d8515ac 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -62,7 +62,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.5.4\""
+        buildConfigField "String", "SDK_VERSION", "\"1.5.6\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index ca77e4b86f..1e8a8b3d3f 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -37,7 +37,7 @@ ext.versionMinor = 5
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 4
+ext.versionPatch = 6
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From 399e3b1c5aaa10ccab0410da1e6cb21b11caed03 Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+github@mailbox.org>
Date: Wed, 19 Oct 2022 18:29:04 +0000
Subject: [PATCH 115/300] Translated using Weblate (German)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 57adb82d3a..10c0e262e3 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2784,9 +2784,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Wähle „Mit QR-Code anmelden“</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
-    <string name="qr_code_login_new_device_instruction_3">Wähle \'QR-Code auf diesem Gerät anzeigen\'</string>
-    <string name="qr_code_login_new_device_instruction_2">Gehe zu Einstellungen -&gt; Sicherheit und Privatsphäre -&gt; Alle Sitzungen anzeigen</string>
-    <string name="qr_code_login_new_device_instruction_1">Öffne ${app_name} auf deinem anderen Gerät</string>
+    <string name="qr_code_login_new_device_instruction_3">Wähle \'QR-Code anzeigen\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Gehe zu Einstellungen -&gt; Sicherheit und Privatsphäre</string>
+    <string name="qr_code_login_new_device_instruction_1">Öffne die App auf deinem anderen Gerät</string>
     <string name="qr_code_login_header_failed_denied_description">Die Anfrage wurde auf dem anderen Gerät abgelehnt.</string>
     <string name="qr_code_login_header_failed_timeout_description">Die Verbindung konnte nicht in der erforderlichen Zeit hergestellt werden.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Verbindung mit diesem Gerät nicht unterstützt.</string>
@@ -2806,4 +2806,11 @@
     <string name="login_scan_qr_code">QR-Code einlesen</string>
     <string name="labs_enable_voice_broadcast_summary">Zeichne Sprachnachrichten auf, während du sie in Echtzeit in den Raumverlauf sendest.</string>
     <string name="labs_enable_voice_broadcast_title">Sprachübertragung aktivieren (in aktiver Entwicklung)</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Der Home-Server unterstützt Anmelden mit QR-Code nicht.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Die Anmeldung wurde vom anderen Gerät abgebrochen.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Der QR-Code ist ungültig.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Das andere Gerät muss angemeldet sein.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Das andere Gerät ist bereits angemeldet.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Es ist ein Problem bei der Herstellung der sicheren Kommunikation aufgetreten. Eines der folgenden Dinge könnte kompromitiert sein: Dein Heim-Server; deine Internetverbindung(en); dein(e) Gerät(e);</string>
+    <string name="qr_code_login_header_failed_other_description">Die Anfrage ist fehlgeschlagen.</string>
 </resources>
\ No newline at end of file

From 8b538a79bb3c6239da8666ef5815630b1ed7a761 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 19 Oct 2022 16:50:12 +0000
Subject: [PATCH 116/300] Translated using Weblate (Czech)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
index 398b7f7b35..717da1624c 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -351,7 +351,7 @@
     <string name="call_in_progress">Hovor probíhá…</string>
     <string name="call_error_user_not_responding">Protější strana hovor nepřijala.</string>
     <string name="permissions_rationale_popup_title">Informace</string>
-    <string name="permissions_rationale_msg_record_audio">${app_name} potřebuje oprávnění pro přístup k Vašemu mikrofonu pro uskutečnění hlasových hovorů.</string>
+    <string name="permissions_rationale_msg_record_audio">${app_name} potřebuje oprávnění pro přístup k vašemu mikrofonu pro uskutečnění hlasových hovorů.</string>
     <string name="yes">ANO</string>
     <string name="no">NE</string>
     <string name="_continue">Pokračovat</string>
@@ -411,12 +411,12 @@
     <string name="done">Hotovo</string>
     <string name="action_sign_out_confirmation_simple">Opravdu se chcete odhlásit\?</string>
     <string name="video_call_in_progress">Video hovor probíhá…</string>
-    <string name="permissions_rationale_msg_camera_and_audio">${app_name} potřebuje oprávnění pro přístup k Vaší kameře a mikrofonu pro uskutečnění video hovoru.
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} potřebuje oprávnění pro přístup k vaší kameře a mikrofonu pro uskutečnění video hovoru.
 \n
 \nProsím, povolte přístup na následující hlášce abyste mohli uskutečnit hovor.</string>
     <string name="room_participants_power_level_prompt">Tuto změnu nelze zvrátit, protože povyšujete uživatele na stejnou úroveň, jakou máte vy.
 \nOpravdu to chcete udělat\?</string>
-    <string name="ssl_cert_not_trust">Toto by mohlo znamenat, že někdo škodlivě zachytává Vaši komunikaci nebo že Váš telefon nedůvěřuje certifikátu poskytnutému vzdáleným serverem.</string>
+    <string name="ssl_cert_not_trust">Toto by mohlo znamenat, že někdo škodlivě zachytává vaši komunikaci nebo že Váš telefon nedůvěřuje certifikátu poskytnutému vzdáleným serverem.</string>
     <string name="ssl_cert_new_account_expl">Pokud administrátor serveru řekl, že toto je předpokládané, ujistěte se, že otisk níže se shoduje s otiskem který Vám poskytl.</string>
     <string name="ssl_unexpected_existing_expl">Certifikát se změnil z toho, kterému Váš telefon důvěřoval. Toto je VELMI NEOBVYKLÉ. Je doporučeno, abyste NEPŘIJALI tento nový certifikát.</string>
     <string name="ssl_expected_existing_expl">Certifikát se změnil z původně důvěryhodného na nyní nedůvěryhodný. Server patrně obnovil svůj certifikát. Kontaktujte administrátora kvůli očekávanému otisku.</string>
@@ -578,7 +578,7 @@
     <string name="settings_deactivate_account_section">Deaktivace účtu</string>
     <string name="settings_deactivate_my_account">Deaktivovat můj účet</string>
     <string name="settings_discovery_category">Objevování</string>
-    <string name="settings_discovery_manage">Správa Vašich nastavení pro objevování.</string>
+    <string name="settings_discovery_manage">Správa vašich nastavení pro objevování.</string>
     <string name="settings_analytics">Analýza</string>
     <string name="settings_opt_in_of_analytics">Odeslat analytická data</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} sbírá anonymní analytická data pro vylepšení aplikace.</string>
@@ -848,7 +848,7 @@
     <string name="keys_backup_setup">Začít používat zálohu klíčů</string>
     <string name="keys_backup_setup_step1_advanced">(Pokročilé)</string>
     <string name="keys_backup_setup_step2_text_title">Zabezpečit zálohu přístupovou frází.</string>
-    <string name="keys_backup_setup_step2_text_description">Uložíme zašifrovanou kopii Vašich klíčů na Vašem domovském serveru. Chraňte svoji zálohu přístupovou frází, abyste ji udrželi v bezpečí.
+    <string name="keys_backup_setup_step2_text_description">Uložíme zašifrovanou kopii vašich klíčů na Vašem domovském serveru. Chraňte svoji zálohu přístupovou frází, abyste ji udrželi v bezpečí.
 \n
 \nZ důvodu nejvyšší bezpečnosti by se měla lišit od hesla účtu.</string>
     <string name="keys_backup_setup_step2_button_title">Nastavit přístupovou frází</string>
@@ -856,7 +856,7 @@
     <string name="keys_backup_setup_step1_recovery_key_alternative">Nebo zabezpečte svoji zálohu pomocí klíče obnovy, uloženého někde v bezpečí.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Pokročilé) Nastavit s klíčem obnovy</string>
     <string name="keys_backup_setup_step3_success_title">Podařilo se!</string>
-    <string name="keys_backup_setup_step3_text_line2">Váš klíč obnovy je záchranná síť - lze jej použít pro obnovu Vašich šifrovaných zpráv, pokud zapomenete svou přístupovou frázi.
+    <string name="keys_backup_setup_step3_text_line2">Váš klíč obnovy je záchranná síť - lze jej použít pro obnovu vašich šifrovaných zpráv, pokud zapomenete svou přístupovou frázi.
 \nUchovávejte svůj klíč obnovy velmi bezpečně, např. ve správci hesel (nebo trezoru)</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Uchovávejte svůj klíč obnovy velmi bezpečně, např. ve správci hesel (nebo trezoru)</string>
     <string name="keys_backup_setup_step3_button_title">Hotovo</string>
@@ -1106,7 +1106,7 @@
     <string name="login_server_url_form_modular_text">Prémiový hosting pro organizace</string>
     <string name="login_server_url_form_modular_notice">Zadejte adresu Modular Element nebo serveru, který chcete použít</string>
     <string name="login_sso_error_message">Při načítání stránky došlo k chybě: %1$s (%2$d)</string>
-    <string name="login_mode_not_supported">Aplikace se nemůže přihlásit k tomuto homeserveru. Homeserver podporuje následující typy přihlášení: %1$s.
+    <string name="login_mode_not_supported">Aplikace se nemůže přihlásit k tomuto domovskému serveru. Domovský server podporuje následující typy přihlášení: %1$s.
 \n
 \nChcete se přihlásit webovým klientem\?</string>
     <string name="login_registration_disabled">Omlouváme se, tento server již nepřijímá nové účty.</string>
@@ -1279,7 +1279,7 @@
     <string name="rendering_event_error_type_of_event_not_handled">${app_name} neobstarává události typu \'%1$s\'</string>
     <string name="rendering_event_error_exception">${app_name} narazil na chybu při převádění obsahu události s id \'%1$s\'</string>
     <string name="unignore">Odignorovat</string>
-    <string name="verify_cannot_cross_sign">Tato relace nemůže sdílet toto ověření s jinými z Vašich relací.
+    <string name="verify_cannot_cross_sign">Tato relace nemůže sdílet toto ověření s jinými z vašich relací.
 \nToto ověření bude uloženo místně a sdíleno v budoucí verzi aplikace.</string>
     <string name="command_description_rainbow">Odešle danou zprávu zabarvenou jako duha</string>
     <string name="command_description_rainbow_emote">Odešle daný emote zabarvený jako duha</string>
@@ -1475,7 +1475,7 @@
     <string name="cross_signing_verify_by_text">Manuálně ověřit textem</string>
     <string name="crosssigning_verify_session">Ověřit přihlášení</string>
     <string name="cross_signing_verify_by_emoji">Interaktivně ověřit pomocí Emoji</string>
-    <string name="confirm_your_identity">Potvrďte svou identitu ověřením tohoto přihlášení v některé z Vašich dalších relacích a udělte přístup k zašifrovaným zprávám.</string>
+    <string name="confirm_your_identity">Potvrďte svou identitu ověřením tohoto přihlášení v některé z vašich dalších relacích a udělte přístup k zašifrovaným zprávám.</string>
     <string name="error_empty_field_choose_user_name">Zvolte si, prosím, uživatelské jméno.</string>
     <string name="error_empty_field_choose_password">Prosím, zvolte heslo.</string>
     <string name="external_link_confirmation_title">Překontrolovat tento odkaz</string>
@@ -1517,7 +1517,7 @@
     <string name="no_permissions_to_start_conf_call">Nemáte povolení zahájit konferenční hovor v této místnosti</string>
     <string name="video_meeting">Zahájit video schůzku</string>
     <string name="audio_meeting">Zahájit hlasovou schůzku</string>
-    <string name="audio_video_meeting_description">Schůzky používají pravidla zabezpečení a přístupu Jitsi. Všichni lidé nyní v místnosti uvidí pozvánku k připojení, zatímco Vaše schůzka probíhá.</string>
+    <string name="audio_video_meeting_description">Schůzky používají pravidla zabezpečení a přístupu Jitsi. Všichni lidé nyní v místnosti uvidí pozvánku k připojení, zatímco vaše schůzka probíhá.</string>
     <string name="cannot_call_yourself">Nemůžete zahájit hovor se sebou</string>
     <string name="cannot_call_yourself_with_invite">Nemůžete zahájit hovor se sebou, počkejte, až účastníci přijmou pozvánku</string>
     <string name="failed_to_add_widget">Přidání widgetu se nezdařilo</string>
@@ -1567,9 +1567,9 @@
     <string name="room_participants_ban_reason">Důvod k vykázání</string>
     <string name="room_participants_unban_title">Zrušit vykázání uživatele</string>
     <string name="room_participants_unban_prompt_msg">Zrušení vykázání uživatele jim opět umožní vstoupit do místnosti.</string>
-    <string name="settings_phone_number_empty">Žádné telefonní číslo nebylo zadáno do Vašeho účtu</string>
+    <string name="settings_phone_number_empty">Žádné telefonní číslo nebylo zadáno do vašeho účtu</string>
     <string name="settings_emails">Emailová adresa</string>
-    <string name="settings_emails_empty">Žádná emailová adresa nebyla zadána do Vašeho účtu</string>
+    <string name="settings_emails_empty">Žádná emailová adresa nebyla zadána do vašeho účtu</string>
     <string name="settings_phone_numbers">Telefonní čísla</string>
     <string name="settings_remove_three_pid_confirmation_content">Ostranit %s\?</string>
     <string name="error_threepid_auth_failed">Ujistěte se, že kliknete na odkaz v e-mailu, který jsme Vám poslali.</string>
@@ -1577,7 +1577,7 @@
     <string name="settings_secure_backup_setup">Vytvořit bezpečnou zálohu</string>
     <string name="settings_secure_backup_reset">Resetovat bezpečnou zálohu</string>
     <string name="settings_secure_backup_enter_to_setup">Nastavit na tomto zařízení</string>
-    <string name="settings_secure_backup_section_info">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na Vašem serveru.</string>
+    <string name="settings_secure_backup_section_info">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na vašem serveru.</string>
     <string name="reset_secure_backup_title">Generovat nový bezpečnostní klíč nebo nastavit novou bezpečnostní frázi pro existující zálohu.</string>
     <string name="reset_secure_backup_warning">To nahradí Váš nynější klíč nebo frázi.</string>
     <string name="disabled_integration_dialog_title">Integrace jsou vypnuty</string>
@@ -1641,7 +1641,7 @@
     <string name="a11y_stop_camera">Zastavit fotoaparát</string>
     <string name="a11y_start_camera">Spustit fotoaparát</string>
     <string name="bottom_sheet_setup_secure_backup_title">Bezpečná záloha</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na Vašem serveru.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Ochrana před ztrátou přístupu k šifrovaným zprávám a datům pomocí zálohy šifrovacích klíčů na vašem serveru.</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Nastavit</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Použít bezpečnostní klíč</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Generovat bezpečnostní klíč k uložení na bezpečném místě např. správci hesel nebo sejfu.</string>
@@ -2104,7 +2104,7 @@
     <string name="space_settings_alias_subtitle">Prohlédnout a spravovat adresy tohoto prostoru.</string>
     <string name="space_settings_alias_title">Adresy prostorů</string>
     <string name="room_upgrade_to_recommended_version">Aktualizujte na doporučenou verzi místnosti</string>
-    <string name="room_using_unstable_room_version">Tato místnost používá místnost verze %s, kterou homeserver označil za nestabilní.</string>
+    <string name="room_using_unstable_room_version">Tato místnost používá verzi místnosti %s, kterou domovský server označil za nestabilní.</string>
     <string name="upgrade_room_no_power_to_manage">K aktualizaci místnosti potřebujete oprávnění</string>
     <string name="upgrade_room_update_parent_space">Automaticky aktualizovat mateřský prostor</string>
     <string name="upgrade_room_auto_invite">Automaticky pozvat uživatele</string>
@@ -2124,7 +2124,7 @@
     <string name="verification_scan_self_emoji_subtitle">Raději ověřit porovnáním emoji</string>
     <string name="verification_scan_with_this_device">Oskenovat tímto zařízením</string>
     <string name="verification_scan_self_notice">Oskenujte kód svým dalším zařízením nebo přepněte a oskenujte tímto zařízením</string>
-    <string name="hs_client_url">URL API Homeserveru</string>
+    <string name="hs_client_url">URL API domovského serveru</string>
     <string name="missing_permissions_title">Chybějící oprávnění</string>
     <string name="denied_permission_camera">Pro provedení této akce udělte, prosím, oprávnění Fotoaparát v systémových nastaveních.</string>
     <string name="denied_permission_generic">Některá z oprávnění potřebných k provedení akce chybí, prosím, udělte oprávnění v systémových nastaveních.</string>
@@ -2839,9 +2839,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Začněte na přihlašovací obrazovce</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vyberte možnost \"Přihlásit se pomocí QR kódu\"</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Začněte na přihlašovací obrazovce</string>
-    <string name="qr_code_login_new_device_instruction_3">Vyberte možnost \"Zobrazit QR kód na tomto zařízení\"</string>
-    <string name="qr_code_login_new_device_instruction_2">Přejděte do Nastavení -&gt; Zabezpečení a soukromí -&gt; Zobrazit všechny relace</string>
-    <string name="qr_code_login_new_device_instruction_1">Otevřete ${app_name} na vašem druhém zařízení</string>
+    <string name="qr_code_login_new_device_instruction_3">Vyberte možnost \"Zobrazit QR kód\"</string>
+    <string name="qr_code_login_new_device_instruction_2">Přejděte do Nastavení -&gt; Zabezpečení a soukromí</string>
+    <string name="qr_code_login_new_device_instruction_1">Otevřete aplikaci na vašem druhém zařízení</string>
     <string name="qr_code_login_header_failed_denied_description">Žádost byla na druhém zařízení zamítnuta.</string>
     <string name="qr_code_login_header_failed_timeout_description">Propojení nebylo dokončeno v požadovaném čase.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Propojení s tímto zařízením není podporováno.</string>
@@ -2861,4 +2861,11 @@
     <string name="login_scan_qr_code">Naskenovat QR kód</string>
     <string name="labs_enable_voice_broadcast_summary">Možnost nahrávat a odesílat hlasové vysílání na časové ose místnosti.</string>
     <string name="labs_enable_voice_broadcast_title">Povolit hlasové vysílání (v aktivním vývoji)</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Domovský server nepodporuje přihlášení pomocí QR kódu.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Přihlášení bylo na druhém zařízení zrušeno.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Tento QR kód je neplatný.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Druhé zařízení musí být přihlášeno.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Druhé zařízení je již přihlášeno.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Při nastavování zabezpečeného zasílání zpráv se vyskytl problém se zabezpečením. Může být napadena jedna z následujících věcí: váš domovský server; vaše internetové připojení; vaše zařízení;</string>
+    <string name="qr_code_login_header_failed_other_description">Žádost se nezdařila.</string>
 </resources>
\ No newline at end of file

From a84123ff8bdffcfb10dd4a9d5a988f9656ea0629 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Wed, 19 Oct 2022 18:38:09 +0000
Subject: [PATCH 117/300] Translated using Weblate (German)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 10c0e262e3..9e37fb513d 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2806,7 +2806,7 @@
     <string name="login_scan_qr_code">QR-Code einlesen</string>
     <string name="labs_enable_voice_broadcast_summary">Zeichne Sprachnachrichten auf, während du sie in Echtzeit in den Raumverlauf sendest.</string>
     <string name="labs_enable_voice_broadcast_title">Sprachübertragung aktivieren (in aktiver Entwicklung)</string>
-    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Der Home-Server unterstützt Anmelden mit QR-Code nicht.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Der Heim-Server unterstützt Anmelden per QR-Code nicht.</string>
     <string name="qr_code_login_header_failed_user_cancelled_description">Die Anmeldung wurde vom anderen Gerät abgebrochen.</string>
     <string name="qr_code_login_header_failed_invalid_qr_code_description">Der QR-Code ist ungültig.</string>
     <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Das andere Gerät muss angemeldet sein.</string>

From fd105ae5aaef32be3e17eb4e2bbb2f73ae911b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 19 Oct 2022 17:54:08 +0000
Subject: [PATCH 118/300] Translated using Weblate (Estonian)

Currently translated at 99.6% (2504 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-et/strings.xml b/library/ui-strings/src/main/res/values-et/strings.xml
index 3ad6feec53..05b01c2bde 100644
--- a/library/ui-strings/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -2754,9 +2754,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Alusta sisselogimisvaatest</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vali „Logi võrku QR-koodi abil“</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Alusta sisselogimisvaatest</string>
-    <string name="qr_code_login_new_device_instruction_3">Vali „Näita selles seadmes QR-koodi“</string>
-    <string name="qr_code_login_new_device_instruction_2">Ava Seadistused -&gt; Turvalisus ja privaatsus -&gt; Näita kõiki sessioone</string>
-    <string name="qr_code_login_new_device_instruction_1">Ava ${app_name} oma teises seades</string>
+    <string name="qr_code_login_new_device_instruction_3">Vali „Näita QR-koodi“</string>
+    <string name="qr_code_login_new_device_instruction_2">Ava Seadistused -&gt; Turvalisus ja privaatsus</string>
+    <string name="qr_code_login_new_device_instruction_1">Ava sama rakendus oma teises seades</string>
     <string name="qr_code_login_header_failed_denied_description">Teine seade lükkas päringu tagasi.</string>
     <string name="qr_code_login_header_failed_timeout_description">Sidumine ei lõppenud etteantud aja jooksul.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Sidumine selle seadmega ei ole toetatud.</string>
@@ -2798,4 +2798,11 @@
 \nJärgmistes vaadetes palun anna sellele rakendusele teavituste kuvamiseks vajalikud õigused.</string>
     <string name="labs_enable_voice_broadcast_summary">Võimalus salvestada ja postitada ringhäälingukõnesid jututoa ajajoonele.</string>
     <string name="labs_enable_voice_broadcast_title">Võta kasutusele ringhäälingukõned (aktiivses arenduses)</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Koduserver ei toeta muude seadmete võrku logimise võimalust.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Sisselogimine katkestati teises seadmes.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">See QR-kood on vigane.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Teine seade peab olema võrku loginud.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Teine seade on juba võrku loginud.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Turvalise sõnumivahetuse ülesseadmisel tekkis turvaviga. Üks kolmest võib olla sattunud vale osapoole kontrolli alla: sinu koduserver, sinu internetiühendus või sinu seade;</string>
+    <string name="qr_code_login_header_failed_other_description">Päring ei õnnestunud.</string>
 </resources>
\ No newline at end of file

From ad81aa764284940de8671819783726f8dacf7843 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Wed, 19 Oct 2022 16:38:14 +0000
Subject: [PATCH 119/300] Translated using Weblate (Russian)

Currently translated at 95.3% (2396 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index e3edf65720..77a555ca4e 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -830,8 +830,8 @@
     <string name="keys_backup_setup_step2_text_description">Зашифрованная копия ключей будет храниться на вашем сервере. Для безопасности защитите её мнемонической фразой.
 \n
 \nДля максимальной безопасности мнемоническая фраза должна отличаться от пароля вашей учётной записи.</string>
-    <string name="keys_backup_setup_step3_text_line2">Ключ восстановления — это страховка, вы можете использовать его для восстановления доступа к вашим зашифрованным сообщениям, если забудете вашу парольную фразу. 
-\nХраните ключ восстановления в надёжном месте, например, в диспетчере паролей (или в сейфе)</string>
+    <string name="keys_backup_setup_step3_text_line2">Бумажный ключ — это подстраховка: вы можете использовать его для восстановления доступа к своим зашифрованным сообщениям, если забудете свою мнемоническую фразу.
+\nХраните свой бумажный ключ в очень надёжном месте, например, в менеджере паролей (или в сейфе)</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Импортирование ключей…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Скачивание ключей…</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Вычисление бумажного ключа…</string>

From 6e6bd6e4a2364d0d15dbb8944c977f3420095c5d Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Wed, 19 Oct 2022 16:48:00 +0000
Subject: [PATCH 120/300] Translated using Weblate (Slovak)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sk/strings.xml b/library/ui-strings/src/main/res/values-sk/strings.xml
index 43a8301d58..289ab52a49 100644
--- a/library/ui-strings/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -2839,9 +2839,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Začnite na prihlasovacej obrazovke</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Vyberte možnosť \"Prihlásiť sa pomocou QR kódu\"</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Začnite na prihlasovacej obrazovke</string>
-    <string name="qr_code_login_new_device_instruction_3">Vyberte možnosť \"Zobraziť QR kód na tomto zariadení\"</string>
-    <string name="qr_code_login_new_device_instruction_2">Prejdite do Nastavenia -&gt; Zabezpečenie a súkromie -&gt; Zobraziť všetky relácie</string>
-    <string name="qr_code_login_new_device_instruction_1">Otvorte ${app_name} na vašom druhom zariadení</string>
+    <string name="qr_code_login_new_device_instruction_3">Vyberte možnosť \"Zobraziť QR kód\"</string>
+    <string name="qr_code_login_new_device_instruction_2">Prejdite do Nastavenia -&gt; Zabezpečenie a súkromie</string>
+    <string name="qr_code_login_new_device_instruction_1">Otvorte aplikáciu na vašom druhom zariadení</string>
     <string name="qr_code_login_header_failed_denied_description">Žiadosť bola na druhom zariadení zamietnutá.</string>
     <string name="qr_code_login_header_failed_timeout_description">Prepojenie nebolo dokončené v požadovanom čase.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Prepojenie s týmto zariadením nie je podporované.</string>
@@ -2859,4 +2859,13 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Pomocou tohto zariadenia sa môžete prihlásiť do mobilného alebo webového zariadenia pomocou QR kódu. Môžete to urobiť dvoma spôsobmi:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Prihlásiť sa pomocou QR kódu</string>
     <string name="login_scan_qr_code">Skenovať QR kód</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Domovský server nepodporuje prihlásenie pomocou QR kódu.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Prihlasovanie bolo zrušené na druhom zariadení.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">QR kód nie je platný.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Druhé zariadenie musí byť prihlásené.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Druhé zariadenie je už prihlásené.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Pri nastavovaní zabezpečeného zasielania správ sa vyskytol bezpečnostný problém. Jedna z nasledujúcich možností môže byť kompromitovaná: Váš domovský server; Vaše internetové pripojenie (pripojenia); Vaše zariadenie (zariadenia);</string>
+    <string name="qr_code_login_header_failed_other_description">Žiadosť zlyhala.</string>
+    <string name="labs_enable_voice_broadcast_summary">Možnosť nahrávania a odosielania hlasového vysielania v časovej osi miestnosti.</string>
+    <string name="labs_enable_voice_broadcast_title">Zapnúť hlasové vysielanie (v štádiu aktívneho vývoja)</string>
 </resources>
\ No newline at end of file

From 228a089de830638338bf5d8e733c404f92200926 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Wed, 19 Oct 2022 15:55:38 +0000
Subject: [PATCH 121/300] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-uk/strings.xml b/library/ui-strings/src/main/res/values-uk/strings.xml
index 2a04e58f41..38e500e1fe 100644
--- a/library/ui-strings/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -2892,9 +2892,9 @@
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Виберіть «Увійти за допомогою QR-коду»</string>
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Почніть з екрана входу</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Почніть з екрана входу</string>
-    <string name="qr_code_login_new_device_instruction_3">Виберіть «Показати QR-код на цьому пристрої»</string>
-    <string name="qr_code_login_new_device_instruction_2">Перейдіть до Налаштування -&gt; Безпека й приватність -&gt; Показати всі сеанси</string>
-    <string name="qr_code_login_new_device_instruction_1">Відкрийте ${app_name} на іншому своєму пристрої</string>
+    <string name="qr_code_login_new_device_instruction_3">Виберіть «Показати QR-код»</string>
+    <string name="qr_code_login_new_device_instruction_2">Перейдіть до Налаштування -&gt; Безпека й приватність</string>
+    <string name="qr_code_login_new_device_instruction_1">Відкрийте застосунок на іншому своєму пристрої</string>
     <string name="qr_code_login_header_failed_denied_description">Запит на іншому пристрої було відхилено.</string>
     <string name="qr_code_login_header_failed_timeout_description">Пов\'язування не було завершено у встановлені терміни.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Пов\'язування з цим пристроєм не підтримується.</string>
@@ -2913,4 +2913,13 @@
     <string name="qr_code_login_scan_qr_code_button">Сканувати QR-код</string>
     <string name="qr_code_login_header_scan_qr_code_title">Сканувати QR-код</string>
     <string name="login_scan_qr_code">Сканувати QR-код</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Домашній сервер не підтримує вхід за допомогою QR-коду.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Вхід на іншому пристрої було скасовано.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Цей QR-код недійсний.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Повинен бути виконаний вхід з іншого пристрою.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Вхід з іншого пристрою вже виконано.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Під час налаштування захищеного обміну повідомленнями виникла проблема з безпекою. Можливо, порушено одне з таких налаштувань: Ваш домашній сервер; Ваше інтернет-з\'єднання; Ваш пристрій;</string>
+    <string name="qr_code_login_header_failed_other_description">Запит не виконаний.</string>
+    <string name="labs_enable_voice_broadcast_summary">Можливість записувати та надсилати голосові записи до стрічки кімнати.</string>
+    <string name="labs_enable_voice_broadcast_title">Увімкнути голосове мовлення (в активній розробці)</string>
 </resources>
\ No newline at end of file

From 1e3f8231ba165023e6e91d48c0f7fe0e36f9f291 Mon Sep 17 00:00:00 2001
From: jucktnich <humidor.tandem0y@icloud.com>
Date: Wed, 19 Oct 2022 18:48:20 +0000
Subject: [PATCH 122/300] Translated using Weblate (German)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 9e37fb513d..2d67b127f9 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2741,7 +2741,7 @@
     <string name="some_devices_will_not_be_able_to_decrypt">⚠ Es befinden sich nicht verifizierte Geräte in diesem Raum. Sie werden deine Nachrichten nicht entschlüsseln können.</string>
     <string name="encryption_never_send_to_unverified_devices_in_room">Niemals verschlüsselte Nachrichten zu unverifizierten Sitzungen in diesem Raum senden.</string>
     <string name="action_got_it">Verstanden</string>
-    <string name="labs_enable_rich_text_editor_summary">Probiere den Rich-Text-Editor aus (bald auch mit Plain-Text-Modus)</string>
+    <string name="labs_enable_rich_text_editor_summary">Probiere den Rich-Text-Editor aus (Klartext-Modus kommt bald)</string>
     <string name="labs_enable_rich_text_editor_title">Aktiviere Rich-Text-Editor</string>
     <string name="device_manager_session_details_device_browser">Browser</string>
     <string name="rich_text_editor_format_strikethrough">Durchgestrichen formatieren</string>

From 5b1e29bb4f1beb0f3ce91888e4b5024fd32a32f6 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Wed, 19 Oct 2022 18:42:29 +0000
Subject: [PATCH 123/300] Translated using Weblate (German)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 2d67b127f9..e8f720d1f5 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2811,6 +2811,6 @@
     <string name="qr_code_login_header_failed_invalid_qr_code_description">Der QR-Code ist ungültig.</string>
     <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Das andere Gerät muss angemeldet sein.</string>
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Das andere Gerät ist bereits angemeldet.</string>
-    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Es ist ein Problem bei der Herstellung der sicheren Kommunikation aufgetreten. Eines der folgenden Dinge könnte kompromitiert sein: Dein Heim-Server; deine Internetverbindung(en); dein(e) Gerät(e);</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Es ist ein Problem bei der Herstellung der sicheren Kommunikation aufgetreten. Eines der folgenden Dinge könnte kompromittiert sein: Dein Heim-Server; deine Internetverbindung(en); dein(e) Gerät(e);</string>
     <string name="qr_code_login_header_failed_other_description">Die Anfrage ist fehlgeschlagen.</string>
 </resources>
\ No newline at end of file

From 2379ce673be7413fc2446429a8190a19e6ff5580 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Wed, 19 Oct 2022 17:02:32 -0400
Subject: [PATCH 124/300] Adds filter event to opt in to thread notifications

---
 .../sdk/api/session/sync/model/RoomSync.kt    |  3 +-
 .../database/RealmSessionStoreMigration.kt    |  4 ++-
 .../database/migration/MigrateSessionTo041.kt | 30 +++++++++++++++++++
 .../query/TimelineEventEntityQueries.kt       |  3 +-
 .../internal/session/filter/FilterFactory.kt  | 17 ++---------
 .../session/filter/RoomEventFilter.kt         |  2 +-
 .../sdk/internal/session/sync/SyncTask.kt     |  4 +--
 7 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
index 472121269f..0651b8f3d8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
@@ -47,11 +47,10 @@ data class RoomSync(
          */
         @Json(name = "unread_notifications") val unreadNotifications: RoomSyncUnreadNotifications? = null,
 
-
         /**
          * The count of threads with unread notifications (not the total # of notifications in all threads)
          */
-        @Json(name = "org.matrix.msc3773.unread_thread_notifications") val unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
+        @Json(name = "unread_thread_notifications") val unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
 
         /**
          * The room summary.
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 9a2c32f97c..5b2874bdef 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
@@ -56,6 +56,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo036
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo037
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo038
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo039
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo041
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import javax.inject.Inject
@@ -64,7 +65,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : MatrixRealmMigration(
         dbName = "Session",
-        schemaVersion = 39L,
+        schemaVersion = 41L,
 ) {
     /**
      * Forces all RealmSessionStoreMigration instances to be equal.
@@ -113,5 +114,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 37) MigrateSessionTo037(realm).perform()
         if (oldVersion < 38) MigrateSessionTo038(realm).perform()
         if (oldVersion < 39) MigrateSessionTo039(realm).perform()
+        if (oldVersion < 41) MigrateSessionTo041(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt
new file mode 100644
index 0000000000..b58d80e50a
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo041.kt
@@ -0,0 +1,30 @@
+/*
+ * 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.RoomSummaryEntityFields
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo041(realm: DynamicRealm) : RealmMigrator(realm, 41) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("RoomSummaryEntity")
+                ?.addField(RoomSummaryEntityFields.THREAD_HIGHLIGHT_COUNT, Int::class.java)
+                ?.addField(RoomSummaryEntityFields.THREAD_NOTIFICATION_COUNT, Int::class.java)
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
index 30010f90fd..1b4b359916 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt
@@ -110,8 +110,7 @@ internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEvent
         endGroup()
     }
     if (filters.filterUseless) {
-        not()
-                .equalTo(TimelineEventEntityFields.ROOT.IS_USELESS, true)
+        not().equalTo(TimelineEventEntityFields.ROOT.IS_USELESS, true)
     }
     if (filters.filterEdits) {
         not().like(TimelineEventEntityFields.ROOT.CONTENT, TimelineEventFilter.Content.EDIT)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 141144acd8..77c5649709 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -29,7 +29,6 @@ internal object FilterFactory {
 //                senders = listOf(userId),
 //                relationSenders = userId?.let { listOf(it) },
                 relationTypes = listOf(RelationType.THREAD),
-                enableUnreadThreadNotifications = true,
         )
     }
 
@@ -39,7 +38,6 @@ internal object FilterFactory {
                 containsUrl = true,
                 types = listOf(EventType.MESSAGE),
                 lazyLoadMembers = true,
-                enableUnreadThreadNotifications = true,
         )
     }
 
@@ -57,32 +55,23 @@ internal object FilterFactory {
     }
 
     fun createDefaultRoomFilter(): RoomEventFilter {
-        return RoomEventFilter(
-                lazyLoadMembers = true
-        )
+        return RoomEventFilter(lazyLoadMembers = true)
     }
 
     fun createElementRoomFilter(): RoomEventFilter {
         return RoomEventFilter(
                 lazyLoadMembers = true,
-                enableUnreadThreadNotifications = true,
                 // TODO Enable this for optimization
                 // types = (listOfSupportedEventTypes + listOfSupportedStateEventTypes).toMutableList()
         )
     }
 
     private fun createElementTimelineFilter(): RoomEventFilter? {
-        return null // RoomEventFilter().apply {
-        // TODO Enable this for optimization
-        // types = listOfSupportedEventTypes.toMutableList()
-        // }
+        return RoomEventFilter(enableUnreadThreadNotifications = true)
     }
 
     private fun createElementStateFilter(): RoomEventFilter {
-        return RoomEventFilter(
-                lazyLoadMembers = true,
-                enableUnreadThreadNotifications = true,
-        )
+        return RoomEventFilter(lazyLoadMembers = true)
     }
 
     // Get only managed types by Element
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index 81d1c04261..082acb63ab 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -81,7 +81,7 @@ internal data class RoomEventFilter(
         /**
          * If true, this will opt-in for the server to return unread threads notifications in [RoomSync]
          */
-        @Json(name = "org.matrix.msc3773.unread_thread_notifications") val enableUnreadThreadNotifications: Boolean? = null,
+        @Json(name = "unread_thread_notifications") val enableUnreadThreadNotifications: Boolean? = null,
 ) {
 
     fun toJSONString(): String {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
index ea296d379d..bc1a69769d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
@@ -140,7 +140,7 @@ internal class DefaultSyncTask @Inject constructor(
                         executeRequest(globalErrorReceiver) {
                             syncAPI.sync(
                                     params = requestParams,
-                                    readTimeOut = readTimeOut
+                                    readTimeOut = readTimeOut,
                             )
                         }
                     }
@@ -178,7 +178,7 @@ internal class DefaultSyncTask @Inject constructor(
             syncRequestStateTracker.setSyncRequestState(
                     SyncRequestState.IncrementalSyncParsing(
                             rooms = nbRooms,
-                            toDevice = nbToDevice
+                            toDevice = nbToDevice,
                     )
             )
             syncResponseHandler.handleResponse(syncResponse, token, null)

From ad7a6bd76b2a6f6b9e7bf4e0228867b76aaa7462 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Oct 2022 23:07:12 +0000
Subject: [PATCH 125/300] Bump material from 1.6.1 to 1.7.0

Bumps [material](https://github.com/material-components/material-components-android) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.6.1...1.7.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/dependencies.gradle b/dependencies.gradle
index f081e0a874..0d7ada0587 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -82,7 +82,7 @@ ext.libs = [
                 'transition'              : "androidx.transition:transition:1.2.0",
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.6.1",
+                'material'                : "com.google.android.material:material:1.7.0",
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
                 // Phone number https://github.com/google/libphonenumber

From 26c550921af72d553575a98f7fbe095b2b4d6f88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Oct 2022 08:27:20 +0200
Subject: [PATCH 126/300] Bump dependency-check-gradle from 7.2.1 to 7.3.0
 (#7415)

Bumps dependency-check-gradle from 7.2.1 to 7.3.0.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

diff --git a/build.gradle b/build.gradle
index d0f093a451..f162685d7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ buildscript {
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
         classpath "com.likethesalad.android:stem-plugin:2.2.3"
-        classpath 'org.owasp:dependency-check-gradle:7.2.1'
+        classpath 'org.owasp:dependency-check-gradle:7.3.0'
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'

From 12da349316b46ffe56afce3f9204f8e28177fef2 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Wed, 19 Oct 2022 20:03:24 +0000
Subject: [PATCH 127/300] Translated using Weblate (German)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index e8f720d1f5..cac0a47ad7 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -42,7 +42,7 @@
     <string name="notice_room_update">%s hat diesen Raum aufgewertet.</string>
     <string name="event_status_sending_message">Sende eine Nachricht …</string>
     <string name="initial_sync_start_importing_account">Erste Synchronisation:
-\nImportiere Benutzerkonto …</string>
+\nImportiere Konto …</string>
     <string name="initial_sync_start_importing_account_crypto">Erste Synchronisation:
 \nImportiere Kryptoschlüssel</string>
     <string name="initial_sync_start_importing_account_rooms">Erste Synchronisation:
@@ -263,13 +263,13 @@
     <string name="matrix_only_filter">Nur Matrix-Kontakte</string>
     <string name="no_result_placeholder">Keine Ergebnisse</string>
     <string name="rooms_header">Räume</string>
-    <string name="send_bug_report_include_logs">Logdateien übermitteln</string>
+    <string name="send_bug_report_include_logs">Sende Protokolle</string>
     <string name="send_bug_report_include_crash_logs">Absturzberichte übermitteln</string>
     <string name="send_bug_report_include_screenshot">Bildschirmfoto übermitteln</string>
     <string name="send_bug_report">Problem melden</string>
     <string name="send_bug_report_description">Bitte beschreibe das Problem. Was hast du genau gemacht\? Was sollte passieren\? Was ist tatsächlich passiert\?</string>
     <string name="send_bug_report_placeholder">Problembeschreibung</string>
-    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle der Anwendung zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, wie die Protokolle und das Bildschirmfoto, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, die nachfolgenden Haken entsprechend entfernen:</string>
+    <string name="send_bug_report_logs_description">Um Probleme diagnostizieren zu können, werden Protokolle der Anwendung zusammen mit dem Fehlerbericht übermittelt. Dieser Fehlerbericht wird, inklusive der Protokolle und des Bildschirmfotos, nicht öffentlich sichtbar sein. Wenn du nur den oben eingegebenen Text senden möchtest, entferne die Häkchen:</string>
     <string name="send_bug_report_alert_message">Du scheinst dein Telefon frustriert zu schütteln. Möchtest du das Fenster zum Senden eines Fehlerberichts öffnen\?</string>
     <string name="send_bug_report_sent">Dein Fehlerbericht wurde erfolgreich übermittelt</string>
     <string name="send_bug_report_failed">Der Fehlerbericht konnte nicht übermittelt werden (%s)</string>
@@ -353,7 +353,7 @@
     <string name="settings_add_phone_number">Telefonnummer hinzufügen</string>
     <string name="settings_app_info_link_summary">Anwendungsinformationen in den Systemeinstellungen anzeigen.</string>
     <string name="settings_app_info_link_title">Anwendungsinformationen</string>
-    <string name="settings_enable_all_notif">Benachrichtigungen für diesen Account</string>
+    <string name="settings_enable_all_notif">Benachrichtigungen für dieses Konto</string>
     <string name="settings_enable_this_device">Benachrichtigungen für diese Sitzung</string>
     <string name="settings_messages_in_one_to_one">Direktnachrichten</string>
     <string name="settings_messages_in_group_chat">Gruppenunterhaltungen</string>
@@ -609,7 +609,7 @@
     <string name="settings_send_typing_notifs">Schreibbenachrichtigungen senden</string>
     <string name="settings_send_typing_notifs_summary">Lasse andere Benutzer wissen, dass du tippst.</string>
     <string name="settings_send_markdown">Markdown-Formatierung</string>
-    <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen wie Sternchen (*), um kursiven Text anzuzeigen.</string>
+    <string name="settings_send_markdown_summary">Formatiere Nachrichten mittels Markdown-Syntax, bevor sie gesendet werden. Dies erlaubt erweiterte Formatierungen wie Sternchen, um kursiven Text anzuzeigen.</string>
     <string name="settings_show_read_receipts">Lesebestätigungen zeigen</string>
     <string name="settings_show_read_receipts_summary">Klicke auf die Lesebestätigungen für eine detailliertere Liste.</string>
     <string name="settings_show_join_leave_messages_summary">Einladungen, Entfernungen und Verbannungen bleiben sichtbar.</string>
@@ -637,7 +637,7 @@
 \nBitte überprüfe die Systemeinstellungen.</string>
     <string name="open_settings">Öffne Einstellungen</string>
     <string name="settings_troubleshoot_test_account_settings_title">Kontoeinstellungen.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Benachrichtigungen sind für dein Konto eingeschaltet.</string>
+    <string name="settings_troubleshoot_test_account_settings_success">Benachrichtigungen sind für dein Konto aktiviert.</string>
     <string name="settings_troubleshoot_test_account_settings_failed">Benachrichtigungen sind für dein Konto deaktiviert.
 \nBitte überprüfe die Kontoeinstellungen.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Aktiviere</string>
@@ -686,7 +686,7 @@
     <string name="done">Fertig</string>
     <string name="settings_notification_advanced">Erweiterte Benachrichtigungseinstellungen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Angepasste Einstellungen.</string>
-    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Beachte, dass einige Nachrichtentypen leise sind (erzeugen eine Benachrichtigung aber keinen Ton).</string>
+    <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Beachte, dass einige Nachrichtentypen leise sind (erzeugen eine Benachrichtigung, aber keinen Ton).</string>
     <string name="settings_troubleshoot_test_bing_settings_failed">Einige Benachrichtigungen sind in deinen erweiterten Einstellungen deaktiviert.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Konto hinzufügen</string>
     <string name="settings_noisy_notifications_preferences">Laute Benachrichtigungen einstellen</string>
@@ -721,7 +721,7 @@
 \nDieser Fehler liegt nicht unter der Kontrolle von ${app_name}. Er kann aus verschiedenen Gründen auftreten. Vielleicht wird es funktionieren, wenn du es später noch einmal probierst. Außerdem kannst Du prüfen, ob die Datennutzung der Google-Play-Dienste unbeschränkt ist und die Geräteuhr richtig eingestellt ist. Der Fehler kann aber auch unter Custom-ROMs auftreten.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDieser Fehler ist außerhalb von ${app_name} passiert. Es gibt kein Google-Konto auf dem Gerät. Bitte füge ein Google-Konto hinzu.</string>
-    <string name="settings_cryptography_manage_keys">Verwaltung der Kryptoschlüssel</string>
+    <string name="settings_cryptography_manage_keys">Verwaltung der Verschlüsselungs-Schlüssel</string>
     <string name="encryption_settings_manage_message_recovery_summary">Schlüsselsicherung verwalten</string>
     <string name="keys_backup_setup_step1_description">Nachrichten in verschlüsselten Räumen sind mit Ende-zu-Ende-Verschlüsselung gesichert. Nur du und der Empfänger haben die Schlüssel um diese Nachrichten zu lesen.
 \n
@@ -759,7 +759,7 @@
     <string name="keys_backup_settings_untrusted_backup">Um die Schlüsselsicherung für diese Sitzung zu verwenden, stelle sie jetzt mit deiner Passphrase oder deinem Wiederherstellungsschlüssel wieder her.</string>
     <string name="keys_backup_settings_delete_confirm_message">Deine gesicherten Schlüssel vom Server löschen\? Du wirst deinen Wiederherstellungsschlüssel nicht mehr nutzen können, um deinen verschlüsselten Nachrichtenverlauf zu lesen.</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">Beim Abmelden gehen deine verschlüsselten Nachrichten verloren</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Schlüssel-Sicherung wird durchgeführt. Wenn du dich jetzt abmeldest, gehen deine verschlüsselten Nachrichten verloren.</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Schlüsselsicherung läuft. Wenn du dich jetzt abmeldest, verlierst du den Zugriff auf deine verschlüsselten Nachrichten.</string>
     <string name="sign_out_bottom_sheet_warning_backup_not_active">Schlüsselsicherung sollte bei allen Sitzungen aktiviert sein, um den Verlust verschlüsselter Nachrichten zu verhindern.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ich möchte meine verschlüsselten Nachrichten nicht</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Sichere Schlüssel …</string>
@@ -781,7 +781,7 @@
     <string name="keys_backup_setup_step2_skip_button_title">(Erweitert) Wiederherstellungsschlüssel einrichten</string>
     <string name="keys_backup_setup_step3_success_title">Erfolg!</string>
     <string name="keys_backup_setup_step3_text_line1">Deine Schlüssel wurden gesichert.</string>
-    <string name="keys_backup_setup_step3_text_line2">Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz - du kannst es benutzen um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Passphrase vergisst.
+    <string name="keys_backup_setup_step3_text_line2">Dein Wiederherstellungsschlüssel ist ein Sicherungsnetz – du kannst es benutzen, um den Zugriff auf deine verschlüsselten Nachrichten wiederherzustellen, falls du deine Passphrase vergisst.
 \nVerwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe)</string>
     <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie einem Passwortmanager (oder Safe) auf</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Ich habe eine Kopie angefertigt</string>
@@ -1024,7 +1024,7 @@
     <string name="report_content_inappropriate">Es ist unangebracht</string>
     <string name="report_content_custom">Benutzerdefinierte Meldung …</string>
     <string name="report_content_custom_title">Diesen Inhalt melden</string>
-    <string name="report_content_custom_hint">Meldegrund</string>
+    <string name="report_content_custom_hint">Grund für Meldung des Inhalts</string>
     <string name="report_content_custom_submit">MELDEN</string>
     <string name="block_user">NUTZER IGNORIEREN</string>
     <string name="content_reported_title">Inhalt gemeldet</string>
@@ -1374,7 +1374,7 @@
     <string name="settings_notification_configuration">Benachrichtigungskonfiguration</string>
     <string name="settings_messages_at_room">Nachrichten mit \"@room\"</string>
     <string name="settings_messages_in_e2e_group_chat">Verschlüsselte Gruppenunterhaltungen</string>
-    <string name="command_description_plain">Sendet eine Nachricht als einfachen Text, ohne sie als Markdown zu interpretieren</string>
+    <string name="command_description_plain">Sendet eine Nachricht als Klartext, ohne sie als Markdown darzustellen</string>
     <string name="auth_invalid_login_param_space_in_password">Inkorrekter Benutzername und/oder Passwort. Das eingegebene Passwort beginnt oder endet mit Leerzeichen, bitte kontrolliere es.</string>
     <string name="message_key">Nachrichtenschlüssel</string>
     <string name="recovery_passphrase">Wiederherstellungs-Passphrase</string>
@@ -1620,7 +1620,7 @@
     <string name="auth_pin_new_pin_action">Neue PIN</string>
     <string name="auth_pin_reset_content">Um deine PIN zurückzusetzen, musst du dich erneut anmelden und eine neue erstellen.</string>
     <string name="settings_security_pin_code_title">Aktiviere PIN</string>
-    <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe \"PIN vergessen\" um dich abzumelden und sie anschließend zurückzusetzen.</string>
+    <string name="settings_security_pin_code_summary">Wenn du deine PIN zurücksetzen möchtest, tippe auf „PIN vergessen“, um dich abzumelden und sie zurückzusetzen.</string>
     <string name="settings_call_show_confirmation_dialog_title">Versehentliche Anrufe verhindern</string>
     <string name="settings_call_show_confirmation_dialog_summary">Bitte um Bestätigung, bevor du einen Anruf tätigst</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Einrichten</string>
@@ -1661,7 +1661,7 @@
     <string name="settings_emails_and_phone_numbers_title">E-Mail und Telefon</string>
     <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mail-Adressen und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
     <string name="settings_text_message_sent_hint">Code</string>
-    <string name="login_msisdn_notice">Verwende das internationale Format (Telefonnummer muss mit \'+\' beginnen)</string>
+    <string name="login_msisdn_notice">Bitte nutze das internationale Format (muss mit ‚+‘ beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
     <string name="error_opening_banned_room">Raum, indem du gebannt wurdest, kann nicht geöffnet werden.</string>
     <string name="room_error_not_found">Raum kann nicht gefunden werden. Stelle sicher, dass er existiert.</string>
@@ -1688,7 +1688,7 @@
     <string name="settings_security_pin_code_notifications_summary_on">Details wie Raumnamen und Nachrichteninhalt zeigen.</string>
     <string name="settings_security_pin_code_notifications_title">Inhalt in Benachrichtigungen anzeigen</string>
     <string name="settings_security_pin_code_use_biometrics_summary_off">PIN-Code ist die einzige Möglichkeit ${app_name} zu entsperren.</string>
-    <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiviere Gerät-spezifische Biometrie wie Fingerabdrücke und Gesichtserkennung.</string>
+    <string name="settings_security_pin_code_use_biometrics_summary_on">Aktiviere gerätespezifische Biometrie wie Fingerabdrücke und Gesichtserkennung.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrie aktivieren</string>
     <string name="settings_security_application_protection_screen_title">Schutz konfigurieren</string>
     <string name="settings_security_application_protection_title">Zugriffsschutz</string>
@@ -1726,10 +1726,10 @@
     <string name="settings_troubleshoot_test_push_notification_content">Du siehst die Benachrichtigung! Klick mich!</string>
     <string name="settings_troubleshoot_test_notification_title">Benachrichtigungsanzeige</string>
     <string name="settings_security_pin_code_grace_period_summary_off">Bei jedem Öffnen von ${app_name} ist der PIN-Code erforderlich.</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">PIN-Code ist erforderlich, nachdem ${app_name} 2 Minuten lang nicht verwendet wurde.</string>
-    <string name="settings_security_pin_code_grace_period_title">Fordere PIN nach 2 Minuten an</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">PIN-Code ist erforderlich, nachdem ${app_name} zwei Minuten lang nicht verwendet wurde.</string>
+    <string name="settings_security_pin_code_grace_period_title">Erfrage PIN nach zwei Minuten</string>
     <string name="settings_security_pin_code_notifications_summary_off">Nur die Anzahl ungelesener Nachrichten in der Benachrichtigung zeigen.</string>
-    <string name="attachment_type_dialog_title">Bild hinzufügen mit</string>
+    <string name="attachment_type_dialog_title">Füge Bild hinzu per</string>
     <string name="warning_room_not_created_yet">Der Raum ist noch nicht erstellt. Raumerstellung abbrechen\?</string>
     <string name="room_list_quick_actions_low_priority_add">Zu niedrige Priorität hinzufügen</string>
     <string name="create_room_topic_hint">Thema</string>
@@ -1742,7 +1742,7 @@
     <string name="create_room_name_section">Raumname</string>
     <string name="settings_export_trail">Prüfung exportieren</string>
     <string name="room_member_open_or_create_dm">Direktnachricht</string>
-    <string name="send_bug_report_include_key_share_history">Verlauf der Anfragen von Schlüsselfreigaben senden</string>
+    <string name="send_bug_report_include_key_share_history">Schlüsselfreigabe-Anfragen übermitteln</string>
     <string name="no_more_results">Keine weiteren Ergebnisse</string>
     <string name="start_chatting">Beginne eine Unterhaltung</string>
     <string name="settings_discovery_consent_action_give_consent">Autorisieren</string>
@@ -1762,7 +1762,7 @@
     <string name="room_settings_room_read_history_dialog_subtitle">Änderungen daran, wer die Chronik lesen kann, gelten nur für kommende Nachrichten in diesem Raum. Die Sichtbarkeit der bestehenden Chronik bleibt unverändert.</string>
     <string name="action_unpublish">Zurückziehen</string>
     <string name="action_add">Hinzufügen</string>
-    <string name="share_by_text">Mit Nachricht teilen</string>
+    <string name="share_by_text">Per Nachricht teilen</string>
     <string name="hide_advanced">Erweiterte Optionen ausblenden</string>
     <string name="show_advanced">Erweiterte Optionen anzeigen</string>
     <string name="room_alias_publish_to_directory_error">Die Sichtbarkeit des Raums konnte nicht abgerufen werden (%1$s).</string>
@@ -1820,9 +1820,9 @@
     <string name="room_permissions_change_room_name">Raumname ändern</string>
     <string name="room_permissions_change_history_visibility">Sichtbarkeit des Verlaufs ändern</string>
     <string name="room_permissions_enable_room_encryption">Raum-Verschlüsselung aktivieren</string>
-    <string name="room_permissions_change_main_address_for_the_room">Haupt-Adresse des Raums ändern</string>
+    <string name="room_permissions_change_main_address_for_the_room">Hauptadresse des Raums ändern</string>
     <string name="room_permissions_change_room_avatar">Raumbild ändern</string>
-    <string name="room_permissions_modify_widgets">Widgets verändern</string>
+    <string name="room_permissions_modify_widgets">Widgets ändern</string>
     <string name="room_permissions_notify_everyone">Jeden benachrichtigen</string>
     <string name="room_permissions_remove_messages_sent_by_others">Von anderen gesendete Nachrichten entfernen</string>
     <string name="room_permissions_ban_users">Nutzer verbannen</string>
@@ -1830,7 +1830,7 @@
     <string name="room_permissions_change_settings">Einstellungen ändern</string>
     <string name="room_permissions_invite_users">Nutzer einladen</string>
     <string name="room_permissions_send_messages">Nachrichten senden</string>
-    <string name="room_permissions_default_role">Standard Rolle</string>
+    <string name="room_permissions_default_role">Standard-Rolle</string>
     <string name="room_permissions_title">Berechtigungen</string>
     <string name="room_settings_permissions_title">Berechtigungen</string>
     <string name="room_permissions_notice_read_only">Du hast nicht die Berechtigung zum Aktualisieren der Rollen, die zum Ändern verschiedener Teile des Raums erforderlich sind</string>
@@ -1918,9 +1918,9 @@
     </plurals>
     <string name="settings_server_upload_size_unknown">Die Obergrenze ist nicht bekannt.</string>
     <string name="settings_server_upload_size_content">Dein Heim-Server akzeptiert Anhänge (wie Dateien, Medien, etc.) mit einer Größe bis zu %s.</string>
-    <string name="settings_server_upload_size_title">Datei-Upload-Obergrenze des Servers</string>
+    <string name="settings_server_upload_size_title">Dateigrößenlimit des Servers</string>
     <string name="settings_server_version">Serverversion</string>
-    <string name="settings_server_name">Servername</string>
+    <string name="settings_server_name">Server-Name</string>
     <string name="room_list_quick_actions_room_settings">Raumeinstellungen</string>
     <string name="jitsi_leave_conf_to_join_another_one_content">Derzeitige Konferenz verlassen und zu einer anderen wechseln\?</string>
     <string name="room_settings_room_version_title">Raum-Version</string>
@@ -1957,8 +1957,8 @@
     <string name="spaces_header">Spaces</string>
     <string name="room_settings_room_access_entry_knock">Jeder kann im Raum anklopfen, Mitglieder können dann zustimmen oder ablehnen</string>
     <string name="invite_people_to_your_space_desc">Momentan bist nur du hier. Mit anderen Leuten wird %s noch viel besser.</string>
-    <string name="invite_to_space_with_name_desc">Diese werden in der Lage sein, %s zu durchsuchen</string>
-    <string name="invite_just_to_this_room_desc">Diese werden kein Teil von %s sein</string>
+    <string name="invite_to_space_with_name_desc">Sie wird in der Lage sein, %s zu durchsuchen</string>
+    <string name="invite_just_to_this_room_desc">Sie wird kein Teil von %s sein</string>
     <string name="share_space_link_message">Tritt meinem Space %1$s %2$s bei</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Spaces sind eine neue Möglichkeit, Räume und Personen zu gruppieren.</string>
     <string name="space_add_existing_rooms">Räume oder Spaces hinzufügen</string>
@@ -1979,7 +1979,7 @@
     <string name="join_space">Space beitreten</string>
     <string name="create_space">Space erstellen</string>
     <string name="invite_just_to_this_room">Nur zu diesem Raum</string>
-    <string name="invite_to_space_with_name">In Space \"%s\" einladen</string>
+    <string name="invite_to_space_with_name">Zu %s einladen</string>
     <string name="invite_by_link">Link teilen</string>
     <string name="invite_by_email">Mithilfe einer E-Mail-Adresse einladen</string>
     <string name="invite_people_menu">Personen einladen</string>
@@ -2067,7 +2067,7 @@
     <string name="error_failed_to_join_room">Beim Versuch %s beizutreten, ist leider ein Fehler aufgetreten</string>
     <string name="room_upgrade_to_recommended_version">Zur empfohlenen Raumversion upgraden</string>
     <string name="joining_replacement_room">Ersatzraum betreten</string>
-    <string name="command_description_upgrade_room">Raum zu neuer Version upgraden</string>
+    <string name="command_description_upgrade_room">Aktualisiert den Raum auf eine neue Version</string>
     <string name="settings_server_room_version_stable">stabil</string>
     <string name="settings_server_room_version_unstable">instabil</string>
     <string name="settings_server_room_versions">Raumversionen 👓</string>
@@ -2108,7 +2108,7 @@
     <string name="select_spaces">Spaces wählen</string>
     <string name="room_create_member_of_space_name_can_join">Mitglieder von %s können Räume finden, betrachten und betreten.</string>
     <string name="room_settings_room_access_private_invite_only_title">Privat (Zutritt nur mit Einladung)</string>
-    <string name="settings_room_upgrades">Raumupgrades</string>
+    <string name="settings_room_upgrades">Raumaktualisierungen</string>
     <string name="settings_messages_by_bot">Nachrichten von Bots</string>
     <string name="settings_room_invitations">Raumeinladungen</string>
     <string name="settings_encrypted_group_messages">Verschlüsselte Gruppennachrichten</string>
@@ -2192,9 +2192,9 @@
     <string name="create_new_space">Neuen Space erstellen</string>
     <string name="room_settings_space_access_title">Zugriff</string>
     <string name="room_settings_access_rules_pref_dialog_title">Wer hat Zugriff\?</string>
-    <string name="settings_notification_emails_enable_for_email">Benachrichtigungen per Email für %s aktivieren</string>
+    <string name="settings_notification_emails_enable_for_email">Benachrichtigungen per E-Mail für %s aktivieren</string>
     <string name="settings_notification_emails_no_emails">Um Benachrichtigungen per E-Mail zu empfangen, musst du eine E-Mail-Adresse hinzufügen</string>
-    <string name="settings_notification_emails_category">Emailbenachrichtigungen</string>
+    <string name="settings_notification_emails_category">E-Mail-Benachrichtigungen</string>
     <string name="room_permissions_upgrade_the_space">Space upgraden</string>
     <string name="room_permissions_change_space_name">Namen vom Space ändern</string>
     <string name="room_permissions_enable_space_encryption">Space verschlüsseln</string>
@@ -2224,7 +2224,7 @@
     <string name="command_description_ignore_user">Blockiert eine Person und versteckt deren Nachrichten</string>
     <string name="room_settings_space_access_public_description">Jeder kann den Space finden und beitreten</string>
     <string name="room_settings_room_notifications_manage_notifications">Du kannst deine Benachrichtigungen in den %1$s verwalten.</string>
-    <string name="room_settings_room_notifications_encryption_notice">Beachte, dass Benachrichtigungen zu Erwähnungen und Schlüsselwörtern in verschlüsselten Räumen momentan nicht verfügbar sind.</string>
+    <string name="room_settings_room_notifications_encryption_notice">Bitte beachte, dass Benachrichtigungen zu Erwähnungen und Schlüsselwörtern in verschlüsselten Räumen mobil nicht verfügbar sind.</string>
     <string name="space_permissions_notice">Wähle die Berechtigungen der Rollen aus</string>
     <string name="space_settings_permissions_subtitle">Rollen deren Berechtigungen einsehen und bearbeiten.</string>
     <plurals name="create_poll_not_enough_options_error">
@@ -2253,7 +2253,7 @@
     <string name="legals_third_party_notices">Externe Bibliotheken</string>
     <string name="analytics_opt_in_list_item_3">Du kannst dies jederzeit in den Einstellungen deaktivieren</string>
     <string name="analytics_opt_in_list_item_2">Wir teilen <b>keine</b> Informationen mit Drittpersonen</string>
-    <string name="analytics_opt_in_list_item_1">Wir erfassen und analysieren <b>keine</b> Accountdaten</string>
+    <string name="analytics_opt_in_list_item_1">Wir erfassen und analysieren <b>keine</b> Kontodaten</string>
     <string name="analytics_opt_in_content">Hilf uns dabei Probleme zu identifizieren und ${app_name} zu verbessern, indem du anonyme Nutzungsdaten teilst. Um zu verstehen, wie Personen mehrere Geräte benutzen, werden wir eine zufällige Kennung generieren, die zwischen deinen Geräten geteilt wird.
 \n
 \n%s kannst du alle unsere Bedingungen lesen.</string>
@@ -2269,7 +2269,7 @@
     <string name="preference_help">Hilfe</string>
     <string name="preference_root_legals">Rechtliches</string>
     <string name="decide_which_spaces_can_access">Entscheide, welche Spaces Zugriff auf den Raum haben sollen. Die Mitglieder der Spaces können diesen Räumen betreten.</string>
-    <string name="analytics_opt_in_content_link">hier</string>
+    <string name="analytics_opt_in_content_link">Hier</string>
     <string name="analytics_opt_in_title">Hilf mit, ${app_name} zu verbessern</string>
     <string name="action_enable">Aktivieren</string>
     <string name="room_member_override_nick_color">Farbe des Anzeigenamens ändern</string>
@@ -2741,8 +2741,8 @@
     <string name="some_devices_will_not_be_able_to_decrypt">⚠ Es befinden sich nicht verifizierte Geräte in diesem Raum. Sie werden deine Nachrichten nicht entschlüsseln können.</string>
     <string name="encryption_never_send_to_unverified_devices_in_room">Niemals verschlüsselte Nachrichten zu unverifizierten Sitzungen in diesem Raum senden.</string>
     <string name="action_got_it">Verstanden</string>
-    <string name="labs_enable_rich_text_editor_summary">Probiere den Rich-Text-Editor aus (Klartext-Modus kommt bald)</string>
-    <string name="labs_enable_rich_text_editor_title">Aktiviere Rich-Text-Editor</string>
+    <string name="labs_enable_rich_text_editor_summary">Probiere den Textverarbeitungs-Editor (bald auch mit Klartext-Modus)</string>
+    <string name="labs_enable_rich_text_editor_title">Textverarbeitungs-Editor aktivieren</string>
     <string name="device_manager_session_details_device_browser">Browser</string>
     <string name="rich_text_editor_format_strikethrough">Durchgestrichen formatieren</string>
     <string name="rich_text_editor_format_italic">Kursiv formatieren</string>

From 5f90f135aebd3a33f5fbfc68d2a7ec6fcd630104 Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Wed, 19 Oct 2022 20:42:29 +0000
Subject: [PATCH 128/300] Translated using Weblate (French)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml
index b77173519d..67396a390f 100644
--- a/library/ui-strings/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -2772,4 +2772,46 @@
 \nVeuillez autoriser l’accès sur la prochaine fenêtre pour pouvoir voir des notifications.</string>
     <string name="labs_enable_rich_text_editor_summary">Essayer l’éditeur de texte formaté (le mode texte brut arrive bientôt)</string>
     <string name="labs_enable_rich_text_editor_title">Activer l’éditeur de texte formaté</string>
+    <string name="qr_code_login_confirm_security_code_description">Vérifiez l’origine de ce code. En appairant un appareil, vous lui fournissez un accès complet à votre compte.</string>
+    <string name="qr_code_login_confirm_security_code">Confirmer</string>
+    <string name="qr_code_login_try_again">Réessayez</string>
+    <string name="qr_code_login_status_no_match">Pas de correspondance \?</string>
+    <string name="qr_code_login_signing_in">Connexion</string>
+    <string name="qr_code_login_connecting_to_device">Connexion à l’appareil</string>
+    <string name="qr_code_login_scan_qr_code_button">Scanner le QR code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Connexion sur un appareil mobile \?</string>
+    <string name="qr_code_login_show_qr_code_button">Afficher le QR code sur cet appareil</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Sélectionnez « Scanner le QR code »</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Démarrez à l’écran de connexion</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Sélectionnez « Se connecter avec un QR code »</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Démarrez à l’écran de connexion</string>
+    <string name="qr_code_login_new_device_instruction_3">Sélectionnez « Afficher le QR code »</string>
+    <string name="qr_code_login_new_device_instruction_2">Allez dans Réglages -&gt; Confidentialité et sécurité</string>
+    <string name="qr_code_login_new_device_instruction_1">Ouvrez l’application sur votre autre appareil</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Le serveur d’accueil ne prend pas en charge la connexion avec un QR code.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">La connexion a été annulée sur l’autre appareil.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Ce QR code est invalide.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">L’autre appareil doit être connecté.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L’autre appareil est déjà connecté.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">La configuration de la messagerie sécurisée a rencontré un problème de sécurité. Un des éléments suivants pourrait être compromis : votre serveur d’accueil ; votre connexion Internet ; votre (vos) appareil(s) ;</string>
+    <string name="qr_code_login_header_failed_other_description">La requête a échoué.</string>
+    <string name="qr_code_login_header_failed_denied_description">La requête a été refusée sur l’autre appareil.</string>
+    <string name="qr_code_login_header_failed_timeout_description">L’appairage n’a pas été effectué dans le temps imparti.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">L’appairage avec cet appareil n’est pas pris en charge.</string>
+    <string name="qr_code_login_header_failed_title">Échec de la connexion</string>
+    <string name="qr_code_login_header_connected_description">Vérifiez votre appareil connecté, le code ci-dessous devrait y être affiché. Confirmez que le code ci-dessous correspond à celui de l’autre appareil :</string>
+    <string name="qr_code_login_header_connected_title">Connexion sécurisée établie</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scannez le QR code ci-dessous avec l’appareil qui n’est pas connecté.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Utilisez votre appareil connecté pour scanner le QR code ci-dessous :</string>
+    <string name="qr_code_login_header_show_qr_code_title">Se connecter avec un QR code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Utilisez l’appareil photo de cet appareil pour scanner le QR code affiché sur votre autre appareil :</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scanner le QR code</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_voice_broadcast_summary">Pouvoir enregistrer et envoyer une diffusion audio dans l’historique du salon.</string>
+    <string name="labs_enable_voice_broadcast_title">Activer la diffusion audio (en cours de développement)</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Vous pouvez utiliser cet appareil pour connecter un appareil mobile ou un client web avec un QR code. Il y a deux façons de le faire :</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Se connecter avec un QR code</string>
+    <string name="login_scan_qr_code">Scanner le QR code</string>
 </resources>
\ No newline at end of file

From 7796d97a98fa9de8fde2172bfe6b22eb437dbe94 Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Thu, 20 Oct 2022 02:49:51 +0000
Subject: [PATCH 129/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (2376 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index ae29132c91..f1fe3a496f 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2625,4 +2625,11 @@
     <string name="labs_enable_new_app_layout_summary">简化的Element，带有可选的标签</string>
     <string name="settings_security_incognito_keyboard_title">无痕键盘</string>
     <string name="settings_security_incognito_keyboard_summary">要求键盘不要基于你在对话中的输入更新任何个性化数据，如输入历史和字典。请注意，某些键盘可能不会遵守此设置。</string>
+    <string name="permissions_rationale_msg_notification">${app_name}需要权限来显示通知。通知可以显示消息、邀请等。
+\n
+\n请在下个弹窗允许访问以便查看通知。</string>
+    <string name="labs_enable_rich_text_editor_summary">试用富文本编辑器（纯文本模式即将到来）</string>
+    <string name="labs_enable_rich_text_editor_title">启用富文本编辑器</string>
+    <string name="a11y_collapse_space_children">折叠%s孩子</string>
+    <string name="a11y_expand_space_children">展开%s孩子</string>
 </resources>
\ No newline at end of file

From e0978a2fc3d5115b1638d1013ae7444f69c07af3 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 20 Oct 2022 01:42:46 +0000
Subject: [PATCH 130/300] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
index c9057cd289..d1f81567c2 100644
--- a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
@@ -2731,9 +2731,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">從登入畫面開始</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">選取「使用 QR code 登入」</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">從登入畫面開始</string>
-    <string name="qr_code_login_new_device_instruction_3">選取「在此裝置上顯示 QR code」</string>
-    <string name="qr_code_login_new_device_instruction_2">到「設定」→「安全與隱私」→「顯示所有工作階段」</string>
-    <string name="qr_code_login_new_device_instruction_1">在您的其他裝置上開啟 ${app_name}</string>
+    <string name="qr_code_login_new_device_instruction_3">選取「顯示 QR code」</string>
+    <string name="qr_code_login_new_device_instruction_2">到「設定」→「安全與隱私」</string>
+    <string name="qr_code_login_new_device_instruction_1">在您的其他裝置上開啟應用程式</string>
     <string name="qr_code_login_header_failed_denied_description">請求在另一台裝置上被拒絕。</string>
     <string name="qr_code_login_header_failed_timeout_description">連結未在規定時間內完成。</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">不支援與其裝置連結。</string>
@@ -2751,4 +2751,13 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">您可以使用此裝置透過 QR code 登入移動裝置或網路裝置。有兩種方法可以作到：</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">使用 QR code 登入</string>
     <string name="login_scan_qr_code">掃描 QR code</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">家伺服器不支援使用 QR code 登入。</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">登入已在其他裝置上取消。</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">該 QR code 無效。</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">其他裝置必須登入。</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">其他裝置已登入。</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">設定安全訊息傳遞時遇到安全問題。以下其中一項可能已被駭入：您的家伺服器、您的網際網路連線、您的裝置；</string>
+    <string name="qr_code_login_header_failed_other_description">請求失敗。</string>
+    <string name="labs_enable_voice_broadcast_summary">可以在聊天室時間軸中錄製並傳送語音廣播。</string>
+    <string name="labs_enable_voice_broadcast_title">啟用語音廣播（正在積極開發中）</string>
 </resources>
\ No newline at end of file

From a5ad00a06532bff235c163d37c3c89e207bf5181 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Wed, 19 Oct 2022 19:02:49 +0000
Subject: [PATCH 131/300] Translated using Weblate (German)

Currently translated at 100.0% (79 of 79 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
---
 fastlane/metadata/android/de-DE/changelogs/40105000.txt | 2 +-
 fastlane/metadata/android/de-DE/changelogs/40105020.txt | 2 +-
 fastlane/metadata/android/de-DE/changelogs/40105040.txt | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/40105000.txt b/fastlane/metadata/android/de-DE/changelogs/40105000.txt
index cd3ec93387..254c0fe0d8 100644
--- a/fastlane/metadata/android/de-DE/changelogs/40105000.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40105000.txt
@@ -1,2 +1,2 @@
 Die wichtigste Änderung in dieser Version: Verzögerte Direktnachrichten standardmäßig aktiviert!
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.2.0
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105020.txt b/fastlane/metadata/android/de-DE/changelogs/40105020.txt
index ac08e662db..af7a8d7cce 100644
--- a/fastlane/metadata/android/de-DE/changelogs/40105020.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40105020.txt
@@ -1,2 +1,2 @@
 Die wichtigste Änderung in dieser Version: Neues App-Layout standardmäßig aktiviert!
-Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases/tag/v1.2.0
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/de-DE/changelogs/40105040.txt b/fastlane/metadata/android/de-DE/changelogs/40105040.txt
new file mode 100644
index 0000000000..017e23cd9e
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Die wichtigste Änderung in dieser Version: Neue Funktionen in den Labor-Einstellungen: Textverarbeitungs-Editor, neue Geräteverwaltung, Sprachübertragung. Noch in aktiver Entwicklung!
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases

From dc6722ec226e6d8101fe6e03236f06547a8368f4 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Wed, 19 Oct 2022 20:22:04 +0000
Subject: [PATCH 132/300] Translated using Weblate (Russian)

Currently translated at 88.6% (70 of 79 strings)

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

diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105020.txt b/fastlane/metadata/android/ru-RU/changelogs/40105020.txt
new file mode 100644
index 0000000000..83bf3c747b
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105020.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: новый вид приложения включён по умолчанию!
+Весь список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40105040.txt b/fastlane/metadata/android/ru-RU/changelogs/40105040.txt
new file mode 100644
index 0000000000..c923750bc4
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии — новые возможности в настройках лаборатории: наглядный текстовый редактор, новое управление устройствами, голосовая трансляция. Всё это ещё находится в активной разработке!
+Весь список изменений: https://github.com/vector-im/element-android/releases

From 1b8308c12bd2eda4d7010509f5a7f3f02242be66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 19 Oct 2022 18:40:32 +0000
Subject: [PATCH 133/300] Translated using Weblate (Estonian)

Currently translated at 100.0% (79 of 79 strings)

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

diff --git a/fastlane/metadata/android/et/changelogs/40105040.txt b/fastlane/metadata/android/et/changelogs/40105040.txt
new file mode 100644
index 0000000000..b1c84cad47
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: Uued võimalused katsete all: vormindatud teksti põhine toimeti, uus seadmehaldus, ringhäälingukõned (kõik on hetkel aktiivsel arendamisel).
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases

From b95ae7d36a2767d7363d92098f8f82cdb4f38ee2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 20 Oct 2022 01:44:30 +0000
Subject: [PATCH 134/300] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (79 of 79 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/40105040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/zh-TW/changelogs/40105040.txt b/fastlane/metadata/android/zh-TW/changelogs/40105040.txt
new file mode 100644
index 0000000000..b35b1185b9
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+此版本中的主要變動：實驗室設定下有新功能：格式化文字編輯器、新裝置管理、語音廣播。仍在積極開發中！
+完整的變更紀錄：https://github.com/vector-im/element-android/releases

From 08271218e6cc2c50a28f2253fe372dbee5c9d3b2 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Wed, 19 Oct 2022 18:43:55 +0000
Subject: [PATCH 135/300] Translated using Weblate (Czech)

Currently translated at 100.0% (79 of 79 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/40105040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/cs-CZ/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/cs-CZ/changelogs/40105040.txt b/fastlane/metadata/android/cs-CZ/changelogs/40105040.txt
new file mode 100644
index 0000000000..c1bf4fd59a
--- /dev/null
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Nové funkce v Experimentálních funkcích: Rozšířený editor zpráv, nová správa zařízení, hlasové vysílání. Stále v aktivním vývoji!
+Úplný seznam změn: https://github.com/vector-im/element-android/releases

From 6554f571f22a45212ee926c55b2da93d63716826 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 19 Oct 2022 11:18:35 +0200
Subject: [PATCH 136/300] VoiceBroadcastPlayer - Inject ActiveSessionHolder
 instead of Session

---
 .../app/features/voicebroadcast/VoiceBroadcastPlayer.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index dfd50ea5cb..e93e128686 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.voicebroadcast
 
 import android.media.AudioAttributes
 import android.media.MediaPlayer
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker.Listener.State
 import im.vector.app.features.voice.VoiceFailure
@@ -25,7 +26,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 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.RelationType
 import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.getRoom
@@ -39,10 +39,12 @@ import javax.inject.Singleton
 
 @Singleton
 class VoiceBroadcastPlayer @Inject constructor(
-        private val session: Session,
+        private val sessionHolder: ActiveSessionHolder,
         private val playbackTracker: AudioMessagePlaybackTracker,
 ) {
 
+    private val session get() = sessionHolder.getActiveSession()
+
     private val mediaPlayerScope = CoroutineScope(Dispatchers.IO)
 
     private var currentMediaPlayer: MediaPlayer? = null

From b89ab6c2fd54cedfb76228d3189deafbecee705a Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 19 Oct 2022 13:04:03 +0200
Subject: [PATCH 137/300] VoiceBroadcastPlayer - release previous MediaPlayer

---
 .../voicebroadcast/VoiceBroadcastPlayer.kt         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index e93e128686..c7259b12f8 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -76,10 +76,8 @@ class VoiceBroadcastPlayer @Inject constructor(
 
     fun stop() {
         currentMediaPlayer?.stop()
-        currentMediaPlayer?.release()
-        currentMediaPlayer?.setOnInfoListener(null)
-        currentMediaPlayer = null
         currentVoiceBroadcastEventId?.let { playbackTracker.stopPlayback(it) }
+        release(currentMediaPlayer)
         playlist = emptyList()
         currentPlayingIndex = -1
     }
@@ -147,11 +145,21 @@ class VoiceBroadcastPlayer @Inject constructor(
         }
     }
 
+    private fun release(mp: MediaPlayer?) {
+        mp?.apply {
+            release()
+            setOnInfoListener(null)
+            setOnCompletionListener(null)
+            setOnErrorListener(null)
+        }
+    }
+
     inner class MediaPlayerListener : MediaPlayer.OnInfoListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener {
 
         override fun onInfo(mp: MediaPlayer, what: Int, extra: Int): Boolean {
             when (what) {
                 MediaPlayer.MEDIA_INFO_STARTED_AS_NEXT -> {
+                    release(currentMediaPlayer)
                     currentMediaPlayer = mp
                     currentPlayingIndex++
                     mediaPlayerScope.launch { prepareNextFile() }

From 0c847cffc131f446cc94c3757883aee2ea870f21 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 19 Oct 2022 13:16:54 +0200
Subject: [PATCH 138/300] VoiceBroadcastPlayer - Use more accurate coroutine
 scope

---
 .../features/voicebroadcast/VoiceBroadcastPlayer.kt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index c7259b12f8..db07503927 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -24,6 +24,7 @@ import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlayb
 import im.vector.app.features.voice.VoiceFailure
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.session.events.model.RelationType
@@ -42,13 +43,13 @@ class VoiceBroadcastPlayer @Inject constructor(
         private val sessionHolder: ActiveSessionHolder,
         private val playbackTracker: AudioMessagePlaybackTracker,
 ) {
-
-    private val session get() = sessionHolder.getActiveSession()
-
-    private val mediaPlayerScope = CoroutineScope(Dispatchers.IO)
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private val session
+        get() = sessionHolder.getActiveSession()
 
     private var currentMediaPlayer: MediaPlayer? = null
     private var currentPlayingIndex: Int = -1
+
     private var playlist = emptyList<MessageAudioEvent>()
     private val currentVoiceBroadcastEventId
         get() = playlist.firstOrNull()?.root?.getRelationContent()?.eventId
@@ -90,7 +91,7 @@ class VoiceBroadcastPlayer @Inject constructor(
 
     private fun startPlayback() {
         val content = playlist.firstOrNull()?.content ?: run { Timber.w("## VoiceBroadcastPlayer: No content to play"); return }
-        mediaPlayerScope.launch {
+        coroutineScope.launch {
             try {
                 currentMediaPlayer = prepareMediaPlayer(content)
                 currentMediaPlayer?.start()
@@ -162,7 +163,7 @@ class VoiceBroadcastPlayer @Inject constructor(
                     release(currentMediaPlayer)
                     currentMediaPlayer = mp
                     currentPlayingIndex++
-                    mediaPlayerScope.launch { prepareNextFile() }
+                    coroutineScope.launch { prepareNextFile() }
                 }
             }
             return false

From fe44a829afdc23d35e0fc13a399affe77d19c7b6 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 19 Oct 2022 13:17:59 +0200
Subject: [PATCH 139/300] VoiceBroadcastPlayer - Improve
 currentVoiceBroadcastId

---
 .../voicebroadcast/VoiceBroadcastPlayer.kt         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index db07503927..72ec181966 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -51,8 +51,8 @@ class VoiceBroadcastPlayer @Inject constructor(
     private var currentPlayingIndex: Int = -1
 
     private var playlist = emptyList<MessageAudioEvent>()
-    private val currentVoiceBroadcastEventId
-        get() = playlist.firstOrNull()?.root?.getRelationContent()?.eventId
+    private val currentVoiceBroadcastId
+        get() = playlist.getOrNull(currentPlayingIndex)?.root?.getRelationContent()?.eventId
 
     private val mediaPlayerListener = MediaPlayerListener()
 
@@ -60,7 +60,7 @@ class VoiceBroadcastPlayer @Inject constructor(
         val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
 
         when {
-            currentVoiceBroadcastEventId != eventId -> {
+            currentVoiceBroadcastId != eventId -> {
                 stop()
                 updatePlaylist(room, eventId)
                 startPlayback()
@@ -72,12 +72,12 @@ class VoiceBroadcastPlayer @Inject constructor(
 
     fun pause() {
         currentMediaPlayer?.pause()
-        currentVoiceBroadcastEventId?.let { playbackTracker.pausePlayback(it) }
+        currentVoiceBroadcastId?.let { playbackTracker.pausePlayback(it) }
     }
 
     fun stop() {
         currentMediaPlayer?.stop()
-        currentVoiceBroadcastEventId?.let { playbackTracker.stopPlayback(it) }
+        currentVoiceBroadcastId?.let { playbackTracker.stopPlayback(it) }
         release(currentMediaPlayer)
         playlist = emptyList()
         currentPlayingIndex = -1
@@ -96,7 +96,7 @@ class VoiceBroadcastPlayer @Inject constructor(
                 currentMediaPlayer = prepareMediaPlayer(content)
                 currentMediaPlayer?.start()
                 currentPlayingIndex = 0
-                currentVoiceBroadcastEventId?.let { playbackTracker.startPlayback(it) }
+                currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
                 prepareNextFile()
             } catch (failure: Throwable) {
                 Timber.e(failure, "Unable to start playback")
@@ -107,7 +107,7 @@ class VoiceBroadcastPlayer @Inject constructor(
 
     private fun resumePlayback() {
         currentMediaPlayer?.start()
-        currentVoiceBroadcastEventId?.let { playbackTracker.startPlayback(it) }
+        currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
     }
 
     private suspend fun prepareNextFile() {

From e9c81ca98fea45ced23afa32185d3a29762ded4a Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 19 Oct 2022 18:07:44 +0200
Subject: [PATCH 140/300] VoiceBroadcastPlayer - Live listening

---
 .../sdk/api/session/events/model/Event.kt     |   2 +-
 .../room/timeline/TimelineEventDataSource.kt  |  10 +-
 .../voicebroadcast/VoiceBroadcastHelper.kt    |   2 +-
 .../voicebroadcast/VoiceBroadcastPlayer.kt    | 236 +++++++++++++++---
 .../usecase/GetVoiceBroadcastStateUseCase.kt  |  41 +++
 5 files changed, 249 insertions(+), 42 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
index 71daf4cc4f..1f16041b54 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/events/model/Event.kt
@@ -401,7 +401,7 @@ fun Event.getRelationContent(): RelationDefaultContent? {
             when (getClearType()) {
                 EventType.STICKER -> getClearContent().toModel<MessageStickerContent>()?.relatesTo
                 in EventType.BEACON_LOCATION_DATA -> getClearContent().toModel<MessageBeaconLocationDataContent>()?.relatesTo
-                else -> null
+                else -> getClearContent()?.get("m.relates_to")?.toContent().toModel()
             }
         }
     }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
index 20094e4be8..2d6082f9b5 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDataSource.kt
@@ -22,6 +22,8 @@ import io.realm.Sort
 import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.events.model.isImageMessage
 import org.matrix.android.sdk.api.session.events.model.isVideoMessage
+import org.matrix.android.sdk.api.session.events.model.toModel
+import org.matrix.android.sdk.api.session.room.model.message.MessageContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.util.Optional
 import org.matrix.android.sdk.internal.database.RealmSessionProvider
@@ -74,7 +76,13 @@ internal class TimelineEventDataSource @Inject constructor(
                     .distinct(TimelineEventEntityFields.EVENT_ID)
                     .findAll()
                     .mapNotNull {
-                        timelineEventMapper.map(it).takeIf { it.root.getRelationContent()?.takeIf { it.type == eventType && it.eventId == eventId } != null }
+                        timelineEventMapper.map(it)
+                                .takeIf {
+                                    val isEventRelatedTo = it.root.getRelationContent()?.takeIf { it.type == eventType && it.eventId == eventId } != null
+                                    val isContentRelatedTo = it.root.getClearContent()?.toModel<MessageContent>()
+                                            ?.relatesTo?.takeIf { it.type == eventType && it.eventId == eventId } != null
+                                    isEventRelatedTo || isContentRelatedTo
+                                }
                     }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt
index b967afa9cb..58e7de7f32 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastHelper.kt
@@ -40,7 +40,7 @@ class VoiceBroadcastHelper @Inject constructor(
 
     suspend fun stopVoiceBroadcast(roomId: String) = stopVoiceBroadcastUseCase.execute(roomId)
 
-    fun playOrResumePlayback(roomId: String, eventId: String) = voiceBroadcastPlayer.play(roomId, eventId)
+    fun playOrResumePlayback(roomId: String, eventId: String) = voiceBroadcastPlayer.playOrResume(roomId, eventId)
 
     fun pausePlayback() = voiceBroadcastPlayer.pause()
 
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 72ec181966..7f5e13504e 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -20,13 +20,19 @@ import android.media.AudioAttributes
 import android.media.MediaPlayer
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
-import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker.Listener.State
 import im.vector.app.features.voice.VoiceFailure
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastStateUseCase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.getRoom
@@ -34,6 +40,11 @@ import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioEvent
 import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
+import org.matrix.android.sdk.api.session.room.timeline.Timeline
+import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
+import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
+import org.matrix.android.sdk.flow.flow
+import org.matrix.android.sdk.flow.unwrap
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -42,62 +53,117 @@ import javax.inject.Singleton
 class VoiceBroadcastPlayer @Inject constructor(
         private val sessionHolder: ActiveSessionHolder,
         private val playbackTracker: AudioMessagePlaybackTracker,
+        private val getVoiceBroadcastStateUseCase: GetVoiceBroadcastStateUseCase,
 ) {
-    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
     private val session
         get() = sessionHolder.getActiveSession()
 
+    private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
+    private var voiceBroadcastStateJob: Job? = null
+    private var currentTimeline: Timeline? = null
+        set(value) {
+            field?.removeAllListeners()
+            field?.dispose()
+            field = value
+        }
+
+    private val mediaPlayerListener = MediaPlayerListener()
+    private var timelineListener: TimelineListener? = null
+
     private var currentMediaPlayer: MediaPlayer? = null
-    private var currentPlayingIndex: Int = -1
+    private var nextMediaPlayer: MediaPlayer? = null
+        set(value) {
+            field = value
+            currentMediaPlayer?.setNextMediaPlayer(value)
+        }
+    private var currentSequence: Int? = null
 
     private var playlist = emptyList<MessageAudioEvent>()
     private val currentVoiceBroadcastId
-        get() = playlist.getOrNull(currentPlayingIndex)?.root?.getRelationContent()?.eventId
+        get() = playlist.firstOrNull()?.root?.getRelationContent()?.eventId
 
-    private val mediaPlayerListener = MediaPlayerListener()
-
-    fun play(roomId: String, eventId: String) {
-        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+    private var state: State = State.IDLE
+        set(value) {
+            Timber.w("## VoiceBroadcastPlayer state: $field -> $value")
+            field = value
+        }
 
+    fun playOrResume(roomId: String, eventId: String) {
+        val hasChanged = currentVoiceBroadcastId != eventId
         when {
-            currentVoiceBroadcastId != eventId -> {
-                stop()
-                updatePlaylist(room, eventId)
-                startPlayback()
-            }
-            playbackTracker.getPlaybackState(eventId) is State.Playing -> pause()
-            else -> resumePlayback()
+            hasChanged -> startPlayback(roomId, eventId)
+            state == State.PAUSED -> resumePlayback()
+            else -> Unit
         }
     }
 
     fun pause() {
         currentMediaPlayer?.pause()
         currentVoiceBroadcastId?.let { playbackTracker.pausePlayback(it) }
+        state = State.PAUSED
     }
 
     fun stop() {
+        // Stop playback
         currentMediaPlayer?.stop()
         currentVoiceBroadcastId?.let { playbackTracker.stopPlayback(it) }
+
+        // Release current player
         release(currentMediaPlayer)
+        currentMediaPlayer = null
+
+        // Release next player
+        release(nextMediaPlayer)
+        nextMediaPlayer = null
+
+        // Do not observe anymore voice broadcast state changes
+        voiceBroadcastStateJob?.cancel()
+        voiceBroadcastStateJob = null
+
+        // In case of live broadcast, stop observing new chunks
+        currentTimeline?.dispose()
+        currentTimeline?.removeAllListeners()
+        currentTimeline = null
+        timelineListener = null
+
+        // Update state
+        state = State.IDLE
+
+        // Clear playlist
         playlist = emptyList()
-        currentPlayingIndex = -1
+        currentSequence = null
     }
 
-    private fun updatePlaylist(room: Room, eventId: String) {
-        val timelineEvents = room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, eventId)
-        val audioEvents = timelineEvents.mapNotNull { it.root.asMessageAudioEvent() }
-        playlist = audioEvents.sortedBy { it.getVoiceBroadcastChunk()?.sequence?.toLong() ?: it.root.originServerTs }
+    private fun startPlayback(roomId: String, eventId: String) {
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        // Stop listening previous voice broadcast if any
+        if (state != State.IDLE) stop()
+
+        state = State.BUFFERING
+
+        val voiceBroadcastState = getVoiceBroadcastStateUseCase.execute(roomId, eventId)
+        if (voiceBroadcastState == VoiceBroadcastState.STOPPED) {
+            // Get static playlist
+            updatePlaylist(getExistingChunks(room, eventId))
+            startPlayback(false)
+        } else {
+            playLiveVoiceBroadcast(room, eventId)
+        }
     }
 
-    private fun startPlayback() {
-        val content = playlist.firstOrNull()?.content ?: run { Timber.w("## VoiceBroadcastPlayer: No content to play"); return }
+    private fun startPlayback(isLive: Boolean) {
+        val event = if (isLive) playlist.lastOrNull() else playlist.firstOrNull()
+        val content = event?.content ?: run { Timber.w("## VoiceBroadcastPlayer: No content to play"); return }
+        val sequence = event.getVoiceBroadcastChunk()?.sequence
         coroutineScope.launch {
             try {
                 currentMediaPlayer = prepareMediaPlayer(content)
                 currentMediaPlayer?.start()
-                currentPlayingIndex = 0
                 currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
-                prepareNextFile()
+                currentSequence = sequence
+                state = State.PLAYING
+                nextMediaPlayer = prepareNextMediaPlayer()
             } catch (failure: Throwable) {
                 Timber.e(failure, "Unable to start playback")
                 throw VoiceFailure.UnableToPlay(failure)
@@ -105,19 +171,68 @@ class VoiceBroadcastPlayer @Inject constructor(
         }
     }
 
+    private fun playLiveVoiceBroadcast(room: Room, eventId: String) {
+        val voiceBroadcastEvent = room.timelineService().getTimelineEvent(eventId)?.root?.asVoiceBroadcastEvent()
+                ?: error("Cannot retrieve voice broadcast $eventId")
+        updatePlaylist(getExistingChunks(room, eventId))
+        startPlayback(true)
+        room.flow()
+                .liveStateEvent(VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO, QueryStringValue.Equals(voiceBroadcastEvent.root.stateKey!!))
+                .unwrap()
+                .mapNotNull { it.asVoiceBroadcastEvent()?.content?.voiceBroadcastState }
+                .onEach { state ->
+                    when (state) {
+                        VoiceBroadcastState.STARTED,
+                        VoiceBroadcastState.PAUSED,
+                        VoiceBroadcastState.RESUMED -> {
+                            observeIncomingChunks(room, eventId)
+                        }
+                        VoiceBroadcastState.STOPPED -> {
+                            currentTimeline?.dispose()
+                            currentTimeline?.removeAllListeners()
+                            currentTimeline = null
+                        }
+                    }
+                }
+                .launchIn(coroutineScope)
+    }
+
+    private fun getExistingChunks(room: Room, eventId: String): List<MessageAudioEvent> {
+        return room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, eventId)
+                .mapNotNull { it.root.asMessageAudioEvent() }
+                .filter { it.isVoiceBroadcast() }
+    }
+
+    private fun observeIncomingChunks(room: Room, eventId: String) {
+        // Fixme this is probably not necessary here
+        currentTimeline?.dispose()
+        currentTimeline?.removeAllListeners()
+        currentTimeline = room.timelineService().createTimeline(null, TimelineSettings(5)).also { timeline ->
+            timelineListener = TimelineListener(eventId).also { timeline.addListener(it) }
+            timeline.start()
+        }
+    }
+
     private fun resumePlayback() {
         currentMediaPlayer?.start()
         currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
+        state = State.PLAYING
     }
 
-    private suspend fun prepareNextFile() {
-        val nextContent = playlist.getOrNull(currentPlayingIndex + 1)?.content
-        if (nextContent == null) {
-            currentMediaPlayer?.setOnCompletionListener(mediaPlayerListener)
-        } else {
-            val nextMediaPlayer = prepareMediaPlayer(nextContent)
-            currentMediaPlayer?.setNextMediaPlayer(nextMediaPlayer)
-        }
+    private fun updatePlaylist(playlist: List<MessageAudioEvent>) {
+        this.playlist = playlist.sortedBy { it.getVoiceBroadcastChunk()?.sequence?.toLong() ?: it.root.originServerTs }
+    }
+
+    private fun getNextAudioContent(): MessageAudioContent? {
+        val nextSequence = currentSequence?.plus(1)
+                ?: timelineListener?.let { playlist.lastOrNull()?.sequence }
+                ?: 1
+        return playlist.find { it.getVoiceBroadcastChunk()?.sequence == nextSequence }?.content
+    }
+
+    private suspend fun prepareNextMediaPlayer(): MediaPlayer? {
+        val nextContent = getNextAudioContent() ?: return null
+        return prepareMediaPlayer(nextContent)
     }
 
     private suspend fun prepareMediaPlayer(messageAudioContent: MessageAudioContent): MediaPlayer {
@@ -141,6 +256,7 @@ class VoiceBroadcastPlayer @Inject constructor(
                 setDataSource(fis.fd)
                 setOnInfoListener(mediaPlayerListener)
                 setOnErrorListener(mediaPlayerListener)
+                setOnCompletionListener(mediaPlayerListener)
                 prepare()
             }
         }
@@ -155,24 +271,59 @@ class VoiceBroadcastPlayer @Inject constructor(
         }
     }
 
-    inner class MediaPlayerListener : MediaPlayer.OnInfoListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener {
+    private inner class TimelineListener(private val voiceBroadcastId: String) : Timeline.Listener {
+        override fun onTimelineUpdated(snapshot: List<TimelineEvent>) {
+            val currentSequences = playlist.map { it.sequence }
+            val newChunks = snapshot
+                    .mapNotNull { timelineEvent ->
+                        timelineEvent.root.asMessageAudioEvent()
+                                ?.takeIf { it.isVoiceBroadcast() && it.getVoiceBroadcastEventId() == voiceBroadcastId && it.sequence !in currentSequences }
+                    }
+            if (newChunks.isEmpty()) return
+            updatePlaylist(playlist + newChunks)
+
+            when (state) {
+                State.PLAYING -> {
+                    if (nextMediaPlayer == null) {
+                        coroutineScope.launch { nextMediaPlayer = prepareNextMediaPlayer() }
+                    }
+                }
+                State.PAUSED -> {
+                    if (nextMediaPlayer == null) {
+                        coroutineScope.launch { nextMediaPlayer = prepareNextMediaPlayer() }
+                    }
+                }
+                State.BUFFERING -> {
+                    val newMediaContent = getNextAudioContent()
+                    if (newMediaContent != null) startPlayback(true)
+                }
+                State.IDLE -> startPlayback(true)
+            }
+        }
+    }
+
+    private inner class MediaPlayerListener : MediaPlayer.OnInfoListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener {
 
         override fun onInfo(mp: MediaPlayer, what: Int, extra: Int): Boolean {
             when (what) {
                 MediaPlayer.MEDIA_INFO_STARTED_AS_NEXT -> {
                     release(currentMediaPlayer)
                     currentMediaPlayer = mp
-                    currentPlayingIndex++
-                    coroutineScope.launch { prepareNextFile() }
+                    currentSequence = currentSequence?.plus(1)
+                    coroutineScope.launch { nextMediaPlayer = prepareNextMediaPlayer() }
                 }
             }
             return false
         }
 
         override fun onCompletion(mp: MediaPlayer) {
-            // Verify that a new media has not been set in the mean time
-            if (!currentMediaPlayer?.isPlaying.orFalse()) {
-                stop()
+            when {
+                timelineListener == null && nextMediaPlayer == null -> {
+                    stop()
+                }
+                nextMediaPlayer == null -> {
+                    state = State.BUFFERING
+                }
             }
         }
 
@@ -181,4 +332,11 @@ class VoiceBroadcastPlayer @Inject constructor(
             return true
         }
     }
+
+    enum class State {
+        PLAYING,
+        PAUSED,
+        BUFFERING,
+        IDLE
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt
new file mode 100644
index 0000000000..5b3153ea40
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt
@@ -0,0 +1,41 @@
+/*
+ * 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 im.vector.app.features.voicebroadcast.usecase
+
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.events.model.RelationType
+import org.matrix.android.sdk.api.session.getRoom
+import timber.log.Timber
+import javax.inject.Inject
+
+class GetVoiceBroadcastStateUseCase @Inject constructor(
+        private val session: Session,
+) {
+
+    fun execute(roomId: String, eventId: String): VoiceBroadcastState? {
+        val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+
+        Timber.d("## GetVoiceBroadcastStateUseCase: get voice broadcast state requested for $eventId")
+
+        val initialEvent = room.timelineService().getTimelineEvent(eventId)?.root?.asVoiceBroadcastEvent() // Fallback to initial event
+        val relatedEvents = room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, eventId).sortedBy { it.root.originServerTs }
+        val lastVoiceBroadcastEvent = relatedEvents.mapNotNull { it.root.asVoiceBroadcastEvent() }.lastOrNull() ?: initialEvent
+        return lastVoiceBroadcastEvent?.content?.voiceBroadcastState
+    }
+}

From f05f0a85b01ade9525b9f8abbc2e4616983e17fa Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 02:22:59 +0200
Subject: [PATCH 141/300] VoiceBroadcastRecorder - Improve recorder by sending
 chunk when pausing

---
 .../voicebroadcast/VoiceBroadcastRecorderQ.kt      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
index 404b112574..21d12ee986 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
@@ -21,6 +21,7 @@ import android.media.MediaRecorder
 import android.os.Build
 import androidx.annotation.RequiresApi
 import im.vector.app.features.voice.AbstractVoiceRecorderQ
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 
 @RequiresApi(Build.VERSION_CODES.Q)
@@ -30,6 +31,7 @@ class VoiceBroadcastRecorderQ(
 
     private var maxFileSize = 0L // zero or negative for no limit
     private var currentSequence = 0
+    private var currentRoomId: String? = null
 
     override var listener: VoiceBroadcastRecorder.Listener? = null
 
@@ -51,11 +53,23 @@ class VoiceBroadcastRecorderQ(
     }
 
     override fun startRecord(roomId: String, chunkLength: Int) {
+        currentRoomId = roomId
         maxFileSize = (chunkLength * audioEncodingBitRate / 8).toLong()
         currentSequence = 1
         startRecord(roomId)
     }
 
+    override fun pauseRecord() {
+        tryOrNull { mediaRecorder?.stop() }
+        mediaRecorder?.reset()
+        notifyOutputFileCreated()
+    }
+
+    override fun resumeRecord() {
+        currentSequence++
+        currentRoomId?.let { startRecord(it) }
+    }
+
     override fun stopRecord() {
         super.stopRecord()
         notifyOutputFileCreated()

From 6d6b4e52087c4c28c4beeedba00be437d6e82da6 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 11:24:45 +0200
Subject: [PATCH 142/300] VoiceBroadcast - Ignore voice broadcast info with
 empty content (eg. redacted)

---
 .../voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt
index 7cb66cd9e5..d5d58f822e 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt
@@ -55,7 +55,7 @@ class StartVoiceBroadcastUseCase @Inject constructor(
                 QueryStringValue.IsNotEmpty
         )
                 .mapNotNull { it.asVoiceBroadcastEvent() }
-                .filter { it.content?.voiceBroadcastState != VoiceBroadcastState.STOPPED }
+                .filter { it.content?.voiceBroadcastState != null && it.content?.voiceBroadcastState != VoiceBroadcastState.STOPPED }
 
         if (onGoingVoiceBroadcastEvents.isEmpty()) {
             startVoiceBroadcast(room)

From ed0d255495c7c6a04bb4e8d2b7f26bc28f415268 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 20 Oct 2022 14:03:42 +0200
Subject: [PATCH 143/300] Quick improvement on the doc.

---
 .../matrix/android/sdk/api/session/room/timeline/Timeline.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
index 1824d5dc6c..9ac33c0545 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.kt
@@ -106,6 +106,8 @@ interface Timeline {
 
         /**
          * Called when new events come through the sync.
+         * Note that the corresponding events may not be available yet in the database.
+         * [onTimelineUpdated] will be called with the event content.
          */
         fun onNewTimelineEvents(eventIds: List<String>) = Unit
 

From 94390697ae045e620452f6e99331c9dabf8c3e81 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 13:18:46 +0200
Subject: [PATCH 144/300] VoiceBroadcastPlayer - Filter live broadcast state
 listening on the referenced eventId

---
 .../app/features/voicebroadcast/VoiceBroadcastPlayer.kt     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 7f5e13504e..c55cb8a1d0 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -179,7 +179,11 @@ class VoiceBroadcastPlayer @Inject constructor(
         room.flow()
                 .liveStateEvent(VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO, QueryStringValue.Equals(voiceBroadcastEvent.root.stateKey!!))
                 .unwrap()
-                .mapNotNull { it.asVoiceBroadcastEvent()?.content?.voiceBroadcastState }
+                .mapNotNull { event ->
+                    event.asVoiceBroadcastEvent()
+                            ?.takeIf { it.reference?.eventId == eventId }
+                            ?.content?.voiceBroadcastState
+                }
                 .onEach { state ->
                     when (state) {
                         VoiceBroadcastState.STARTED,

From 99a2afa5ee1378050f9b2d334d72166a71a33e54 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 13:32:16 +0200
Subject: [PATCH 145/300] Add changelog

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

diff --git a/changelog.d/7419.wip b/changelog.d/7419.wip
new file mode 100644
index 0000000000..06f69dfa7f
--- /dev/null
+++ b/changelog.d/7419.wip
@@ -0,0 +1 @@
+[Voice Broadcast] Live listening support

From bafa2f8bde785d85a82df37c4715e7a06f2b261f Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 13:43:50 +0200
Subject: [PATCH 146/300] VoiceBroadcastRecorder - Send last sequence number on
 pause and stop

---
 .../app/features/voicebroadcast/VoiceBroadcastRecorder.kt       | 1 +
 .../app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt      | 2 +-
 .../voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt    | 2 ++
 .../voicebroadcast/usecase/PauseVoiceBroadcastUseCase.kt        | 1 +
 .../voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt         | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt
index 37ff920c57..c9bb0c5f54 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt
@@ -23,6 +23,7 @@ import java.io.File
 interface VoiceBroadcastRecorder : VoiceRecorder {
 
     var listener: Listener?
+    var currentSequence: Int
 
     fun startRecord(roomId: String, chunkLength: Int)
 
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
index 21d12ee986..a65aae6f8a 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
@@ -30,8 +30,8 @@ class VoiceBroadcastRecorderQ(
 ) : AbstractVoiceRecorderQ(context), VoiceBroadcastRecorder {
 
     private var maxFileSize = 0L // zero or negative for no limit
-    private var currentSequence = 0
     private var currentRoomId: String? = null
+    override var currentSequence = 0
 
     override var listener: VoiceBroadcastRecorder.Listener? = null
 
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt
index a9db63c538..d882d4049e 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/model/MessageVoiceBroadcastInfoContent.kt
@@ -44,6 +44,8 @@ data class MessageVoiceBroadcastInfoContent(
         @Json(name = "state") val voiceBroadcastStateStr: String = "",
         /** The length of the voice chunks in seconds. **/
         @Json(name = "chunk_length") val chunkLength: Int? = null,
+        /** The sequence of the last sent chunk. **/
+        @Json(name = "last_chunk_sequence") val lastChunkSequence: Int? = null,
 ) : MessageContent {
 
     val voiceBroadcastState: VoiceBroadcastState? = VoiceBroadcastState.values()
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCase.kt
index 835a57c102..1430dd8c86 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/PauseVoiceBroadcastUseCase.kt
@@ -59,6 +59,7 @@ class PauseVoiceBroadcastUseCase @Inject constructor(
                 body = MessageVoiceBroadcastInfoContent(
                         relatesTo = reference,
                         voiceBroadcastStateStr = VoiceBroadcastState.PAUSED.value,
+                        lastChunkSequence = voiceBroadcastRecorder?.currentSequence,
                 ).toContent(),
         )
 
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt
index 6eefa06979..bc6a3e7be6 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StopVoiceBroadcastUseCase.kt
@@ -60,6 +60,7 @@ class StopVoiceBroadcastUseCase @Inject constructor(
                 body = MessageVoiceBroadcastInfoContent(
                         relatesTo = reference,
                         voiceBroadcastStateStr = VoiceBroadcastState.STOPPED.value,
+                        lastChunkSequence = voiceBroadcastRecorder?.currentSequence,
                 ).toContent(),
         )
 

From 05eeef9dfec7b89218f4abb430435561b092b607 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 14:36:47 +0200
Subject: [PATCH 147/300] VoiceBroadcastListener - Handle end of live listening

---
 .../voicebroadcast/VoiceBroadcastPlayer.kt    | 65 ++++++-------------
 ...UseCase.kt => GetVoiceBroadcastUseCase.kt} | 11 ++--
 2 files changed, 25 insertions(+), 51 deletions(-)
 rename vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/{GetVoiceBroadcastStateUseCase.kt => GetVoiceBroadcastUseCase.kt} (80%)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index c55cb8a1d0..403675a9ee 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -23,16 +23,12 @@ import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlayb
 import im.vector.app.features.voice.VoiceFailure
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
 import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
-import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastStateUseCase
+import im.vector.app.features.voicebroadcast.usecase.GetVoiceBroadcastUseCase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.mapNotNull
-import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
-import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.getRoom
@@ -43,8 +39,6 @@ import org.matrix.android.sdk.api.session.room.model.message.asMessageAudioEvent
 import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
-import org.matrix.android.sdk.flow.flow
-import org.matrix.android.sdk.flow.unwrap
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -53,7 +47,7 @@ import javax.inject.Singleton
 class VoiceBroadcastPlayer @Inject constructor(
         private val sessionHolder: ActiveSessionHolder,
         private val playbackTracker: AudioMessagePlaybackTracker,
-        private val getVoiceBroadcastStateUseCase: GetVoiceBroadcastStateUseCase,
+        private val getVoiceBroadcastUseCase: GetVoiceBroadcastUseCase,
 ) {
     private val session
         get() = sessionHolder.getActiveSession()
@@ -87,6 +81,7 @@ class VoiceBroadcastPlayer @Inject constructor(
             Timber.w("## VoiceBroadcastPlayer state: $field -> $value")
             field = value
         }
+    private var currentRoomId: String? = null
 
     fun playOrResume(roomId: String, eventId: String) {
         val hasChanged = currentVoiceBroadcastId != eventId
@@ -132,17 +127,19 @@ class VoiceBroadcastPlayer @Inject constructor(
         // Clear playlist
         playlist = emptyList()
         currentSequence = null
+        currentRoomId = null
     }
 
     private fun startPlayback(roomId: String, eventId: String) {
         val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
+        currentRoomId = roomId
 
         // Stop listening previous voice broadcast if any
         if (state != State.IDLE) stop()
 
         state = State.BUFFERING
 
-        val voiceBroadcastState = getVoiceBroadcastStateUseCase.execute(roomId, eventId)
+        val voiceBroadcastState = getVoiceBroadcastUseCase.execute(roomId, eventId)?.content?.voiceBroadcastState
         if (voiceBroadcastState == VoiceBroadcastState.STOPPED) {
             // Get static playlist
             updatePlaylist(getExistingChunks(room, eventId))
@@ -172,33 +169,10 @@ class VoiceBroadcastPlayer @Inject constructor(
     }
 
     private fun playLiveVoiceBroadcast(room: Room, eventId: String) {
-        val voiceBroadcastEvent = room.timelineService().getTimelineEvent(eventId)?.root?.asVoiceBroadcastEvent()
-                ?: error("Cannot retrieve voice broadcast $eventId")
+        room.timelineService().getTimelineEvent(eventId)?.root?.asVoiceBroadcastEvent() ?: error("Cannot retrieve voice broadcast $eventId")
         updatePlaylist(getExistingChunks(room, eventId))
         startPlayback(true)
-        room.flow()
-                .liveStateEvent(VoiceBroadcastConstants.STATE_ROOM_VOICE_BROADCAST_INFO, QueryStringValue.Equals(voiceBroadcastEvent.root.stateKey!!))
-                .unwrap()
-                .mapNotNull { event ->
-                    event.asVoiceBroadcastEvent()
-                            ?.takeIf { it.reference?.eventId == eventId }
-                            ?.content?.voiceBroadcastState
-                }
-                .onEach { state ->
-                    when (state) {
-                        VoiceBroadcastState.STARTED,
-                        VoiceBroadcastState.PAUSED,
-                        VoiceBroadcastState.RESUMED -> {
-                            observeIncomingChunks(room, eventId)
-                        }
-                        VoiceBroadcastState.STOPPED -> {
-                            currentTimeline?.dispose()
-                            currentTimeline?.removeAllListeners()
-                            currentTimeline = null
-                        }
-                    }
-                }
-                .launchIn(coroutineScope)
+        observeIncomingEvents(room, eventId)
     }
 
     private fun getExistingChunks(room: Room, eventId: String): List<MessageAudioEvent> {
@@ -207,10 +181,7 @@ class VoiceBroadcastPlayer @Inject constructor(
                 .filter { it.isVoiceBroadcast() }
     }
 
-    private fun observeIncomingChunks(room: Room, eventId: String) {
-        // Fixme this is probably not necessary here
-        currentTimeline?.dispose()
-        currentTimeline?.removeAllListeners()
+    private fun observeIncomingEvents(room: Room, eventId: String) {
         currentTimeline = room.timelineService().createTimeline(null, TimelineSettings(5)).also { timeline ->
             timelineListener = TimelineListener(eventId).also { timeline.addListener(it) }
             timeline.start()
@@ -321,13 +292,17 @@ class VoiceBroadcastPlayer @Inject constructor(
         }
 
         override fun onCompletion(mp: MediaPlayer) {
-            when {
-                timelineListener == null && nextMediaPlayer == null -> {
-                    stop()
-                }
-                nextMediaPlayer == null -> {
-                    state = State.BUFFERING
-                }
+            if (nextMediaPlayer != null) return
+            val roomId = currentRoomId ?: return
+            val voiceBroadcastId = currentVoiceBroadcastId ?: return
+            val voiceBroadcastEventContent = getVoiceBroadcastUseCase.execute(roomId, voiceBroadcastId)?.content ?: return
+            val isLive = voiceBroadcastEventContent.voiceBroadcastState != null && voiceBroadcastEventContent.voiceBroadcastState != VoiceBroadcastState.STOPPED
+
+            if (!isLive && voiceBroadcastEventContent.lastChunkSequence == currentSequence) {
+                // We'll not receive new chunks anymore so we can stop the live listening
+                stop()
+            } else {
+                state = State.BUFFERING
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastUseCase.kt
similarity index 80%
rename from vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt
rename to vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastUseCase.kt
index 5b3153ea40..d08fa14a95 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastStateUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/GetVoiceBroadcastUseCase.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.voicebroadcast.usecase
 
-import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastEvent
 import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.RelationType
@@ -24,18 +24,17 @@ import org.matrix.android.sdk.api.session.getRoom
 import timber.log.Timber
 import javax.inject.Inject
 
-class GetVoiceBroadcastStateUseCase @Inject constructor(
+class GetVoiceBroadcastUseCase @Inject constructor(
         private val session: Session,
 ) {
 
-    fun execute(roomId: String, eventId: String): VoiceBroadcastState? {
+    fun execute(roomId: String, eventId: String): VoiceBroadcastEvent? {
         val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
 
-        Timber.d("## GetVoiceBroadcastStateUseCase: get voice broadcast state requested for $eventId")
+        Timber.d("## GetVoiceBroadcastUseCase: get voice broadcast $eventId")
 
         val initialEvent = room.timelineService().getTimelineEvent(eventId)?.root?.asVoiceBroadcastEvent() // Fallback to initial event
         val relatedEvents = room.timelineService().getTimelineEventsRelatedTo(RelationType.REFERENCE, eventId).sortedBy { it.root.originServerTs }
-        val lastVoiceBroadcastEvent = relatedEvents.mapNotNull { it.root.asVoiceBroadcastEvent() }.lastOrNull() ?: initialEvent
-        return lastVoiceBroadcastEvent?.content?.voiceBroadcastState
+        return relatedEvents.mapNotNull { it.root.asVoiceBroadcastEvent() }.lastOrNull() ?: initialEvent
     }
 }

From 0a9f2bfa0ad050ff99ea546059d868134068dfac Mon Sep 17 00:00:00 2001
From: yostyle <y.pintas@gmail.com>
Date: Thu, 20 Oct 2022 19:30:17 +0200
Subject: [PATCH 148/300] Fix some PR comments

---
 .../vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 403675a9ee..62252570c6 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -116,8 +116,6 @@ class VoiceBroadcastPlayer @Inject constructor(
         voiceBroadcastStateJob = null
 
         // In case of live broadcast, stop observing new chunks
-        currentTimeline?.dispose()
-        currentTimeline?.removeAllListeners()
         currentTimeline = null
         timelineListener = null
 

From 4c712095735fc5844ad93b5916fbe110bbf13ae2 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 17:58:03 +0200
Subject: [PATCH 149/300] VoiceBroadcast - Add recording view

---
 .../src/main/res/values/strings.xml           |   5 +
 .../ui-styles/src/main/res/values/dimens.xml  |   3 +
 .../timeline/factory/MessageItemFactory.kt    |   2 +-
 .../factory/VoiceBroadcastItemFactory.kt      |  44 ++++--
 .../item/MessageVoiceBroadcastItem.kt         | 104 -------------
 .../MessageVoiceBroadcastRecordingItem.kt     | 137 ++++++++++++++++++
 .../voicebroadcast/VoiceBroadcastRecorder.kt  |  17 ++-
 .../voicebroadcast/VoiceBroadcastRecorderQ.kt |  26 +++-
 .../usecase/StartVoiceBroadcastUseCase.kt     |   8 +-
 .../res/drawable/ic_live_broadcast_16.xml     |  21 +++
 .../main/res/drawable/ic_recording_dot.xml    |   9 ++
 vector/src/main/res/drawable/ic_stop.xml      |   9 ++
 .../res/drawable/rounded_rect_shape_2.xml     |  11 ++
 ...em_timeline_event_voice_broadcast_stub.xml | 107 +++++++++-----
 14 files changed, 337 insertions(+), 166 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastItem.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
 create mode 100644 vector/src/main/res/drawable/ic_live_broadcast_16.xml
 create mode 100644 vector/src/main/res/drawable/ic_recording_dot.xml
 create mode 100644 vector/src/main/res/drawable/ic_stop.xml
 create mode 100644 vector/src/main/res/drawable/rounded_rect_shape_2.xml

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index e6714005a1..69b4d57e28 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3078,6 +3078,11 @@
     <string name="audio_message_reply_content">%1$s (%2$s)</string>
     <string name="audio_message_file_size">(%1$s)</string>
 
+    <string name="voice_broadcast_live">Live</string>
+    <string name="a11y_resume_voice_broadcast_record">Resume voice broadcast record</string>
+    <string name="a11y_pause_voice_broadcast_record">Pause voice broadcast record</string>
+    <string name="a11y_stop_voice_broadcast_record">Stop voice broadcast record</string>
+
     <string name="upgrade_room_for_restricted">Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
     <string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
 
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index 52d16eae7d..50d5aaf014 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -73,6 +73,9 @@
     <dimen name="location_sharing_live_duration_choice_margin_horizontal">12dp</dimen>
     <dimen name="location_sharing_live_duration_choice_margin_vertical">22dp</dimen>
 
+    <!-- Voice Broadcast -->
+    <dimen name="voice_broadcast_controller_button_size">48dp</dimen>
+
     <!-- Material 3 -->
     <dimen name="collapsing_toolbar_layout_medium_size">112dp</dimen>
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index cb947a67ce..245d92f95b 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -201,7 +201,7 @@ class MessageItemFactory @Inject constructor(
             is MessagePollContent -> buildPollItem(messageContent, informationData, highlight, callback, attributes)
             is MessageLocationContent -> buildLocationItem(messageContent, informationData, highlight, attributes)
             is MessageBeaconInfoContent -> liveLocationShareMessageItemFactory.create(params.event, highlight, attributes)
-            is MessageVoiceBroadcastInfoContent -> voiceBroadcastItemFactory.create(messageContent, params.eventsGroup, highlight, callback, attributes)
+            is MessageVoiceBroadcastInfoContent -> voiceBroadcastItemFactory.create(params, messageContent, highlight, callback, attributes)
             else -> buildNotHandledMessageItem(messageContent, informationData, highlight, callback, attributes)
         }
         return messageItem?.apply {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
index f2dfb020a1..1064d2bbc5 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -15,46 +15,66 @@
  */
 package im.vector.app.features.home.room.detail.timeline.factory
 
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
-import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
-import im.vector.app.features.home.room.detail.timeline.helper.TimelineEventsGroup
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceBroadcastEventsGroup
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
-import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastItem
-import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastItem_
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem_
+import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder
 import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
 import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class VoiceBroadcastItemFactory @Inject constructor(
         private val session: Session,
         private val avatarSizeProvider: AvatarSizeProvider,
-        private val audioMessagePlaybackTracker: AudioMessagePlaybackTracker,
+        private val colorProvider: ColorProvider,
+        private val drawableProvider: DrawableProvider,
+        private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
 ) {
 
     fun create(
+            params: TimelineItemFactoryParams,
             messageContent: MessageVoiceBroadcastInfoContent,
-            eventsGroup: TimelineEventsGroup?,
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
-    ): MessageVoiceBroadcastItem? {
+    ): MessageVoiceBroadcastRecordingItem? {
         // Only display item of the initial event with updated data
         if (messageContent.voiceBroadcastState != VoiceBroadcastState.STARTED) return null
-        val voiceBroadcastEventsGroup = eventsGroup?.let { VoiceBroadcastEventsGroup(it) } ?: return null
+        val voiceBroadcastEventsGroup = params.eventsGroup?.let { VoiceBroadcastEventsGroup(it) } ?: return null
         val mostRecentTimelineEvent = voiceBroadcastEventsGroup.getLastDisplayableEvent()
         val mostRecentEvent = mostRecentTimelineEvent.root.asVoiceBroadcastEvent()
         val mostRecentMessageContent = mostRecentEvent?.content ?: return null
         val isRecording = mostRecentMessageContent.voiceBroadcastState != VoiceBroadcastState.STOPPED && mostRecentEvent.root.stateKey == session.myUserId
-        return MessageVoiceBroadcastItem_()
+        return if (isRecording) {
+            createRecordingItem(params.event.roomId, highlight, callback, attributes)
+        } else {
+            createRecordingItem(params.event.roomId, highlight, callback, attributes)
+        }
+    }
+
+    private fun createRecordingItem(
+            roomId: String,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
+    ): MessageVoiceBroadcastRecordingItem? {
+        val roomSummary = session.getRoom(roomId)?.roomSummary()
+        return MessageVoiceBroadcastRecordingItem_()
                 .attributes(attributes)
                 .highlighted(highlight)
-                .voiceBroadcastState(mostRecentMessageContent.voiceBroadcastState)
-                .recording(isRecording)
-                .audioMessagePlaybackTracker(audioMessagePlaybackTracker)
+                .roomItem(roomSummary?.toMatrixItem())
+                .colorProvider(colorProvider)
+                .drawableProvider(drawableProvider)
+                .voiceBroadcastRecorder(voiceBroadcastRecorder)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .callback(callback)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastItem.kt
deleted file mode 100644
index 1927024a36..0000000000
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastItem.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 im.vector.app.features.home.room.detail.timeline.item
-
-import android.annotation.SuppressLint
-import android.widget.ImageButton
-import android.widget.TextView
-import com.airbnb.epoxy.EpoxyAttribute
-import com.airbnb.epoxy.EpoxyModelClass
-import im.vector.app.R
-import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
-import im.vector.app.features.home.room.detail.timeline.TimelineEventController
-import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
-import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker.Listener.State
-import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
-
-@EpoxyModelClass
-abstract class MessageVoiceBroadcastItem : AbsMessageItem<MessageVoiceBroadcastItem.Holder>() {
-
-    @EpoxyAttribute
-    var callback: TimelineEventController.Callback? = null
-
-    @EpoxyAttribute
-    var voiceBroadcastState: VoiceBroadcastState? = null
-
-    @EpoxyAttribute
-    var recording: Boolean = false
-
-    @EpoxyAttribute
-    lateinit var audioMessagePlaybackTracker: AudioMessagePlaybackTracker
-
-    private val voiceBroadcastEventId
-        get() = attributes.informationData.eventId
-
-    override fun isCacheable(): Boolean = false
-
-    override fun bind(holder: Holder) {
-        super.bind(holder)
-        bindVoiceBroadcastItem(holder)
-    }
-
-    @SuppressLint("SetTextI18n") // Temporary text
-    private fun bindVoiceBroadcastItem(holder: Holder) {
-        holder.currentStateText.text = "Voice Broadcast state: ${voiceBroadcastState?.value ?: "None"}"
-        if (recording) {
-            renderRecording(holder)
-        } else {
-            renderListening(holder)
-        }
-    }
-
-    private fun renderListening(holder: Holder) {
-        audioMessagePlaybackTracker.track(attributes.informationData.eventId, object : AudioMessagePlaybackTracker.Listener {
-            override fun onUpdate(state: State) {
-                holder.playButton.isEnabled = state !is State.Playing
-                holder.pauseButton.isEnabled = state is State.Playing
-                holder.stopButton.isEnabled = state !is State.Idle
-            }
-        })
-        holder.playButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcastEventId)) }
-        holder.pauseButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.Pause) }
-        holder.stopButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Listening.Stop) }
-    }
-
-    private fun renderRecording(holder: Holder) {
-        with(holder) {
-            playButton.isEnabled = voiceBroadcastState == VoiceBroadcastState.PAUSED
-            pauseButton.isEnabled = voiceBroadcastState == VoiceBroadcastState.STARTED || voiceBroadcastState == VoiceBroadcastState.RESUMED
-            stopButton.isEnabled = voiceBroadcastState == VoiceBroadcastState.STARTED ||
-                    voiceBroadcastState == VoiceBroadcastState.RESUMED ||
-                    voiceBroadcastState == VoiceBroadcastState.PAUSED
-            playButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
-            pauseButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
-            stopButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
-        }
-    }
-
-    override fun getViewStubId() = STUB_ID
-
-    class Holder : AbsMessageLocationItem.Holder(STUB_ID) {
-        val currentStateText by bind<TextView>(R.id.currentStateText)
-        val playButton by bind<ImageButton>(R.id.playButton)
-        val pauseButton by bind<ImageButton>(R.id.pauseButton)
-        val stopButton by bind<ImageButton>(R.id.stopButton)
-    }
-
-    companion object {
-        private val STUB_ID = R.id.messageVoiceBroadcastStub
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
new file mode 100644
index 0000000000..d271c55ebb
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
@@ -0,0 +1,137 @@
+/*
+ * 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 im.vector.app.features.home.room.detail.timeline.item
+
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.extensions.tintBackground
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass
+abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceBroadcastRecordingItem.Holder>() {
+
+    @EpoxyAttribute
+    var callback: TimelineEventController.Callback? = null
+
+    @EpoxyAttribute
+    var voiceBroadcastRecorder: VoiceBroadcastRecorder? = null
+
+    @EpoxyAttribute
+    lateinit var colorProvider: ColorProvider
+
+    @EpoxyAttribute
+    lateinit var drawableProvider: DrawableProvider
+
+    @EpoxyAttribute
+    var roomItem: MatrixItem? = null
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    private lateinit var recorderListener: VoiceBroadcastRecorder.Listener
+
+    override fun isCacheable(): Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        bindVoiceBroadcastItem(holder)
+    }
+
+    private fun bindVoiceBroadcastItem(holder: Holder) {
+        recorderListener = object : VoiceBroadcastRecorder.Listener {
+            override fun onStateUpdated(state: VoiceBroadcastRecorder.State) {
+                renderState(holder, state)
+            }
+        }
+        voiceBroadcastRecorder?.addListener(recorderListener)
+        renderHeader(holder)
+    }
+
+    private fun renderHeader(holder: Holder) {
+        with(holder) {
+            roomItem?.let {
+                attributes.avatarRenderer.render(it, roomAvatarImageView)
+                titleText.text = it.displayName
+            }
+        }
+    }
+
+    private fun renderState(holder: Holder, state: VoiceBroadcastRecorder.State) {
+        with(holder) {
+            when (state) {
+                VoiceBroadcastRecorder.State.Recording -> {
+                    stopRecordButton.isEnabled = true
+
+                    liveIndicator.isVisible = true
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorOnError))
+
+                    val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+                    val drawable = drawableProvider.getDrawable(R.drawable.ic_play_pause_pause, drawableColor)
+                    recordButton.setImageDrawable(drawable)
+                    recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_pause_voice_broadcast_record)
+                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
+                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                }
+                VoiceBroadcastRecorder.State.Paused -> {
+                    stopRecordButton.isEnabled = true
+
+                    liveIndicator.isVisible = true
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.vctr_content_quaternary))
+
+                    recordButton.setImageResource(R.drawable.ic_recording_dot)
+                    recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_resume_voice_broadcast_record)
+                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
+                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                }
+                VoiceBroadcastRecorder.State.Idle -> {
+                    recordButton.isEnabled = false
+                    stopRecordButton.isEnabled = false
+                    liveIndicator.isVisible = false
+                }
+            }
+        }
+    }
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+        voiceBroadcastRecorder?.removeListener(recorderListener)
+    }
+
+    override fun getViewStubId() = STUB_ID
+
+    class Holder : AbsMessageItem.Holder(STUB_ID) {
+        val liveIndicator by bind<TextView>(R.id.liveIndicator)
+        val roomAvatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
+        val titleText by bind<TextView>(R.id.titleText)
+        val recordButton by bind<ImageButton>(R.id.recordButton)
+        val stopRecordButton by bind<ImageButton>(R.id.stopRecordButton)
+    }
+
+    companion object {
+        private val STUB_ID = R.id.messageVoiceBroadcastStub
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt
index c9bb0c5f54..8b69051823 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorder.kt
@@ -22,12 +22,21 @@ import java.io.File
 
 interface VoiceBroadcastRecorder : VoiceRecorder {
 
-    var listener: Listener?
-    var currentSequence: Int
+    val currentSequence: Int
+    val state: State
 
     fun startRecord(roomId: String, chunkLength: Int)
+    fun addListener(listener: Listener)
+    fun removeListener(listener: Listener)
 
-    fun interface Listener {
-        fun onVoiceMessageCreated(file: File, @IntRange(from = 1) sequence: Int)
+    interface Listener {
+        fun onVoiceMessageCreated(file: File, @IntRange(from = 1) sequence: Int) = Unit
+        fun onStateUpdated(state: State) = Unit
+    }
+
+    enum class State {
+        Recording,
+        Paused,
+        Idle,
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
index a65aae6f8a..cd1a61b986 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
@@ -32,8 +32,13 @@ class VoiceBroadcastRecorderQ(
     private var maxFileSize = 0L // zero or negative for no limit
     private var currentRoomId: String? = null
     override var currentSequence = 0
+    override var state = VoiceBroadcastRecorder.State.Idle
+        set(value) {
+            field = value
+            listeners.forEach { it.onStateUpdated(value) }
+        }
 
-    override var listener: VoiceBroadcastRecorder.Listener? = null
+    private val listeners = mutableListOf<VoiceBroadcastRecorder.Listener>()
 
     override val outputFormat = MediaRecorder.OutputFormat.MPEG_4
     override val audioEncoder = MediaRecorder.AudioEncoder.HE_AAC
@@ -57,24 +62,28 @@ class VoiceBroadcastRecorderQ(
         maxFileSize = (chunkLength * audioEncodingBitRate / 8).toLong()
         currentSequence = 1
         startRecord(roomId)
+        state = VoiceBroadcastRecorder.State.Recording
     }
 
     override fun pauseRecord() {
         tryOrNull { mediaRecorder?.stop() }
         mediaRecorder?.reset()
         notifyOutputFileCreated()
+        state = VoiceBroadcastRecorder.State.Paused
     }
 
     override fun resumeRecord() {
         currentSequence++
         currentRoomId?.let { startRecord(it) }
+        state = VoiceBroadcastRecorder.State.Recording
     }
 
     override fun stopRecord() {
         super.stopRecord()
         notifyOutputFileCreated()
-        listener = null
+        listeners.clear()
         currentSequence = 0
+        state = VoiceBroadcastRecorder.State.Idle
     }
 
     override fun release() {
@@ -82,6 +91,15 @@ class VoiceBroadcastRecorderQ(
         super.release()
     }
 
+    override fun addListener(listener: VoiceBroadcastRecorder.Listener) {
+        listeners.add(listener)
+        listener.onStateUpdated(state)
+    }
+
+    override fun removeListener(listener: VoiceBroadcastRecorder.Listener) {
+        listeners.remove(listener)
+    }
+
     private fun onMaxFileSizeApproaching(roomId: String) {
         setNextOutputFile(roomId)
     }
@@ -92,8 +110,8 @@ class VoiceBroadcastRecorderQ(
     }
 
     private fun notifyOutputFileCreated() {
-        outputFile?.let {
-            listener?.onVoiceMessageCreated(it, currentSequence)
+        outputFile?.let { file ->
+            listeners.forEach { it.onVoiceMessageCreated(file, currentSequence) }
             outputFile = nextOutputFile
             nextOutputFile = null
         }
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt
index d5d58f822e..7934d18e36 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/usecase/StartVoiceBroadcastUseCase.kt
@@ -81,9 +81,11 @@ class StartVoiceBroadcastUseCase @Inject constructor(
     }
 
     private fun startRecording(room: Room, eventId: String, chunkLength: Int) {
-        voiceBroadcastRecorder?.listener = VoiceBroadcastRecorder.Listener { file, sequence ->
-            sendVoiceFile(room, file, eventId, sequence)
-        }
+        voiceBroadcastRecorder?.addListener(object : VoiceBroadcastRecorder.Listener {
+            override fun onVoiceMessageCreated(file: File, sequence: Int) {
+                sendVoiceFile(room, file, eventId, sequence)
+            }
+        })
         voiceBroadcastRecorder?.startRecord(room.roomId, chunkLength)
     }
 
diff --git a/vector/src/main/res/drawable/ic_live_broadcast_16.xml b/vector/src/main/res/drawable/ic_live_broadcast_16.xml
new file mode 100644
index 0000000000..7d427a56d0
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_live_broadcast_16.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M13.459,2.791C13.233,2.5 12.814,2.448 12.523,2.674C12.233,2.9 12.181,3.318 12.406,3.609L12.406,3.609L12.407,3.61L12.416,3.622C12.425,3.634 12.439,3.654 12.458,3.68C12.496,3.733 12.552,3.815 12.62,3.923C12.757,4.138 12.943,4.456 13.128,4.854C13.502,5.654 13.866,6.756 13.866,8C13.866,9.245 13.502,10.347 13.128,11.147C12.943,11.545 12.757,11.863 12.62,12.078C12.552,12.186 12.496,12.267 12.458,12.321C12.439,12.347 12.425,12.367 12.416,12.378L12.407,12.391L12.406,12.391L12.406,12.392C12.181,12.683 12.233,13.101 12.523,13.327C12.814,13.553 13.233,13.5 13.459,13.21L12.962,12.823C13.459,13.21 13.459,13.21 13.459,13.21L13.46,13.208L13.462,13.205L13.468,13.198L13.485,13.175C13.5,13.155 13.52,13.128 13.545,13.093C13.595,13.023 13.664,12.922 13.745,12.794C13.908,12.538 14.123,12.17 14.337,11.711C14.763,10.797 15.199,9.499 15.199,8C15.199,6.502 14.763,5.204 14.337,4.29C14.123,3.831 13.908,3.463 13.745,3.207C13.664,3.079 13.595,2.978 13.545,2.908C13.52,2.873 13.5,2.846 13.485,2.826L13.468,2.803L13.462,2.795L13.46,2.793L13.46,2.792C13.46,2.792 13.459,2.791 12.933,3.2L13.459,2.791Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11.726,5.191C11.5,4.901 11.081,4.848 10.791,5.074C10.501,5.3 10.448,5.717 10.672,6.008L10.674,6.011C10.677,6.015 10.683,6.022 10.691,6.033C10.707,6.056 10.731,6.092 10.762,6.141C10.825,6.238 10.91,6.384 10.996,6.568C11.169,6.94 11.333,7.442 11.333,8.001C11.333,8.559 11.169,9.061 10.996,9.433C10.91,9.617 10.825,9.763 10.762,9.86C10.731,9.909 10.707,9.945 10.691,9.968C10.683,9.979 10.677,9.986 10.674,9.99L10.672,9.994C10.448,10.284 10.501,10.701 10.791,10.927C11.081,11.153 11.5,11.101 11.726,10.81L11.2,10.401C11.726,10.81 11.726,10.81 11.726,10.81L11.727,10.808L11.729,10.806L11.733,10.801L11.744,10.787C11.752,10.775 11.764,10.759 11.778,10.74C11.806,10.7 11.843,10.646 11.887,10.576C11.975,10.438 12.09,10.241 12.204,9.997C12.431,9.511 12.667,8.813 12.667,8.001C12.667,7.188 12.431,6.49 12.204,6.004C12.09,5.76 11.975,5.563 11.887,5.425C11.843,5.356 11.806,5.301 11.778,5.261C11.764,5.242 11.752,5.226 11.744,5.214L11.733,5.2L11.729,5.195L11.727,5.193L11.727,5.192C11.727,5.192 11.726,5.191 11.2,5.601L11.726,5.191Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M2.407,13.21C2.633,13.5 3.052,13.553 3.343,13.327C3.633,13.101 3.686,12.683 3.461,12.392L3.46,12.391L3.459,12.391L3.45,12.378C3.441,12.366 3.427,12.347 3.408,12.321C3.371,12.267 3.314,12.186 3.246,12.078C3.109,11.863 2.924,11.545 2.738,11.147C2.364,10.347 2,9.245 2,8C2,6.756 2.364,5.654 2.738,4.854C2.924,4.456 3.109,4.138 3.246,3.923C3.314,3.815 3.371,3.733 3.408,3.68C3.427,3.654 3.441,3.634 3.45,3.622L3.459,3.61L3.46,3.609L3.461,3.609C3.686,3.318 3.633,2.9 3.343,2.674C3.052,2.448 2.633,2.5 2.407,2.791L2.904,3.177C2.407,2.791 2.407,2.791 2.407,2.791L2.406,2.793L2.404,2.795L2.399,2.802L2.381,2.826C2.366,2.846 2.346,2.873 2.321,2.908C2.272,2.978 2.203,3.079 2.121,3.207C1.958,3.463 1.744,3.831 1.529,4.29C1.103,5.204 0.667,6.502 0.667,8C0.667,9.499 1.103,10.797 1.529,11.711C1.744,12.17 1.958,12.538 2.121,12.794C2.203,12.922 2.272,13.023 2.321,13.093C2.346,13.128 2.366,13.155 2.381,13.175L2.399,13.198L2.404,13.205L2.406,13.208L2.407,13.209C2.407,13.209 2.407,13.21 2.934,12.8L2.407,13.21Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4.14,10.809C4.366,11.1 4.785,11.153 5.076,10.926C5.365,10.701 5.418,10.284 5.194,9.993L5.192,9.99C5.189,9.986 5.183,9.978 5.175,9.967C5.16,9.945 5.135,9.909 5.104,9.86C5.042,9.762 4.956,9.616 4.87,9.433C4.697,9.061 4.533,8.559 4.533,8C4.533,7.442 4.697,6.94 4.87,6.568C4.956,6.384 5.042,6.238 5.104,6.14C5.135,6.092 5.16,6.055 5.175,6.033C5.183,6.022 5.189,6.014 5.192,6.01L5.194,6.007C5.418,5.717 5.365,5.299 5.076,5.074C4.785,4.848 4.366,4.9 4.14,5.191L4.666,5.6C4.14,5.191 4.14,5.191 4.14,5.191L4.139,5.192L4.137,5.194L4.134,5.199L4.123,5.214C4.114,5.226 4.102,5.241 4.088,5.261C4.061,5.3 4.023,5.355 3.979,5.424C3.891,5.562 3.776,5.759 3.662,6.004C3.436,6.489 3.2,7.187 3.2,8C3.2,8.813 3.436,9.511 3.662,9.996C3.776,10.241 3.891,10.438 3.979,10.576C4.023,10.645 4.061,10.7 4.088,10.739C4.102,10.759 4.114,10.775 4.123,10.786L4.134,10.801L4.137,10.806L4.139,10.808L4.14,10.809C4.14,10.809 4.14,10.809 4.666,10.4L4.14,10.809Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M8,8m-1.333,0a1.333,1.333 0,1 1,2.667 0a1.333,1.333 0,1 1,-2.667 0"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_recording_dot.xml b/vector/src/main/res/drawable/ic_recording_dot.xml
new file mode 100644
index 0000000000..f5d92f9718
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_recording_dot.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,8m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0"
+      android:fillColor="#FF5B55"/>
+</vector>
diff --git a/vector/src/main/res/drawable/ic_stop.xml b/vector/src/main/res/drawable/ic_stop.xml
new file mode 100644
index 0000000000..459a7cfce2
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_stop.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="24dp"
+    android:viewportWidth="18"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M1.5,3L16.5,3A1.5,1.5 0,0 1,18 4.5L18,19.5A1.5,1.5 0,0 1,16.5 21L1.5,21A1.5,1.5 0,0 1,0 19.5L0,4.5A1.5,1.5 0,0 1,1.5 3z"
+      android:fillColor="#737D8C"/>
+</vector>
diff --git a/vector/src/main/res/drawable/rounded_rect_shape_2.xml b/vector/src/main/res/drawable/rounded_rect_shape_2.xml
new file mode 100644
index 0000000000..977de2fd09
--- /dev/null
+++ b/vector/src/main/res/drawable/rounded_rect_shape_2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size android:width="40dp" android:height="40dp"/>
+
+    <solid android:color="?vctr_system" />
+
+    <corners android:radius="2dp" />
+
+</shape>
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_stub.xml
index e35060f72a..6773280ba5 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_stub.xml
@@ -5,58 +5,89 @@
     android:id="@+id/messageRootLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:backgroundTint="?vctr_content_quinary"
     android:padding="@dimen/layout_vertical_margin"
     tools:viewBindingIgnore="true">
 
     <TextView
-        android:id="@+id/currentStateText"
-        style="@style/Widget.Vector.TextView.HeadlineMedium"
+        android:id="@+id/liveIndicator"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/playButton"
+        android:layout_height="20dp"
+        android:background="@drawable/rounded_rect_shape_2"
+        android:backgroundTint="?colorError"
+        android:drawablePadding="4dp"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxWidth="100dp"
+        android:paddingHorizontal="4dp"
+        android:singleLine="true"
+        android:text="@string/voice_broadcast_live"
+        android:textColor="?colorOnError"
+        app:drawableStartCompat="@drawable/ic_live_broadcast_16"
+        app:drawableTint="?colorOnError"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/roomAvatarImageView"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Voice Broadcast state: STARTED" />
+        tools:src="@sample/user_round_avatars" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/avatarRightBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="right"
+        app:barrierMargin="6dp"
+        app:constraint_referenced_ids="roomAvatarImageView" />
+
+    <TextView
+        android:id="@+id/titleText"
+        style="@style/Widget.Vector.TextView.Body.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/users.json/data/displayName" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/headerBottomBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:barrierMargin="12dp"
+        app:constraint_referenced_ids="roomAvatarImageView,titleText" />
 
     <ImageButton
-        android:id="@+id/playButton"
-        android:layout_width="@dimen/item_event_message_media_button_size"
-        android:layout_height="@dimen/item_event_message_media_button_size"
-        android:layout_marginTop="@dimen/layout_vertical_margin"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_play_voice_message"
-        android:src="@drawable/ic_play_pause_play"
+        android:id="@+id/recordButton"
+        android:layout_width="@dimen/voice_broadcast_controller_button_size"
+        android:layout_height="@dimen/voice_broadcast_controller_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_resume_voice_broadcast_record"
+        android:src="@drawable/ic_recording_dot"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/pauseButton"
+        app:layout_constraintEnd_toStartOf="@id/stopRecordButton"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/currentStateText"
-        app:tint="@color/vector_content_primary_tint_selector" />
+        app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier" />
 
     <ImageButton
-        android:id="@+id/pauseButton"
-        android:layout_width="@dimen/item_event_message_media_button_size"
-        android:layout_height="@dimen/item_event_message_media_button_size"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_pause_voice_message"
-        android:src="@drawable/ic_play_pause_pause"
-        app:layout_constraintBottom_toBottomOf="@id/playButton"
-        app:layout_constraintEnd_toStartOf="@id/stopButton"
-        app:layout_constraintStart_toEndOf="@id/playButton"
-        app:layout_constraintTop_toTopOf="@id/playButton"
-        app:tint="@color/vector_content_primary_tint_selector" />
-
-    <ImageButton
-        android:id="@+id/stopButton"
-        android:layout_width="@dimen/item_event_message_media_button_size"
-        android:layout_height="@dimen/item_event_message_media_button_size"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/a11y_stop_voice_message"
-        android:src="@drawable/ic_close_24dp"
-        app:layout_constraintBottom_toBottomOf="@id/pauseButton"
+        android:id="@+id/stopRecordButton"
+        android:layout_width="@dimen/voice_broadcast_controller_button_size"
+        android:layout_height="@dimen/voice_broadcast_controller_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_stop_voice_broadcast_record"
+        android:src="@drawable/ic_stop"
+        app:layout_constraintBottom_toBottomOf="@id/recordButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/pauseButton"
-        app:layout_constraintTop_toTopOf="@id/playButton"
-        app:tint="@color/vector_content_primary_tint_selector" />
+        app:layout_constraintStart_toEndOf="@id/recordButton"
+        app:layout_constraintTop_toTopOf="@id/recordButton" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From f1b4ebbc37f266702327fc9db517c8d142178387 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 18:10:32 +0200
Subject: [PATCH 150/300] VoiceBroadcast - Introduce listening view

---
 .../factory/VoiceBroadcastItemFactory.kt      |  28 +++-
 .../MessageVoiceBroadcastListeningItem.kt     | 137 ++++++++++++++++++
 .../MessageVoiceBroadcastRecordingItem.kt     |   2 +-
 ...em_timeline_event_view_stubs_container.xml |  11 +-
 ..._event_voice_broadcast_listening_stub.xml} |   0
 ...e_event_voice_broadcast_recording_stub.xml |  93 ++++++++++++
 6 files changed, 265 insertions(+), 6 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
 rename vector/src/main/res/layout/{item_timeline_event_voice_broadcast_stub.xml => item_timeline_event_voice_broadcast_listening_stub.xml} (100%)
 create mode 100644 vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
index 1064d2bbc5..13a38ac4be 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -15,12 +15,16 @@
  */
 package im.vector.app.features.home.room.detail.timeline.factory
 
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.home.room.detail.timeline.helper.AvatarSizeProvider
 import im.vector.app.features.home.room.detail.timeline.helper.VoiceBroadcastEventsGroup
 import im.vector.app.features.home.room.detail.timeline.item.AbsMessageItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastListeningItem
+import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastListeningItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem_
 import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder
@@ -46,7 +50,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
-    ): MessageVoiceBroadcastRecordingItem? {
+    ): VectorEpoxyModel<out VectorEpoxyHolder>? {
         // Only display item of the initial event with updated data
         if (messageContent.voiceBroadcastState != VoiceBroadcastState.STARTED) return null
         val voiceBroadcastEventsGroup = params.eventsGroup?.let { VoiceBroadcastEventsGroup(it) } ?: return null
@@ -57,7 +61,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
         return if (isRecording) {
             createRecordingItem(params.event.roomId, highlight, callback, attributes)
         } else {
-            createRecordingItem(params.event.roomId, highlight, callback, attributes)
+            createListeningItem(params.event.roomId, highlight, callback, attributes)
         }
     }
 
@@ -66,7 +70,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
-    ): MessageVoiceBroadcastRecordingItem? {
+    ): MessageVoiceBroadcastRecordingItem {
         val roomSummary = session.getRoom(roomId)?.roomSummary()
         return MessageVoiceBroadcastRecordingItem_()
                 .attributes(attributes)
@@ -78,4 +82,22 @@ class VoiceBroadcastItemFactory @Inject constructor(
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .callback(callback)
     }
+
+    private fun createListeningItem(
+            roomId: String,
+            highlight: Boolean,
+            callback: TimelineEventController.Callback?,
+            attributes: AbsMessageItem.Attributes,
+    ): MessageVoiceBroadcastListeningItem {
+        val roomSummary = session.getRoom(roomId)?.roomSummary()
+        return MessageVoiceBroadcastListeningItem_()
+                .attributes(attributes)
+                .highlighted(highlight)
+                .roomItem(roomSummary?.toMatrixItem())
+                .colorProvider(colorProvider)
+                .drawableProvider(drawableProvider)
+                .voiceBroadcastRecorder(voiceBroadcastRecorder)
+                .leftGuideline(avatarSizeProvider.leftGuideline)
+                .callback(callback)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
new file mode 100644
index 0000000000..e5d0fd6c30
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
@@ -0,0 +1,137 @@
+/*
+ * 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 im.vector.app.features.home.room.detail.timeline.item
+
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.isVisible
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.extensions.tintBackground
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
+import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.home.room.detail.timeline.TimelineEventController
+import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass
+abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceBroadcastListeningItem.Holder>() {
+
+    @EpoxyAttribute
+    var callback: TimelineEventController.Callback? = null
+
+    @EpoxyAttribute
+    var voiceBroadcastRecorder: VoiceBroadcastRecorder? = null
+
+    @EpoxyAttribute
+    lateinit var colorProvider: ColorProvider
+
+    @EpoxyAttribute
+    lateinit var drawableProvider: DrawableProvider
+
+    @EpoxyAttribute
+    var roomItem: MatrixItem? = null
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    private lateinit var recorderListener: VoiceBroadcastRecorder.Listener
+
+    override fun isCacheable(): Boolean = false
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+        bindVoiceBroadcastItem(holder)
+    }
+
+    private fun bindVoiceBroadcastItem(holder: Holder) {
+        recorderListener = object : VoiceBroadcastRecorder.Listener {
+            override fun onStateUpdated(state: VoiceBroadcastRecorder.State) {
+                renderState(holder, state)
+            }
+        }
+        voiceBroadcastRecorder?.addListener(recorderListener)
+        renderHeader(holder)
+    }
+
+    private fun renderHeader(holder: Holder) {
+        with(holder) {
+            roomItem?.let {
+                attributes.avatarRenderer.render(it, roomAvatarImageView)
+                titleText.text = it.displayName
+            }
+        }
+    }
+
+    private fun renderState(holder: Holder, state: VoiceBroadcastRecorder.State) {
+        with(holder) {
+            when (state) {
+                VoiceBroadcastRecorder.State.Recording -> {
+                    stopRecordButton.isEnabled = true
+
+                    liveIndicator.isVisible = true
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorOnError))
+
+                    val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
+                    val drawable = drawableProvider.getDrawable(R.drawable.ic_play_pause_pause, drawableColor)
+                    recordButton.setImageDrawable(drawable)
+                    recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_pause_voice_broadcast_record)
+                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
+                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                }
+                VoiceBroadcastRecorder.State.Paused -> {
+                    stopRecordButton.isEnabled = true
+
+                    liveIndicator.isVisible = true
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.vctr_content_quaternary))
+
+                    recordButton.setImageResource(R.drawable.ic_recording_dot)
+                    recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_resume_voice_broadcast_record)
+                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
+                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                }
+                VoiceBroadcastRecorder.State.Idle -> {
+                    recordButton.isEnabled = false
+                    stopRecordButton.isEnabled = false
+                    liveIndicator.isVisible = false
+                }
+            }
+        }
+    }
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+        voiceBroadcastRecorder?.removeListener(recorderListener)
+    }
+
+    override fun getViewStubId() = STUB_ID
+
+    class Holder : AbsMessageItem.Holder(STUB_ID) {
+        val liveIndicator by bind<TextView>(R.id.liveIndicator)
+        val roomAvatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
+        val titleText by bind<TextView>(R.id.titleText)
+        val recordButton by bind<ImageButton>(R.id.recordButton)
+        val stopRecordButton by bind<ImageButton>(R.id.stopRecordButton)
+    }
+
+    companion object {
+        private val STUB_ID = R.id.messageVoiceBroadcastListeningStub
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
index d271c55ebb..30475c1659 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
@@ -132,6 +132,6 @@ abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceB
     }
 
     companion object {
-        private val STUB_ID = R.id.messageVoiceBroadcastStub
+        private val STUB_ID = R.id.messageVoiceBroadcastRecordingStub
     }
 }
diff --git a/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
index 6fcf5711f7..643f4a89c8 100644
--- a/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
+++ b/vector/src/main/res/layout/item_timeline_event_view_stubs_container.xml
@@ -48,10 +48,17 @@
         tools:visibility="gone" />
 
     <ViewStub
-        android:id="@+id/messageVoiceBroadcastStub"
+        android:id="@+id/messageVoiceBroadcastRecordingStub"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout="@layout/item_timeline_event_voice_broadcast_stub"
+        android:layout="@layout/item_timeline_event_voice_broadcast_recording_stub"
+        tools:visibility="gone" />
+
+    <ViewStub
+        android:id="@+id/messageVoiceBroadcastListeningStub"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout="@layout/item_timeline_event_voice_broadcast_listening_stub"
         tools:visibility="gone" />
 
     <ViewStub
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
similarity index 100%
rename from vector/src/main/res/layout/item_timeline_event_voice_broadcast_stub.xml
rename to vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
new file mode 100644
index 0000000000..6773280ba5
--- /dev/null
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/messageRootLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/rounded_rect_shape_8"
+    android:backgroundTint="?vctr_content_quinary"
+    android:padding="@dimen/layout_vertical_margin"
+    tools:viewBindingIgnore="true">
+
+    <TextView
+        android:id="@+id/liveIndicator"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:background="@drawable/rounded_rect_shape_2"
+        android:backgroundTint="?colorError"
+        android:drawablePadding="4dp"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxWidth="100dp"
+        android:paddingHorizontal="4dp"
+        android:singleLine="true"
+        android:text="@string/voice_broadcast_live"
+        android:textColor="?colorOnError"
+        app:drawableStartCompat="@drawable/ic_live_broadcast_16"
+        app:drawableTint="?colorOnError"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/roomAvatarImageView"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/user_round_avatars" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/avatarRightBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="right"
+        app:barrierMargin="6dp"
+        app:constraint_referenced_ids="roomAvatarImageView" />
+
+    <TextView
+        android:id="@+id/titleText"
+        style="@style/Widget.Vector.TextView.Body.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/avatar"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@sample/users.json/data/displayName" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/headerBottomBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:barrierMargin="12dp"
+        app:constraint_referenced_ids="roomAvatarImageView,titleText" />
+
+    <ImageButton
+        android:id="@+id/recordButton"
+        android:layout_width="@dimen/voice_broadcast_controller_button_size"
+        android:layout_height="@dimen/voice_broadcast_controller_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_resume_voice_broadcast_record"
+        android:src="@drawable/ic_recording_dot"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/stopRecordButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier" />
+
+    <ImageButton
+        android:id="@+id/stopRecordButton"
+        android:layout_width="@dimen/voice_broadcast_controller_button_size"
+        android:layout_height="@dimen/voice_broadcast_controller_button_size"
+        android:background="@drawable/bg_rounded_button"
+        android:backgroundTint="?vctr_system"
+        android:contentDescription="@string/a11y_stop_voice_broadcast_record"
+        android:src="@drawable/ic_stop"
+        app:layout_constraintBottom_toBottomOf="@id/recordButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/recordButton"
+        app:layout_constraintTop_toTopOf="@id/recordButton" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From f711a0ea740f14f4d63eff35d67355e5224bdf57 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 19:07:34 +0200
Subject: [PATCH 151/300] VoiceBroadcast - Listening view

---
 .../src/main/res/values/strings.xml           |  3 +
 .../factory/VoiceBroadcastItemFactory.kt      | 11 ++-
 .../MessageVoiceBroadcastListeningItem.kt     | 97 +++++++++++--------
 .../voicebroadcast/VoiceBroadcastPlayer.kt    | 17 +++-
 ...e_event_voice_broadcast_listening_stub.xml | 32 +++---
 5 files changed, 98 insertions(+), 62 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 69b4d57e28..ea9b4b5999 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3082,6 +3082,9 @@
     <string name="a11y_resume_voice_broadcast_record">Resume voice broadcast record</string>
     <string name="a11y_pause_voice_broadcast_record">Pause voice broadcast record</string>
     <string name="a11y_stop_voice_broadcast_record">Stop voice broadcast record</string>
+    <string name="a11y_play_voice_broadcast">Play or resume voice broadcast</string>
+    <string name="a11y_pause_voice_broadcast">Pause voice broadcast</string>
+    <string name="a11y_voice_broadcast_buffering">Buffering</string>
 
     <string name="upgrade_room_for_restricted">Anyone in %s will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
     <string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
index 13a38ac4be..af14d532c8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -27,6 +27,7 @@ import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadca
 import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastListeningItem_
 import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem
 import im.vector.app.features.home.room.detail.timeline.item.MessageVoiceBroadcastRecordingItem_
+import im.vector.app.features.voicebroadcast.VoiceBroadcastPlayer
 import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder
 import im.vector.app.features.voicebroadcast.model.MessageVoiceBroadcastInfoContent
 import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
@@ -42,6 +43,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
         private val colorProvider: ColorProvider,
         private val drawableProvider: DrawableProvider,
         private val voiceBroadcastRecorder: VoiceBroadcastRecorder?,
+        private val voiceBroadcastPlayer: VoiceBroadcastPlayer,
 ) {
 
     fun create(
@@ -53,7 +55,8 @@ class VoiceBroadcastItemFactory @Inject constructor(
     ): VectorEpoxyModel<out VectorEpoxyHolder>? {
         // Only display item of the initial event with updated data
         if (messageContent.voiceBroadcastState != VoiceBroadcastState.STARTED) return null
-        val voiceBroadcastEventsGroup = params.eventsGroup?.let { VoiceBroadcastEventsGroup(it) } ?: return null
+        val eventsGroup = params.eventsGroup ?: return null
+        val voiceBroadcastEventsGroup = VoiceBroadcastEventsGroup(eventsGroup)
         val mostRecentTimelineEvent = voiceBroadcastEventsGroup.getLastDisplayableEvent()
         val mostRecentEvent = mostRecentTimelineEvent.root.asVoiceBroadcastEvent()
         val mostRecentMessageContent = mostRecentEvent?.content ?: return null
@@ -61,7 +64,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
         return if (isRecording) {
             createRecordingItem(params.event.roomId, highlight, callback, attributes)
         } else {
-            createListeningItem(params.event.roomId, highlight, callback, attributes)
+            createListeningItem(params.event.roomId, eventsGroup.groupId, highlight, callback, attributes)
         }
     }
 
@@ -85,6 +88,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
 
     private fun createListeningItem(
             roomId: String,
+            voiceBroadcastId: String,
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
@@ -96,7 +100,8 @@ class VoiceBroadcastItemFactory @Inject constructor(
                 .roomItem(roomSummary?.toMatrixItem())
                 .colorProvider(colorProvider)
                 .drawableProvider(drawableProvider)
-                .voiceBroadcastRecorder(voiceBroadcastRecorder)
+                .voiceBroadcastPlayer(voiceBroadcastPlayer)
+                .voiceBroadcastId(voiceBroadcastId)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .callback(callback)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
index e5d0fd6c30..3a090b0eb6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.item
 
+import android.view.View
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
@@ -23,12 +24,11 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
-import im.vector.app.core.extensions.tintBackground
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
-import im.vector.app.features.home.room.detail.RoomDetailAction.VoiceBroadcastAction
+import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
-import im.vector.app.features.voicebroadcast.VoiceBroadcastRecorder
+import im.vector.app.features.voicebroadcast.VoiceBroadcastPlayer
 import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass
@@ -38,7 +38,10 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
     var callback: TimelineEventController.Callback? = null
 
     @EpoxyAttribute
-    var voiceBroadcastRecorder: VoiceBroadcastRecorder? = null
+    var voiceBroadcastPlayer: VoiceBroadcastPlayer? = null
+
+    @EpoxyAttribute
+    lateinit var voiceBroadcastId: String
 
     @EpoxyAttribute
     lateinit var colorProvider: ColorProvider
@@ -52,7 +55,7 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
     @EpoxyAttribute
     var title: String? = null
 
-    private lateinit var recorderListener: VoiceBroadcastRecorder.Listener
+    private lateinit var playerListener: VoiceBroadcastPlayer.Listener
 
     override fun isCacheable(): Boolean = false
 
@@ -62,12 +65,10 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
     }
 
     private fun bindVoiceBroadcastItem(holder: Holder) {
-        recorderListener = object : VoiceBroadcastRecorder.Listener {
-            override fun onStateUpdated(state: VoiceBroadcastRecorder.State) {
-                renderState(holder, state)
-            }
+        playerListener = VoiceBroadcastPlayer.Listener { state ->
+            renderState(holder, state)
         }
-        voiceBroadcastRecorder?.addListener(recorderListener)
+        voiceBroadcastPlayer?.addListener(playerListener)
         renderHeader(holder)
     }
 
@@ -80,45 +81,59 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         }
     }
 
-    private fun renderState(holder: Holder, state: VoiceBroadcastRecorder.State) {
+    private fun renderState(holder: Holder, state: VoiceBroadcastPlayer.State) {
+        if (isCurrentMediaActive()) {
+            renderActiveMedia(holder, state)
+        } else {
+            renderInactiveMedia(holder)
+        }
+    }
+
+    @Suppress("UNUSED_PARAMETER")
+    private fun renderActiveMedia(holder: Holder, state: VoiceBroadcastPlayer.State) {
         with(holder) {
+            bufferingView.isVisible = state == VoiceBroadcastPlayer.State.BUFFERING
+            playPauseButton.isVisible = state != VoiceBroadcastPlayer.State.BUFFERING
+            liveIndicator.isVisible = false
+//            liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorOnError))
+
             when (state) {
-                VoiceBroadcastRecorder.State.Recording -> {
-                    stopRecordButton.isEnabled = true
-
-                    liveIndicator.isVisible = true
-                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorOnError))
-
-                    val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
-                    val drawable = drawableProvider.getDrawable(R.drawable.ic_play_pause_pause, drawableColor)
-                    recordButton.setImageDrawable(drawable)
-                    recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_pause_voice_broadcast_record)
-                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
-                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                VoiceBroadcastPlayer.State.PLAYING -> {
+                    playPauseButton.setImageResource(R.drawable.ic_play_pause_pause)
+                    playPauseButton.contentDescription = view.resources.getString(R.string.a11y_play_voice_broadcast)
+                    playPauseButton.setOnClickListener { attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.Pause) }
                 }
-                VoiceBroadcastRecorder.State.Paused -> {
-                    stopRecordButton.isEnabled = true
-
-                    liveIndicator.isVisible = true
-                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.vctr_content_quaternary))
-
-                    recordButton.setImageResource(R.drawable.ic_recording_dot)
-                    recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_resume_voice_broadcast_record)
-                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
-                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
-                }
-                VoiceBroadcastRecorder.State.Idle -> {
-                    recordButton.isEnabled = false
-                    stopRecordButton.isEnabled = false
-                    liveIndicator.isVisible = false
+                VoiceBroadcastPlayer.State.IDLE,
+                VoiceBroadcastPlayer.State.PAUSED -> {
+                    playPauseButton.setImageResource(R.drawable.ic_play_pause_play)
+                    playPauseButton.contentDescription = view.resources.getString(R.string.a11y_pause_voice_broadcast)
+                    playPauseButton.setOnClickListener {
+                        attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcastId))
+                    }
                 }
+                VoiceBroadcastPlayer.State.BUFFERING -> Unit
             }
         }
     }
 
+    private fun renderInactiveMedia(holder: Holder) {
+        with(holder) {
+            liveIndicator.isVisible = false
+            bufferingView.isVisible = false
+            playPauseButton.isVisible = true
+            playPauseButton.setImageResource(R.drawable.ic_play_pause_play)
+            playPauseButton.contentDescription = view.resources.getString(R.string.a11y_pause_voice_broadcast)
+            playPauseButton.setOnClickListener {
+                attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcastId))
+            }
+        }
+    }
+
+    private fun isCurrentMediaActive() = voiceBroadcastPlayer?.currentVoiceBroadcastId == voiceBroadcastId
+
     override fun unbind(holder: Holder) {
         super.unbind(holder)
-        voiceBroadcastRecorder?.removeListener(recorderListener)
+        voiceBroadcastPlayer?.removeListener(playerListener)
     }
 
     override fun getViewStubId() = STUB_ID
@@ -127,8 +142,8 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         val liveIndicator by bind<TextView>(R.id.liveIndicator)
         val roomAvatarImageView by bind<ImageView>(R.id.roomAvatarImageView)
         val titleText by bind<TextView>(R.id.titleText)
-        val recordButton by bind<ImageButton>(R.id.recordButton)
-        val stopRecordButton by bind<ImageButton>(R.id.stopRecordButton)
+        val playPauseButton by bind<ImageButton>(R.id.playPauseButton)
+        val bufferingView by bind<View>(R.id.bufferingView)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 62252570c6..9c118f957d 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -73,15 +73,17 @@ class VoiceBroadcastPlayer @Inject constructor(
     private var currentSequence: Int? = null
 
     private var playlist = emptyList<MessageAudioEvent>()
-    private val currentVoiceBroadcastId
+    val currentVoiceBroadcastId
         get() = playlist.firstOrNull()?.root?.getRelationContent()?.eventId
 
     private var state: State = State.IDLE
         set(value) {
             Timber.w("## VoiceBroadcastPlayer state: $field -> $value")
             field = value
+            listeners.forEach { it.onStateChanged(value) }
         }
     private var currentRoomId: String? = null
+    private var listeners = mutableListOf<Listener>()
 
     fun playOrResume(roomId: String, eventId: String) {
         val hasChanged = currentVoiceBroadcastId != eventId
@@ -128,6 +130,15 @@ class VoiceBroadcastPlayer @Inject constructor(
         currentRoomId = null
     }
 
+    fun addListener(listener: Listener) {
+        listeners.add(listener)
+        listener.onStateChanged(state)
+    }
+
+    fun removeListener(listener: Listener) {
+        listeners.remove(listener)
+    }
+
     private fun startPlayback(roomId: String, eventId: String) {
         val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
         currentRoomId = roomId
@@ -316,4 +327,8 @@ class VoiceBroadcastPlayer @Inject constructor(
         BUFFERING,
         IDLE
     }
+
+    fun interface Listener {
+        fun onStateChanged(state: State)
+    }
 }
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
index 6773280ba5..506ca4ff47 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
@@ -65,29 +65,27 @@
         app:constraint_referenced_ids="roomAvatarImageView,titleText" />
 
     <ImageButton
-        android:id="@+id/recordButton"
+        android:id="@+id/playPauseButton"
         android:layout_width="@dimen/voice_broadcast_controller_button_size"
         android:layout_height="@dimen/voice_broadcast_controller_button_size"
         android:background="@drawable/bg_rounded_button"
         android:backgroundTint="?vctr_system"
-        android:contentDescription="@string/a11y_resume_voice_broadcast_record"
-        android:src="@drawable/ic_recording_dot"
+        android:contentDescription="@string/a11y_play_voice_broadcast"
+        android:src="@drawable/ic_play_pause_play"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/stopRecordButton"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier"
+        app:tint="?vctr_content_secondary" />
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/bufferingView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/a11y_voice_broadcast_buffering"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/playPauseButton"
         app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier" />
 
-    <ImageButton
-        android:id="@+id/stopRecordButton"
-        android:layout_width="@dimen/voice_broadcast_controller_button_size"
-        android:layout_height="@dimen/voice_broadcast_controller_button_size"
-        android:background="@drawable/bg_rounded_button"
-        android:backgroundTint="?vctr_system"
-        android:contentDescription="@string/a11y_stop_voice_broadcast_record"
-        android:src="@drawable/ic_stop"
-        app:layout_constraintBottom_toBottomOf="@id/recordButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/recordButton"
-        app:layout_constraintTop_toTopOf="@id/recordButton" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

From cebc096ac70dad17ebef02f5cc3882ae2b5e93d2 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 21:06:27 +0200
Subject: [PATCH 152/300] VoiceBroadcast - Update live indicator icon

---
 .../factory/VoiceBroadcastItemFactory.kt      |  4 ++-
 .../MessageVoiceBroadcastListeningItem.kt     | 28 +++++++++++++++++--
 .../MessageVoiceBroadcastRecordingItem.kt     |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
index af14d532c8..5a70f66d75 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -64,7 +64,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
         return if (isRecording) {
             createRecordingItem(params.event.roomId, highlight, callback, attributes)
         } else {
-            createListeningItem(params.event.roomId, eventsGroup.groupId, highlight, callback, attributes)
+            createListeningItem(params.event.roomId, eventsGroup.groupId, mostRecentMessageContent.voiceBroadcastState, highlight, callback, attributes)
         }
     }
 
@@ -89,6 +89,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
     private fun createListeningItem(
             roomId: String,
             voiceBroadcastId: String,
+            voiceBroadcastState: VoiceBroadcastState?,
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
@@ -102,6 +103,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
                 .drawableProvider(drawableProvider)
                 .voiceBroadcastPlayer(voiceBroadcastPlayer)
                 .voiceBroadcastId(voiceBroadcastId)
+                .voiceBroadcastState(voiceBroadcastState)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .callback(callback)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
index 3a090b0eb6..bf0f202f0c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
@@ -24,11 +24,13 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
+import im.vector.app.core.extensions.tintBackground
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.TimelineEventController
 import im.vector.app.features.voicebroadcast.VoiceBroadcastPlayer
+import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
 import org.matrix.android.sdk.api.util.MatrixItem
 
 @EpoxyModelClass
@@ -43,6 +45,9 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
     @EpoxyAttribute
     lateinit var voiceBroadcastId: String
 
+    @EpoxyAttribute
+    var voiceBroadcastState: VoiceBroadcastState? = null
+
     @EpoxyAttribute
     lateinit var colorProvider: ColorProvider
 
@@ -70,6 +75,7 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         }
         voiceBroadcastPlayer?.addListener(playerListener)
         renderHeader(holder)
+        renderLiveIcon(holder)
     }
 
     private fun renderHeader(holder: Holder) {
@@ -81,6 +87,25 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         }
     }
 
+    private fun renderLiveIcon(holder: Holder) {
+        with(holder) {
+            when (voiceBroadcastState) {
+                VoiceBroadcastState.STARTED,
+                VoiceBroadcastState.RESUMED -> {
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorError))
+                    liveIndicator.isVisible = true
+                }
+                VoiceBroadcastState.PAUSED -> {
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.vctr_content_quaternary))
+                    liveIndicator.isVisible = true
+                }
+                VoiceBroadcastState.STOPPED, null -> {
+                    liveIndicator.isVisible = false
+                }
+            }
+        }
+    }
+
     private fun renderState(holder: Holder, state: VoiceBroadcastPlayer.State) {
         if (isCurrentMediaActive()) {
             renderActiveMedia(holder, state)
@@ -94,8 +119,6 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         with(holder) {
             bufferingView.isVisible = state == VoiceBroadcastPlayer.State.BUFFERING
             playPauseButton.isVisible = state != VoiceBroadcastPlayer.State.BUFFERING
-            liveIndicator.isVisible = false
-//            liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorOnError))
 
             when (state) {
                 VoiceBroadcastPlayer.State.PLAYING -> {
@@ -118,7 +141,6 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
 
     private fun renderInactiveMedia(holder: Holder) {
         with(holder) {
-            liveIndicator.isVisible = false
             bufferingView.isVisible = false
             playPauseButton.isVisible = true
             playPauseButton.setImageResource(R.drawable.ic_play_pause_play)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
index 30475c1659..ff459e00d2 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
@@ -87,7 +87,7 @@ abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceB
                     stopRecordButton.isEnabled = true
 
                     liveIndicator.isVisible = true
-                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorOnError))
+                    liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorError))
 
                     val drawableColor = colorProvider.getColorFromAttribute(R.attr.vctr_content_secondary)
                     val drawable = drawableProvider.getDrawable(R.drawable.ic_play_pause_pause, drawableColor)

From 9c5b6d8207ff3b5f94aa5bb44f0ab848aee5e7b6 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 21:11:00 +0200
Subject: [PATCH 153/300] Fix null voiceBroadcastId when the playlist is empty

---
 .../features/voicebroadcast/VoiceBroadcastPlayer.kt    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 9c118f957d..28ed7a58b8 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -30,7 +30,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.events.model.RelationType
-import org.matrix.android.sdk.api.session.events.model.getRelationContent
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
 import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
@@ -73,8 +72,7 @@ class VoiceBroadcastPlayer @Inject constructor(
     private var currentSequence: Int? = null
 
     private var playlist = emptyList<MessageAudioEvent>()
-    val currentVoiceBroadcastId
-        get() = playlist.firstOrNull()?.root?.getRelationContent()?.eventId
+    var currentVoiceBroadcastId: String? = null
 
     private var state: State = State.IDLE
         set(value) {
@@ -128,6 +126,7 @@ class VoiceBroadcastPlayer @Inject constructor(
         playlist = emptyList()
         currentSequence = null
         currentRoomId = null
+        currentVoiceBroadcastId = null
     }
 
     fun addListener(listener: Listener) {
@@ -141,11 +140,12 @@ class VoiceBroadcastPlayer @Inject constructor(
 
     private fun startPlayback(roomId: String, eventId: String) {
         val room = session.getRoom(roomId) ?: error("Unknown roomId: $roomId")
-        currentRoomId = roomId
-
         // Stop listening previous voice broadcast if any
         if (state != State.IDLE) stop()
 
+        currentRoomId = roomId
+        currentVoiceBroadcastId = eventId
+
         state = State.BUFFERING
 
         val voiceBroadcastState = getVoiceBroadcastUseCase.execute(roomId, eventId)?.content?.voiceBroadcastState

From 6ff7a7f3aeb43bd8819d3d53d3a20125eada8125 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 21:20:17 +0200
Subject: [PATCH 154/300] Update buffering view

---
 ...item_timeline_event_voice_broadcast_listening_stub.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
index 506ca4ff47..6a4fcef77a 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
@@ -78,14 +78,18 @@
         app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier"
         app:tint="?vctr_content_secondary" />
 
-    <com.google.android.material.progressindicator.CircularProgressIndicator
+
+    <ProgressBar
         android:id="@+id/bufferingView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/a11y_voice_broadcast_buffering"
+        android:indeterminate="true"
+        android:indeterminateTint="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/playPauseButton"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/headerBottomBarrier" />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>

From 72a1acec8959a0db909e529f0e7ac585d537cf2f Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 21:26:39 +0200
Subject: [PATCH 155/300] Fix voice broadcast state update on wrong thread

---
 .../app/features/voicebroadcast/VoiceBroadcastPlayer.kt      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index 28ed7a58b8..bb5fe5c37d 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.voicebroadcast
 
 import android.media.AudioAttributes
 import android.media.MediaPlayer
+import androidx.annotation.MainThread
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.voice.VoiceFailure
@@ -29,6 +30,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.session.events.model.RelationType
 import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.Room
@@ -75,6 +77,7 @@ class VoiceBroadcastPlayer @Inject constructor(
     var currentVoiceBroadcastId: String? = null
 
     private var state: State = State.IDLE
+        @MainThread
         set(value) {
             Timber.w("## VoiceBroadcastPlayer state: $field -> $value")
             field = value
@@ -168,7 +171,7 @@ class VoiceBroadcastPlayer @Inject constructor(
                 currentMediaPlayer?.start()
                 currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
                 currentSequence = sequence
-                state = State.PLAYING
+                withContext(Dispatchers.Main) { state = State.PLAYING }
                 nextMediaPlayer = prepareNextMediaPlayer()
             } catch (failure: Throwable) {
                 Timber.e(failure, "Unable to start playback")

From 930c85672866c5d83c47795656d40c8b740639e6 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 22:38:02 +0200
Subject: [PATCH 156/300] Add additional information in listening tile

---
 .../factory/VoiceBroadcastItemFactory.kt      | 14 ++++-
 .../MessageVoiceBroadcastListeningItem.kt     |  6 +-
 ...dcast_16.xml => ic_voice_broadcast_16.xml} |  0
 ...e_event_voice_broadcast_listening_stub.xml | 60 +++++++++++++++++--
 ...e_event_voice_broadcast_recording_stub.xml |  2 +-
 5 files changed, 75 insertions(+), 7 deletions(-)
 rename vector/src/main/res/drawable/{ic_live_broadcast_16.xml => ic_voice_broadcast_16.xml} (100%)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
index 5a70f66d75..98f45cd5db 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -34,6 +34,7 @@ import im.vector.app.features.voicebroadcast.model.VoiceBroadcastState
 import im.vector.app.features.voicebroadcast.model.asVoiceBroadcastEvent
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.getRoom
+import org.matrix.android.sdk.api.session.getUser
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -61,10 +62,19 @@ class VoiceBroadcastItemFactory @Inject constructor(
         val mostRecentEvent = mostRecentTimelineEvent.root.asVoiceBroadcastEvent()
         val mostRecentMessageContent = mostRecentEvent?.content ?: return null
         val isRecording = mostRecentMessageContent.voiceBroadcastState != VoiceBroadcastState.STOPPED && mostRecentEvent.root.stateKey == session.myUserId
+        val recorderName = mostRecentTimelineEvent.root.stateKey?.let {  session.getUser(it) }?.displayName ?: mostRecentTimelineEvent.root.stateKey
         return if (isRecording) {
             createRecordingItem(params.event.roomId, highlight, callback, attributes)
         } else {
-            createListeningItem(params.event.roomId, eventsGroup.groupId, mostRecentMessageContent.voiceBroadcastState, highlight, callback, attributes)
+            createListeningItem(
+                    params.event.roomId,
+                    eventsGroup.groupId,
+                    mostRecentMessageContent.voiceBroadcastState,
+                    recorderName,
+                    highlight,
+                    callback,
+                    attributes
+            )
         }
     }
 
@@ -90,6 +100,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
             roomId: String,
             voiceBroadcastId: String,
             voiceBroadcastState: VoiceBroadcastState?,
+            broadcasterName: String?,
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
@@ -104,6 +115,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
                 .voiceBroadcastPlayer(voiceBroadcastPlayer)
                 .voiceBroadcastId(voiceBroadcastId)
                 .voiceBroadcastState(voiceBroadcastState)
+                .broadcasterName(broadcasterName)
                 .leftGuideline(avatarSizeProvider.leftGuideline)
                 .callback(callback)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
index bf0f202f0c..130d44202f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
@@ -48,6 +48,9 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
     @EpoxyAttribute
     var voiceBroadcastState: VoiceBroadcastState? = null
 
+    @EpoxyAttribute
+    var broadcasterName: String? = null
+
     @EpoxyAttribute
     lateinit var colorProvider: ColorProvider
 
@@ -84,6 +87,7 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
                 attributes.avatarRenderer.render(it, roomAvatarImageView)
                 titleText.text = it.displayName
             }
+            broadcasterNameText.text = broadcasterName
         }
     }
 
@@ -114,7 +118,6 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         }
     }
 
-    @Suppress("UNUSED_PARAMETER")
     private fun renderActiveMedia(holder: Holder, state: VoiceBroadcastPlayer.State) {
         with(holder) {
             bufferingView.isVisible = state == VoiceBroadcastPlayer.State.BUFFERING
@@ -166,6 +169,7 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
         val titleText by bind<TextView>(R.id.titleText)
         val playPauseButton by bind<ImageButton>(R.id.playPauseButton)
         val bufferingView by bind<View>(R.id.bufferingView)
+        val broadcasterNameText by bind<TextView>(R.id.broadcasterNameText)
     }
 
     companion object {
diff --git a/vector/src/main/res/drawable/ic_live_broadcast_16.xml b/vector/src/main/res/drawable/ic_voice_broadcast_16.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_live_broadcast_16.xml
rename to vector/src/main/res/drawable/ic_voice_broadcast_16.xml
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
index 6a4fcef77a..73acde2942 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
@@ -24,7 +24,7 @@
         android:singleLine="true"
         android:text="@string/voice_broadcast_live"
         android:textColor="?colorOnError"
-        app:drawableStartCompat="@drawable/ic_live_broadcast_16"
+        app:drawableStartCompat="@drawable/ic_voice_broadcast_16"
         app:drawableTint="?colorOnError"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -36,7 +36,7 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@sample/user_round_avatars" />
+        tools:src="@sample/room_round_avatars" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/avatarRightBarrier"
@@ -54,7 +54,59 @@
         android:contentDescription="@string/avatar"
         app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@sample/users.json/data/displayName" />
+        tools:src="@sample/rooms.json/data/name" />
+
+    <LinearLayout
+        android:id="@+id/broadcasterViewGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toBottomOf="@id/titleText">
+
+        <ImageView
+            android:id="@+id/broadcasterIcon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_marginEnd="5dp"
+            android:src="@drawable/ic_microphone"
+            app:tint="?vctr_content_secondary" />
+
+        <TextView
+            android:id="@+id/broadcasterNameText"
+            style="@style/Widget.Vector.TextView.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="@sample/users.json/data/displayName" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/voiceBroadcastViewGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        app:layout_constraintStart_toEndOf="@id/avatarRightBarrier"
+        app:layout_constraintTop_toBottomOf="@id/broadcasterViewGroup">
+
+        <ImageView
+            android:id="@+id/voiceBroadcastIcon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_marginEnd="5dp"
+            android:src="@drawable/ic_voice_broadcast_16"
+            app:tint="?vctr_content_secondary" />
+
+        <TextView
+            android:id="@+id/voiceBroadcastText"
+            style="@style/Widget.Vector.TextView.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/attachment_type_voice_broadcast" />
+    </LinearLayout>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/headerBottomBarrier"
@@ -62,7 +114,7 @@
         android:layout_height="wrap_content"
         app:barrierDirection="bottom"
         app:barrierMargin="12dp"
-        app:constraint_referenced_ids="roomAvatarImageView,titleText" />
+        app:constraint_referenced_ids="roomAvatarImageView,titleText,broadcasterViewGroup,voiceBroadcastViewGroup" />
 
     <ImageButton
         android:id="@+id/playPauseButton"
diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
index 6773280ba5..e3bb85138d 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_recording_stub.xml
@@ -24,7 +24,7 @@
         android:singleLine="true"
         android:text="@string/voice_broadcast_live"
         android:textColor="?colorOnError"
-        app:drawableStartCompat="@drawable/ic_live_broadcast_16"
+        app:drawableStartCompat="@drawable/ic_voice_broadcast_16"
         app:drawableTint="?colorOnError"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

From 8869d82dd0f7a3e2aa232456f7cf324daaf04d16 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 22:39:27 +0200
Subject: [PATCH 157/300] Add changelog

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

diff --git a/changelog.d/7421.wip b/changelog.d/7421.wip
new file mode 100644
index 0000000000..4a399eee04
--- /dev/null
+++ b/changelog.d/7421.wip
@@ -0,0 +1 @@
+[Voice Broadcast] Improve rendering in the timeline

From 9a96de4f06f60ed47261f9cb34b743db4e169918 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 22:45:22 +0200
Subject: [PATCH 158/300] Set id to VoiceBroadcast items

---
 .../timeline/factory/VoiceBroadcastItemFactory.kt   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
index 98f45cd5db..5dc601a91a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/VoiceBroadcastItemFactory.kt
@@ -62,9 +62,15 @@ class VoiceBroadcastItemFactory @Inject constructor(
         val mostRecentEvent = mostRecentTimelineEvent.root.asVoiceBroadcastEvent()
         val mostRecentMessageContent = mostRecentEvent?.content ?: return null
         val isRecording = mostRecentMessageContent.voiceBroadcastState != VoiceBroadcastState.STOPPED && mostRecentEvent.root.stateKey == session.myUserId
-        val recorderName = mostRecentTimelineEvent.root.stateKey?.let {  session.getUser(it) }?.displayName ?: mostRecentTimelineEvent.root.stateKey
+        val recorderName = mostRecentTimelineEvent.root.stateKey?.let { session.getUser(it) }?.displayName ?: mostRecentTimelineEvent.root.stateKey
         return if (isRecording) {
-            createRecordingItem(params.event.roomId, highlight, callback, attributes)
+            createRecordingItem(
+                    params.event.roomId,
+                    eventsGroup.groupId,
+                    highlight,
+                    callback,
+                    attributes
+            )
         } else {
             createListeningItem(
                     params.event.roomId,
@@ -80,12 +86,14 @@ class VoiceBroadcastItemFactory @Inject constructor(
 
     private fun createRecordingItem(
             roomId: String,
+            voiceBroadcastId: String,
             highlight: Boolean,
             callback: TimelineEventController.Callback?,
             attributes: AbsMessageItem.Attributes,
     ): MessageVoiceBroadcastRecordingItem {
         val roomSummary = session.getRoom(roomId)?.roomSummary()
         return MessageVoiceBroadcastRecordingItem_()
+                .id("voice_broadcast_$voiceBroadcastId")
                 .attributes(attributes)
                 .highlighted(highlight)
                 .roomItem(roomSummary?.toMatrixItem())
@@ -107,6 +115,7 @@ class VoiceBroadcastItemFactory @Inject constructor(
     ): MessageVoiceBroadcastListeningItem {
         val roomSummary = session.getRoom(roomId)?.roomSummary()
         return MessageVoiceBroadcastListeningItem_()
+                .id("voice_broadcast_$voiceBroadcastId")
                 .attributes(attributes)
                 .highlighted(highlight)
                 .roomItem(roomSummary?.toMatrixItem())

From f2cc08263fa59f3ca58b3ac41a7508b04aa65117 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 22:48:09 +0200
Subject: [PATCH 159/300] Call onClick instead of setOnClickListener

---
 .../timeline/item/MessageVoiceBroadcastListeningItem.kt  | 7 ++++---
 .../timeline/item/MessageVoiceBroadcastRecordingItem.kt  | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
index 130d44202f..5b58dda4e6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastListeningItem.kt
@@ -24,6 +24,7 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
+import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.tintBackground
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
@@ -127,13 +128,13 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
                 VoiceBroadcastPlayer.State.PLAYING -> {
                     playPauseButton.setImageResource(R.drawable.ic_play_pause_pause)
                     playPauseButton.contentDescription = view.resources.getString(R.string.a11y_play_voice_broadcast)
-                    playPauseButton.setOnClickListener { attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.Pause) }
+                    playPauseButton.onClick { attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.Pause) }
                 }
                 VoiceBroadcastPlayer.State.IDLE,
                 VoiceBroadcastPlayer.State.PAUSED -> {
                     playPauseButton.setImageResource(R.drawable.ic_play_pause_play)
                     playPauseButton.contentDescription = view.resources.getString(R.string.a11y_pause_voice_broadcast)
-                    playPauseButton.setOnClickListener {
+                    playPauseButton.onClick {
                         attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcastId))
                     }
                 }
@@ -148,7 +149,7 @@ abstract class MessageVoiceBroadcastListeningItem : AbsMessageItem<MessageVoiceB
             playPauseButton.isVisible = true
             playPauseButton.setImageResource(R.drawable.ic_play_pause_play)
             playPauseButton.contentDescription = view.resources.getString(R.string.a11y_pause_voice_broadcast)
-            playPauseButton.setOnClickListener {
+            playPauseButton.onClick {
                 attributes.callback?.onTimelineItemAction(RoomDetailAction.VoiceBroadcastAction.Listening.PlayOrResume(voiceBroadcastId))
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
index ff459e00d2..41ef1fac9c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
@@ -23,6 +23,7 @@ import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
+import im.vector.app.core.epoxy.onClick
 import im.vector.app.core.extensions.tintBackground
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.DrawableProvider
@@ -93,8 +94,8 @@ abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceB
                     val drawable = drawableProvider.getDrawable(R.drawable.ic_play_pause_pause, drawableColor)
                     recordButton.setImageDrawable(drawable)
                     recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_pause_voice_broadcast_record)
-                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
-                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                    recordButton.onClick { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Pause) }
+                    stopRecordButton.onClick { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
                 }
                 VoiceBroadcastRecorder.State.Paused -> {
                     stopRecordButton.isEnabled = true
@@ -104,8 +105,8 @@ abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceB
 
                     recordButton.setImageResource(R.drawable.ic_recording_dot)
                     recordButton.contentDescription = holder.view.resources.getString(R.string.a11y_resume_voice_broadcast_record)
-                    recordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
-                    stopRecordButton.setOnClickListener { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
+                    recordButton.onClick { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Resume) }
+                    stopRecordButton.onClick { attributes.callback?.onTimelineItemAction(VoiceBroadcastAction.Recording.Stop) }
                 }
                 VoiceBroadcastRecorder.State.Idle -> {
                     recordButton.isEnabled = false

From 4a76998c98bec82af2cbe8e436f7edbd07f7bfaa Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 22:50:09 +0200
Subject: [PATCH 160/300] Use CopyOnWriteArrayList

---
 .../vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt | 3 ++-
 .../app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
index bb5fe5c37d..2c892c8306 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastPlayer.kt
@@ -41,6 +41,7 @@ import org.matrix.android.sdk.api.session.room.timeline.Timeline
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import timber.log.Timber
+import java.util.concurrent.CopyOnWriteArrayList
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -84,7 +85,7 @@ class VoiceBroadcastPlayer @Inject constructor(
             listeners.forEach { it.onStateChanged(value) }
         }
     private var currentRoomId: String? = null
-    private var listeners = mutableListOf<Listener>()
+    private var listeners = CopyOnWriteArrayList<Listener>()
 
     fun playOrResume(roomId: String, eventId: String) {
         val hasChanged = currentVoiceBroadcastId != eventId
diff --git a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
index cd1a61b986..5285dc5e3b 100644
--- a/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
+++ b/vector/src/main/java/im/vector/app/features/voicebroadcast/VoiceBroadcastRecorderQ.kt
@@ -23,6 +23,7 @@ import androidx.annotation.RequiresApi
 import im.vector.app.features.voice.AbstractVoiceRecorderQ
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
+import java.util.concurrent.CopyOnWriteArrayList
 
 @RequiresApi(Build.VERSION_CODES.Q)
 class VoiceBroadcastRecorderQ(
@@ -38,7 +39,7 @@ class VoiceBroadcastRecorderQ(
             listeners.forEach { it.onStateUpdated(value) }
         }
 
-    private val listeners = mutableListOf<VoiceBroadcastRecorder.Listener>()
+    private val listeners = CopyOnWriteArrayList<VoiceBroadcastRecorder.Listener>()
 
     override val outputFormat = MediaRecorder.OutputFormat.MPEG_4
     override val audioEncoder = MediaRecorder.AudioEncoder.HE_AAC

From 34cafa373f5f29a65d3d4e3318bfe0273396c149 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 23:43:33 +0200
Subject: [PATCH 161/300] Add missing content description

---
 .../item_timeline_event_voice_broadcast_listening_stub.xml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
index 73acde2942..248c04a2f6 100644
--- a/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_voice_broadcast_listening_stub.xml
@@ -71,6 +71,7 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_marginEnd="5dp"
+            android:contentDescription="@null"
             android:src="@drawable/ic_microphone"
             app:tint="?vctr_content_secondary" />
 
@@ -97,6 +98,7 @@
             android:layout_width="16dp"
             android:layout_height="16dp"
             android:layout_marginEnd="5dp"
+            android:contentDescription="@null"
             android:src="@drawable/ic_voice_broadcast_16"
             app:tint="?vctr_content_secondary" />
 

From 926f4d920180e40905f253d00df93aef714793ae Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Thu, 20 Oct 2022 23:58:17 +0200
Subject: [PATCH 162/300] Fix play/pause button disabled

---
 .../detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
index 41ef1fac9c..c417053b2a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceBroadcastRecordingItem.kt
@@ -86,6 +86,7 @@ abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceB
             when (state) {
                 VoiceBroadcastRecorder.State.Recording -> {
                     stopRecordButton.isEnabled = true
+                    recordButton.isEnabled = true
 
                     liveIndicator.isVisible = true
                     liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.colorError))
@@ -99,6 +100,7 @@ abstract class MessageVoiceBroadcastRecordingItem : AbsMessageItem<MessageVoiceB
                 }
                 VoiceBroadcastRecorder.State.Paused -> {
                     stopRecordButton.isEnabled = true
+                    recordButton.isEnabled = true
 
                     liveIndicator.isVisible = true
                     liveIndicator.tintBackground(colorProvider.getColorFromAttribute(R.attr.vctr_content_quaternary))

From 1086ed367eae93be7443eb9b42b82635244579ed Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Thu, 20 Oct 2022 19:42:06 -0400
Subject: [PATCH 163/300] Fixes thread notifications instantly disappearing

---
 .../room/summary/RoomSummaryUpdater.kt        | 10 ++--
 .../home/room/detail/TimelineViewModel.kt     | 51 +++++++++++++------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index c740e07257..7c83a4afa7 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -114,14 +114,12 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.notificationCount = unreadNotifications?.notificationCount ?: 0
 
         roomSummaryEntity.threadHighlightCount = unreadThreadNotifications
-                ?.map { it.value.highlightCount.takeIf { count -> (count ?: 0) > 0 } }
-                ?.size
-                ?: 0
-        roomSummaryEntity.threadNotificationCount = unreadThreadNotifications
-                ?.map { it.value.notificationCount.takeIf { count -> (count ?: 0) > 0 } }
-                ?.size
+                ?.count { (it.value.highlightCount ?: 0) > 0 }
                 ?: 0
 
+        roomSummaryEntity.threadNotificationCount = unreadThreadNotifications
+                ?.count { (it.value.notificationCount ?: 0) > 0 }
+                ?: 0
 
         if (membership != null) {
             roomSummaryEntity.membership = membership
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index 511fd597fe..c30d7a648d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.home.room.detail
 
 import android.net.Uri
 import androidx.annotation.IdRes
+import androidx.lifecycle.asFlow
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Loading
@@ -407,22 +408,40 @@ class TimelineViewModel @AssistedInject constructor(
      * Observe local unread threads.
      */
     private fun observeLocalThreadNotifications() {
-        if (room == null) return
-        room.flow()
-                .liveLocalUnreadThreadList()
-                .execute {
-                    val threadList = it.invoke()
-                    val isUserMentioned = threadList?.firstOrNull { threadRootEvent ->
-                        threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
-                    }?.let { true } ?: false
-                    val numberOfLocalUnreadThreads = threadList?.size ?: 0
-                    copy(
-                            threadNotificationBadgeState = ThreadNotificationBadgeState(
-                                    numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
-                                    isUserMentioned = isUserMentioned
-                            )
-                    )
-                }
+        val threadNotificationsSupported = session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreadReadReceiptsAndNotifications
+        if (threadNotificationsSupported) {
+            room?.getRoomSummaryLive()
+                    ?.asFlow()
+                    ?.onEach {
+                        it.getOrNull()?.let {
+                            setState {
+                                copy(
+                                        threadNotificationBadgeState = ThreadNotificationBadgeState(
+                                                numberOfLocalUnreadThreads = it.threadNotificationCount + it.threadHighlightCount,
+                                                isUserMentioned = it.threadHighlightCount > 0,
+                                        )
+                                )
+                            }
+                        }
+                    }
+                    ?.launchIn(viewModelScope)
+        } else {
+            room?.flow()
+                    ?.liveLocalUnreadThreadList()
+                    ?.execute {
+                        val threadList = it.invoke()
+                        val isUserMentioned = threadList?.firstOrNull { threadRootEvent ->
+                            threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
+                        }?.let { true } ?: false
+                        val numberOfLocalUnreadThreads = threadList?.size ?: 0
+                        copy(
+                                threadNotificationBadgeState = ThreadNotificationBadgeState(
+                                        numberOfLocalUnreadThreads = numberOfLocalUnreadThreads,
+                                        isUserMentioned = isUserMentioned
+                                )
+                        )
+                    }
+        }
     }
 
     override fun handle(action: RoomDetailAction) {

From f76490130cab871b7dade83b7a1a03aaeb0ae48c Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Thu, 20 Oct 2022 19:49:37 -0400
Subject: [PATCH 164/300] Adds changelog file

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

diff --git a/changelog.d/7424.misc b/changelog.d/7424.misc
new file mode 100644
index 0000000000..6c6673eaf0
--- /dev/null
+++ b/changelog.d/7424.misc
@@ -0,0 +1 @@
+Gets thread notifications from sync response

From 8a4d918b250325949c2bb6c0a06bc99c586a7bf9 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Fri, 21 Oct 2022 09:59:40 +0100
Subject: [PATCH 165/300] Update triage-labelled.yml

---
 .github/workflows/triage-labelled.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 18ce26171c..34e36a55da 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -52,8 +52,8 @@ jobs:
       (contains(github.event.issue.labels.*.name, 'S-Critical') &&
        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
         contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-       contains(github.event.issue.labels.*.name, 'S-Major') &&
-       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
+       (contains(github.event.issue.labels.*.name, 'S-Major') &&
+        contains(github.event.issue.labels.*.name, 'O-Frequent')) ||
        contains(github.event.issue.labels.*.name, 'A11y'))
     steps:
       - uses: octokit/graphql-action@v2.x

From 113d0ff5400860337deb5786c105cfeba655363e Mon Sep 17 00:00:00 2001
From: Nikita Fedrunov <66663241+fedrunov@users.noreply.github.com>
Date: Fri, 21 Oct 2022 15:06:20 +0200
Subject: [PATCH 166/300] =?UTF-8?q?thread=20read=20receipts=20and=20unread?=
 =?UTF-8?q?=20notifications=20support=20is=20added=20to=20hom=E2=80=A6=20(?=
 =?UTF-8?q?#7386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homeserver/HomeServerCapabilities.kt      |  5 +++
 .../auth/version/HomeServerVersion.kt         |  1 +
 .../sdk/internal/auth/version/Versions.kt     | 11 ++++++
 .../database/RealmSessionStoreMigration.kt    |  4 ++-
 .../mapper/HomeServerCapabilitiesMapper.kt    |  1 +
 .../database/migration/MigrateSessionTo040.kt | 34 +++++++++++++++++++
 .../model/HomeServerCapabilitiesEntity.kt     |  1 +
 .../GetHomeServerCapabilitiesTask.kt          |  3 ++
 8 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
index 8c14ca892a..773e870ffd 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/homeserver/HomeServerCapabilities.kt
@@ -65,6 +65,11 @@ data class HomeServerCapabilities(
          * True if the home server supports login via qr code, false otherwise.
          */
         val canLoginWithQrCode: Boolean = false,
+
+        /**
+         * True if the home server supports threaded read receipts and unread notifications.
+         */
+        val canUseThreadReadReceiptsAndNotifications: Boolean = false,
 ) {
 
     enum class RoomCapabilitySupport {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
index 75639c6a21..d443d6e3c8 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/HomeServerVersion.kt
@@ -60,5 +60,6 @@ internal data class HomeServerVersion(
         val r0_6_0 = HomeServerVersion(major = 0, minor = 6, patch = 0)
         val r0_6_1 = HomeServerVersion(major = 0, minor = 6, patch = 1)
         val v1_3_0 = HomeServerVersion(major = 1, minor = 3, patch = 0)
+        val v1_4_0 = HomeServerVersion(major = 1, minor = 4, patch = 0)
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
index 5e133fab9c..1245d8df4b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/version/Versions.kt
@@ -54,6 +54,8 @@ private const val FEATURE_SEPARATE_ADD_AND_BIND = "m.separate_add_and_bind"
 private const val FEATURE_THREADS_MSC3440 = "org.matrix.msc3440"
 private const val FEATURE_THREADS_MSC3440_STABLE = "org.matrix.msc3440.stable"
 private const val FEATURE_QR_CODE_LOGIN = "org.matrix.msc3882"
+private const val FEATURE_THREADS_MSC3771 = "org.matrix.msc3771"
+private const val FEATURE_THREADS_MSC3773 = "org.matrix.msc3773"
 
 /**
  * Return true if the SDK supports this homeserver version.
@@ -79,6 +81,15 @@ internal fun Versions.doesServerSupportThreads(): Boolean {
     return unstableFeatures?.get(FEATURE_THREADS_MSC3440_STABLE) ?: false
 }
 
+/**
+ * Indicate if the homeserver support MSC3771 and MSC3773 for threaded read receipts and unread notifications.
+ */
+internal fun Versions.doesServerSupportThreadUnreadNotifications(): Boolean {
+    val msc3771 = unstableFeatures?.get(FEATURE_THREADS_MSC3771) ?: false
+    val msc3773 = unstableFeatures?.get(FEATURE_THREADS_MSC3773) ?: false
+    return getMaxVersion() >= HomeServerVersion.v1_4_0 || (msc3771 && msc3773)
+}
+
 internal fun Versions.doesServerSupportQrCodeLogin(): Boolean {
     return unstableFeatures?.get(FEATURE_QR_CODE_LOGIN) ?: false
 }
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 9a2c32f97c..def0f6de7a 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
@@ -56,6 +56,7 @@ import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo036
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo037
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo038
 import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo039
+import org.matrix.android.sdk.internal.database.migration.MigrateSessionTo040
 import org.matrix.android.sdk.internal.util.Normalizer
 import org.matrix.android.sdk.internal.util.database.MatrixRealmMigration
 import javax.inject.Inject
@@ -64,7 +65,7 @@ internal class RealmSessionStoreMigration @Inject constructor(
         private val normalizer: Normalizer
 ) : MatrixRealmMigration(
         dbName = "Session",
-        schemaVersion = 39L,
+        schemaVersion = 40L,
 ) {
     /**
      * Forces all RealmSessionStoreMigration instances to be equal.
@@ -113,5 +114,6 @@ internal class RealmSessionStoreMigration @Inject constructor(
         if (oldVersion < 37) MigrateSessionTo037(realm).perform()
         if (oldVersion < 38) MigrateSessionTo038(realm).perform()
         if (oldVersion < 39) MigrateSessionTo039(realm).perform()
+        if (oldVersion < 40) MigrateSessionTo040(realm).perform()
     }
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
index 63fa101c45..3528ca0051 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/mapper/HomeServerCapabilitiesMapper.kt
@@ -45,6 +45,7 @@ internal object HomeServerCapabilitiesMapper {
                 canUseThreading = entity.canUseThreading,
                 canControlLogoutDevices = entity.canControlLogoutDevices,
                 canLoginWithQrCode = entity.canLoginWithQrCode,
+                canUseThreadReadReceiptsAndNotifications = entity.canUseThreadReadReceiptsAndNotifications
         )
     }
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.kt
new file mode 100644
index 0000000000..b3e02342dd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo040.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.HomeServerCapabilitiesEntityFields
+import org.matrix.android.sdk.internal.extensions.forceRefreshOfHomeServerCapabilities
+import org.matrix.android.sdk.internal.util.database.RealmMigrator
+
+internal class MigrateSessionTo040(realm: DynamicRealm) : RealmMigrator(realm, 40) {
+
+    override fun doMigrate(realm: DynamicRealm) {
+        realm.schema.get("HomeServerCapabilitiesEntity")
+                ?.addField(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, Boolean::class.java)
+                ?.transform { obj ->
+                    obj.set(HomeServerCapabilitiesEntityFields.CAN_USE_THREAD_READ_RECEIPTS_AND_NOTIFICATIONS, false)
+                }
+                ?.forceRefreshOfHomeServerCapabilities()
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
index cfa02b2c74..89f1e50b30 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/HomeServerCapabilitiesEntity.kt
@@ -32,6 +32,7 @@ internal open class HomeServerCapabilitiesEntity(
         var canUseThreading: Boolean = false,
         var canControlLogoutDevices: Boolean = false,
         var canLoginWithQrCode: Boolean = false,
+        var canUseThreadReadReceiptsAndNotifications: Boolean = false,
 ) : RealmObject() {
 
     companion object
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
index 2c3cb440b6..a5953d870c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/homeserver/GetHomeServerCapabilitiesTask.kt
@@ -25,6 +25,7 @@ import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities
 import org.matrix.android.sdk.internal.auth.version.Versions
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportLogoutDevices
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportQrCodeLogin
+import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreadUnreadNotifications
 import org.matrix.android.sdk.internal.auth.version.doesServerSupportThreads
 import org.matrix.android.sdk.internal.auth.version.isLoginAndRegistrationSupportedBySdk
 import org.matrix.android.sdk.internal.database.model.HomeServerCapabilitiesEntity
@@ -144,6 +145,8 @@ internal class DefaultGetHomeServerCapabilitiesTask @Inject constructor(
                 homeServerCapabilitiesEntity.canControlLogoutDevices = getVersionResult.doesServerSupportLogoutDevices()
                 homeServerCapabilitiesEntity.canUseThreading = /* capabilities?.threads?.enabled.orFalse() || */
                         getVersionResult.doesServerSupportThreads()
+                homeServerCapabilitiesEntity.canUseThreadReadReceiptsAndNotifications =
+                        getVersionResult.doesServerSupportThreadUnreadNotifications()
                 homeServerCapabilitiesEntity.canLoginWithQrCode = getVersionResult.doesServerSupportQrCodeLogin()
             }
 

From 31811bb7e0eff83b1fcabc1cd27298ebb121bc5e Mon Sep 17 00:00:00 2001
From: jonnyandrew <jonny.andrew@protonmail.com>
Date: Fri, 21 Oct 2022 17:36:31 +0100
Subject: [PATCH 167/300] Fix crash by disabling Flipper on API 22 and below
 (#7428)

* Disable Flipper on API 21 and below - only affects debug builds.

Due to a bug: https://github.com/facebook/flipper/issues/3572

* Add jonnyandrew to PR sign-off allowlist

Co-authored-by: Benoit Marty <benoit.marty@gmail.com>
---
 changelog.d/7428.bugfix                       |  1 +
 tools/danger/dangerfile.js                    |  1 +
 .../vector/app/flipper/VectorFlipperProxy.kt  | 56 ++++++++++++-------
 3 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 changelog.d/7428.bugfix

diff --git a/changelog.d/7428.bugfix b/changelog.d/7428.bugfix
new file mode 100644
index 0000000000..8f014af31b
--- /dev/null
+++ b/changelog.d/7428.bugfix
@@ -0,0 +1 @@
+Fix crash by disabling Flipper on Android API 22 and below - only affects debug version of the application.
diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
index 1a36474470..2fc55bad0c 100644
--- a/tools/danger/dangerfile.js
+++ b/tools/danger/dangerfile.js
@@ -81,6 +81,7 @@ const allowList = [
     "Florian14",
     "ganfra",
     "jmartinesp",
+    "jonnyandrew",
     "langleyd",
     "MadLittleMods",
     "manuroe",
diff --git a/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
index 2e4336c942..cbf9e4f11f 100644
--- a/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
+++ b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt
@@ -17,6 +17,7 @@
 package im.vector.app.flipper
 
 import android.content.Context
+import android.os.Build
 import com.facebook.flipper.android.AndroidFlipperClient
 import com.facebook.flipper.android.utils.FlipperUtils
 import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin
@@ -31,6 +32,7 @@ import com.kgurgul.flipper.RealmDatabaseDriver
 import com.kgurgul.flipper.RealmDatabaseProvider
 import im.vector.app.core.debug.FlipperProxy
 import io.realm.RealmConfiguration
+import okhttp3.Interceptor
 import org.matrix.android.sdk.api.Matrix
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -41,29 +43,43 @@ class VectorFlipperProxy @Inject constructor(
 ) : FlipperProxy {
     private val networkFlipperPlugin = NetworkFlipperPlugin()
 
+    private val isEnabled: Boolean
+        get() {
+            // https://github.com/facebook/flipper/issues/3572
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                return false
+            }
+
+            return FlipperUtils.shouldEnableFlipper(context)
+        }
+
     override fun init(matrix: Matrix) {
+        if (!isEnabled) return
+
         SoLoader.init(context, false)
 
-        if (FlipperUtils.shouldEnableFlipper(context)) {
-            val client = AndroidFlipperClient.getInstance(context)
-            client.addPlugin(CrashReporterPlugin.getInstance())
-            client.addPlugin(SharedPreferencesFlipperPlugin(context))
-            client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
-            client.addPlugin(networkFlipperPlugin)
-            client.addPlugin(
-                    DatabasesFlipperPlugin(
-                            RealmDatabaseDriver(
-                                    context = context,
-                                    realmDatabaseProvider = object : RealmDatabaseProvider {
-                                        override fun getRealmConfigurations(): List<RealmConfiguration> {
-                                            return matrix.debugService().getAllRealmConfigurations()
-                                        }
-                                    })
-                    )
-            )
-            client.start()
-        }
+        val client = AndroidFlipperClient.getInstance(context)
+        client.addPlugin(CrashReporterPlugin.getInstance())
+        client.addPlugin(SharedPreferencesFlipperPlugin(context))
+        client.addPlugin(InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()))
+        client.addPlugin(networkFlipperPlugin)
+        client.addPlugin(
+                DatabasesFlipperPlugin(
+                        RealmDatabaseDriver(
+                                context = context,
+                                realmDatabaseProvider = object : RealmDatabaseProvider {
+                                    override fun getRealmConfigurations(): List<RealmConfiguration> {
+                                        return matrix.debugService().getAllRealmConfigurations()
+                                    }
+                                })
+                )
+        )
+        client.start()
     }
 
-    override fun networkInterceptor() = FlipperOkhttpInterceptor(networkFlipperPlugin)
+    override fun networkInterceptor(): Interceptor? {
+        if (!isEnabled) return null
+
+        return FlipperOkhttpInterceptor(networkFlipperPlugin)
+    }
 }

From bec71438247f6fdf67b429499d92731ed2264259 Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Thu, 20 Oct 2022 16:13:17 +0100
Subject: [PATCH 168/300] Add new attachments selection dialog

---
 .../src/main/res/values/strings.xml           | 10 ++
 .../app/core/di/MavericksViewModelModule.kt   |  6 ++
 .../core/ui/views/BottomSheetActionButton.kt  |  5 +
 .../features/attachments/AttachmentType.kt    | 37 ++++++++
 .../AttachmentTypeSelectorBottomSheet.kt      | 79 ++++++++++++++++
 ...chmentTypeSelectorSharedActionViewModel.kt | 30 ++++++
 .../attachments/AttachmentTypeSelectorView.kt | 70 +++++++-------
 .../AttachmentTypeSelectorViewModel.kt        | 59 ++++++++++++
 .../features/attachments/AttachmentsHelper.kt |  2 +-
 .../composer/MessageComposerFragment.kt       | 64 ++++++++-----
 .../bottom_sheet_attachment_type_selector.xml | 92 +++++++++++++++++++
 .../AttachmentTypeSelectorViewModelTest.kt    | 91 ++++++++++++++++++
 .../app/test/fakes/FakeVectorFeatures.kt      |  8 ++
 13 files changed, 492 insertions(+), 61 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
 create mode 100644 vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
 create mode 100644 vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index ea9b4b5999..9ce87199b0 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3205,6 +3205,16 @@
     <string name="tooltip_attachment_location">Share location</string>
     <string name="tooltip_attachment_voice_broadcast">Start a voice broadcast</string>
 
+    <string name="attachment_type_selector_gallery">Photo library</string>
+    <string name="attachment_type_selector_sticker">Stickers</string>
+    <string name="attachment_type_selector_file">Attachments</string>
+    <string name="attachment_type_selector_voice_broadcast">Voice broadcast</string>
+    <string name="attachment_type_selector_poll">Polls</string>
+    <string name="attachment_type_selector_location">Location</string>
+    <string name="attachment_type_selector_camera">Camera</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+    <string name="attachment_type_selector_text_formatting">Text formatting</string>
+
     <string name="message_reaction_show_less">Show less</string>
     <plurals name="message_reaction_show_more">
         <item quantity="one">"%1$d more"</item>
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
index 97590028d8..2242abb7aa 100644
--- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -22,6 +22,7 @@ import dagger.hilt.InstallIn
 import dagger.multibindings.IntoMap
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewModel
+import im.vector.app.features.attachments.AttachmentTypeSelectorViewModel
 import im.vector.app.features.auth.ReAuthViewModel
 import im.vector.app.features.call.VectorCallViewModel
 import im.vector.app.features.call.conference.JitsiCallViewModel
@@ -677,4 +678,9 @@ interface MavericksViewModelModule {
     @IntoMap
     @MavericksViewModelKey(VectorSettingsLabsViewModel::class)
     fun vectorSettingsLabsViewModelFactory(factory: VectorSettingsLabsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(AttachmentTypeSelectorViewModel::class)
+    fun attachmentTypeSelectorViewModelFactory(factory: AttachmentTypeSelectorViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index a3e8b3780c..d16bf67a34 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -38,6 +38,11 @@ class BottomSheetActionButton @JvmOverloads constructor(
 ) : FrameLayout(context, attrs, defStyleAttr) {
     val views: ViewBottomSheetActionButtonBinding
 
+    override fun setOnClickListener(l: OnClickListener?) {
+        super.setOnClickListener(l)
+        views.bottomSheetActionClickableZone.setOnClickListener(l)
+    }
+
     var title: String? = null
         set(value) {
             field = value
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt
new file mode 100644
index 0000000000..f4b97b9f9c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt
@@ -0,0 +1,37 @@
+/*
+ * 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 im.vector.app.features.attachments
+
+import im.vector.app.core.utils.PERMISSIONS_EMPTY
+import im.vector.app.core.utils.PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING
+import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSIONS_FOR_VOICE_BROADCAST
+
+/**
+ * The all possible types to pick with their required permissions.
+ */
+enum class AttachmentType(val permissions: List<String>) {
+    CAMERA(PERMISSIONS_FOR_TAKING_PHOTO),
+    GALLERY(PERMISSIONS_EMPTY),
+    FILE(PERMISSIONS_EMPTY),
+    STICKER(PERMISSIONS_EMPTY),
+    CONTACT(PERMISSIONS_FOR_PICKING_CONTACT),
+    POLL(PERMISSIONS_EMPTY),
+    LOCATION(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING),
+    VOICE_BROADCAST(PERMISSIONS_FOR_VOICE_BROADCAST),
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
new file mode 100644
index 0000000000..88cad2ab0b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
@@ -0,0 +1,79 @@
+/*
+ * 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 im.vector.app.features.attachments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetAttachmentTypeSelectorBinding
+import im.vector.app.features.home.room.detail.TimelineViewModel
+
+@AndroidEntryPoint
+class AttachmentTypeSelectorBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetAttachmentTypeSelectorBinding>() {
+
+    private val viewModel: AttachmentTypeSelectorViewModel by fragmentViewModel()
+    private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
+    private val sharedActionViewModel: AttachmentTypeSelectorSharedActionViewModel by viewModels(
+            ownerProducer = { requireParentFragment() }
+    )
+
+    override val showExpanded = true
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetAttachmentTypeSelectorBinding {
+        return BottomSheetAttachmentTypeSelectorBinding.inflate(inflater, container, false)
+    }
+
+    override fun invalidate() = withState(viewModel, timelineViewModel) { viewState, timelineState ->
+        super.invalidate()
+        views.location.visibility = if (viewState.isLocationVisible) View.VISIBLE else View.GONE
+        views.voiceBroadcast.visibility = if (viewState.isVoiceBroadcastVisible) View.VISIBLE else View.GONE
+        views.poll.visibility = if (!timelineState.isThreadTimeline()) View.VISIBLE else View.GONE
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.gallery.debouncedClicks { onAttachmentSelected(AttachmentType.GALLERY) }
+        views.stickers.debouncedClicks { onAttachmentSelected(AttachmentType.STICKER) }
+        views.file.debouncedClicks { onAttachmentSelected(AttachmentType.FILE) }
+        views.voiceBroadcast.debouncedClicks { onAttachmentSelected(AttachmentType.VOICE_BROADCAST) }
+        views.poll.debouncedClicks { onAttachmentSelected(AttachmentType.POLL) }
+        views.location.debouncedClicks { onAttachmentSelected(AttachmentType.LOCATION) }
+        views.camera.debouncedClicks { onAttachmentSelected(AttachmentType.CAMERA) }
+        views.contact.debouncedClicks { onAttachmentSelected(AttachmentType.CONTACT) }
+    }
+
+    private fun onAttachmentSelected(attachmentType: AttachmentType) {
+        val action = AttachmentTypeSelectorSharedAction.SelectAttachmentTypeAction(attachmentType)
+        sharedActionViewModel.post(action)
+        dismiss()
+    }
+
+    companion object {
+        fun show(fragmentManager: FragmentManager) {
+            val bottomSheet = AttachmentTypeSelectorBottomSheet()
+            bottomSheet.show(fragmentManager, "AttachmentTypeSelectorBottomSheet")
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
new file mode 100644
index 0000000000..2b85b6882a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
@@ -0,0 +1,30 @@
+/*
+ * 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 im.vector.app.features.attachments
+
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+class AttachmentTypeSelectorSharedActionViewModel @Inject constructor() :
+        VectorSharedActionViewModel<AttachmentTypeSelectorSharedAction>()
+
+sealed class AttachmentTypeSelectorSharedAction : VectorSharedAction {
+    data class SelectAttachmentTypeAction(
+            val attachmentType: AttachmentType
+    ) : AttachmentTypeSelectorSharedAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
index 8536b765d4..55805a0728 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
@@ -30,17 +30,11 @@ import android.view.animation.TranslateAnimation
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import android.widget.PopupWindow
-import androidx.annotation.StringRes
 import androidx.appcompat.widget.TooltipCompat
 import androidx.core.view.doOnNextLayout
 import androidx.core.view.isVisible
 import im.vector.app.R
 import im.vector.app.core.epoxy.onClick
-import im.vector.app.core.utils.PERMISSIONS_EMPTY
-import im.vector.app.core.utils.PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING
-import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
-import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
-import im.vector.app.core.utils.PERMISSIONS_FOR_VOICE_BROADCAST
 import im.vector.app.databinding.ViewAttachmentTypeSelectorBinding
 import im.vector.app.features.attachments.AttachmentTypeSelectorView.Callback
 import kotlin.math.max
@@ -59,7 +53,7 @@ class AttachmentTypeSelectorView(
 ) : PopupWindow(context) {
 
     interface Callback {
-        fun onTypeSelected(type: Type)
+        fun onTypeSelected(type: AttachmentType)
     }
 
     private val views: ViewAttachmentTypeSelectorBinding
@@ -69,14 +63,14 @@ class AttachmentTypeSelectorView(
     init {
         contentView = inflater.inflate(R.layout.view_attachment_type_selector, null, false)
         views = ViewAttachmentTypeSelectorBinding.bind(contentView)
-        views.attachmentGalleryButton.configure(Type.GALLERY)
-        views.attachmentCameraButton.configure(Type.CAMERA)
-        views.attachmentFileButton.configure(Type.FILE)
-        views.attachmentStickersButton.configure(Type.STICKER)
-        views.attachmentContactButton.configure(Type.CONTACT)
-        views.attachmentPollButton.configure(Type.POLL)
-        views.attachmentLocationButton.configure(Type.LOCATION)
-        views.attachmentVoiceBroadcast.configure(Type.VOICE_BROADCAST)
+        views.attachmentGalleryButton.configure(AttachmentType.GALLERY)
+        views.attachmentCameraButton.configure(AttachmentType.CAMERA)
+        views.attachmentFileButton.configure(AttachmentType.FILE)
+        views.attachmentStickersButton.configure(AttachmentType.STICKER)
+        views.attachmentContactButton.configure(AttachmentType.CONTACT)
+        views.attachmentPollButton.configure(AttachmentType.POLL)
+        views.attachmentLocationButton.configure(AttachmentType.LOCATION)
+        views.attachmentVoiceBroadcast.configure(AttachmentType.VOICE_BROADCAST)
         width = LinearLayout.LayoutParams.MATCH_PARENT
         height = LinearLayout.LayoutParams.WRAP_CONTENT
         animationStyle = 0
@@ -127,16 +121,16 @@ class AttachmentTypeSelectorView(
         }
     }
 
-    fun setAttachmentVisibility(type: Type, isVisible: Boolean) {
+    fun setAttachmentVisibility(type: AttachmentType, isVisible: Boolean) {
         when (type) {
-            Type.CAMERA -> views.attachmentCameraButton
-            Type.GALLERY -> views.attachmentGalleryButton
-            Type.FILE -> views.attachmentFileButton
-            Type.STICKER -> views.attachmentStickersButton
-            Type.CONTACT -> views.attachmentContactButton
-            Type.POLL -> views.attachmentPollButton
-            Type.LOCATION -> views.attachmentLocationButton
-            Type.VOICE_BROADCAST -> views.attachmentVoiceBroadcast
+            AttachmentType.CAMERA -> views.attachmentCameraButton
+            AttachmentType.GALLERY -> views.attachmentGalleryButton
+            AttachmentType.FILE -> views.attachmentFileButton
+            AttachmentType.STICKER -> views.attachmentStickersButton
+            AttachmentType.CONTACT -> views.attachmentContactButton
+            AttachmentType.POLL -> views.attachmentPollButton
+            AttachmentType.LOCATION -> views.attachmentLocationButton
+            AttachmentType.VOICE_BROADCAST -> views.attachmentVoiceBroadcast
         }.let {
             it.isVisible = isVisible
         }
@@ -200,13 +194,13 @@ class AttachmentTypeSelectorView(
         return Pair(x, y)
     }
 
-    private fun ImageButton.configure(type: Type): ImageButton {
+    private fun ImageButton.configure(type: AttachmentType): ImageButton {
         this.setOnClickListener(TypeClickListener(type))
-        TooltipCompat.setTooltipText(this, context.getString(type.tooltipRes))
+        TooltipCompat.setTooltipText(this, context.getString(attachmentTooltipLabels.getValue(type)))
         return this
     }
 
-    private inner class TypeClickListener(private val type: Type) : View.OnClickListener {
+    private inner class TypeClickListener(private val type: AttachmentType) : View.OnClickListener {
 
         override fun onClick(v: View) {
             dismiss()
@@ -217,14 +211,18 @@ class AttachmentTypeSelectorView(
     /**
      * The all possible types to pick with their required permissions and tooltip resource.
      */
-    enum class Type(val permissions: List<String>, @StringRes val tooltipRes: Int) {
-        CAMERA(PERMISSIONS_FOR_TAKING_PHOTO, R.string.tooltip_attachment_photo),
-        GALLERY(PERMISSIONS_EMPTY, R.string.tooltip_attachment_gallery),
-        FILE(PERMISSIONS_EMPTY, R.string.tooltip_attachment_file),
-        STICKER(PERMISSIONS_EMPTY, R.string.tooltip_attachment_sticker),
-        CONTACT(PERMISSIONS_FOR_PICKING_CONTACT, R.string.tooltip_attachment_contact),
-        POLL(PERMISSIONS_EMPTY, R.string.tooltip_attachment_poll),
-        LOCATION(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING, R.string.tooltip_attachment_location),
-        VOICE_BROADCAST(PERMISSIONS_FOR_VOICE_BROADCAST, R.string.tooltip_attachment_voice_broadcast),
+    private companion object {
+        private val attachmentTooltipLabels: Map<AttachmentType, Int> = AttachmentType.values().associateWith {
+            when (it) {
+                AttachmentType.CAMERA -> R.string.tooltip_attachment_photo
+                AttachmentType.GALLERY -> R.string.tooltip_attachment_gallery
+                AttachmentType.FILE -> R.string.tooltip_attachment_file
+                AttachmentType.STICKER -> R.string.tooltip_attachment_sticker
+                AttachmentType.CONTACT -> R.string.tooltip_attachment_contact
+                AttachmentType.POLL -> R.string.tooltip_attachment_poll
+                AttachmentType.LOCATION -> R.string.tooltip_attachment_location
+                AttachmentType.VOICE_BROADCAST -> R.string.tooltip_attachment_voice_broadcast
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
new file mode 100644
index 0000000000..ec45e226be
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
@@ -0,0 +1,59 @@
+/*
+ * 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 im.vector.app.features.attachments
+
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.EmptyAction
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.VectorFeatures
+
+class AttachmentTypeSelectorViewModel @AssistedInject constructor(
+        @Assisted initialState: AttachmentTypeSelectorViewState,
+        private val vectorFeatures: VectorFeatures,
+) : VectorViewModel<AttachmentTypeSelectorViewState, EmptyAction, EmptyViewEvents>(initialState) {
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<AttachmentTypeSelectorViewModel, AttachmentTypeSelectorViewState> {
+        override fun create(initialState: AttachmentTypeSelectorViewState): AttachmentTypeSelectorViewModel
+    }
+
+    companion object : MavericksViewModelFactory<AttachmentTypeSelectorViewModel, AttachmentTypeSelectorViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: EmptyAction) {
+        // do nothing
+    }
+
+    init {
+        setState {
+            this.copy(
+                    isLocationVisible = vectorFeatures.isLocationSharingEnabled(),
+                    isVoiceBroadcastVisible = vectorFeatures.isVoiceBroadcastEnabled(),
+            )
+        }
+    }
+}
+
+data class AttachmentTypeSelectorViewState(
+        val isLocationVisible: Boolean = false,
+        val isVoiceBroadcastVisible: Boolean = false,
+) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index 1a8e10d102..9692777e15 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -54,7 +54,7 @@ class AttachmentsHelper(
     private var captureUri: Uri? = null
 
     // The pending type is set if we have to handle permission request. It must be restored if the activity gets killed.
-    var pendingType: AttachmentTypeSelectorView.Type? = null
+    var pendingType: AttachmentType? = null
 
     // Restorable
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
index 55ec922a57..afa9c84353 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
@@ -40,6 +40,7 @@ import androidx.core.text.buildSpannedString
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.parentFragmentViewModel
@@ -63,6 +64,10 @@ import im.vector.app.core.utils.onPermissionDeniedDialog
 import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.databinding.FragmentComposerBinding
 import im.vector.app.features.VectorFeatures
+import im.vector.app.features.attachments.AttachmentType
+import im.vector.app.features.attachments.AttachmentTypeSelectorBottomSheet
+import im.vector.app.features.attachments.AttachmentTypeSelectorSharedAction
+import im.vector.app.features.attachments.AttachmentTypeSelectorSharedActionViewModel
 import im.vector.app.features.attachments.AttachmentTypeSelectorView
 import im.vector.app.features.attachments.AttachmentsHelper
 import im.vector.app.features.attachments.ContactAttachment
@@ -92,6 +97,7 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.share.SharedData
 import im.vector.app.features.voice.VoiceFailure
 import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -161,6 +167,7 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
     private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
     private val messageComposerViewModel: MessageComposerViewModel by parentFragmentViewModel()
     private lateinit var sharedActionViewModel: MessageSharedActionViewModel
+    private val attachmentViewModel: AttachmentTypeSelectorSharedActionViewModel by viewModels()
 
     private val composer: MessageComposerView get() {
         return if (vectorPreferences.isRichTextEditorEnabled()) {
@@ -219,6 +226,11 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
             }
         }
 
+        attachmentViewModel.stream()
+                .filterIsInstance<AttachmentTypeSelectorSharedAction.SelectAttachmentTypeAction>()
+                .onEach { onTypeSelected(it.attachmentType) }
+                .launchIn(lifecycleScope)
+
         if (savedInstanceState != null) {
             handleShareData()
         }
@@ -299,21 +311,25 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
         }
         composer.callback = object : PlainTextComposerLayout.Callback {
             override fun onAddAttachment() {
-                if (!::attachmentTypeSelector.isInitialized) {
-                    attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@MessageComposerFragment)
-                    attachmentTypeSelector.setAttachmentVisibility(
-                            AttachmentTypeSelectorView.Type.LOCATION,
-                            vectorFeatures.isLocationSharingEnabled(),
-                    )
-                    attachmentTypeSelector.setAttachmentVisibility(
-                            AttachmentTypeSelectorView.Type.POLL, !isThreadTimeLine()
-                    )
-                    attachmentTypeSelector.setAttachmentVisibility(
-                            AttachmentTypeSelectorView.Type.VOICE_BROADCAST,
-                            vectorPreferences.isVoiceBroadcastEnabled(), // TODO check user permission
-                    )
+                if (vectorPreferences.isRichTextEditorEnabled()) {
+                    AttachmentTypeSelectorBottomSheet.show(childFragmentManager)
+                } else {
+                    if (!::attachmentTypeSelector.isInitialized) {
+                        attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@MessageComposerFragment)
+                        attachmentTypeSelector.setAttachmentVisibility(
+                                AttachmentType.LOCATION,
+                                vectorFeatures.isLocationSharingEnabled(),
+                        )
+                        attachmentTypeSelector.setAttachmentVisibility(
+                                AttachmentType.POLL, !isThreadTimeLine()
+                        )
+                        attachmentTypeSelector.setAttachmentVisibility(
+                                AttachmentType.VOICE_BROADCAST,
+                                vectorPreferences.isVoiceBroadcastEnabled(), // TODO check user permission
+                        )
+                    }
+                    attachmentTypeSelector.show(composer.attachmentButton)
                 }
-                attachmentTypeSelector.show(composer.attachmentButton)
             }
 
             override fun onExpandOrCompactChange() {
@@ -662,20 +678,20 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
         }
     }
 
-    private fun launchAttachmentProcess(type: AttachmentTypeSelectorView.Type) {
+    private fun launchAttachmentProcess(type: AttachmentType) {
         when (type) {
-            AttachmentTypeSelectorView.Type.CAMERA -> attachmentsHelper.openCamera(
+            AttachmentType.CAMERA -> attachmentsHelper.openCamera(
                     activity = requireActivity(),
                     vectorPreferences = vectorPreferences,
                     cameraActivityResultLauncher = attachmentCameraActivityResultLauncher,
                     cameraVideoActivityResultLauncher = attachmentCameraVideoActivityResultLauncher
             )
-            AttachmentTypeSelectorView.Type.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
-            AttachmentTypeSelectorView.Type.STICKER -> timelineViewModel.handle(RoomDetailAction.SelectStickerAttachment)
-            AttachmentTypeSelectorView.Type.POLL -> navigator.openCreatePoll(requireContext(), roomId, null, PollMode.CREATE)
-            AttachmentTypeSelectorView.Type.LOCATION -> {
+            AttachmentType.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher)
+            AttachmentType.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher)
+            AttachmentType.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
+            AttachmentType.STICKER -> timelineViewModel.handle(RoomDetailAction.SelectStickerAttachment)
+            AttachmentType.POLL -> navigator.openCreatePoll(requireContext(), roomId, null, PollMode.CREATE)
+            AttachmentType.LOCATION -> {
                 navigator
                         .openLocationSharing(
                                 context = requireContext(),
@@ -685,11 +701,11 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
                                 locationOwnerId = session.myUserId
                         )
             }
-            AttachmentTypeSelectorView.Type.VOICE_BROADCAST -> timelineViewModel.handle(VoiceBroadcastAction.Recording.Start)
+            AttachmentType.VOICE_BROADCAST -> timelineViewModel.handle(VoiceBroadcastAction.Recording.Start)
         }
     }
 
-    override fun onTypeSelected(type: AttachmentTypeSelectorView.Type) {
+    override fun onTypeSelected(type: AttachmentType) {
         if (checkPermissions(type.permissions, requireActivity(), typeSelectedActivityResultLauncher)) {
             launchAttachmentProcess(type)
         } else {
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
new file mode 100644
index 0000000000..3aec5b5c20
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?colorSurface"
+    android:orientation="vertical">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/gallery"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_gallery"
+                app:leftIcon="@drawable/ic_attachment_gallery"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/stickers"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_sticker"
+                app:leftIcon="@drawable/ic_attachment_sticker"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/file"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_file"
+                app:leftIcon="@drawable/ic_attachment_file"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/voiceBroadcast"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_voice_broadcast"
+                app:leftIcon="@drawable/ic_attachment_voice_broadcast"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/poll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_poll"
+                app:leftIcon="@drawable/ic_attachment_poll"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/location"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_location"
+                app:leftIcon="@drawable/ic_attachment_location"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/camera"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_camera"
+                app:leftIcon="@drawable/ic_attachment_camera"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+            <im.vector.app.core.ui.views.BottomSheetActionButton
+                android:id="@+id/contact"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:actionTitle="@string/attachment_type_selector_contact"
+                app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
+                app:tint="?colorPrimary"
+                app:titleTextColor="?vctr_content_primary" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
diff --git a/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt b/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt
new file mode 100644
index 0000000000..478f631c06
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt
@@ -0,0 +1,91 @@
+/*
+ * 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 im.vector.app.features.attachments
+
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.test.fakes.FakeVectorFeatures
+import im.vector.app.test.test
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+internal class AttachmentTypeSelectorViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule()
+
+    private val fakeVectorFeatures = FakeVectorFeatures()
+    private val initialState = AttachmentTypeSelectorViewState()
+
+    @Before
+    fun setUp() {
+        // Disable all features by default
+        fakeVectorFeatures.givenLocationSharing(isEnabled = false)
+        fakeVectorFeatures.givenVoiceBroadcast(isEnabled = false)
+    }
+
+    @Test
+    fun `given features are not enabled, then options are not visible`() {
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState,
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `given location sharing is enabled, then location sharing option is visible`() {
+        fakeVectorFeatures.givenLocationSharing(isEnabled = true)
+
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState.copy(
+                                        isLocationVisible = true
+                                ),
+                        )
+                )
+                .finish()
+    }
+
+    @Test
+    fun `given voice broadcast is enabled, then voice broadcast option is visible`() {
+        fakeVectorFeatures.givenVoiceBroadcast(isEnabled = true)
+
+        createViewModel()
+                .test()
+                .assertStates(
+                        listOf(
+                                initialState.copy(
+                                        isVoiceBroadcastVisible = true
+                                ),
+                        )
+                )
+                .finish()
+    }
+
+    private fun createViewModel(): AttachmentTypeSelectorViewModel {
+        return AttachmentTypeSelectorViewModel(
+                initialState,
+                vectorFeatures = fakeVectorFeatures,
+        )
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
index 4e6b4fc3df..d989abc214 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
@@ -42,4 +42,12 @@ class FakeVectorFeatures : VectorFeatures by spyk<DefaultVectorFeatures>() {
     fun givenCombinedLoginDisabled() {
         every { isOnboardingCombinedLoginEnabled() } returns false
     }
+
+    fun givenLocationSharing(isEnabled: Boolean) {
+        every { isLocationSharingEnabled() } returns isEnabled
+    }
+
+    fun givenVoiceBroadcast(isEnabled: Boolean) {
+        every { isVoiceBroadcastEnabled() } returns isEnabled
+    }
 }

From 17c43c91888162d3c7675511ff910c46c3aa32fc Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Thu, 20 Oct 2022 16:13:18 +0100
Subject: [PATCH 169/300] Add rounded corners to bottom sheet dialog.

Note these are currently only visible in the collapsed state.
- [Google issue](https://issuetracker.google.com/issues/144859239)
- [Rejected PR](https://github.com/material-components/material-components-android/pull/437)
- [Github issue](https://github.com/material-components/material-components-android/issues/1278)
---
 .../src/main/res/values/styles_bottom_sheet.xml       | 11 +++++++++++
 .../layout/bottom_sheet_attachment_type_selector.xml  |  1 -
 .../res/layout/view_bottom_sheet_action_button.xml    |  3 +--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index f6c30040d9..7b704a6331 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -14,6 +14,7 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_light</item>
         <item name="android:textColorLink">@color/element_link_light</item>
+        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
@@ -28,6 +29,7 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
         <item name="android:textColorLink">@color/element_link_dark</item>
+        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
@@ -35,6 +37,15 @@
     </style>
 
     <!-- BottomSheet style -->
+    <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
+    </style>
+
+    <style name="BottomSheetShapeAppearance" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">20dp</item>
+    </style>
+
     <style name="BottomSheetItemTextMain">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">0dp</item>
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
index 3aec5b5c20..559673716e 100644
--- a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface"
     android:orientation="vertical">
 
     <androidx.core.widget.NestedScrollView
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index f8521c7eba..05a99fe8ae 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -10,7 +10,6 @@
         android:id="@+id/bottomSheetActionClickableZone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?colorSurface"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
@@ -93,4 +92,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</merge>
\ No newline at end of file
+</merge>

From f52aaef6459254ecceb49744ce64b32877b621d2 Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Fri, 21 Oct 2022 12:43:11 +0100
Subject: [PATCH 170/300] Add changelog entry

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

diff --git a/changelog.d/7429.feature b/changelog.d/7429.feature
new file mode 100644
index 0000000000..9857452eca
--- /dev/null
+++ b/changelog.d/7429.feature
@@ -0,0 +1 @@
+Add new UI for selecting an attachment

From 5896f14043b34b630afb9b9c938a2a66dbe2f1f6 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Sat, 22 Oct 2022 13:50:16 +0000
Subject: [PATCH 171/300] Translated using Weblate (Catalan)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ca/strings.xml b/library/ui-strings/src/main/res/values-ca/strings.xml
index fa363cee8c..87be4a96a5 100644
--- a/library/ui-strings/src/main/res/values-ca/strings.xml
+++ b/library/ui-strings/src/main/res/values-ca/strings.xml
@@ -381,7 +381,7 @@
     <string name="settings_version">Versió</string>
     <string name="settings_olm_version">Versió d\'OLM</string>
     <string name="settings_app_term_conditions">Termes i condicions</string>
-    <string name="settings_third_party_notices">Avisos de terceres parts</string>
+    <string name="settings_third_party_notices">Avisos de tercers</string>
     <string name="settings_copyright">Copyright</string>
     <string name="settings_privacy_policy">Política de privacitat</string>
     <string name="settings_clear_cache">Esborra la memòria cau</string>
@@ -1198,8 +1198,8 @@
     <string name="login_reset_password_success_notice_2">Se t\'ha desconnectat de totes les teves sessions i no rebràs més notificacions. Per reactivar les notificacions, torna a iniciar sessió a cada dispositiu.</string>
     <string name="push_gateway_item_format">Format:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">session_name:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
+    <string name="push_gateway_item_device_name">Àlies de la sessió:</string>
+    <string name="push_gateway_item_push_key">Clau \'push\':</string>
     <string name="push_gateway_item_app_id">ID d\'aplicació:</string>
     <string name="alert_push_are_disabled_description">Revisa la configuració per activar les notificacions</string>
     <string name="settings_troubleshoot_test_push_notification_content">Estàs veient la notificació! Clica\'m!</string>
@@ -1376,7 +1376,7 @@
     <string name="room_participants_unban_prompt_msg">Si treus el vet a un usuari podrà tornar a unir-se a la sala.</string>
     <string name="failed_to_unban">No s\'ha pogut treure el vet a l\'usuari</string>
     <string name="room_participants_unban_title">Treu el vet a l\'usuari</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
+    <string name="push_gateway_item_app_display_name">Àlies de l\'aplicació:</string>
     <string name="room_widget_permission_display_name">El teu àlies</string>
     <string name="room_settings_set_avatar">Estableix la foto</string>
     <string name="room_widget_permission_avatar_url">URL de la teva foto</string>
@@ -1630,7 +1630,7 @@
     <string name="default_message_emote_snow">ha enviat una nevada ❄️</string>
     <string name="user_code_my_code">El meu codi</string>
     <string name="user_code_share">Comparteix el meu codi</string>
-    <string name="user_code_scan">Escaneja un codi QR</string>
+    <string name="user_code_scan">Escaneja codi QR</string>
     <string name="not_a_valid_qr_code">No és un codi QR de Matrix vàlid</string>
     <string name="settings_failed_to_get_crypto_device_info">No hi ha informació criptogràfica disponible</string>
     <string name="verification_conclusion_ok_self_notice">La nova sessió s\'ha verificat. Tindrà accés als teus missatges xifrats i es mostrarà de confiança per als altres usuaris.</string>
@@ -2745,4 +2745,73 @@
     <string name="device_manager_verification_status_unknown">Estat de verificació desconegut</string>
     <string name="login_scan_qr_code">Escaneja codi QR</string>
     <string name="push_gateway_item_device_id">ID de sessió:</string>
+    <string name="permissions_rationale_msg_notification">${app_name} necessita permís per mostrar notificacions. Les notificacions poden mostrar missatges, invitacions, etc.
+\n
+\nConcedeix els permisos a les següents finestres emergents per poder veure les notificacions correctament.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">S\'ha detectat un problema de seguretat en configurar la missatgeria segura. Algun dels següents elements pot estar compromès: el servidor que utilitzes; alguna de les teves connexions a Internet; algun dels teus dispositius;</string>
+    <string name="qr_code_login_header_connected_description">Comprova el dispositiu amb la sessió iniciada, s\'hauria de mostrar el codi de sota. Verifica que el codi de sota coincideix amb el del dispositiu:</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Comença a la pantalla d\'inici de sessió</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Comença a la pantalla d\'inici de sessió</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Iniciant sessió a un dispositiu mòbil\?</string>
+    <string name="qr_code_login_show_qr_code_button">Mostra codi QR</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecciona \'Escaneja codi QR\'</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecciona \'Mostra codi QR\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Ves a Configuració -&gt; Seguretat i privadesa</string>
+    <string name="qr_code_login_new_device_instruction_1">Obre l\'aplicació en l\'altre dispositiu</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Inici de sessió cancel·lat per l\'altre dispositiu.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">El codi QR és invàlid.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">L\'altre dispositiu ha d\'haver iniciat sessió.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L\'altre dispositiu ja ha iniciat sessió.</string>
+    <string name="qr_code_login_header_failed_other_description">Ha fallat la petició.</string>
+    <string name="qr_code_login_header_failed_denied_description">Petició denegada per l\'altre dispositiu.</string>
+    <string name="qr_code_login_header_failed_timeout_description">La vinculació no s\'ha completat en el temps permès.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">La vinculació amb aquest dispositiu no està admesa.</string>
+    <string name="qr_code_login_header_failed_title">Connexió sense èxit</string>
+    <string name="qr_code_login_header_connected_title">Connexió segura establerta</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Escaneja el codi QR de sota amb el dispositiu amb la sessió tancada.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Utilitza el dispositiu amb la sessió iniciada per escanejar el codi QR següent:</string>
+    <string name="qr_code_login_try_again">Torna-ho a provar</string>
+    <string name="qr_code_login_status_no_match">No coincideix\?</string>
+    <string name="qr_code_login_signing_in">Iniciant sessió</string>
+    <string name="qr_code_login_connecting_to_device">Connectant al dispositiu</string>
+    <string name="qr_code_login_scan_qr_code_button">Escaneja codi QR</string>
+    <string name="qr_code_login_confirm_security_code">Confirma</string>
+    <string name="qr_code_login_confirm_security_code_description">Assegura\'t que coneixes l\'origen d\'aquest codi. L\'enllaç de dispositius, proporciona a algú accés complet al teu compte.</string>
+    <string name="rich_text_editor_format_underline">Aplica subratllat</string>
+    <string name="rich_text_editor_format_strikethrough">Ratlla-ho</string>
+    <string name="rich_text_editor_format_bold">Aplica negreta</string>
+    <string name="rich_text_editor_format_italic">Aplica cursiva</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecciona \'Inicia sessió amb codi QR\'</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">El servidor no és compatible amb l\'inici de sessió mitjançant codi QR.</string>
+    <string name="qr_code_login_header_show_qr_code_title">Inicia sessió amb codi QR</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Utilitza la càmera d\'aquest dispositiu per escanejar el codi QR que es mostra a l\'altre dispositiu:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Escaneja codi QR</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_voice_broadcast_summary">Permet enregistrar i enviar emissions de veu dins una sala.</string>
+    <string name="labs_enable_voice_broadcast_title">Activa l\'emissió de veu (en desenvolupament)</string>
+    <string name="labs_enable_client_info_recording_title">Activa la gravació d\'informació de client</string>
+    <string name="labs_enable_client_info_recording_summary">Desa el nom de client, la versió i l\'URL per reconèixer les sessions més fàcilment dins el gestor de sessions.</string>
+    <string name="labs_enable_session_manager_summary">Obté un millor control i visibilitat de totes les teves sessions.</string>
+    <string name="labs_enable_session_manager_title">Activa el nou gestor de sessions</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Pots utilitzar aquest dispositiu per iniciar la sessió amb un codi QR a un dispositiu mòbil o web. Ho pots fer de dues maneres:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Inicia sessió amb codi QR</string>
+    <string name="device_manager_session_details_device_operating_system">Sistema operatiu</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Navegador</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Versió</string>
+    <string name="device_manager_session_details_application_name">Nom</string>
+    <string name="device_manager_session_details_application">Aplicació</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifica la teva sessió actual per mostrar l\'estat de verificació d\'aquesta sessió.</string>
+    <string name="push_gateway_item_enabled">Activat:</string>
+    <string name="error_check_network">Alguna cosa ha anat malament. Comprova la teva connexió i torna-ho a provar.</string>
+    <string name="grant_permission">Concedir permís</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} necessita permís per mostrar notificacions.
+\nSi us plau, concedeix-li el permís.</string>
+    <string name="labs_enable_rich_text_editor_summary">Prova l\'editor de text enriquit (el mode text pla arribarà aviat)</string>
+    <string name="labs_enable_rich_text_editor_title">Activa l\'editor de text enriquit</string>
+    <string name="device_manager_push_notifications_description">Rep notificacions en aquesta sessió.</string>
+    <string name="device_manager_push_notifications_title">Notificacions</string>
 </resources>
\ No newline at end of file

From 8d90657117b442defb36d76b3669e8a68b382c0a Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Fri, 21 Oct 2022 06:35:49 +0000
Subject: [PATCH 172/300] Translated using Weblate (Czech)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
index 717da1624c..510600a641 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -971,7 +971,7 @@
     <string name="preference_voice_and_video">Hlas a video</string>
     <string name="preference_root_help_about">Nápověda a O aplikaci</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Registrovat token</string>
-    <string name="send_suggestion">Učinit návrh</string>
+    <string name="send_suggestion">Poslat návrh</string>
     <string name="send_suggestion_content">Prosím, zapište svůj návrh níže.</string>
     <string name="send_suggestion_report_placeholder">Popište svůj návrh tady</string>
     <string name="send_suggestion_sent">Děkujeme, návrh byl úspěšně odeslán</string>
@@ -2762,7 +2762,7 @@
     <string name="labs_enable_deferred_dm_summary">Vytvořit přímou zprávu pouze při první zprávě</string>
     <string name="labs_enable_deferred_dm_title">Povolit odložené přímé zprávy</string>
     <string name="labs_enable_new_app_layout_summary">Zjednodušený Element s volitelnými kartami</string>
-    <string name="labs_enable_new_app_layout_title">Povolit nový vzhled</string>
+    <string name="labs_enable_new_app_layout_title">Zapnout nové uspořádání</string>
     <string name="device_manager_learn_more_session_rename">Ostatní uživatelé v přímých zprávách a místnostech, ke kterým se připojíte, si mohou prohlédnout úplný seznam vašich relací.
 \n
 \nTo jim poskytuje jistotu, že s vámi skutečně mluví, ale také to znamená, že mohou vidět název relace, který zde zadáte.</string>

From 292a7beb4bbfc58c97fde4a7de82fe63b6761655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Fri, 21 Oct 2022 19:25:53 +0000
Subject: [PATCH 173/300] Translated using Weblate (Finnish)

Currently translated at 81.1% (2039 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fi/strings.xml b/library/ui-strings/src/main/res/values-fi/strings.xml
index a576e7f0dc..4da0dec3a2 100644
--- a/library/ui-strings/src/main/res/values-fi/strings.xml
+++ b/library/ui-strings/src/main/res/values-fi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="notice_room_invite_no_invitee">Käyttäjän %s kutsu</string>
     <string name="notice_room_invite">%1$s kutsui käyttäjän %2$s</string>
     <string name="notice_room_invite_you">%1$s kutsui sinut</string>
@@ -401,7 +401,7 @@
     <string name="media_saving_period_1_month">1 kuukausi</string>
     <string name="media_saving_period_forever">Ikuisesti</string>
     <string name="settings_theme">Teema</string>
-    <string name="font_size">Kirjaisinkoko</string>
+    <string name="font_size">Fontin koko</string>
     <string name="tiny">Pienin</string>
     <string name="small">Pieni</string>
     <string name="normal">Normaali</string>
@@ -955,8 +955,8 @@
     <string name="settings_push_gateway_no_pushers">Ei rekisteröityjä viesti-ilmoitusten yhdyskäytäviä</string>
     <string name="push_gateway_item_app_id">app_id:</string>
     <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_display_name">app_display_name:</string>
-    <string name="push_gateway_item_device_name">device_name:</string>
+    <string name="push_gateway_item_app_display_name">Sovelluksen näyttönimi:</string>
+    <string name="push_gateway_item_device_name">Istunnon näyttönimi:</string>
     <string name="push_gateway_item_format">Formaatti:</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">Rekisteröi tunniste</string>
     <string name="send_file_step_encrypting_thumbnail">Salataan pikkukuvaa…</string>
@@ -1039,7 +1039,7 @@
     <string name="login_registration_not_supported">Sovellus ei pysty luomaan uusia tunnuksia tälle kotipalvelimelle.
 \n
 \nHaluatko rekisteröityä web-klientillä\?</string>
-    <string name="login_login_with_email_error">Tämä sähköpostiosoite ei ole liitettynä mihinkään tunnukseen.</string>
+    <string name="login_login_with_email_error">Tämä sähköpostiosoite ei ole liitettynä mihinkään tiliin.</string>
     <string name="login_reset_password_on">Palauta salasana palvelimella %1$s</string>
     <string name="login_reset_password_notice">Sähköpostiisi lähetetään viesti uuden salananan asettamiseksi.</string>
     <string name="login_reset_password_submit">Seuraava</string>
@@ -1048,7 +1048,7 @@
     <string name="login_reset_password_warning_title">Varoitus!</string>
     <string name="login_reset_password_warning_content">Salasanan vaihtaminen nollaa kaikki osapuolten välisen salauksen avaimet kaikilla laitteillasi, joka estää sinua lukemasta vanhoja viestejä. Ota käyttöön avainten varmuuskopiointi tai vie huoneen avaimet toiselta laitteelta ennen kuin vaihdat salasanasi.</string>
     <string name="login_reset_password_warning_submit">Jatka</string>
-    <string name="login_reset_password_error_not_found">Tämä sähköposti ei ole liitettynä mihinkään tunnukseen</string>
+    <string name="login_reset_password_error_not_found">Tämä sähköposti ei ole liitettynä mihinkään tiliin</string>
     <string name="login_reset_password_mail_confirmation_title">Tarkista sähköpostisi</string>
     <string name="login_reset_password_mail_confirmation_notice">Vahvistusviesti lähetettiin osoitteeseen %1$s.</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Näpäytä linkkiä vahvistaaksesi uuden salasanasi. Seurattuasi siinä olevaa linkkiä, klikkaa alapuolelta.</string>
@@ -1062,7 +1062,7 @@
 \n
 \nPeru salasananvaihtoprosessi\?</string>
     <string name="login_set_email_title">Aseta sähköpostiosoite</string>
-    <string name="login_set_email_notice">Aseta sähköpostiosoite palauttaaksesi tunnuksesi. Myöhemmin, voit antaa muiden löytää sinut sähköpostillasi.</string>
+    <string name="login_set_email_notice">Aseta sähköpostiosoite palauttaaksesi tilisi. Myöhemmin voit antaa muiden löytää sinut sähköpostiosoitettasi etsimällä.</string>
     <string name="login_set_email_mandatory_hint">Sähköposti</string>
     <string name="login_set_email_optional_hint">Sähköposti (vapaaehtoinen)</string>
     <string name="login_set_email_submit">Seuraava</string>
@@ -2116,4 +2116,186 @@
     <string name="notice_room_canonical_alias_alternative_changed">%1$s muutti tämän huoneen vaihtoehtoisia osoitteita.</string>
     <string name="initial_sync_request_title">Alkusynkronointipyyntö</string>
     <string name="room_alias_action_unpublish">Poista tämän osoitteen julkaisu</string>
-</resources>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Vahvistamaton</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Parhaan turvallisuuden takaamiseksi kirjaudu ulos istunnoista, joita et tunnista tai et enää käytä.</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Vahvistetu</string>
+    <string name="a11y_device_manager_filter">Suodata</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">Käyttämättä %1$d päivän tai pidempään</item>
+        <item quantity="other">Käyttämättä %1$d päivää tai pidempään</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Käyttämätön</string>
+    <string name="device_manager_filter_option_unverified_description">Ei valmis turvallista viestintää varten</string>
+    <string name="device_manager_filter_option_unverified">Vahvistamaton</string>
+    <string name="device_manager_filter_option_verified_description">Valmis turvallista viestintää varten</string>
+    <string name="device_manager_filter_option_verified">Vahvistettu</string>
+    <string name="device_manager_filter_option_all_sessions">Kaikki istunnot</string>
+    <string name="device_manager_filter_bottom_sheet_title">Suodata</string>
+    <string name="device_manager_session_last_activity">Viimeisin toiminta %1$s</string>
+    <string name="device_manager_device_title">Laite</string>
+    <string name="device_manager_session_title">Istunto</string>
+    <string name="device_manager_current_session_title">Nykyinen istunto</string>
+    <string name="device_manager_inactive_sessions_title">Käyttämättä olevat istunnot</string>
+    <string name="device_manager_unverified_sessions_description">Vahvista nämä istunnot tai kirjaudu niistä ulos.</string>
+    <string name="device_manager_unverified_sessions_title">Vahvistamattomat istunnot</string>
+    <string name="device_manager_header_section_security_recommendations_description">Paranna tilisi turvallisuutta seuraamalla näitä suosituksia.</string>
+    <string name="device_manager_header_section_security_recommendations_title">Turvallisuussuositukset</string>
+    <plurals name="device_manager_other_sessions_description_inactive">
+        <item quantity="one">Käyttämättä %1$d+ päivän (%2$s)</item>
+        <item quantity="other">Käyttämättä %1$d+ päivää (%2$s)</item>
+    </plurals>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Vahvistamaton · Nykyinen istuntosi</string>
+    <string name="device_manager_other_sessions_description_unverified">Vahvistamaton · Viimeisin toiminta %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">Vahvistettu · Viimeisin toiminta %1$s</string>
+    <string name="device_manager_other_sessions_view_all">Näytä kaikki (%1$d)</string>
+    <string name="device_manager_view_details">Näytä tiedot</string>
+    <string name="device_manager_verify_session">Vahvista istunto</string>
+    <string name="device_manager_verification_status_unknown">Tuntematon vahvistuksen tila</string>
+    <string name="device_manager_verification_status_unverified">Vahvistamaton istunto</string>
+    <string name="device_manager_verification_status_verified">Vahvistettu istunto</string>
+    <string name="a11y_device_manager_device_type_unknown">Tuntematon laitetyyppi</string>
+    <string name="a11y_device_manager_device_type_desktop">Työpöytä</string>
+    <string name="a11y_device_manager_device_type_mobile">Mobiili</string>
+    <string name="device_manager_sessions_other_description">Turvallisuuden vuoksi vahvista istunnot ja kirjaudu ulos niistä istunnoista, joita et tunnista tai et enää käytä.</string>
+    <string name="device_manager_sessions_other_title">Muut istunnot</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">%d viesti poistettu</item>
+        <item quantity="other">%d viestiä poistettu</item>
+    </plurals>
+    <string name="live_location_labs_promotion_switch_title">Käytä sijainnin jakamista</string>
+    <string name="settings_troubleshoot_test_current_distributor">Tällä hetkellä käytössä %s.</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Menetelmä</string>
+    <plurals name="settings_troubleshoot_test_distributors_many">
+        <item quantity="one">Löytyi %d menetelmä.</item>
+        <item quantity="other">Löytyi %d menetelmää.</item>
+    </plurals>
+    <string name="settings_troubleshoot_test_distributors_title">Saatavilla olevat menetelmät</string>
+    <string name="settings_notification_method">Ilmoitusmenetelmä</string>
+    <string name="unifiedpush_distributor_background_sync">Taustasynkronointi</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Valitse miten ilmoitukset vastaanotetaan</string>
+    <string name="screen_sharing_notification_description">Näytönjako on päällä</string>
+    <string name="screen_sharing_notification_title">${app_name}-näytönjako</string>
+    <string name="room_message_autocomplete_notification">Huoneilmoitus</string>
+    <string name="room_message_notify_everyone">Ilmoita koko huoneelle</string>
+    <string name="live_location_share_location_item_share">Jaa sijainti</string>
+    <string name="live_location_bottom_sheet_last_updated_at">Päivitetty %1$s sitten</string>
+    <string name="location_share_live_remaining_time">%1$s jäljellä</string>
+    <string name="location_share_external">Avaa sovelluksella</string>
+    <string name="location_share_live_select_duration_option_3">8 tuntia</string>
+    <string name="location_share_live_select_duration_option_2">1 tunti</string>
+    <string name="location_share_live_select_duration_option_1">15 minuuttia</string>
+    <string name="closed_poll_option_description">Tulokset näytetään vain kun lopetat kyselyn</string>
+    <string name="poll_end_room_list_preview">Kysely lopetettu</string>
+    <string name="end_poll_confirmation_approve_button">Lopeta kysely</string>
+    <string name="end_poll_confirmation_title">Lopetetaanko tämä kysely\?</string>
+    <string name="poll_undisclosed_not_ended">Tulokset tulevat näkyviin kun kysely lopetetaan</string>
+    <string name="poll_end_action">Lopeta kysely</string>
+    <string name="audio_message_file_size">(%1$s)</string>
+    <string name="audio_message_reply_content">%1$s (%2$s)</string>
+    <string name="error_audio_message_unable_to_play">Ei voi toistaa %1$s</string>
+    <string name="a11y_pause_audio_message">Keskeytä %1$s</string>
+    <string name="a11y_play_audio_message">Toista %1$s</string>
+    <string name="a11y_audio_playback_duration" tools:ignore="PluralsCandidate">%1$d minuuttia %2$d sekuntia</string>
+    <string name="space_explore_filter_no_result_title">Tuloksia ei löydy</string>
+    <string name="a11y_open_settings">Avaa asetukset</string>
+    <string name="settings_security_incognito_keyboard_title">Incognito-näppäimistö</string>
+    <string name="settings_sessions_list">Istunnot</string>
+    <string name="permalink_unsupported_groups">Tätä linkkiä ei voi avata: yhteisöt on korvattu avaruuksilla</string>
+    <string name="login_scan_qr_code">Skannaa QR-koodi</string>
+    <string name="ftue_auth_login_username_entry">Käyttäjänimi / sähköposti / puhelin</string>
+    <string name="ftue_auth_captcha_title">Olethan ihminen\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Seuraa sähköpostiosoitteeseen %s lähetettyjä ohjeita</string>
+    <string name="ftue_auth_password_reset_confirmation">Salasanan nollaus</string>
+    <string name="ftue_auth_forgot_password">Unohtunut salasana</string>
+    <string name="ftue_auth_email_resend_email">Lähetä sähköposti uudelleen</string>
+    <string name="ftue_auth_email_verification_footer">Etkö saanut sähköpostia\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Seuraa sähköpostiosoitteeseen %s lähetettyjä ohjeita</string>
+    <string name="ftue_auth_email_verification_title">Vahvista sähköpostiosoitteesi</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Lähetä koodi uudelleen</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Koodi lähetettiin numeroon %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Vahvista puhelinnumerosi</string>
+    <string name="ftue_auth_sign_out_all_devices">Kirjaudu ulos kaikilta laitteilta</string>
+    <string name="ftue_auth_reset_password">Nollaa salasana</string>
+    <string name="ftue_auth_new_password_subtitle">Vähintään kahdeksan merkkiä.</string>
+    <string name="ftue_auth_new_password_title">Valitse uusi salasana</string>
+    <string name="ftue_auth_new_password_entry_title">Uusi salasana</string>
+    <string name="ftue_auth_reset_password_breaker_title">Tarkista sähköpostisi.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s lähettää sinulle vahvistuslinkin</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Vahvistuskoodi</string>
+    <string name="ftue_auth_phone_entry_title">Puhelinnumero</string>
+    <string name="ftue_auth_phone_subtitle">%s haluaa vahvistaa tilisi</string>
+    <string name="ftue_auth_phone_title">Anna puhelinnumerosi</string>
+    <string name="ftue_auth_email_entry_title">Sähköpostiosoite</string>
+    <string name="ftue_auth_email_subtitle">%s haluaa vahvistaa tilisi</string>
+    <string name="ftue_auth_email_title">Anna sähköpostiosoitteesi</string>
+    <string name="ftue_auth_terms_subtitle">Lue palvelimen %s käyttöehdot</string>
+    <string name="ftue_auth_terms_title">Palvelimen käytännöt</string>
+    <string name="ftue_auth_choose_server_ems_title">Haluatko ylläpitää omaa palvelinta\?</string>
+    <string name="ftue_auth_choose_server_entry_hint">Palvelimen verkko-osoite</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Mikä on palvelimesi osoite\?</string>
+    <string name="ftue_auth_choose_server_subtitle">Mikä on palvelimesi osoite\? Se on kuin koti kaikille tiedoillesi</string>
+    <string name="ftue_auth_choose_server_title">Valitse palvelin</string>
+    <string name="ftue_auth_welcome_back_title">Tervetuloa takaisin!</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Muokkaa</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Vähintään kahdeksan merkkiä</string>
+    <string name="ftue_auth_create_account_title">Luo tili</string>
+    <string name="ftue_account_created_take_me_home">Vie minut kotiin</string>
+    <string name="ftue_auth_use_case_join_existing_server">Aikeissa liittyä olemassa olevalle palvelimelle\?</string>
+    <string name="ftue_auth_use_case_option_three">Yhteisöt</string>
+    <string name="ftue_auth_use_case_option_two">Tiimit</string>
+    <string name="ftue_auth_use_case_option_one">Kaverit ja perhe</string>
+    <string name="a11y_open_spaces">Avaa avaruusluettelo</string>
+    <string name="a11y_create_message">Luo uusi keskustelu tai huone</string>
+    <string name="give_feedback_threads">Anna palautetta</string>
+    <string name="push_gateway_item_enabled">Käytössä:</string>
+    <string name="push_gateway_item_device_id">Istunnon ID:</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Katselet jo tätä ketjua!</string>
+    <string name="updating_your_data">Päivitetään tietojasi…</string>
+    <string name="error_check_network">Jokin meni vikaan. Tarkista verkkoyhteys ja yritä uudelleen.</string>
+    <string name="room_list_filter_people">Ihmiset</string>
+    <string name="room_list_filter_favourites">Suosikit</string>
+    <string name="room_list_filter_unreads">Lukemattomat</string>
+    <string name="room_list_filter_all">Kaikki</string>
+    <string name="font_size_use_system">Käytä järjestelmän oletusta</string>
+    <string name="font_size_section_manually">Valitse itse</string>
+    <string name="font_size_section_auto">Aseta automaattisesti</string>
+    <string name="font_size_title">Valitse fontin koko</string>
+    <string name="grant_permission">Myönnä oikeus</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s ja %2$d muu</item>
+        <item quantity="other">%1$s ja %2$d muuta</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s ja %2$s</string>
+    <string name="thread_list_empty_title">Pidä keskustelut organisoituna ketjujen avulla</string>
+    <string name="thread_list_modal_my_threads_title">Omat ketjut</string>
+    <string name="thread_list_modal_all_threads_title">Kaikki ketjut</string>
+    <string name="room_permissions_change_main_address_for_the_space">Muuta avaruuden pääosoitetta</string>
+    <string name="invites_empty_message">Täällä näkyvät uudet pyynnöt ja kutsut.</string>
+    <string name="invites_empty_title">Ei mitään uutta.</string>
+    <string name="invites_title">Kutsut</string>
+    <string name="space_list_empty_message">Avaruudet ovat uusi tapa ryhmitellä huoneita ja ihmisiä. Luo avaruus aloittaaksesi.</string>
+    <string name="space_list_empty_title">Ei avaruuksia vielä.</string>
+    <string name="action_got_it">Selvä</string>
+    <string name="action_next">Seuraava</string>
+    <string name="action_view_threads">Näytä ketjut</string>
+    <string name="onboarding_new_app_layout_spaces_message">Käytä avaruuksia (oikealla alhaalla) nopeammin ja helpommin kuin koskaan aiemmin.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Käytä avaruuksia</string>
+    <string name="explore_rooms">Selaa huoneita</string>
+    <string name="change_space">Vaihda avaruutta</string>
+    <string name="create_room">Luo huone</string>
+    <string name="start_chat">Aloita keskustelu</string>
+    <string name="all_chats">Kaikki keskustelut</string>
+    <string name="onboarding_new_app_layout_button_try">Kokeile</string>
+    <string name="onboarding_new_app_layout_feedback_message">Anna palautetta napauttamalla oikeaa yläkulmaa.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Anna palautetta</string>
+    <string name="onboarding_new_app_layout_welcome_message">${app_name}in yksinkertaistaminen asetti välilehdet valinnaiseksi. Hallitse välilehtiä oikean yläkulman valikosta.</string>
+    <string name="onboarding_new_app_layout_welcome_title">Tervetuloa uuteen näkymään!</string>
+    <string name="labs_enable_new_app_layout_summary">Yksinkertaistettu Element valinnaisilla välilehdillä</string>
+    <string name="labs_enable_new_app_layout_title">Ota uusi asettelu käyttöön</string>
+    <string name="home_layout_preferences_sort_name">A - Ö</string>
+    <string name="home_layout_preferences_sort_activity">Aktiivisuus</string>
+    <string name="home_layout_preferences_sort_by">Järjestysperuste</string>
+    <string name="home_layout_preferences_recents">Näytä viimeisimmät</string>
+    <string name="home_layout_preferences_filters">Näytä suodattimet</string>
+    <string name="home_layout_preferences">Asettelun asetukset</string>
+</resources>
\ No newline at end of file

From 097d231d7d0e68278c27ce7c75fed2de8cc473fa Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 21 Oct 2022 09:41:47 +0000
Subject: [PATCH 174/300] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-hu/strings.xml b/library/ui-strings/src/main/res/values-hu/strings.xml
index 59792a9218..43620c4339 100644
--- a/library/ui-strings/src/main/res/values-hu/strings.xml
+++ b/library/ui-strings/src/main/res/values-hu/strings.xml
@@ -2788,9 +2788,9 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="qr_code_login_show_qr_code_button">QR kód megjelenítése ezen az eszközön</string>
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Válaszd ezt: „QR kód beolvasása”</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Válaszd ezt: „Belépés QR kóddal”</string>
-    <string name="qr_code_login_new_device_instruction_3">Válaszd ezt: „QR kód megjelenítése ezen az eszközön”</string>
-    <string name="qr_code_login_new_device_instruction_2">Menj a Beállítások -&gt; Biztonság és Adatvédelem -&gt; Minden munkamenet megjelenítése menübe</string>
-    <string name="qr_code_login_new_device_instruction_1">Nyisd meg a(z) ${app_name} alkalmazást a másik eszközön</string>
+    <string name="qr_code_login_new_device_instruction_3">Válaszd ezt: „QR kód megjelenítése”</string>
+    <string name="qr_code_login_new_device_instruction_2">Menj a Beállítások -&gt; Biztonság és Adatvédelem</string>
+    <string name="qr_code_login_new_device_instruction_1">Nyisd meg az alkalmazást a másik eszközön</string>
     <string name="qr_code_login_header_failed_denied_description">A kérést elutasították a másik eszközön.</string>
     <string name="qr_code_login_header_failed_timeout_description">Az összekötés az elvárt időn belül nem fejeződött be.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Összekötés ezzel az eszközzel nem támogatott.</string>
@@ -2805,4 +2805,13 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="one">1</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Belépés QR kóddal</string>
     <string name="login_scan_qr_code">QR kód beolvasása</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">A matrix szerver nem támogatja más eszköz bejelentkeztetését.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">A bejelentkezés a másik eszköz által meg lett szakítva.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">QR kód érvénytelen.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">A másik eszköznek már bejelentkezve kell lennie.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">A másik eszköz már bejelentkezett.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Biztonsági probléma lépett fel a biztonságos üzenetküldés beállításánál. Valamihez illetéktelenül fértek hozzá: Matrix szervered, Internet kapcsolatod, Eszközöd,</string>
+    <string name="qr_code_login_header_failed_other_description">A kérés sikertelen.</string>
+    <string name="labs_enable_voice_broadcast_summary">Hang közvetítés felvételéhez és a szoba idővonalára küldéséhez.</string>
+    <string name="labs_enable_voice_broadcast_title">Hang közvetítés engedélyezése (aktív fejlesztés alatt)</string>
 </resources>
\ No newline at end of file

From 11a69dd6b790c45bf2809611cd2b7a2772c8299e Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Fri, 21 Oct 2022 00:46:29 +0000
Subject: [PATCH 175/300] Translated using Weblate (Indonesian)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-in/strings.xml b/library/ui-strings/src/main/res/values-in/strings.xml
index 6d20563d55..56b06c288a 100644
--- a/library/ui-strings/src/main/res/values-in/strings.xml
+++ b/library/ui-strings/src/main/res/values-in/strings.xml
@@ -2729,13 +2729,13 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="qr_code_login_scan_qr_code_button">Pindai kode QR</string>
     <string name="qr_code_login_signing_in_a_mobile_device">Ingin masuk di perangkat ponsel\?</string>
     <string name="qr_code_login_show_qr_code_button">Tampilkan kode QR di perangkat ini</string>
-    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Pilih \'Pindai dengan kode QR\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Pilih \'Pindai kode QR\'</string>
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Mulai dari layar masuk</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Pilih \'Masuk dengan kode QR\'</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Mulai dari layar masuk</string>
-    <string name="qr_code_login_new_device_instruction_3">Pilih \'Tampilkan kode QR di perangkat ini\'</string>
-    <string name="qr_code_login_new_device_instruction_2">Pergi ke Pengaturan → Keamanan &amp; Privasi → Tampilkan Semua Sesi</string>
-    <string name="qr_code_login_new_device_instruction_1">Buka ${app_name} di perangkat Anda yang lain</string>
+    <string name="qr_code_login_new_device_instruction_3">Pilih \'Tampilkan kode QR\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Pergi ke Pengaturan → Keamanan &amp; Privasi</string>
+    <string name="qr_code_login_new_device_instruction_1">Buka aplikasi di perangkat Anda yang lain</string>
     <string name="qr_code_login_header_failed_denied_description">Permintaan ditolak di perangkat lain.</string>
     <string name="qr_code_login_header_failed_timeout_description">Penautan tidak selesai dalam waktu yang dibutuhkan.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Penautan dengan perangkat ini tidak didukung.</string>
@@ -2753,4 +2753,13 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Anda dapat menggunakan perangkat ini untuk masuk ke perangkat ponsel atau web dengan sebuah kode QR. Ada dua cara untuk melalukan ini:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Masuk dengan Kode QR</string>
     <string name="login_scan_qr_code">Pindai kode QR</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Sebuah masalah keamanan ditemukan ketika menyiapkan perpesanan aman. Salah satu dari berikut mungkin dikompromikan: homeserver Anda; koneksi internet Anda; perangkat Anda;</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Pemasukan dibatalkan di perangkat yang lain.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Kode QR tidak absah.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Perangkat yang lain harus masuk.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Perangkat yang lain sudah masuk.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Homeserver tidak mendukung masuk dengan kode QR.</string>
+    <string name="qr_code_login_header_failed_other_description">Permintaan gagal.</string>
+    <string name="labs_enable_voice_broadcast_summary">Memungkinkan untuk merekam dan mengirim siaran suara dalam linimasa ruangan.</string>
+    <string name="labs_enable_voice_broadcast_title">Aktifkan siaran suara (dalam pengembangan aktif)</string>
 </resources>
\ No newline at end of file

From afc564cc6f582a6af9f41a3bda942e1c6f8bca24 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 20 Oct 2022 10:24:57 +0000
Subject: [PATCH 176/300] Translated using Weblate (Italian)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-it/strings.xml b/library/ui-strings/src/main/res/values-it/strings.xml
index be542cab88..8657e49671 100644
--- a/library/ui-strings/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -2776,9 +2776,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Inizia nella schermata di accesso</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Seleziona ‘Accedi con codice QR’</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Inizia nella schermata di accesso</string>
-    <string name="qr_code_login_new_device_instruction_3">Seleziona ‘Mostra codice QR in questo dispositivo’</string>
-    <string name="qr_code_login_new_device_instruction_2">Vai in Impostazioni -&gt; Sicurezza e privacy -&gt; Mostra tutte le sessioni</string>
-    <string name="qr_code_login_new_device_instruction_1">Apri ${app_name} sull\'altro dispositivo</string>
+    <string name="qr_code_login_new_device_instruction_3">Seleziona ‘Mostra codice QR’</string>
+    <string name="qr_code_login_new_device_instruction_2">Vai in Impostazioni -&gt; Sicurezza e privacy</string>
+    <string name="qr_code_login_new_device_instruction_1">Apri l\'app sull\'altro dispositivo</string>
     <string name="qr_code_login_header_failed_denied_description">La richiesta è stata negata sull\'altro dispositivo.</string>
     <string name="qr_code_login_header_failed_timeout_description">Il collegamento non è stato completato nel tempo previsto.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Il collegamento con questo dispositivo non è supportato.</string>
@@ -2798,4 +2798,11 @@
     <string name="login_scan_qr_code">Scansiona codice QR</string>
     <string name="labs_enable_voice_broadcast_summary">Registra e invia broadcast vocali nella linea temporale della stanza.</string>
     <string name="labs_enable_voice_broadcast_title">Attiva broadcast voce (in sviluppo attivo)</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">L\'homeserver non supporta l\'accesso con codice QR.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">L\'accesso è stato annullato sull\'altro dispositivo.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Quel codice QR non è valido.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">L\'altro dispositivo deve fare l\'accesso.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L\'altro dispositivo ha già fatto l\'accesso.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Si è verificato un problema di sicurezza configurando i messaggi sicuri. Una delle seguenti cose potrebbe essere compromessa: il tuo homeserver; la/e connessione/i internet; il/i dispositivo/i;</string>
+    <string name="qr_code_login_header_failed_other_description">La richiesta è fallita.</string>
 </resources>
\ No newline at end of file

From e450d4b7d2162a006ff35b0205770115b941f12b Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Fri, 21 Oct 2022 06:13:42 +0000
Subject: [PATCH 177/300] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
index 97141a9765..efee012faa 100644
--- a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
@@ -2785,9 +2785,9 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Comece na tela de signin</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecione \'Fazer signin com QR code\'</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Comece na tela de signin</string>
-    <string name="qr_code_login_new_device_instruction_3">Selecione \'Mostrar QR code neste dispositivo\'</string>
-    <string name="qr_code_login_new_device_instruction_2">Vá para Configurações -&gt; Segurança &amp; Privacidade -&gt; Mostrar Todas as Sessões</string>
-    <string name="qr_code_login_new_device_instruction_1">Obra ${app_name} em seu outro dispositivo</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecione \'Mostrar QR code\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Vá para Configurações -&gt; Segurança &amp; Privacidade</string>
+    <string name="qr_code_login_new_device_instruction_1">Abra o app em seu outro dispositivo</string>
     <string name="qr_code_login_header_failed_denied_description">A requisição foi negada no outro dispositivo.</string>
     <string name="qr_code_login_header_failed_timeout_description">A linkagem não foi completada no tempo requerido.</string>
     <string name="qr_code_login_header_failed_device_is_not_supported_description">Linkagem com este dispositivo não é suportado.</string>
@@ -2805,4 +2805,13 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Você pode usar este dispositivo para fazer signin com um dispositivo móvel ou web com um QR code. Existem duas maneiras de fazer isto:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Fazer signin com QR Code</string>
     <string name="login_scan_qr_code">Scannar QR code</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">O servidorcasa não suporta sign in com QR code.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">O sign in foi cancelado no outro dispositivo.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">O QR code é inválido.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">O outro dispositivo deve estar feito signin.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">O outro dispositivo já está feito signin.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Um problema de segurança foi encontrado ao configurar mensageria segura. Um dos seguintes pode ter sido comprometido: Seu servidorcasa; Sua(s) conexão(ões) de internet; Seu(s) dispositivo(s);</string>
+    <string name="qr_code_login_header_failed_other_description">A requisição falhou.</string>
+    <string name="labs_enable_voice_broadcast_summary">Seja capaz de gravar e enviar broadcast de voz em timeline de sala.</string>
+    <string name="labs_enable_voice_broadcast_title">Broadcast de voz (sob desenvolvimento ativo)</string>
 </resources>
\ No newline at end of file

From 6bb8ebe3373aa9ec11cf3f1330c05be959d42392 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Fri, 21 Oct 2022 14:02:42 +0000
Subject: [PATCH 178/300] Translated using Weblate (Russian)

Currently translated at 95.5% (2400 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index 77a555ca4e..afc0d432ed 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -434,14 +434,14 @@
     <string name="encryption_information_device_name">Публичное название</string>
     <string name="device_manager_session_details_session_id">ID сессии</string>
     <string name="encryption_information_device_key">Ключ сессии</string>
-    <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей комнаты</string>
-    <string name="encryption_export_room_keys">Экспорт ключей комнаты</string>
+    <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей от комнат</string>
+    <string name="encryption_export_room_keys">Экспорт ключей от комнат</string>
     <string name="encryption_export_room_keys_summary">Экспорт ключей в локальный файл</string>
     <string name="encryption_export_export">Экспорт</string>
     <string name="passphrase_enter_passphrase">Введите мнемоническую фразу</string>
     <string name="passphrase_confirm_passphrase">Подтвердите мнемоническую фразу</string>
-    <string name="encryption_import_e2e_room_keys">Импорт E2E ключей комнаты</string>
-    <string name="encryption_import_room_keys">Импорт ключей комнаты</string>
+    <string name="encryption_import_e2e_room_keys">Импорт E2E ключей от комнат</string>
+    <string name="encryption_import_room_keys">Импорт ключей от комнат</string>
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
     <string name="encryption_import_import">Импорт</string>
     <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для проверенных сессий</string>
@@ -725,14 +725,14 @@
     <string name="settings_cryptography_manage_keys">Управление криптографическими ключами</string>
     <string name="encryption_settings_manage_message_recovery_summary">Управление резервным копированием ключей</string>
     <string name="notification_silent">Беззвучный</string>
-    <string name="passphrase_empty_error_message">Пожалуйста, введите мнемоническую фразу</string>
+    <string name="passphrase_empty_error_message">Введите мнемоническую фразу</string>
     <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
     <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите мнемоническую фразу, если хотите, чтобы ${app_name} сгенерировал бумажный ключ.</string>
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
     <string name="keys_backup_setup_step1_description">Сообщения в зашифрованных комнатах защищены сквозным шифрованием. Ключи для прочтения этих сообщений есть только у вас и получателя(ей).
 \n
 \nНадёжно сохраните резервную копию ключей, чтобы не потерять их.</string>
-    <string name="keys_backup_setup_step2_button_title">Установите парольную фразу</string>
+    <string name="keys_backup_setup_step2_button_title">Задайте мнемоническую фразу</string>
     <string name="keys_backup_setup_step3_copy_button_title">Сохранить бумажный ключ</string>
     <string name="keys_backup_setup_step3_button_title">Готово</string>
     <string name="keys_backup_setup_step3_save_button_title">Сохранить как файл</string>
@@ -782,7 +782,7 @@
     </plurals>
     <string name="keys_backup_recovery_code_error_decrypt">Невозможно расшифровать резервную копию с помощью этого бумажного ключа: пожалуйста, убедитесь, что вы ввели правильный бумажный ключ.</string>
     <string name="keys_backup_passphrase_error_decrypt">Невозможно расшифровать резервную копию с помощью этой мнемонической фразы: пожалуйста, убедитесь, что вы ввели правильную мнемоническую фразу.</string>
-    <string name="keys_backup_setup_step3_generating_key_status">Генерация бумажного ключа с использованием мнемонической фразы может занять несколько секунд.</string>
+    <string name="keys_backup_setup_step3_generating_key_status">Создание бумажного ключа с использованием мнемонической фразы может занять несколько секунд.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nЭта ошибка вне контроля ${app_name}. На телефоне нет учетной записи Google. Пожалуйста, добавьте аккаунт Google.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
@@ -1526,10 +1526,10 @@
     <string name="bootstrap_migration_enter_backup_password">Чтобы продолжить работу, введите парольную фразу для резервного копирования ключа.</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для резервного копирования ключей, вы можете %s.</string>
     <string name="power_level_edit_title">Задать роль</string>
-    <string name="bootstrap_info_text_2">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
+    <string name="bootstrap_info_text_2">Введите мнемоническую фразу, известную только вам, которая используется для защиты данных на вашем сервере.</string>
     <string name="bootstrap_loading_title">Настройка восстановления.</string>
     <string name="bootstrap_finish_title">Готово!</string>
-    <string name="keep_it_safe">Храните его в безопасности</string>
+    <string name="keep_it_safe">Храните его в надёжном месте</string>
     <string name="finish">Завершить</string>
     <string name="bootstrap_crosssigning_progress_initializing">Публикация созданных ключей идентификации</string>
     <string name="bootstrap_crosssigning_progress_default_key">Определение ключа SSSS по умолчанию</string>
@@ -1625,13 +1625,13 @@
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Используйте ключ безопасности</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Создайте ключ безопасности для хранения в надежном месте, например в менеджере паролей или сейфе.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Использовать мнемоническую фразу</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите секретную фразу, известную только вам, и создайте ключ для резервного копирования.</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Введите мнемоническую фразу, известную только вам, и создайте ключ для резервного копирования.</string>
     <string name="bottom_sheet_save_your_recovery_key_title">Сохраните свой ключ безопасности</string>
     <string name="bottom_sheet_save_your_recovery_key_content">Храните бумажный ключ в надёжном месте, например, в менеджере паролей или в сейфе.</string>
-    <string name="set_a_security_phrase_title">Задайте секретную фразу</string>
-    <string name="set_a_security_phrase_notice">Введите секретную фразу, известную только вам, для защиты данных на вашем сервере.</string>
+    <string name="set_a_security_phrase_title">Задайте мнемоническую фразу</string>
+    <string name="set_a_security_phrase_notice">Введите мнемоническую фразу, известную только вам, которая используется для защиты данных на вашем сервере.</string>
     <string name="set_a_security_phrase_hint">Мнемоническая фраза</string>
-    <string name="set_a_security_phrase_again_notice">Для подтверждения введите вашу секретную фразу ещё раз.</string>
+    <string name="set_a_security_phrase_again_notice">Введите мнемоническую фразу ещё раз, чтобы подтвердить её.</string>
     <string name="room_settings_name_hint">Название комнаты</string>
     <string name="room_settings_topic_hint">Тема</string>
     <string name="room_settings_save_success">Вы успешно изменили настройки комнаты</string>
@@ -1679,7 +1679,8 @@
     <plurals name="encryption_import_room_keys_success">
         <item quantity="one">%1$d/%2$d ключ успешно импортирован.</item>
         <item quantity="few">%1$d/%2$d ключа успешно импортированы.</item>
-        <item quantity="many">%1$d/%2$d ключей успешно импортировано.</item>
+        <item quantity="many">%1$d/%2$d ключей успешно импортированы.</item>
+        <item quantity="other">%1$d/%2$d ключей успешно импортированы.</item>
     </plurals>
     <string name="room_manage_integrations">Управление интеграциями</string>
     <string name="room_no_active_widgets">Нет активных виджетов</string>
@@ -2792,4 +2793,8 @@
         <item quantity="many">Рассмотрите возможность выхода из старых сессий (%1$d дней или дольше), которые вы более не используете.</item>
         <item quantity="other">Рассмотрите возможность выхода из старых сессий (%1$d дней или дольше), которые вы более не используете.</item>
     </plurals>
+    <string name="attachment_type_voice_broadcast">Голосовая трансляция</string>
+    <string name="labs_enable_voice_broadcast_title">Голосовые трансляции (в активной разработке)</string>
+    <string name="labs_enable_client_info_recording_summary">Записывает название клиента, версию и URL-адрес для более лёгкого распознавания сессий в менеджере сессий.</string>
+    <string name="labs_enable_client_info_recording_title">Записывать информацию о клиенте</string>
 </resources>
\ No newline at end of file

From acc1f6628e2f3b300d11adf1efd9009f27b4919d Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Sat, 22 Oct 2022 16:04:41 +0000
Subject: [PATCH 179/300] Translated using Weblate (Swedish)

Currently translated at 98.1% (2465 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sv/strings.xml b/library/ui-strings/src/main/res/values-sv/strings.xml
index 1f38d2069c..48c5c62187 100644
--- a/library/ui-strings/src/main/res/values-sv/strings.xml
+++ b/library/ui-strings/src/main/res/values-sv/strings.xml
@@ -2718,4 +2718,53 @@
 \nVänligen ge åtkomst på nästa pop-uper för att kunna se aviseringar.</string>
     <string name="labs_enable_rich_text_editor_title">Aktivera rik-text-redigerare</string>
     <string name="labs_enable_rich_text_editor_summary">Testa den nya rik-text-redigeraren</string>
+    <string name="onboarding_new_app_layout_welcome_title">Välkommen till en ny vy!</string>
+    <string name="home_empty_no_unreads_message">Det här är vart dina olästa meddelanden hamnar, när du har några.</string>
+    <string name="home_empty_no_unreads_title">Inget att rapportera.</string>
+    <string name="home_empty_no_rooms_message">Den säkra allt-i-ett-chattappen för teams, vänner och organisationer. Skapa en chatt eller gå med i ett existerande rum för att komma igång.</string>
+    <string name="home_empty_no_rooms_title">Välkommen till ${app_name},
+\n%s.</string>
+    <string name="home_empty_space_no_rooms_message">Utrymmen är ett nytt sätt att gruppera rum och personer. Lägg till ett existerande rum, eller skapa ett nytt, med knappen nere till höger.</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nser lite tom ut.</string>
+    <string name="labs_enable_voice_broadcast_summary">Möjliggör att spela in och skicka röstsändning i rummets tidslinje.</string>
+    <string name="labs_enable_voice_broadcast_title">Aktivera röstsändning (under aktiv utveckling)</string>
+    <string name="labs_enable_client_info_recording_summary">Spara klientnamnet, versionen, och URL:en för att enklare känna igen sessioner i sessionehanteraren.</string>
+    <string name="labs_enable_client_info_recording_title">Aktivera klientinforapportering</string>
+    <string name="labs_enable_session_manager_summary">Ha bättre insyn i och kontroll över alla dina sessioner.</string>
+    <string name="labs_enable_session_manager_title">Aktivera den nya sessionshanteraren</string>
+    <string name="device_manager_learn_more_session_rename">Andra användare i direktmeddelanden och rum du går med in kan se en full lista över dina sessioner.
+\n
+\nDet försäkrar dem om att de verkligen pratar med dig, men det betyder också att de kan se sessionsnamnet du anger här.</string>
+    <string name="device_manager_learn_more_session_rename_title">Döper om sessioner</string>
+    <string name="device_manager_learn_more_sessions_verified">Verifierade sessioner har loggat in med dina uppgifter och har sedan verifierats, antingen med din säkra lösenfras eller genom att kors-verifiera.
+\n
+\nDet betyder att det har krypteringsnycklar för dina tidigare meddelanden, bekräftar för andra användare du kommunicerar med att dessa sessioner verkligen är du.</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Verifierade sessioner</string>
+    <string name="device_manager_learn_more_sessions_unverified">Overifierade sessioner är sessioner som har loggat in med dina uppgifter men som inte har kors-verifierats.
+\n
+\nDu bör speciellt försäkra dig om att du känner igen dessa sessioner eftersom att de kan utgöra otillåten användning av ditt konto.</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Overifierade sessioner</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inaktiva sessioner är sessioner du inte har använt på länge, men de tar fortfarande emot krypteringsnycklar.
+\n
+\nBorttagning av inaktiva sessioner förbättrar säkerhet och prestanda, och gör det lättare för dig att se om en ny session ser misstänkt ut.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Inaktiva sessioner</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Du kan använda den här enheten för att logga in på en mobil- eller webbenhet med en QR-kod. Det finns två sätt att göra detta:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Logga in med QR-kod</string>
+    <string name="device_manager_session_rename_warning">Observera att sessionsnamnen också kan ses av folk du kommunicerar med.</string>
+    <string name="device_manager_session_rename_description">Anpassade namn kan hjälpa dig att känna igen dina enheter lättare.</string>
+    <string name="device_manager_session_rename_edit_hint">Sessionsnamn</string>
+    <string name="device_manager_session_rename">Döp om session</string>
+    <string name="device_manager_session_details_device_ip_address">IP-adress</string>
+    <string name="device_manager_session_details_device_operating_system">Operativsystem</string>
+    <string name="device_manager_session_details_device_model">Modell</string>
+    <string name="device_manager_session_details_device_browser">Webbläsare</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_application_version">Version</string>
+    <string name="device_manager_session_details_application_name">Namn</string>
+    <string name="device_manager_session_details_application">Applikation</string>
+    <string name="device_manager_session_details_session_last_activity">Senaste aktiviteten</string>
+    <string name="device_manager_session_details_session_name">Sessionsnamn</string>
+    <string name="device_manager_push_notifications_description">Ta emot pushnotiser i den här sessionen.</string>
+    <string name="login_scan_qr_code">Skanna QR-kod</string>
 </resources>
\ No newline at end of file

From 0754370b2603fe09d6ef08e201755685ed46a5d7 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 20 Oct 2022 19:31:55 +0000
Subject: [PATCH 180/300] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2512 of 2512 strings)

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

diff --git a/library/ui-strings/src/main/res/values-uk/strings.xml b/library/ui-strings/src/main/res/values-uk/strings.xml
index 38e500e1fe..941e2cc0e1 100644
--- a/library/ui-strings/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -2839,12 +2839,12 @@
     <string name="device_manager_session_rename">Перейменувати сеанс</string>
     <string name="device_manager_session_overview_signout">Вийти з цього сеансу</string>
     <string name="device_manager_other_sessions_description_unverified_current_session">Не звірений - Ваш поточний сеанс</string>
-    <string name="tooltip_attachment_voice_broadcast">Розпочати голосове мовлення</string>
+    <string name="tooltip_attachment_voice_broadcast">Розпочати трансляцію голосового повідомлення</string>
     <string name="key_authenticity_not_guaranteed">Справжність цього зашифрованого повідомлення не може бути гарантована на цьому пристрої.</string>
     <string name="settings_security_incognito_keyboard_summary">Заборонити клавіатурі оновлювати будь-які персоналізовані дані, як-от історію набору тексту та словник, на основі того, що ви набрали в розмовах. Зверніть увагу, що деякі клавіатури можуть не дотримуватися цього налаштування.</string>
     <string name="settings_security_incognito_keyboard_title">Клавіатура інкогніто</string>
     <string name="command_description_table_flip">Надсилає (╯°□°）╯︵ ┻━┻ на початку текстового повідомлення</string>
-    <string name="attachment_type_voice_broadcast">Голосове мовлення</string>
+    <string name="attachment_type_voice_broadcast">Голосові повідомлення</string>
     <string name="command_description_devtools">Відкрийте інструменти розробника</string>
     <string name="room_settings_global_block_unverified_info_text">🔒 Ви увімкнули шифрування лише для перевірених сеансів для всіх кімнат у налаштуваннях безпеки.</string>
     <string name="some_devices_will_not_be_able_to_decrypt">⚠ У цій кімнаті є неперевірені пристрої, вони не зможуть розшифрувати повідомлення, які ви надсилаєте.</string>
@@ -2920,6 +2920,6 @@
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Вхід з іншого пристрою вже виконано.</string>
     <string name="qr_code_login_header_failed_e2ee_security_issue_description">Під час налаштування захищеного обміну повідомленнями виникла проблема з безпекою. Можливо, порушено одне з таких налаштувань: Ваш домашній сервер; Ваше інтернет-з\'єднання; Ваш пристрій;</string>
     <string name="qr_code_login_header_failed_other_description">Запит не виконаний.</string>
-    <string name="labs_enable_voice_broadcast_summary">Можливість записувати та надсилати голосові записи до стрічки кімнати.</string>
-    <string name="labs_enable_voice_broadcast_title">Увімкнути голосове мовлення (в активній розробці)</string>
+    <string name="labs_enable_voice_broadcast_summary">Можливість записувати та надсилати голосові повідомлення до стрічки кімнати.</string>
+    <string name="labs_enable_voice_broadcast_title">Увімкнути голосові повідомлення (в активній розробці)</string>
 </resources>
\ No newline at end of file

From eca8eae7f7278a18e9b7eb7ae686f716d7f1fe34 Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Thu, 20 Oct 2022 10:12:53 +0000
Subject: [PATCH 181/300] Translated using Weblate (French)

Currently translated at 100.0% (79 of 79 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/40105040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/fr-FR/changelogs/40105040.txt b/fastlane/metadata/android/fr-FR/changelogs/40105040.txt
new file mode 100644
index 0000000000..027e2b0252
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Nouvelles fonctionnalités expérimentales : éditeur de texte formaté, nouveau gestionnaire d’appareils, diffusion audio. C’est toujours en cours de développement !
+Intégralité des changements : https://github.com/vector-im/element-android/releases

From 66963781a832ab8f05568afa5d8d0f470e5422c7 Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Fri, 21 Oct 2022 06:09:38 +0000
Subject: [PATCH 182/300] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (79 of 79 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
---
 fastlane/metadata/android/pt-BR/changelogs/40105040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/pt-BR/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/pt-BR/changelogs/40105040.txt b/fastlane/metadata/android/pt-BR/changelogs/40105040.txt
new file mode 100644
index 0000000000..99d6971bf3
--- /dev/null
+++ b/fastlane/metadata/android/pt-BR/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Principais mudanças nesta versão: Novas funcionalidades sob as configurações de labs: Compositor de texto rico, novo gerenciador de dispositivo, broadcast de voz. Ainda sob desenvolvimento ativo!
+Changelog completo: https://github.com/vector-im/element-android/releases

From ea07b4640a055b45ec87aacc56ea6f7f07dd9cd9 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Thu, 20 Oct 2022 09:18:53 +0000
Subject: [PATCH 183/300] Translated using Weblate (Russian)

Currently translated at 91.1% (72 of 79 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/40104340.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/40104360.txt | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/40104340.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/40104360.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104340.txt b/fastlane/metadata/android/ru-RU/changelogs/40104340.txt
new file mode 100644
index 0000000000..63da187fe9
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Основные изменения в этой версии: различные исправления ошибок и улучшения стабильности.
+Полный список изменений: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40104360.txt b/fastlane/metadata/android/ru-RU/changelogs/40104360.txt
new file mode 100644
index 0000000000..208233d92e
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/40104360.txt
@@ -0,0 +1,3 @@
+Новый вид приложения можно включить в настройках лаборатории. Пожалуйста, попробуйте!
+Исправлены проблемы, связанные с отсутствием уведомлений и длительной инкрементной синхронизацией.
+Полный список изменений: https://github.com/vector-im/element-android/releases

From 666c5f20760d18a487f16d341fcfadd0bb6c69eb Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Thu, 20 Oct 2022 17:20:42 +0000
Subject: [PATCH 184/300] Translated using Weblate (Slovak)

Currently translated at 100.0% (79 of 79 strings)

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

diff --git a/fastlane/metadata/android/sk/changelogs/40105040.txt b/fastlane/metadata/android/sk/changelogs/40105040.txt
new file mode 100644
index 0000000000..75d4196fbf
--- /dev/null
+++ b/fastlane/metadata/android/sk/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Hlavné zmeny v tejto verzii: Nové funkcie v rámci laboratórnych nastavení: Rozšírený textový editor, nová správa zariadení, hlasové vysielanie. Stále prebieha aktívny vývoj!
+Úplný zoznam zmien: https://github.com/vector-im/element-android/releases

From a63df378d70db9af3fe84c98d2fabded763c8020 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Fri, 21 Oct 2022 18:36:58 +0000
Subject: [PATCH 185/300] Translated using Weblate (Swedish)

Currently translated at 100.0% (79 of 79 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/40105040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/sv-SE/changelogs/40105040.txt b/fastlane/metadata/android/sv-SE/changelogs/40105040.txt
new file mode 100644
index 0000000000..66b2b47e7d
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Huvudsakliga ändringar i den här versionen: Nya funktioner under experimentinställningarna: Rik-text-redigerare, ny enhetshantering, röstsändning. Fortfarande under aktiv utveckling!
+Full ändringslogg: https://github.com/vector-im/element-android/releases

From d67809c1e5653b3645ada525f4f734ddce1afeab Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 20 Oct 2022 19:19:25 +0000
Subject: [PATCH 186/300] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (79 of 79 strings)

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

diff --git a/fastlane/metadata/android/uk/changelogs/40105040.txt b/fastlane/metadata/android/uk/changelogs/40105040.txt
new file mode 100644
index 0000000000..bbc005f84c
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Основні зміни в цій версії: Нові можливості в налаштуваннях лабораторії: Текстовий редактор, нове керування пристроями, голосові повідомлення. Досі в активній розробці!
+Список усіх змін: https://github.com/vector-im/element-android/releases

From c278bfd5fa76c1e20e9505f45b0e1404234b45a8 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 20 Oct 2022 08:58:26 +0000
Subject: [PATCH 187/300] Translated using Weblate (Italian)

Currently translated at 100.0% (79 of 79 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/40105040.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/40105040.txt

diff --git a/fastlane/metadata/android/it-IT/changelogs/40105040.txt b/fastlane/metadata/android/it-IT/changelogs/40105040.txt
new file mode 100644
index 0000000000..557ae3bd66
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Modifiche principali in questa versione: nuove funzioni nelle impostazioni Laboratori: compositore in rich text, nuova gestione dispositivi, broadcast voce. Ancora in sviluppo attivo!
+Cronologia completa: https://github.com/vector-im/element-android/releases

From 7c984b947351afe690027e366c5655a0f5bbbdb3 Mon Sep 17 00:00:00 2001
From: mmehdishafiee <mmhdishafiee@gmail.com>
Date: Thu, 20 Oct 2022 13:54:04 +0000
Subject: [PATCH 188/300] Translated using Weblate (Persian)

Currently translated at 98.7% (78 of 79 strings)

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

diff --git a/fastlane/metadata/android/fa/changelogs/40105040.txt b/fastlane/metadata/android/fa/changelogs/40105040.txt
new file mode 100644
index 0000000000..69bd6bf93c
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+تغییرات اصلی در این نسخه: قابلیت‌های جدید در تنظیمات آزمایشی: پردازشگر متن غنی، مدیریت دستگاه‌ جدید، پخش صدا. هنوز فعالانه در حال توسعه‌اند.
+لیست کامل تغییرات: https://github.com/vector-im/element-android/releases

From 2c34e0589e92d5a0ab02170346b14937d711c9ed Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Fri, 21 Oct 2022 00:34:23 +0000
Subject: [PATCH 189/300] Translated using Weblate (Indonesian)

Currently translated at 100.0% (79 of 79 strings)

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

diff --git a/fastlane/metadata/android/id/changelogs/40105040.txt b/fastlane/metadata/android/id/changelogs/40105040.txt
new file mode 100644
index 0000000000..810af47607
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/40105040.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Fitur baru di belakang pengaturan uji coba: Komposer teks kaya, pengelolaan perangkat baru, siaran suara. Masih dalam pengembangan aktif!
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases

From 9da575b4d0c616997ca8e18d8f62c6a6a414acb9 Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:19:01 +0100
Subject: [PATCH 190/300] Remove redundant call to superclass click listener

---
 .../java/im/vector/app/core/ui/views/BottomSheetActionButton.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index d16bf67a34..ca3e6a360a 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -39,7 +39,6 @@ class BottomSheetActionButton @JvmOverloads constructor(
     val views: ViewBottomSheetActionButtonBinding
 
     override fun setOnClickListener(l: OnClickListener?) {
-        super.setOnClickListener(l)
         views.bottomSheetActionClickableZone.setOnClickListener(l)
     }
 

From 74591f526111eb5472a3090014488170ca7944ff Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:20:51 +0100
Subject: [PATCH 191/300] Refactor to use view visibility helper

---
 .../attachments/AttachmentTypeSelectorBottomSheet.kt       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
index 88cad2ab0b..af17800455 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import com.airbnb.mvrx.fragmentViewModel
@@ -47,9 +48,9 @@ class AttachmentTypeSelectorBottomSheet : VectorBaseBottomSheetDialogFragment<Bo
 
     override fun invalidate() = withState(viewModel, timelineViewModel) { viewState, timelineState ->
         super.invalidate()
-        views.location.visibility = if (viewState.isLocationVisible) View.VISIBLE else View.GONE
-        views.voiceBroadcast.visibility = if (viewState.isVoiceBroadcastVisible) View.VISIBLE else View.GONE
-        views.poll.visibility = if (!timelineState.isThreadTimeline()) View.VISIBLE else View.GONE
+        views.location.isVisible = viewState.isLocationVisible
+        views.voiceBroadcast.isVisible = viewState.isVoiceBroadcastVisible
+        views.poll.isVisible = !timelineState.isThreadTimeline()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

From c401d55dea49b47f2e3123ed385c092d73dbfeda Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:21:52 +0100
Subject: [PATCH 192/300] Change redundant sealed class to interface

---
 .../AttachmentTypeSelectorSharedActionViewModel.kt            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
index 2b85b6882a..e02b10c54b 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
@@ -23,8 +23,8 @@ import javax.inject.Inject
 class AttachmentTypeSelectorSharedActionViewModel @Inject constructor() :
         VectorSharedActionViewModel<AttachmentTypeSelectorSharedAction>()
 
-sealed class AttachmentTypeSelectorSharedAction : VectorSharedAction {
+sealed interface AttachmentTypeSelectorSharedAction : VectorSharedAction {
     data class SelectAttachmentTypeAction(
             val attachmentType: AttachmentType
-    ) : AttachmentTypeSelectorSharedAction()
+    ) : AttachmentTypeSelectorSharedAction
 }

From 0650b6ae22d0f0459e03ec6533d1fbde30b17203 Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:24:00 +0100
Subject: [PATCH 193/300] Remove unused string

---
 library/ui-strings/src/main/res/values/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 9ce87199b0..d5223a0638 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3213,7 +3213,6 @@
     <string name="attachment_type_selector_location">Location</string>
     <string name="attachment_type_selector_camera">Camera</string>
     <string name="attachment_type_selector_contact">Contact</string>
-    <string name="attachment_type_selector_text_formatting">Text formatting</string>
 
     <string name="message_reaction_show_less">Show less</string>
     <plurals name="message_reaction_show_more">

From 293811220d52b3ea9da0796cbd99ba46dd4fbe25 Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:26:11 +0100
Subject: [PATCH 194/300] Revert "Add rounded corners to bottom sheet dialog."

This reverts commit 17c43c91888162d3c7675511ff910c46c3aa32fc.
---
 .../src/main/res/values/styles_bottom_sheet.xml       | 11 -----------
 .../layout/bottom_sheet_attachment_type_selector.xml  |  1 +
 .../res/layout/view_bottom_sheet_action_button.xml    |  3 ++-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
index 7b704a6331..f6c30040d9 100644
--- a/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
+++ b/library/ui-styles/src/main/res/values/styles_bottom_sheet.xml
@@ -14,7 +14,6 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_light</item>
         <item name="android:textColorLink">@color/element_link_light</item>
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Dark" parent="Theme.MaterialComponents.BottomSheetDialog">
@@ -29,7 +28,6 @@
         <!-- Default color for text View -->
         <item name="android:textColorTertiary">@color/element_content_primary_dark</item>
         <item name="android:textColorLink">@color/element_link_dark</item>
-        <item name="bottomSheetStyle">@style/BottomSheetStyle</item>
     </style>
 
     <style name="Theme.Vector.BottomSheetDialog.Black" parent="Theme.Vector.BottomSheetDialog.Dark">
@@ -37,15 +35,6 @@
     </style>
 
     <!-- BottomSheet style -->
-    <style name="BottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
-        <item name="shapeAppearance">@style/BottomSheetShapeAppearance</item>
-    </style>
-
-    <style name="BottomSheetShapeAppearance" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">20dp</item>
-    </style>
-
     <style name="BottomSheetItemTextMain">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:layout_width">0dp</item>
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
index 559673716e..3aec5b5c20 100644
--- a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?colorSurface"
     android:orientation="vertical">
 
     <androidx.core.widget.NestedScrollView
diff --git a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
index 05a99fe8ae..f8521c7eba 100644
--- a/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
+++ b/vector/src/main/res/layout/view_bottom_sheet_action_button.xml
@@ -10,6 +10,7 @@
         android:id="@+id/bottomSheetActionClickableZone"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?colorSurface"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
@@ -92,4 +93,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</merge>
+</merge>
\ No newline at end of file

From b9c1aa6ded4edcf9caa0c6ad250845cc332e53ab Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:31:15 +0100
Subject: [PATCH 195/300] Remove redundant view group

---
 .../bottom_sheet_attachment_type_selector.xml | 144 +++++++++---------
 1 file changed, 69 insertions(+), 75 deletions(-)

diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
index 3aec5b5c20..79a60624cf 100644
--- a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
@@ -1,92 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface"
-    android:orientation="vertical">
+    android:background="?colorSurface">
 
-    <androidx.core.widget.NestedScrollView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <LinearLayout
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/gallery"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            app:actionTitle="@string/attachment_type_selector_gallery"
+            app:leftIcon="@drawable/ic_attachment_gallery"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/gallery"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_gallery"
-                app:leftIcon="@drawable/ic_attachment_gallery"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/stickers"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_sticker"
+            app:leftIcon="@drawable/ic_attachment_sticker"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/stickers"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_sticker"
-                app:leftIcon="@drawable/ic_attachment_sticker"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/file"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_file"
+            app:leftIcon="@drawable/ic_attachment_file"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/file"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_file"
-                app:leftIcon="@drawable/ic_attachment_file"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/voiceBroadcast"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_voice_broadcast"
+            app:leftIcon="@drawable/ic_attachment_voice_broadcast"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/voiceBroadcast"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_voice_broadcast"
-                app:leftIcon="@drawable/ic_attachment_voice_broadcast"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/poll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_poll"
+            app:leftIcon="@drawable/ic_attachment_poll"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/poll"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_poll"
-                app:leftIcon="@drawable/ic_attachment_poll"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/location"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_location"
+            app:leftIcon="@drawable/ic_attachment_location"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/location"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_location"
-                app:leftIcon="@drawable/ic_attachment_location"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/camera"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_camera"
+            app:leftIcon="@drawable/ic_attachment_camera"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/camera"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_camera"
-                app:leftIcon="@drawable/ic_attachment_camera"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
+        <im.vector.app.core.ui.views.BottomSheetActionButton
+            android:id="@+id/contact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:actionTitle="@string/attachment_type_selector_contact"
+            app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
+            app:tint="?colorPrimary"
+            app:titleTextColor="?vctr_content_primary" />
 
-            <im.vector.app.core.ui.views.BottomSheetActionButton
-                android:id="@+id/contact"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:actionTitle="@string/attachment_type_selector_contact"
-                app:leftIcon="@drawable/ic_attachment_contact_white_24dp"
-                app:tint="?colorPrimary"
-                app:titleTextColor="?vctr_content_primary" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</LinearLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

From cdc8f7fea7b742f4206f9af9e789fe59d25637dc Mon Sep 17 00:00:00 2001
From: Jonny Andrew <jonny.andrew@protonmail.com>
Date: Mon, 24 Oct 2022 09:43:03 +0100
Subject: [PATCH 196/300] Remove redundant `this`

---
 .../app/features/attachments/AttachmentTypeSelectorViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
index ec45e226be..fe6616e53a 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
@@ -45,7 +45,7 @@ class AttachmentTypeSelectorViewModel @AssistedInject constructor(
 
     init {
         setState {
-            this.copy(
+            copy(
                     isLocationVisible = vectorFeatures.isLocationSharingEnabled(),
                     isVoiceBroadcastVisible = vectorFeatures.isVoiceBroadcastEnabled(),
             )

From 59cf20be35000c695a9e5aa39717ae8072205fba Mon Sep 17 00:00:00 2001
From: Nikita Fedrunov <66663241+fedrunov@users.noreply.github.com>
Date: Mon, 24 Oct 2022 11:01:44 +0200
Subject: [PATCH 197/300] added UI tests for new App Layout's screens (#7305)

---
 .../app/espresso/tools/ViewActionsExt.kt      | 44 ++++++++++++++++++
 .../vector/app/ui/UiAllScreensSanityTest.kt   |  8 ++++
 .../im/vector/app/ui/robot/ElementRobot.kt    | 14 ++++++
 .../app/ui/robot/LayoutPreferencesRobot.kt    | 46 +++++++++++++++++++
 .../im/vector/app/ui/robot/RoomListRobot.kt   | 37 +++++++++++++--
 5 files changed, 144 insertions(+), 5 deletions(-)
 create mode 100644 vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt
 create mode 100644 vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt

diff --git a/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt
new file mode 100644
index 0000000000..c1e5c0164b
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ViewActionsExt.kt
@@ -0,0 +1,44 @@
+/*
+ * 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 im.vector.app.espresso.tools
+
+import android.view.View
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import com.google.android.material.tabs.TabLayout
+import org.hamcrest.Matchers.allOf
+
+fun selectTabAtPosition(tabIndex: Int): ViewAction {
+    return object : ViewAction {
+        override fun getDescription() = "with tab at index $tabIndex"
+
+        override fun getConstraints() = allOf(isDisplayed(), isAssignableFrom(TabLayout::class.java))
+
+        override fun perform(uiController: UiController, view: View) {
+            val tabLayout = view as TabLayout
+            val tabAtIndex: TabLayout.Tab = tabLayout.getTabAt(tabIndex)
+                    ?: throw PerformException.Builder()
+                            .withCause(Throwable("No tab at index $tabIndex"))
+                            .build()
+
+            tabAtIndex.select()
+        }
+    }
+}
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
index d4878b8dcc..52607bd9a1 100644
--- a/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt
@@ -135,6 +135,14 @@ class UiAllScreensSanityTest {
 
         elementRobot.space { selectSpace(spaceName) }
 
+        elementRobot.layoutPreferences {
+            crawl()
+        }
+
+        elementRobot.roomList {
+            crawlTabs()
+        }
+
         elementRobot.withDeveloperMode {
             settings {
                 advancedSettings { crawlDeveloperOptions() }
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index d9dfb0facf..8f1df52863 100644
--- a/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -17,8 +17,10 @@
 package im.vector.app.ui.robot
 
 import android.view.View
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.closeSoftKeyboard
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
@@ -94,6 +96,18 @@ class ElementRobot(
         waitUntilViewVisible(withId(R.id.roomListContainer))
     }
 
+    fun layoutPreferences(block: LayoutPreferencesRobot.() -> Unit) {
+        openActionBarOverflowOrOptionsMenu(
+                ApplicationProvider.getApplicationContext()
+        )
+        clickOn(R.string.home_layout_preferences)
+        waitUntilDialogVisible(withId(R.id.home_layout_settings_recents))
+
+        block(LayoutPreferencesRobot())
+
+        pressBack()
+    }
+
     fun newDirectMessage(block: NewDirectMessageRobot.() -> Unit) {
         if (labsPreferences.isNewAppLayoutEnabled) {
             clickOn(R.id.newLayoutCreateChatButton)
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt
new file mode 100644
index 0000000000..429511e10f
--- /dev/null
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/LayoutPreferencesRobot.kt
@@ -0,0 +1,46 @@
+/*
+ * 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 im.vector.app.ui.robot
+
+import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
+import im.vector.app.R
+
+class LayoutPreferencesRobot {
+
+    fun crawl() {
+        toggleRecents()
+        toggleFilters()
+        useAZOrderd()
+        useActivityOrder()
+    }
+
+    fun toggleRecents() {
+        clickOn(R.id.home_layout_settings_recents)
+    }
+
+    fun toggleFilters() {
+        clickOn(R.id.home_layout_settings_filters)
+    }
+
+    fun useAZOrderd() {
+        clickOn(R.id.home_layout_settings_sort_name)
+    }
+
+    fun useActivityOrder() {
+        clickOn(R.id.home_layout_settings_sort_activity)
+    }
+}
diff --git a/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
index e4984aeed0..cbc46f15e7 100644
--- a/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
+++ b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt
@@ -21,29 +21,41 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.contrib.RecyclerViewActions
-import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import im.vector.app.R
+import im.vector.app.espresso.tools.selectTabAtPosition
 import im.vector.app.espresso.tools.waitUntilActivityVisible
 import im.vector.app.espresso.tools.waitUntilDialogVisible
+import im.vector.app.espresso.tools.waitUntilViewVisible
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.room.list.home.header.HomeRoomFilter
 import im.vector.app.features.roomdirectory.RoomDirectoryActivity
 import im.vector.app.ui.robot.settings.labs.LabFeaturesPreferences
+import im.vector.app.waitForView
 
 class RoomListRobot(private val labsPreferences: LabFeaturesPreferences) {
 
     fun openRoom(roomName: String, block: RoomDetailRobot.() -> Unit) {
-        clickOn(roomName)
+        onView(withId(R.id.roomListView))
+                .perform(
+                        RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
+                                hasDescendant(withText(roomName)),
+                                ViewActions.click()
+                        )
+                )
         block(RoomDetailRobot())
         pressBack()
     }
 
     fun verifyCreatedRoom() {
-        onView(ViewMatchers.withId(R.id.roomListView))
+        onView(withId(R.id.roomListView))
                 .perform(
                         RecyclerViewActions.actionOnItem<RecyclerView.ViewHolder>(
-                                ViewMatchers.hasDescendant(withText(R.string.room_displayname_empty_room)),
+                                hasDescendant(withText(R.string.room_displayname_empty_room)),
                                 ViewActions.longClick()
                         )
                 )
@@ -53,7 +65,7 @@ class RoomListRobot(private val labsPreferences: LabFeaturesPreferences) {
     fun newRoom(block: NewRoomRobot.() -> Unit) {
         if (labsPreferences.isNewAppLayoutEnabled) {
             clickOn(R.id.newLayoutCreateChatButton)
-            waitUntilDialogVisible(ViewMatchers.withId(R.id.create_room))
+            waitUntilDialogVisible(withId(R.id.create_room))
             clickOn(R.id.create_room)
         } else {
             clickOn(R.id.createGroupRoomButton)
@@ -67,4 +79,19 @@ class RoomListRobot(private val labsPreferences: LabFeaturesPreferences) {
             pressBack()
         }
     }
+
+    fun crawlTabs() {
+        waitUntilActivityVisible<HomeActivity> {
+            waitUntilViewVisible(withId(R.id.roomListContainer))
+        }
+
+        selectFilterTab(HomeRoomFilter.UNREADS)
+        waitForView(withId(R.id.emptyTitleView))
+        selectFilterTab(HomeRoomFilter.ALL)
+        waitForView(withId(R.id.roomNameView))
+    }
+
+    fun selectFilterTab(filter: HomeRoomFilter) {
+        onView(withId(R.id.home_filter_tabs_tabs)).perform(selectTabAtPosition(filter.ordinal))
+    }
 }

From 3673e720fabcf8f78eb7c46173042422bd2c1d4d Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 24 Oct 2022 10:31:55 -0400
Subject: [PATCH 198/300] Code improvements

---
 .../sdk/api/session/room/model/RoomSummary.kt   |  4 ++--
 .../sdk/api/session/sync/model/RoomSync.kt      |  2 +-
 .../internal/session/filter/RoomEventFilter.kt  |  4 +++-
 .../home/room/detail/TimelineViewModel.kt       | 17 +++++++++--------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 6058564b78..b63656dc50 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -98,11 +98,11 @@ data class RoomSummary(
          */
         val highlightCount: Int = 0,
         /**
-         * Number of threads with unread messages in this room
+         * Number of threads with unread messages in this room.
          */
         val threadNotificationCount: Int = 0,
         /**
-         * Number of threads with highlighted messages in this room
+         * Number of threads with highlighted messages in this room.
          */
         val threadHighlightCount: Int = 0,
         /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
index 0651b8f3d8..7eb44c1350 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/model/RoomSync.kt
@@ -48,7 +48,7 @@ data class RoomSync(
         @Json(name = "unread_notifications") val unreadNotifications: RoomSyncUnreadNotifications? = null,
 
         /**
-         * The count of threads with unread notifications (not the total # of notifications in all threads)
+         * The count of threads with unread notifications (not the total # of notifications in all threads).
          */
         @Json(name = "unread_thread_notifications") val unreadThreadNotifications: Map<String, RoomSyncUnreadThreadNotifications>? = null,
 
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index 082acb63ab..fd6acea71d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -75,7 +75,9 @@ internal data class RoomEventFilter(
          */
         @Json(name = "contains_url") val containsUrl: Boolean? = null,
         /**
-         * If true, enables lazy-loading of membership events. See Lazy-loading room members for more information. Defaults to false.
+         * If true, enables lazy-loading of membership events.
+         * See Lazy-loading room members for more information.
+         * Defaults to false.
          */
         @Json(name = "lazy_load_members") val lazyLoadMembers: Boolean? = null,
         /**
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index a019ab862d..62f3cad5aa 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -408,11 +408,12 @@ class TimelineViewModel @AssistedInject constructor(
      * Observe local unread threads.
      */
     private fun observeLocalThreadNotifications() {
+        if (room == null) return
         val threadNotificationsSupported = session.homeServerCapabilitiesService().getHomeServerCapabilities().canUseThreadReadReceiptsAndNotifications
         if (threadNotificationsSupported) {
-            room?.getRoomSummaryLive()
-                    ?.asFlow()
-                    ?.onEach {
+            room.getRoomSummaryLive()
+                    .asFlow()
+                    .onEach {
                         it.getOrNull()?.let {
                             setState {
                                 copy(
@@ -424,15 +425,15 @@ class TimelineViewModel @AssistedInject constructor(
                             }
                         }
                     }
-                    ?.launchIn(viewModelScope)
+                    .launchIn(viewModelScope)
         } else {
-            room?.flow()
-                    ?.liveLocalUnreadThreadList()
-                    ?.execute {
+            room.flow()
+                    .liveLocalUnreadThreadList()
+                    .execute {
                         val threadList = it.invoke()
                         val isUserMentioned = threadList?.firstOrNull { threadRootEvent ->
                             threadRootEvent.root.threadDetails?.threadNotificationState == ThreadNotificationState.NEW_HIGHLIGHTED_MESSAGE
-                        }?.let { true } ?: false
+                        } != null
                         val numberOfLocalUnreadThreads = threadList?.size ?: 0
                         copy(
                                 threadNotificationBadgeState = ThreadNotificationBadgeState(

From c9fee49b98f0c8e4f9f02532810f1e1fd3e1f134 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:03:12 +0000
Subject: [PATCH 199/300] Bump alex-page/github-project-automation-plus from
 0.8.1 to 0.8.2

Bumps [alex-page/github-project-automation-plus](https://github.com/alex-page/github-project-automation-plus) from 0.8.1 to 0.8.2.
- [Release notes](https://github.com/alex-page/github-project-automation-plus/releases)
- [Commits](https://github.com/alex-page/github-project-automation-plus/compare/bb266ff4dde9242060e2d5418e120a133586d488...1f8873e97e3c8f58161a323b7c568c1f623a1c4d)

---
updated-dependencies:
- dependency-name: alex-page/github-project-automation-plus
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/triage-incoming.yml      | 2 +-
 .github/workflows/triage-priority-bugs.yml | 4 ++--
 .github/workflows/triage-unlabelled.yml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 6a22bf5223..4dadc25ab4 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -10,7 +10,7 @@ jobs:
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Issue triage
           column: Incoming
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
index e762102226..07e73fe805 100644
--- a/.github/workflows/triage-priority-bugs.yml
+++ b/.github/workflows/triage-priority-bugs.yml
@@ -24,7 +24,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Android App Team
           column: Important Issues & Topics (P1)
@@ -50,7 +50,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent')))
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Crypto Team
           column: Ready
diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml
index 06df286d09..98d6579958 100644
--- a/.github/workflows/triage-unlabelled.yml
+++ b/.github/workflows/triage-unlabelled.yml
@@ -28,7 +28,7 @@ jobs:
             echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
           fi
       - name: Move issue
-        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         if: ${{ env.ALREADY_IN_BOARD == 'true' }}
         with:
           project: Issue triage

From 085fbcf2fa5a28f6bf4b4ecaf455e7e0f60a60b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:08:46 +0000
Subject: [PATCH 200/300] Bump fragment from 1.5.3 to 1.5.4

Bumps `fragment` from 1.5.3 to 1.5.4.

Updates `fragment-ktx` from 1.5.3 to 1.5.4

Updates `fragment-testing` from 1.5.3 to 1.5.4

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/dependencies.gradle b/dependencies.gradle
index f081e0a874..23829b7317 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -30,7 +30,7 @@ def vanniktechEmoji = "0.16.0-SNAPSHOT"
 
 def sentry = "6.4.3"
 
-def fragment = "1.5.3"
+def fragment = "1.5.4"
 
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819

From 8163d0d47b76796969127b1946006accd82c022d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:09:47 +0000
Subject: [PATCH 201/300] Bump kluent-android from 1.68 to 1.72

Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.68 to 1.72.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/compare/v1.68...v1.72)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/dependencies.gradle b/dependencies.gradle
index f081e0a874..c86b50d80a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -167,7 +167,7 @@ ext.libs = [
                 'sentryAndroid'         : "io.sentry:sentry-android:$sentry"
         ],
         tests       : [
-                'kluent'                 : "org.amshove.kluent:kluent-android:1.68",
+                'kluent'                 : "org.amshove.kluent:kluent-android:1.72",
                 'timberJunitRule'        : "net.lachlanmckee:timber-junit-rule:1.0.1",
                 'junit'                  : "junit:junit:4.13.2",
         ]

From 76ab69e7a53379db5221dabf004909dbe4c977a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:10:34 +0000
Subject: [PATCH 202/300] Bump sentry-android from 6.4.3 to 6.6.0

Bumps [sentry-android](https://github.com/getsentry/sentry-java) from 6.4.3 to 6.6.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.4.3...6.6.0)

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

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

diff --git a/dependencies.gradle b/dependencies.gradle
index f081e0a874..f3e563b9d2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -28,7 +28,7 @@ def jjwt = "0.11.5"
 // the whole commit which set version 0.16.0-SNAPSHOT
 def vanniktechEmoji = "0.16.0-SNAPSHOT"
 
-def sentry = "6.4.3"
+def sentry = "6.6.0"
 
 def fragment = "1.5.3"
 

From b3dcc605d98818670db2cffaacd4848a7083cbfe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 23:11:23 +0000
Subject: [PATCH 203/300] Bump exifinterface from 1.3.4 to 1.3.5

Bumps exifinterface from 1.3.4 to 1.3.5.

---
updated-dependencies:
- dependency-name: androidx.exifinterface:exifinterface
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/dependencies.gradle b/dependencies.gradle
index f081e0a874..b44808f630 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -55,7 +55,7 @@ ext.libs = [
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
                 'core'                    : "androidx.core:core-ktx:1.9.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
-                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.4",
+                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.5",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
                 'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",

From dffb9d3d9d6eb97c3588028a81935a9fb30f69e9 Mon Sep 17 00:00:00 2001
From: ericdecanini <eddecanini@gmail.com>
Date: Mon, 24 Oct 2022 21:39:31 -0400
Subject: [PATCH 204/300] Fixes lint error

---
 .../android/sdk/internal/session/filter/RoomEventFilter.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
index fd6acea71d..4bb66a6159 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/RoomEventFilter.kt
@@ -81,7 +81,7 @@ internal data class RoomEventFilter(
          */
         @Json(name = "lazy_load_members") val lazyLoadMembers: Boolean? = null,
         /**
-         * If true, this will opt-in for the server to return unread threads notifications in [RoomSync]
+         * If true, this will opt-in for the server to return unread threads notifications in [RoomSync].
          */
         @Json(name = "unread_thread_notifications") val enableUnreadThreadNotifications: Boolean? = null,
 ) {

From 1cf167cfa5080ccef6e895233d7da9d896a89a71 Mon Sep 17 00:00:00 2001
From: Jingchao Feng <fjch1997@outlook.com>
Date: Tue, 25 Oct 2022 07:20:36 +0000
Subject: [PATCH 205/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.3% (2376 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index f1fe3a496f..8ae0c311fb 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2419,9 +2419,9 @@
     <string name="ftue_auth_use_case_subtitle">我们会帮你建立连接</string>
     <string name="ftue_auth_use_case_title">你会与谁聊最多？</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name}也非常适合工作场所。受到世界上最安全的组织信任。</string>
-    <string name="ftue_auth_carousel_control_body">选择保存你的对话的位置，给你控制权和独立性。通过Matrix连接。</string>
+    <string name="ftue_auth_carousel_control_body">聊天消息存储位置一律由您掌控，不受外来因素干扰。技术由 Matrix 提供。</string>
     <string name="ftue_auth_carousel_secure_body">安全且独立的通信，为你提供和在家中面对面对话同样等级的隐私。</string>
-    <string name="ftue_auth_carousel_encrypted_title">安全传送消息。</string>
+    <string name="ftue_auth_carousel_encrypted_title">安全传递信息</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">向主服务器注册端点token失败：
 \n%1$s</string>
     <string name="threads_beta_enable_notice_message">Threads帮助保持你的对话不离题且易于跟踪。%s启用消息列会刷新应用。这对一些账户可能需要更长时间。</string>
@@ -2481,7 +2481,7 @@
     <string name="ftue_auth_use_case_connect_to_server">连接服务器</string>
     <string name="ftue_auth_use_case_join_existing_server">想要加入已有的服务器？</string>
     <string name="ftue_auth_use_case_skip_partial">跳过此问题</string>
-    <string name="ftue_auth_use_case_option_one">朋友和家人</string>
+    <string name="ftue_auth_use_case_option_one">家人和朋友</string>
     <string name="ftue_auth_carousel_secure_title">拥有你的对话。</string>
     <string name="attachment_type_location">位置</string>
     <string name="send_feedback_threads_title">Threads Beta反馈</string>

From 224f016acf189f4a6190a6df08fcfd3b9953f539 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Mon, 24 Oct 2022 07:34:23 +0000
Subject: [PATCH 206/300] Translated using Weblate (Czech)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
index 510600a641..404b19ea71 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -2868,4 +2868,11 @@
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Druhé zařízení je již přihlášeno.</string>
     <string name="qr_code_login_header_failed_e2ee_security_issue_description">Při nastavování zabezpečeného zasílání zpráv se vyskytl problém se zabezpečením. Může být napadena jedna z následujících věcí: váš domovský server; vaše internetové připojení; vaše zařízení;</string>
     <string name="qr_code_login_header_failed_other_description">Žádost se nezdařila.</string>
+    <string name="a11y_voice_broadcast_buffering">Ukládání do vyrovnávací paměti</string>
+    <string name="a11y_pause_voice_broadcast">Pozastavit hlasové vysílání</string>
+    <string name="a11y_play_voice_broadcast">Přehrát nebo obnovit hlasové vysílání</string>
+    <string name="a11y_stop_voice_broadcast_record">Ukončit záznam hlasového vysílání</string>
+    <string name="a11y_pause_voice_broadcast_record">Pozastavit záznam hlasového vysílání</string>
+    <string name="a11y_resume_voice_broadcast_record">Obnovit záznam hlasového vysílání</string>
+    <string name="voice_broadcast_live">Živě</string>
 </resources>
\ No newline at end of file

From e0af6e661d20edffbff31bb85626d7103aa9c443 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Sun, 23 Oct 2022 06:31:29 +0000
Subject: [PATCH 207/300] Translated using Weblate (German)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index cac0a47ad7..546d7a4e9c 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2813,4 +2813,11 @@
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Das andere Gerät ist bereits angemeldet.</string>
     <string name="qr_code_login_header_failed_e2ee_security_issue_description">Es ist ein Problem bei der Herstellung der sicheren Kommunikation aufgetreten. Eines der folgenden Dinge könnte kompromittiert sein: Dein Heim-Server; deine Internetverbindung(en); dein(e) Gerät(e);</string>
     <string name="qr_code_login_header_failed_other_description">Die Anfrage ist fehlgeschlagen.</string>
+    <string name="a11y_play_voice_broadcast">Abspielen oder fortsetzen der Sprachübertragung</string>
+    <string name="a11y_resume_voice_broadcast_record">Fortsetzen der Sprachübertragung</string>
+    <string name="a11y_voice_broadcast_buffering">Puffere</string>
+    <string name="a11y_pause_voice_broadcast">Pausiere Sprachübertragung</string>
+    <string name="a11y_stop_voice_broadcast_record">Stoppe Aufzeichnung der Sprachübertragung</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausiere Aufzeichnung der Sprachübertragung</string>
+    <string name="voice_broadcast_live">Live</string>
 </resources>
\ No newline at end of file

From 1c0f059fd7307a368761b69d87b53556f905eca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Mon, 24 Oct 2022 11:07:22 +0000
Subject: [PATCH 208/300] Translated using Weblate (Finnish)

Currently translated at 81.1% (2045 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fi/strings.xml b/library/ui-strings/src/main/res/values-fi/strings.xml
index 4da0dec3a2..486a8e5b30 100644
--- a/library/ui-strings/src/main/res/values-fi/strings.xml
+++ b/library/ui-strings/src/main/res/values-fi/strings.xml
@@ -2298,4 +2298,11 @@
     <string name="home_layout_preferences_recents">Näytä viimeisimmät</string>
     <string name="home_layout_preferences_filters">Näytä suodattimet</string>
     <string name="home_layout_preferences">Asettelun asetukset</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\nvaikuttaa hieman tyhjältä.</string>
+    <string name="create_spaces_invite_public_header">Ketkä ovat tiimikavereitasi\?</string>
+    <string name="create_spaces_private_teammates">Yksityinen avaruus sinulle ja tiimikavereillesi</string>
+    <string name="create_spaces_me_and_teammates">Minä ja tiimikaverit</string>
+    <string name="room_permissions_upgrade_the_space">Päivitä avaruus</string>
+    <string name="room_permissions_change_space_avatar">Vaihda avaruuden kuva</string>
 </resources>
\ No newline at end of file

From a1d550ad1d781a249fda170bd0f1711bac8d7675 Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Sun, 23 Oct 2022 09:49:22 +0000
Subject: [PATCH 209/300] Translated using Weblate (French)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml
index 67396a390f..d6f9d8957f 100644
--- a/library/ui-strings/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -2814,4 +2814,11 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Vous pouvez utiliser cet appareil pour connecter un appareil mobile ou un client web avec un QR code. Il y a deux façons de le faire :</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Se connecter avec un QR code</string>
     <string name="login_scan_qr_code">Scanner le QR code</string>
+    <string name="a11y_voice_broadcast_buffering">Mise en mémoire tampon</string>
+    <string name="a11y_pause_voice_broadcast">Mettre en pause la diffusion audio</string>
+    <string name="a11y_play_voice_broadcast">Lire ou continuer la diffusion audio</string>
+    <string name="a11y_stop_voice_broadcast_record">Arrêter l’enregistrement de la diffusion audio</string>
+    <string name="a11y_pause_voice_broadcast_record">Mettre en pause l’enregistrement de la diffusion audio</string>
+    <string name="a11y_resume_voice_broadcast_record">Continuer l’enregistrement de la diffusion audio</string>
+    <string name="voice_broadcast_live">Direct</string>
 </resources>
\ No newline at end of file

From 20ce4a3136be4ae6972559264ceaa67f4da6752b Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 23 Oct 2022 17:10:18 +0000
Subject: [PATCH 210/300] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-hu/strings.xml b/library/ui-strings/src/main/res/values-hu/strings.xml
index 43620c4339..5f65b11910 100644
--- a/library/ui-strings/src/main/res/values-hu/strings.xml
+++ b/library/ui-strings/src/main/res/values-hu/strings.xml
@@ -2814,4 +2814,11 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="qr_code_login_header_failed_other_description">A kérés sikertelen.</string>
     <string name="labs_enable_voice_broadcast_summary">Hang közvetítés felvételéhez és a szoba idővonalára küldéséhez.</string>
     <string name="labs_enable_voice_broadcast_title">Hang közvetítés engedélyezése (aktív fejlesztés alatt)</string>
+    <string name="a11y_voice_broadcast_buffering">Pufferelés</string>
+    <string name="a11y_pause_voice_broadcast">Hang közvetítés szüneteltetése</string>
+    <string name="a11y_play_voice_broadcast">Hang közvetítés lejátszása vagy lejátszás folytatása</string>
+    <string name="a11y_stop_voice_broadcast_record">Hang közvetítés felvétel leállítása</string>
+    <string name="a11y_pause_voice_broadcast_record">Hang közvetítés felvétel megállítása</string>
+    <string name="a11y_resume_voice_broadcast_record">Hang közvetítés felvétel újraindítása</string>
+    <string name="voice_broadcast_live">Élő</string>
 </resources>
\ No newline at end of file

From 079273f00179644185b33e0249981f2e3d1ba56e Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Sun, 23 Oct 2022 00:40:57 +0000
Subject: [PATCH 211/300] Translated using Weblate (Indonesian)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-in/strings.xml b/library/ui-strings/src/main/res/values-in/strings.xml
index 56b06c288a..622a7d3949 100644
--- a/library/ui-strings/src/main/res/values-in/strings.xml
+++ b/library/ui-strings/src/main/res/values-in/strings.xml
@@ -2762,4 +2762,11 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="qr_code_login_header_failed_other_description">Permintaan gagal.</string>
     <string name="labs_enable_voice_broadcast_summary">Memungkinkan untuk merekam dan mengirim siaran suara dalam linimasa ruangan.</string>
     <string name="labs_enable_voice_broadcast_title">Aktifkan siaran suara (dalam pengembangan aktif)</string>
+    <string name="a11y_voice_broadcast_buffering">Memuat</string>
+    <string name="a11y_pause_voice_broadcast">Jeda siaran suara</string>
+    <string name="a11y_play_voice_broadcast">Mainkan atau lanjutkan siaran suara</string>
+    <string name="a11y_stop_voice_broadcast_record">Hentikan rekaman siaran suara</string>
+    <string name="a11y_pause_voice_broadcast_record">Jeda rekaman siaran suara</string>
+    <string name="a11y_resume_voice_broadcast_record">Lanjutkan rekaman siaran suara</string>
+    <string name="voice_broadcast_live">Langsung</string>
 </resources>
\ No newline at end of file

From 0e50002fd1f88202c87b71d75d86aefa7fa5a9e1 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 24 Oct 2022 08:06:00 +0000
Subject: [PATCH 212/300] Translated using Weblate (Italian)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-it/strings.xml b/library/ui-strings/src/main/res/values-it/strings.xml
index 8657e49671..c95d2aebce 100644
--- a/library/ui-strings/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -2722,12 +2722,12 @@
     <string name="device_manager_session_rename">Rinomina sessione</string>
     <string name="device_manager_session_overview_signout">Disconnetti questa sessione</string>
     <string name="device_manager_other_sessions_description_unverified_current_session">Non verificata · La sessione attuale</string>
-    <string name="tooltip_attachment_voice_broadcast">Inizia un broadcast vocale</string>
+    <string name="tooltip_attachment_voice_broadcast">Inizia una trasmissione vocale</string>
     <string name="key_authenticity_not_guaranteed">L\'autenticità di questo messaggio cifrato non può essere garantita su questo dispositivo.</string>
     <string name="settings_security_incognito_keyboard_summary">Richiedi che la tastiera non debba aggiornare dati personalizzati come la cronologia di digitazione e il dizionario in base a cosa digiti nelle conversazioni. Nota che alcune tastiere potrebbero non rispettare questa impostazione.</string>
     <string name="settings_security_incognito_keyboard_title">Tastiera incognito</string>
     <string name="command_description_table_flip">Antepone (╯°□°）╯︵ ┻━┻ ad un messaggio di testo</string>
-    <string name="attachment_type_voice_broadcast">Broadcast voce</string>
+    <string name="attachment_type_voice_broadcast">Trasmissione vocale</string>
     <string name="command_description_devtools">Apri la schermata degli strumenti per sviluppatori</string>
     <string name="room_settings_global_block_unverified_info_text">🔒 Hai attivato la crittografia solo per sessioni verificate in tutte le stanze nelle impostazioni di sicurezza.</string>
     <string name="some_devices_will_not_be_able_to_decrypt">⚠ Ci sono dispositivi non verificati in questa stanza, non potranno decifrare i messaggi che invii.</string>
@@ -2796,8 +2796,8 @@
     <string name="device_manager_sessions_sign_in_with_qr_code_description">Puoi usare questo dispositivo per accedere in un dispositivo mobile o web con un codice QR. Ci sono due modi:</string>
     <string name="device_manager_sessions_sign_in_with_qr_code_title">Accedi con codice QR</string>
     <string name="login_scan_qr_code">Scansiona codice QR</string>
-    <string name="labs_enable_voice_broadcast_summary">Registra e invia broadcast vocali nella linea temporale della stanza.</string>
-    <string name="labs_enable_voice_broadcast_title">Attiva broadcast voce (in sviluppo attivo)</string>
+    <string name="labs_enable_voice_broadcast_summary">Registra e invia trasmissioni vocali nella linea temporale della stanza.</string>
+    <string name="labs_enable_voice_broadcast_title">Attiva trasmissione vocale (in sviluppo attivo)</string>
     <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">L\'homeserver non supporta l\'accesso con codice QR.</string>
     <string name="qr_code_login_header_failed_user_cancelled_description">L\'accesso è stato annullato sull\'altro dispositivo.</string>
     <string name="qr_code_login_header_failed_invalid_qr_code_description">Quel codice QR non è valido.</string>
@@ -2805,4 +2805,11 @@
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">L\'altro dispositivo ha già fatto l\'accesso.</string>
     <string name="qr_code_login_header_failed_e2ee_security_issue_description">Si è verificato un problema di sicurezza configurando i messaggi sicuri. Una delle seguenti cose potrebbe essere compromessa: il tuo homeserver; la/e connessione/i internet; il/i dispositivo/i;</string>
     <string name="qr_code_login_header_failed_other_description">La richiesta è fallita.</string>
+    <string name="a11y_voice_broadcast_buffering">Buffering</string>
+    <string name="a11y_pause_voice_broadcast">Sospendi trasmissione vocale</string>
+    <string name="a11y_play_voice_broadcast">Avvia o riprendi trasmissione vocale</string>
+    <string name="a11y_stop_voice_broadcast_record">Ferma registrazione trasmissione vocale</string>
+    <string name="a11y_pause_voice_broadcast_record">Sospendi registrazione trasmissione vocale</string>
+    <string name="a11y_resume_voice_broadcast_record">Riprendi registrazione trasmissione vocale</string>
+    <string name="voice_broadcast_live">In diretta</string>
 </resources>
\ No newline at end of file

From fbaa759fae7663be0395499338b3bff9d386bff7 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Mon, 24 Oct 2022 13:01:23 +0000
Subject: [PATCH 213/300] Translated using Weblate (Russian)

Currently translated at 95.2% (2400 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index afc0d432ed..3bd2232060 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -434,14 +434,14 @@
     <string name="encryption_information_device_name">Публичное название</string>
     <string name="device_manager_session_details_session_id">ID сессии</string>
     <string name="encryption_information_device_key">Ключ сессии</string>
-    <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей от комнат</string>
-    <string name="encryption_export_room_keys">Экспорт ключей от комнат</string>
+    <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей</string>
+    <string name="encryption_export_room_keys">Экспорт ключей</string>
     <string name="encryption_export_room_keys_summary">Экспорт ключей в локальный файл</string>
     <string name="encryption_export_export">Экспорт</string>
     <string name="passphrase_enter_passphrase">Введите мнемоническую фразу</string>
     <string name="passphrase_confirm_passphrase">Подтвердите мнемоническую фразу</string>
-    <string name="encryption_import_e2e_room_keys">Импорт E2E ключей от комнат</string>
-    <string name="encryption_import_room_keys">Импорт ключей от комнат</string>
+    <string name="encryption_import_e2e_room_keys">Импорт E2E ключей</string>
+    <string name="encryption_import_room_keys">Импорт ключей</string>
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
     <string name="encryption_import_import">Импорт</string>
     <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для проверенных сессий</string>
@@ -618,7 +618,7 @@
     <string name="system_alerts_header">Системные оповещения</string>
     <string name="dialog_title_error">Ошибка</string>
     <string name="passphrase_create_passphrase">Создать мнемоническую фразу</string>
-    <string name="passphrase_passphrase_does_not_match">Парольные фразы не совпадают</string>
+    <string name="passphrase_passphrase_does_not_match">Мнемонические фразы не совпадают</string>
     <string name="resource_limit_contact_admin">свяжитесь с вашим администратором</string>
     <string name="resource_limit_soft_default">Превышен один из ресурсных лимитов сервера, по этому <b>некоторые пользователи не смогут авторизоваться</b>.</string>
     <string name="resource_limit_hard_default">Превышен один из ресурсных лимитов сервера.</string>
@@ -726,7 +726,7 @@
     <string name="encryption_settings_manage_message_recovery_summary">Управление резервным копированием ключей</string>
     <string name="notification_silent">Беззвучный</string>
     <string name="passphrase_empty_error_message">Введите мнемоническую фразу</string>
-    <string name="passphrase_passphrase_too_weak">Парольная фраза слишком простая</string>
+    <string name="passphrase_passphrase_too_weak">Мнемоническая фраза слишком проста</string>
     <string name="keys_backup_passphrase_not_empty_error_message">Пожалуйста, удалите мнемоническую фразу, если хотите, чтобы ${app_name} сгенерировал бумажный ключ.</string>
     <string name="keys_backup_setup_step1_title">Никогда не теряйте зашифрованных сообщений</string>
     <string name="keys_backup_setup_step1_description">Сообщения в зашифрованных комнатах защищены сквозным шифрованием. Ключи для прочтения этих сообщений есть только у вас и получателя(ей).
@@ -744,7 +744,7 @@
     <string name="keys_backup_settings_delete_confirm_message">Удалить резервную копию ключей шифрования с сервера\? Вы больше не сможете использовать бумажный ключ для чтения истории зашифрованных сообщений.</string>
     <string name="keys_backup_settings_delete_confirm_title">Удалить резервную копию</string>
     <string name="keys_backup_settings_deleting_backup">Удаление резервной копии…</string>
-    <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервную копию ключа в этой сессии, восстановите его с помощью своей парольной фразы или ключа восстановления.</string>
+    <string name="keys_backup_settings_untrusted_backup">Чтобы использовать резервное копирование ключей в этой сессии, восстановите их с помощью мнемонической фразы или бумажного ключа.</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">Резервная копия имеет недействительную подпись из подтвержденной сессии %s</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">Резервная копия имеет действительную подпись из неподтвержденной сессии %s</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">Резервная копия имеет действительную подпись из подтверждённой сессии %s.</string>
@@ -1520,9 +1520,9 @@
 \n
 \nМы рекомендуем вам немедленно изменить свой пароль и ключ восстановления в настройках.</string>
     <string name="verification_cancelled">Подтверждение отменено</string>
-    <string name="bootstrap_crosssigning_progress_pbkdf2">Генерация ключа безопасности из парольной фразы</string>
-    <string name="bootstrap_progress_generating_ssss">Генерация ключа SSSS из парольной фразы</string>
-    <string name="bootstrap_progress_generating_ssss_with_info">Генерация ключа SSSS из парольной фразы (%s)</string>
+    <string name="bootstrap_crosssigning_progress_pbkdf2">Создание бумажного ключа из мнемонической фразы</string>
+    <string name="bootstrap_progress_generating_ssss">Создание ключа SSSS из мнемонической фразы</string>
+    <string name="bootstrap_progress_generating_ssss_with_info">Создание ключа SSSS из мнемонической фразы (%s)</string>
     <string name="bootstrap_migration_enter_backup_password">Чтобы продолжить работу, введите парольную фразу для резервного копирования ключа.</string>
     <string name="bootstrap_migration_with_passphrase_helper_with_link">Если вы не знаете вашу парольную фразу для резервного копирования ключей, вы можете %s.</string>
     <string name="power_level_edit_title">Задать роль</string>

From 9e14c85be641feef395efd3cfa111f540f834f06 Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Mon, 24 Oct 2022 12:58:03 +0000
Subject: [PATCH 214/300] Translated using Weblate (Slovak)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sk/strings.xml b/library/ui-strings/src/main/res/values-sk/strings.xml
index 289ab52a49..3c86ea5d3b 100644
--- a/library/ui-strings/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -2868,4 +2868,11 @@
     <string name="qr_code_login_header_failed_other_description">Žiadosť zlyhala.</string>
     <string name="labs_enable_voice_broadcast_summary">Možnosť nahrávania a odosielania hlasového vysielania v časovej osi miestnosti.</string>
     <string name="labs_enable_voice_broadcast_title">Zapnúť hlasové vysielanie (v štádiu aktívneho vývoja)</string>
+    <string name="a11y_voice_broadcast_buffering">Načítavanie do vyrovnávacej pamäte</string>
+    <string name="a11y_pause_voice_broadcast">Pozastaviť hlasové vysielanie</string>
+    <string name="a11y_play_voice_broadcast">Prehrať alebo pokračovať v nahrávaní hlasového vysielania</string>
+    <string name="a11y_stop_voice_broadcast_record">Zastaviť nahrávanie hlasového vysielania</string>
+    <string name="a11y_pause_voice_broadcast_record">Pozastaviť nahrávanie hlasového vysielania</string>
+    <string name="a11y_resume_voice_broadcast_record">Pokračovať v nahrávaní hlasového vysielania</string>
+    <string name="voice_broadcast_live">Naživo</string>
 </resources>
\ No newline at end of file

From ba039efb08fec9e779859e6c382b8da07264aa29 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Mon, 24 Oct 2022 18:59:28 +0000
Subject: [PATCH 215/300] Translated using Weblate (Swedish)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sv/strings.xml b/library/ui-strings/src/main/res/values-sv/strings.xml
index 48c5c62187..af66ba5ce0 100644
--- a/library/ui-strings/src/main/res/values-sv/strings.xml
+++ b/library/ui-strings/src/main/res/values-sv/strings.xml
@@ -2544,7 +2544,7 @@
     <string name="ftue_auth_email_resend_email">Skicka e-brev igen</string>
     <string name="ftue_auth_email_verification_footer">Fick du inget e-brev\?</string>
     <string name="ftue_auth_email_verification_subtitle">För att bekräfta din e-post, tryck på knappen i e-brevet vi just skickade till %s</string>
-    <string name="ftue_auth_email_verification_title">Kolla din e-post för att verifiera.</string>
+    <string name="ftue_auth_email_verification_title">Verifiera din e-post</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Skicka kod igen</string>
     <string name="ftue_auth_phone_confirmation_subtitle">En kod skickades till %s</string>
     <string name="ftue_auth_phone_confirmation_title">Bekräfta ditt telefonnummer</string>
@@ -2767,4 +2767,58 @@
     <string name="device_manager_session_details_session_name">Sessionsnamn</string>
     <string name="device_manager_push_notifications_description">Ta emot pushnotiser i den här sessionen.</string>
     <string name="login_scan_qr_code">Skanna QR-kod</string>
+    <string name="rich_text_editor_format_underline">Använd understrykning</string>
+    <string name="rich_text_editor_format_strikethrough">Använd överstrykning</string>
+    <string name="rich_text_editor_format_italic">Använd kursiv stil</string>
+    <string name="rich_text_editor_format_bold">Använd fetstil</string>
+    <string name="qr_code_login_confirm_security_code_description">Se till att du känner till ursprunget till denna kod. Genom att länka enheter ger du någon full åtkomst till ditt konto.</string>
+    <string name="qr_code_login_confirm_security_code">Bekräfta</string>
+    <string name="qr_code_login_try_again">Pröva igen</string>
+    <string name="qr_code_login_status_no_match">Ingen match\?</string>
+    <string name="qr_code_login_signing_in">Loggar in dig</string>
+    <string name="qr_code_login_connecting_to_device">Ansluter till enhet</string>
+    <string name="qr_code_login_scan_qr_code_button">Skanna QR-kod</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Loggar du in en mobil\?</string>
+    <string name="qr_code_login_show_qr_code_button">Visa QR-kod på den här enheten</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Välj \'Skanna QR-kod\'</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Börja på inloggningsskärmen</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Välj \'Logga in med QR-kod\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Börja på inloggningsskärmen</string>
+    <string name="qr_code_login_new_device_instruction_3">Välj \'Visa QR-kod\'</string>
+    <string name="qr_code_login_new_device_instruction_2">Gå till Inställningar -&gt; Säkerhet och sekretess</string>
+    <string name="qr_code_login_new_device_instruction_1">Öppna appen på din andra enhet</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">Hemservern stöder inte inloggning med QR-kod.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Inloggningen avbröts på den andra enheten.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Den QR-koden är ogiltig.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Den andra enheten måste vara inloggad.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Den andra enheten är redan inloggad.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Ett säkerhetsproblem påträffades vid konfigurering av säker meddelandehantering. En av följande kan vara äventyrad: Din hemserver; Din internetuppkoppling Din enhet;</string>
+    <string name="qr_code_login_header_failed_other_description">Begäran misslyckades.</string>
+    <string name="qr_code_login_header_failed_denied_description">Begäran nekades på den andra enheten.</string>
+    <string name="qr_code_login_header_failed_timeout_description">Länkningen slutfördes inte inom den krävda tiden.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Länkning med den här enheten stöds inte.</string>
+    <string name="qr_code_login_header_failed_title">Misslyckad anslutning</string>
+    <string name="qr_code_login_header_connected_description">Kolla din inloggade enhet, koden nedan borde visas. Bekräfta att koden nedan matchar den enheten:</string>
+    <string name="qr_code_login_header_connected_title">Säker anslutning etablerad</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Skanna QR-koden nedan med din utloggade enhet.</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Använd din inloggade enhet för att skanna QR-koden nedan:</string>
+    <string name="qr_code_login_header_show_qr_code_title">Logga in med QR-kod</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Använd den här enhetens kamera för att skanna QR-koden på din andra enhet:</string>
+    <string name="a11y_voice_broadcast_buffering">Buffrar</string>
+    <string name="a11y_pause_voice_broadcast">Pausa röstsändning</string>
+    <string name="a11y_play_voice_broadcast">Spela eller återuppta röstsändning</string>
+    <string name="a11y_stop_voice_broadcast_record">Avsluta inspelning av röstsändning</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausa inspelning av röstsändning</string>
+    <string name="a11y_resume_voice_broadcast_record">Återuppta inspelning av röstsändning</string>
+    <string name="voice_broadcast_live">Realtid</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Skanna QR-kod</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="onboarding_new_app_layout_button_try">Pröva</string>
+    <string name="onboarding_new_app_layout_feedback_message">Tryck uppe till höger för att se alternativet att ge återkoppling.</string>
+    <string name="onboarding_new_app_layout_feedback_title">Ge återkoppling</string>
+    <string name="onboarding_new_app_layout_spaces_message">Kom åt dina utrymmen (nere till höger) snabbare och enklare än någonsin förut.</string>
+    <string name="onboarding_new_app_layout_spaces_title">Kom åt utrymmen</string>
+    <string name="onboarding_new_app_layout_welcome_message">För att förenkla din ${app_name} så är flikar nu valfria. Hantera dem i menyn uppe till höger.</string>
 </resources>
\ No newline at end of file

From 3029447360f6297c7c4d748b8fcb4507d350b241 Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Tue, 25 Oct 2022 07:21:14 +0000
Subject: [PATCH 216/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.3% (2376 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 8ae0c311fb..a7b0f702f9 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2421,7 +2421,7 @@
     <string name="ftue_auth_carousel_workplace_body">${app_name}也非常适合工作场所。受到世界上最安全的组织信任。</string>
     <string name="ftue_auth_carousel_control_body">聊天消息存储位置一律由您掌控，不受外来因素干扰。技术由 Matrix 提供。</string>
     <string name="ftue_auth_carousel_secure_body">安全且独立的通信，为你提供和在家中面对面对话同样等级的隐私。</string>
-    <string name="ftue_auth_carousel_encrypted_title">安全传递信息</string>
+    <string name="ftue_auth_carousel_encrypted_title">安全传送消息。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">向主服务器注册端点token失败：
 \n%1$s</string>
     <string name="threads_beta_enable_notice_message">Threads帮助保持你的对话不离题且易于跟踪。%s启用消息列会刷新应用。这对一些账户可能需要更长时间。</string>

From 92e9c490d49b3a2d579fbed56da7042f1a8e6f11 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 24 Oct 2022 03:19:24 +0000
Subject: [PATCH 217/300] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
index d1f81567c2..a64e5dd39e 100644
--- a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
@@ -2760,4 +2760,11 @@
     <string name="qr_code_login_header_failed_other_description">請求失敗。</string>
     <string name="labs_enable_voice_broadcast_summary">可以在聊天室時間軸中錄製並傳送語音廣播。</string>
     <string name="labs_enable_voice_broadcast_title">啟用語音廣播（正在積極開發中）</string>
+    <string name="a11y_voice_broadcast_buffering">正在緩衝</string>
+    <string name="a11y_pause_voice_broadcast">暫停語音廣播</string>
+    <string name="a11y_play_voice_broadcast">播放或繼續語音廣播</string>
+    <string name="a11y_stop_voice_broadcast_record">停止語音廣播錄製</string>
+    <string name="a11y_pause_voice_broadcast_record">暫停語音廣播錄製</string>
+    <string name="a11y_resume_voice_broadcast_record">繼續語音廣播錄製</string>
+    <string name="voice_broadcast_live">直播</string>
 </resources>
\ No newline at end of file

From f8144664fdfe7422f06465bc9a5cebd4400ce3cf Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 24 Oct 2022 08:06:25 +0000
Subject: [PATCH 218/300] Translated using Weblate (Italian)

Currently translated at 100.0% (79 of 79 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/40105040.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/it-IT/changelogs/40105040.txt b/fastlane/metadata/android/it-IT/changelogs/40105040.txt
index 557ae3bd66..1e69c7436e 100644
--- a/fastlane/metadata/android/it-IT/changelogs/40105040.txt
+++ b/fastlane/metadata/android/it-IT/changelogs/40105040.txt
@@ -1,2 +1,2 @@
-Modifiche principali in questa versione: nuove funzioni nelle impostazioni Laboratori: compositore in rich text, nuova gestione dispositivi, broadcast voce. Ancora in sviluppo attivo!
+Modifiche principali in questa versione: nuove funzioni nelle impostazioni Laboratori: compositore in rich text, nuova gestione dispositivi, trasmissione voce. Ancora in sviluppo attivo!
 Cronologia completa: https://github.com/vector-im/element-android/releases

From d908ca6b02e4afd940f9552307d3d8226a7ebe33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:09:03 +0000
Subject: [PATCH 219/300] Bump activity-ktx from 1.6.0 to 1.6.1

Bumps activity-ktx from 1.6.0 to 1.6.1.

---
updated-dependencies:
- dependency-name: androidx.activity:activity-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

diff --git a/dependencies.gradle b/dependencies.gradle
index 14c13ebf9b..27992c682b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -50,7 +50,7 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity-ktx:1.6.0",
+                'activity'                : "androidx.activity:activity-ktx:1.6.1",
                 'appCompat'               : "androidx.appcompat:appcompat:1.5.1",
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
                 'core'                    : "androidx.core:core-ktx:1.9.0",

From b7e0d93ce135ce0c4a6c8b4ca4216dc9375e6142 Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Tue, 25 Oct 2022 13:50:22 +0100
Subject: [PATCH 220/300] Do not require kittykat's PR to include a sign-off

---
 tools/danger/dangerfile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
index 2fc55bad0c..d0b4e6d300 100644
--- a/tools/danger/dangerfile.js
+++ b/tools/danger/dangerfile.js
@@ -82,6 +82,7 @@ const allowList = [
     "ganfra",
     "jmartinesp",
     "jonnyandrew",
+    "kittykat",
     "langleyd",
     "MadLittleMods",
     "manuroe",

From b532112f584a0cbeebf2b943bb9a3812739bb643 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 18 Oct 2022 15:14:02 +0200
Subject: [PATCH 221/300] Adding changelog entry

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

diff --git a/changelog.d/7396.feature b/changelog.d/7396.feature
new file mode 100644
index 0000000000..8ce14eb3d3
--- /dev/null
+++ b/changelog.d/7396.feature
@@ -0,0 +1 @@
+Multi selection in sessions list

From 2e155b1acc316df93a71cfa9794b92cde5494696 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 18 Oct 2022 16:24:04 +0200
Subject: [PATCH 222/300] Toggling of selectMode using menu i
 OtherSessionsFragment

---
 .../src/main/res/values/strings.xml           |  7 ++
 .../v2/othersessions/OtherSessionsAction.kt   |  2 +
 .../v2/othersessions/OtherSessionsFragment.kt | 65 ++++++++++++++++++-
 .../othersessions/OtherSessionsViewModel.kt   | 11 ++++
 .../othersessions/OtherSessionsViewState.kt   |  1 +
 .../src/main/res/menu/menu_other_sessions.xml | 21 ++++++
 6 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/res/menu/menu_other_sessions.xml

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index d5223a0638..7c74162859 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3328,6 +3328,13 @@
     <string name="device_manager_other_sessions_no_unverified_sessions_found">No unverified sessions found.</string>
     <string name="device_manager_other_sessions_no_inactive_sessions_found">No inactive sessions found.</string>
     <string name="device_manager_other_sessions_clear_filter">Clear Filter</string>
+    <string name="device_manager_other_sessions_select">Select sessions</string>
+    <string name="device_manager_other_sessions_select_all">Select all</string>
+    <string name="device_manager_other_sessions_deselect_all">Deselect all</string>
+    <plurals name="device_manager_other_sessions_selected">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
     <string name="device_manager_session_overview_signout">Sign out of this session</string>
     <string name="device_manager_session_details_title">Session details</string>
     <string name="device_manager_session_details_description">Application, device, and activity information.</string>
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
index 7164ecc866..2d184ffeaa 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
@@ -21,4 +21,6 @@ import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
 
 sealed class OtherSessionsAction : VectorViewModelAction {
     data class FilterDevices(val filterType: DeviceManagerFilterType) : OtherSessionsAction()
+    object EnableSelectMode : OtherSessionsAction()
+    object DisableSelectMode : OtherSessionsAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index 610776e22e..804344e00e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -18,8 +18,12 @@ package im.vector.app.features.settings.devices.v2.othersessions
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import androidx.annotation.StringRes
 import androidx.core.view.isVisible
 import com.airbnb.mvrx.Success
@@ -31,7 +35,9 @@ import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment.ResultListener.Companion.RESULT_OK
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.VectorMenuProvider
 import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.StringProvider
 import im.vector.app.databinding.FragmentOtherSessionsBinding
 import im.vector.app.features.settings.devices.v2.DeviceFullInfo
 import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterBottomSheet
@@ -46,19 +52,65 @@ import javax.inject.Inject
 class OtherSessionsFragment :
         VectorBaseFragment<FragmentOtherSessionsBinding>(),
         VectorBaseBottomSheetDialogFragment.ResultListener,
-        OtherSessionsView.Callback {
+        OtherSessionsView.Callback,
+        VectorMenuProvider {
 
     private val viewModel: OtherSessionsViewModel by fragmentViewModel()
     private val args: OtherSessionsArgs by args()
 
     @Inject lateinit var colorProvider: ColorProvider
 
+    @Inject lateinit var stringProvider: StringProvider
+
     @Inject lateinit var viewNavigator: OtherSessionsViewNavigator
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentOtherSessionsBinding {
         return FragmentOtherSessionsBinding.inflate(layoutInflater, container, false)
     }
 
+    override fun getMenuRes() = R.menu.menu_other_sessions
+
+    override fun handlePrepareMenu(menu: Menu) {
+        withState(viewModel) { state ->
+            val isSelectModeEnabled = state.isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsSelectAll).isVisible = isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsDeselectAll).isVisible = isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsSelect).isVisible = !isSelectModeEnabled
+        }
+    }
+
+    override fun handleMenuItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.otherSessionsSelect -> {
+                enableSelectMode(true)
+                true
+            }
+            else -> false
+        }
+    }
+
+    // TODO call enableSelectMode(true) on long press of an item when disabled
+    private fun enableSelectMode(isEnabled: Boolean) {
+        val action = if (isEnabled) OtherSessionsAction.EnableSelectMode else OtherSessionsAction.DisableSelectMode
+        viewModel.handle(action)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        activity?.onBackPressedDispatcher?.addCallback(owner = this) {
+            handleBackPress(this)
+        }
+    }
+
+    private fun handleBackPress(onBackPressedCallback: OnBackPressedCallback) = withState(viewModel) { state ->
+        if (state.isSelectModeEnabled) {
+            enableSelectMode(false)
+        } else {
+            onBackPressedCallback.isEnabled = false
+            activity?.onBackPressedDispatcher?.onBackPressed()
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar(views.otherSessionsToolbar).setTitle(args.titleResourceId).allowBack()
@@ -102,11 +154,22 @@ class OtherSessionsFragment :
     }
 
     override fun invalidate() = withState(viewModel) { state ->
+        updateToolbar(state.isSelectModeEnabled)
         if (state.devices is Success) {
             renderDevices(state.devices(), state.currentFilter)
         }
     }
 
+    private fun updateToolbar(isSelectModeEnabled: Boolean) {
+        invalidateOptionsMenu()
+        val title = if (isSelectModeEnabled) {
+            stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_selected, 0, 0)
+        } else {
+            getString(args.titleResourceId)
+        }
+        toolbar?.title = title
+    }
+
     private fun renderDevices(devices: List<DeviceFullInfo>?, currentFilter: DeviceManagerFilterType) {
         views.otherSessionsFilterBadgeImageView.isVisible = currentFilter != DeviceManagerFilterType.ALL_SESSIONS
         views.otherSessionsSecurityRecommendationView.isVisible = currentFilter != DeviceManagerFilterType.ALL_SESSIONS
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
index e52953e2b6..21291fc082 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
@@ -64,9 +64,12 @@ class OtherSessionsViewModel @AssistedInject constructor(
                 }
     }
 
+    // TODO update unit tests
     override fun handle(action: OtherSessionsAction) {
         when (action) {
             is OtherSessionsAction.FilterDevices -> handleFilterDevices(action)
+            OtherSessionsAction.DisableSelectMode -> handleDisableSelectMode()
+            OtherSessionsAction.EnableSelectMode -> handleEnableSelectMode()
         }
     }
 
@@ -78,4 +81,12 @@ class OtherSessionsViewModel @AssistedInject constructor(
         }
         observeDevices(action.filterType)
     }
+
+    private fun handleDisableSelectMode() {
+        setState { copy(isSelectModeEnabled = false) }
+    }
+
+    private fun handleEnableSelectMode() {
+        setState { copy(isSelectModeEnabled = true) }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt
index 5256a9b27a..0db3c8cd0e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewState.kt
@@ -26,6 +26,7 @@ data class OtherSessionsViewState(
         val devices: Async<List<DeviceFullInfo>> = Uninitialized,
         val currentFilter: DeviceManagerFilterType = DeviceManagerFilterType.ALL_SESSIONS,
         val excludeCurrentDevice: Boolean = false,
+        val isSelectModeEnabled: Boolean = false,
 ) : MavericksState {
 
     constructor(args: OtherSessionsArgs) : this(excludeCurrentDevice = args.excludeCurrentDevice)
diff --git a/vector/src/main/res/menu/menu_other_sessions.xml b/vector/src/main/res/menu/menu_other_sessions.xml
new file mode 100644
index 0000000000..0edab99127
--- /dev/null
+++ b/vector/src/main/res/menu/menu_other_sessions.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
+
+    <item
+        android:id="@+id/otherSessionsSelect"
+        android:title="@string/device_manager_other_sessions_select"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsSelectAll"
+        android:title="@string/device_manager_other_sessions_select_all"
+        app:showAsAction="withText|never" />
+
+    <item
+        android:id="@+id/otherSessionsDeselectAll"
+        android:title="@string/device_manager_other_sessions_deselect_all"
+        app:showAsAction="withText|never" />
+</menu>

From ab2e91ae80fd33c12eef06e0ae9a88acf2b346e2 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 18 Oct 2022 17:06:39 +0200
Subject: [PATCH 223/300] Enable selectMode when long pressing on list item

---
 .../settings/devices/v2/VectorSettingsDevicesFragment.kt   | 4 ++++
 .../features/settings/devices/v2/list/OtherSessionItem.kt  | 5 +++++
 .../settings/devices/v2/list/OtherSessionsController.kt    | 6 ++++++
 .../features/settings/devices/v2/list/OtherSessionsView.kt | 5 +++++
 .../devices/v2/othersessions/OtherSessionsFragment.kt      | 7 ++++++-
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index c507699e0b..1c348af4f9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -331,6 +331,10 @@ class VectorSettingsDevicesFragment :
         views.waitingView.root.isVisible = isLoading
     }
 
+    override fun onOtherSessionLongClicked(deviceId: String) {
+        // do nothing
+    }
+
     override fun onOtherSessionClicked(deviceId: String) {
         navigateToSessionOverview(deviceId)
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
index f83f069a9f..6397a42f7f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.settings.devices.v2.list
 
 import android.graphics.drawable.Drawable
+import android.view.View.OnLongClickListener
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
@@ -59,11 +60,15 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var clickListener: ClickListener? = null
 
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var onLongClickListener: OnLongClickListener? = null
+
     private val setDeviceTypeIconUseCase = SetDeviceTypeIconUseCase()
 
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.view.onClick(clickListener)
+        holder.view.setOnLongClickListener(onLongClickListener)
         if (clickListener == null) {
             holder.view.isClickable = false
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index 59e7e1888e..d7166d02d2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.settings.devices.v2.list
 
+import android.view.View
 import com.airbnb.epoxy.TypedEpoxyController
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
@@ -38,6 +39,7 @@ class OtherSessionsController @Inject constructor(
     var callback: Callback? = null
 
     interface Callback {
+        fun onItemLongClicked(deviceId: String)
         fun onItemClicked(deviceId: String)
     }
 
@@ -72,6 +74,10 @@ class OtherSessionsController @Inject constructor(
                     sessionDescriptionColor(descriptionColor)
                     stringProvider(this@OtherSessionsController.stringProvider)
                     clickListener { device.deviceInfo.deviceId?.let { host.callback?.onItemClicked(it) } }
+                    onLongClickListener(View.OnLongClickListener {
+                        device.deviceInfo.deviceId?.let { host.callback?.onItemLongClicked(it) }
+                        true
+                    })
                 }
             }
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt
index 6f6956c885..a4f8bb64db 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsView.kt
@@ -40,6 +40,7 @@ class OtherSessionsView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), OtherSessionsController.Callback {
 
     interface Callback {
+        fun onOtherSessionLongClicked(deviceId: String)
         fun onOtherSessionClicked(deviceId: String)
         fun onViewAllOtherSessionsClicked()
     }
@@ -107,4 +108,8 @@ class OtherSessionsView @JvmOverloads constructor(
     override fun onItemClicked(deviceId: String) {
         callback?.onOtherSessionClicked(deviceId)
     }
+
+    override fun onItemLongClicked(deviceId: String) {
+        callback?.onOtherSessionLongClicked(deviceId)
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index 804344e00e..77aac4d91d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -89,7 +89,6 @@ class OtherSessionsFragment :
         }
     }
 
-    // TODO call enableSelectMode(true) on long press of an item when disabled
     private fun enableSelectMode(isEnabled: Boolean) {
         val action = if (isEnabled) OtherSessionsAction.EnableSelectMode else OtherSessionsAction.DisableSelectMode
         viewModel.handle(action)
@@ -253,6 +252,12 @@ class OtherSessionsFragment :
         SessionLearnMoreBottomSheet.show(childFragmentManager, args)
     }
 
+    override fun onOtherSessionLongClicked(deviceId: String) = withState(viewModel) { state ->
+        if (!state.isSelectModeEnabled) {
+            enableSelectMode(true)
+        }
+    }
+
     override fun onOtherSessionClicked(deviceId: String) {
         viewNavigator.navigateToSessionOverview(
                 context = requireActivity(),

From 5b1bf8a68eca5a6a3442e22bb5e171d1928dcf60 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 11:40:43 +0200
Subject: [PATCH 224/300] Select devices with basic UI for tests

---
 .../settings/devices/v2/DeviceFullInfo.kt     |  1 +
 .../devices/v2/list/OtherSessionItem.kt       |  9 +++++
 .../v2/list/OtherSessionsController.kt        |  1 +
 .../v2/othersessions/OtherSessionsAction.kt   |  3 +-
 .../v2/othersessions/OtherSessionsFragment.kt | 34 ++++++++++-------
 .../othersessions/OtherSessionsViewModel.kt   | 35 +++++++++++++++--
 .../main/res/layout/item_other_session.xml    | 38 +++++++++++++------
 .../main/res/layout/view_other_sessions.xml   |  2 +-
 8 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt
index a47ea7e917..4864c41394 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/DeviceFullInfo.kt
@@ -30,4 +30,5 @@ data class DeviceFullInfo(
         val isCurrentDevice: Boolean,
         val deviceExtendedInfo: DeviceExtendedInfo,
         val matrixClientInfo: MatrixClientInfoContent?,
+        val isSelected: Boolean = false,
 )
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
index 6397a42f7f..888305fb4e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
@@ -17,10 +17,12 @@
 package im.vector.app.features.settings.devices.v2.list
 
 import android.graphics.drawable.Drawable
+import android.view.View
 import android.view.View.OnLongClickListener
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -57,6 +59,9 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
     @EpoxyAttribute
     lateinit var stringProvider: StringProvider
 
+    @EpoxyAttribute
+    var selected: Boolean = false
+
     @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
     var clickListener: ClickListener? = null
 
@@ -81,6 +86,9 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
             holder.otherSessionDescriptionTextView.setTextColor(it)
         }
         holder.otherSessionDescriptionTextView.setCompoundDrawablesWithIntrinsicBounds(sessionDescriptionDrawable, null, null, null)
+        // TODO set drawable with correct color and corners
+        val color = if (selected) R.color.alert_default_error_background else android.R.color.transparent
+        holder.otherSessionItemBackgroundView.setBackgroundColor(ContextCompat.getColor(holder.view.context, color))
     }
 
     class Holder : VectorEpoxyHolder() {
@@ -88,5 +96,6 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
         val otherSessionVerificationStatusImageView by bind<ShieldImageView>(R.id.otherSessionVerificationStatusImageView)
         val otherSessionNameTextView by bind<TextView>(R.id.otherSessionNameTextView)
         val otherSessionDescriptionTextView by bind<TextView>(R.id.otherSessionDescriptionTextView)
+        val otherSessionItemBackgroundView by bind<View>(R.id.otherSessionItemBackground)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index d7166d02d2..b50abaaf7d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -73,6 +73,7 @@ class OtherSessionsController @Inject constructor(
                     sessionDescriptionDrawable(descriptionDrawable)
                     sessionDescriptionColor(descriptionColor)
                     stringProvider(this@OtherSessionsController.stringProvider)
+                    selected(device.isSelected)
                     clickListener { device.deviceInfo.deviceId?.let { host.callback?.onItemClicked(it) } }
                     onLongClickListener(View.OnLongClickListener {
                         device.deviceInfo.deviceId?.let { host.callback?.onItemLongClicked(it) }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
index 2d184ffeaa..becac467ec 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
@@ -21,6 +21,7 @@ import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
 
 sealed class OtherSessionsAction : VectorViewModelAction {
     data class FilterDevices(val filterType: DeviceManagerFilterType) : OtherSessionsAction()
-    object EnableSelectMode : OtherSessionsAction()
+    data class EnableSelectMode(val deviceId: String?) : OtherSessionsAction()
     object DisableSelectMode : OtherSessionsAction()
+    data class ToggleSelectionForDevice(val deviceId: String) : OtherSessionsAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index 77aac4d91d..1a0d63f04a 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -89,8 +89,8 @@ class OtherSessionsFragment :
         }
     }
 
-    private fun enableSelectMode(isEnabled: Boolean) {
-        val action = if (isEnabled) OtherSessionsAction.EnableSelectMode else OtherSessionsAction.DisableSelectMode
+    private fun enableSelectMode(isEnabled: Boolean, deviceId: String? = null) {
+        val action = if (isEnabled) OtherSessionsAction.EnableSelectMode(deviceId) else OtherSessionsAction.DisableSelectMode
         viewModel.handle(action)
     }
 
@@ -153,23 +153,25 @@ class OtherSessionsFragment :
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-        updateToolbar(state.isSelectModeEnabled)
         if (state.devices is Success) {
-            renderDevices(state.devices(), state.currentFilter)
+            val devices = state.devices().orEmpty()
+            renderDevices(devices, state.currentFilter)
+            updateToolbar(devices, state.isSelectModeEnabled)
         }
     }
 
-    private fun updateToolbar(isSelectModeEnabled: Boolean) {
+    private fun updateToolbar(devices: List<DeviceFullInfo>, isSelectModeEnabled: Boolean) {
         invalidateOptionsMenu()
         val title = if (isSelectModeEnabled) {
-            stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_selected, 0, 0)
+            val selection = devices.count { it.isSelected }
+            stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_selected, selection, selection)
         } else {
             getString(args.titleResourceId)
         }
         toolbar?.title = title
     }
 
-    private fun renderDevices(devices: List<DeviceFullInfo>?, currentFilter: DeviceManagerFilterType) {
+    private fun renderDevices(devices: List<DeviceFullInfo>, currentFilter: DeviceManagerFilterType) {
         views.otherSessionsFilterBadgeImageView.isVisible = currentFilter != DeviceManagerFilterType.ALL_SESSIONS
         views.otherSessionsSecurityRecommendationView.isVisible = currentFilter != DeviceManagerFilterType.ALL_SESSIONS
         views.deviceListHeaderOtherSessions.isVisible = currentFilter == DeviceManagerFilterType.ALL_SESSIONS
@@ -222,7 +224,7 @@ class OtherSessionsFragment :
             }
         }
 
-        if (devices.isNullOrEmpty()) {
+        if (devices.isEmpty()) {
             views.deviceListOtherSessions.isVisible = false
             views.otherSessionsNotFoundLayout.isVisible = true
         } else {
@@ -254,15 +256,19 @@ class OtherSessionsFragment :
 
     override fun onOtherSessionLongClicked(deviceId: String) = withState(viewModel) { state ->
         if (!state.isSelectModeEnabled) {
-            enableSelectMode(true)
+            enableSelectMode(true, deviceId)
         }
     }
 
-    override fun onOtherSessionClicked(deviceId: String) {
-        viewNavigator.navigateToSessionOverview(
-                context = requireActivity(),
-                deviceId = deviceId
-        )
+    override fun onOtherSessionClicked(deviceId: String) = withState(viewModel) { state ->
+        if (state.isSelectModeEnabled) {
+            viewModel.handle(OtherSessionsAction.ToggleSelectionForDevice(deviceId))
+        } else {
+            viewNavigator.navigateToSessionOverview(
+                    context = requireActivity(),
+                    deviceId = deviceId
+            )
+        }
     }
 
     override fun onViewAllOtherSessionsClicked() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
index 21291fc082..4a00f0ab2b 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.settings.devices.v2.othersessions
 
 import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -69,7 +70,8 @@ class OtherSessionsViewModel @AssistedInject constructor(
         when (action) {
             is OtherSessionsAction.FilterDevices -> handleFilterDevices(action)
             OtherSessionsAction.DisableSelectMode -> handleDisableSelectMode()
-            OtherSessionsAction.EnableSelectMode -> handleEnableSelectMode()
+            is OtherSessionsAction.EnableSelectMode -> handleEnableSelectMode(action.deviceId)
+            is OtherSessionsAction.ToggleSelectionForDevice -> handleToggleSelectionForDevice(action.deviceId)
         }
     }
 
@@ -83,10 +85,37 @@ class OtherSessionsViewModel @AssistedInject constructor(
     }
 
     private fun handleDisableSelectMode() {
+        // TODO deselect all selected sessions
         setState { copy(isSelectModeEnabled = false) }
     }
 
-    private fun handleEnableSelectMode() {
-        setState { copy(isSelectModeEnabled = true) }
+    private fun handleEnableSelectMode(deviceId: String?) {
+        toggleSelectionForDevice(deviceId, true)
+    }
+
+    private fun handleToggleSelectionForDevice(deviceId: String) = withState { state ->
+        toggleSelectionForDevice(deviceId, state.isSelectModeEnabled)
+    }
+
+    private fun toggleSelectionForDevice(deviceId: String?, enableSelectMode: Boolean) = withState { state ->
+        val updatedDevices = if (state.devices is Success) {
+            val devices = state.devices.invoke().toMutableList()
+            val indexToUpdate = devices.indexOfFirst { it.deviceInfo.deviceId == deviceId }
+            if (indexToUpdate >= 0) {
+                val currentInfo = devices[indexToUpdate]
+                val updatedInfo = currentInfo.copy(isSelected = !currentInfo.isSelected)
+                devices[indexToUpdate] = updatedInfo
+            }
+            Success(devices)
+        } else {
+            state.devices
+        }
+
+        setState {
+            copy(
+                    devices = updatedDevices,
+                    isSelectModeEnabled = enableSelectMode
+            )
+        }
     }
 }
diff --git a/vector/src/main/res/layout/item_other_session.xml b/vector/src/main/res/layout/item_other_session.xml
index 2f93c2be5d..29f6fafcbc 100644
--- a/vector/src/main/res/layout/item_other_session.xml
+++ b/vector/src/main/res/layout/item_other_session.xml
@@ -5,30 +5,44 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?selectableItemBackground"
-    android:paddingTop="16dp">
+    android:paddingTop="8dp"
+    android:paddingHorizontal="8dp">
+
+    <View
+        android:id="@+id/otherSessionItemBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@id/otherSessionVerificationStatusImageView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/otherSessionDeviceTypeImageView"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="11dp"
         android:background="@drawable/bg_device_type"
         android:contentDescription="@string/a11y_device_manager_device_type_mobile"
         android:padding="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/otherSessionItemBackground"
+        app:layout_constraintStart_toStartOf="@+id/otherSessionItemBackground"
+        app:layout_constraintTop_toTopOf="@+id/otherSessionItemBackground"
         tools:src="@drawable/ic_device_type_mobile" />
 
     <im.vector.app.core.ui.views.ShieldImageView
         android:id="@+id/otherSessionVerificationStatusImageView"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginStart="24dp"
+        android:layout_marginStart="26dp"
         android:layout_marginTop="24dp"
         android:background="@drawable/circle_with_border"
         android:importantForAccessibility="no"
         android:padding="6dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/otherSessionDeviceTypeImageView"
+        app:layout_constraintTop_toTopOf="@id/otherSessionDeviceTypeImageView"
         tools:src="@drawable/ic_shield_trusted" />
 
     <TextView
@@ -37,21 +51,23 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="8dp"
         android:ellipsize="end"
         android:lines="1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/otherSessionDeviceTypeImageView"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toTopOf="@id/otherSessionDeviceTypeImageView"
         tools:text="Element Mobile: Android" />
 
     <TextView
         android:id="@+id/otherSessionDescriptionTextView"
         style="@style/TextAppearance.Vector.Body.DevicesManagement"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
         android:drawablePadding="8dp"
+        app:layout_constraintBottom_toBottomOf="@id/otherSessionDeviceTypeImageView"
+        app:layout_constraintEnd_toEndOf="@id/otherSessionNameTextView"
         app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
         app:layout_constraintTop_toBottomOf="@id/otherSessionNameTextView"
         tools:text="@string/device_manager_verification_status_verified" />
@@ -59,10 +75,10 @@
     <View
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:background="?vctr_content_quinary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
-        app:layout_constraintTop_toBottomOf="@id/otherSessionDescriptionTextView" />
+        app:layout_constraintTop_toBottomOf="@+id/otherSessionItemBackground" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/view_other_sessions.xml b/vector/src/main/res/layout/view_other_sessions.xml
index aacbbe8ffe..2d02870174 100644
--- a/vector/src/main/res/layout/view_other_sessions.xml
+++ b/vector/src/main/res/layout/view_other_sessions.xml
@@ -9,7 +9,6 @@
         android:id="@+id/otherSessionsRecyclerView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -21,6 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="0dp"
+        android:layout_marginStart="16dp"
         app:layout_constraintStart_toStartOf="@id/otherSessionsRecyclerView"
         app:layout_constraintTop_toBottomOf="@id/otherSessionsRecyclerView"
         tools:text="@string/device_manager_other_sessions_view_all" />

From 2fc2665ff31c994c334522638d0d1b036b4852e2 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 12:51:59 +0200
Subject: [PATCH 225/300] Deselect all sessions when leaving select mode

---
 .../v2/othersessions/OtherSessionsFragment.kt |  2 +-
 .../othersessions/OtherSessionsViewModel.kt   | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index 1a0d63f04a..73e528b358 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -154,7 +154,7 @@ class OtherSessionsFragment :
 
     override fun invalidate() = withState(viewModel) { state ->
         if (state.devices is Success) {
-            val devices = state.devices().orEmpty()
+            val devices = state.devices.invoke()
             renderDevices(devices, state.currentFilter)
             updateToolbar(devices, state.isSelectModeEnabled)
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
index 4a00f0ab2b..4ad2ab96e8 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
@@ -85,16 +85,15 @@ class OtherSessionsViewModel @AssistedInject constructor(
     }
 
     private fun handleDisableSelectMode() {
-        // TODO deselect all selected sessions
-        setState { copy(isSelectModeEnabled = false) }
+        setSelectionForAllDevices(isSelected = false, enableSelectMode = false)
     }
 
     private fun handleEnableSelectMode(deviceId: String?) {
-        toggleSelectionForDevice(deviceId, true)
+        toggleSelectionForDevice(deviceId, enableSelectMode = true)
     }
 
     private fun handleToggleSelectionForDevice(deviceId: String) = withState { state ->
-        toggleSelectionForDevice(deviceId, state.isSelectModeEnabled)
+        toggleSelectionForDevice(deviceId, enableSelectMode = state.isSelectModeEnabled)
     }
 
     private fun toggleSelectionForDevice(deviceId: String?, enableSelectMode: Boolean) = withState { state ->
@@ -118,4 +117,20 @@ class OtherSessionsViewModel @AssistedInject constructor(
             )
         }
     }
+
+    private fun setSelectionForAllDevices(isSelected: Boolean, enableSelectMode: Boolean) = withState { state ->
+        val updatedDevices = if (state.devices is Success) {
+            val updatedDevices = state.devices.invoke().map { it.copy(isSelected = isSelected) }
+            Success(updatedDevices)
+        } else {
+            state.devices
+        }
+
+        setState {
+            copy(
+                    devices = updatedDevices,
+                    isSelectModeEnabled = enableSelectMode
+            )
+        }
+    }
 }

From a703b8ae1015e0335a6444dc1f5a9af770dbaee3 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 14:16:31 +0200
Subject: [PATCH 226/300] Select all/Deselect all actions

---
 .../devices/v2/othersessions/OtherSessionsAction.kt    |  2 ++
 .../devices/v2/othersessions/OtherSessionsFragment.kt  |  8 ++++++++
 .../devices/v2/othersessions/OtherSessionsViewModel.kt | 10 ++++++++++
 3 files changed, 20 insertions(+)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
index becac467ec..1978708ebf 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsAction.kt
@@ -24,4 +24,6 @@ sealed class OtherSessionsAction : VectorViewModelAction {
     data class EnableSelectMode(val deviceId: String?) : OtherSessionsAction()
     object DisableSelectMode : OtherSessionsAction()
     data class ToggleSelectionForDevice(val deviceId: String) : OtherSessionsAction()
+    object SelectAll : OtherSessionsAction()
+    object DeselectAll : OtherSessionsAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index 73e528b358..958266631e 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -85,6 +85,14 @@ class OtherSessionsFragment :
                 enableSelectMode(true)
                 true
             }
+            R.id.otherSessionsSelectAll -> {
+                viewModel.handle(OtherSessionsAction.SelectAll)
+                true
+            }
+            R.id.otherSessionsDeselectAll -> {
+                viewModel.handle(OtherSessionsAction.DeselectAll)
+                true
+            }
             else -> false
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
index 4ad2ab96e8..e4c1b98288 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
@@ -72,6 +72,8 @@ class OtherSessionsViewModel @AssistedInject constructor(
             OtherSessionsAction.DisableSelectMode -> handleDisableSelectMode()
             is OtherSessionsAction.EnableSelectMode -> handleEnableSelectMode(action.deviceId)
             is OtherSessionsAction.ToggleSelectionForDevice -> handleToggleSelectionForDevice(action.deviceId)
+            OtherSessionsAction.DeselectAll -> handleDeselectAll()
+            OtherSessionsAction.SelectAll -> handleSelectAll()
         }
     }
 
@@ -118,6 +120,14 @@ class OtherSessionsViewModel @AssistedInject constructor(
         }
     }
 
+    private fun handleSelectAll() = withState { state ->
+        setSelectionForAllDevices(isSelected = true, enableSelectMode = state.isSelectModeEnabled)
+    }
+
+    private fun handleDeselectAll() = withState { state ->
+        setSelectionForAllDevices(isSelected = false, enableSelectMode = state.isSelectModeEnabled)
+    }
+
     private fun setSelectionForAllDevices(isSelected: Boolean, enableSelectMode: Boolean) = withState { state ->
         val updatedDevices = if (state.devices is Success) {
             val updatedDevices = state.devices.invoke().map { it.copy(isSelected = isSelected) }

From 3390d7fde493101d1c0b2662210f666de467facc Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 15:32:09 +0200
Subject: [PATCH 227/300] Handling correct UI for selected session

---
 .../devices/v2/list/OtherSessionItem.kt       | 24 ++++++++++++++-----
 .../v2/list/OtherSessionsController.kt        |  2 ++
 .../src/main/res/drawable/bg_device_type.xml  | 18 +++++++++-----
 .../main/res/drawable/bg_other_session.xml    |  9 +++++++
 .../main/res/layout/item_other_session.xml    |  1 +
 5 files changed, 42 insertions(+), 12 deletions(-)
 create mode 100644 vector/src/main/res/drawable/bg_other_session.xml

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
index 888305fb4e..de1cd33d35 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionItem.kt
@@ -22,7 +22,6 @@ import android.view.View.OnLongClickListener
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.app.R
@@ -30,6 +29,8 @@ import im.vector.app.core.epoxy.ClickListener
 import im.vector.app.core.epoxy.VectorEpoxyHolder
 import im.vector.app.core.epoxy.VectorEpoxyModel
 import im.vector.app.core.epoxy.onClick
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.resources.DrawableProvider
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.ui.views.ShieldImageView
 import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
@@ -59,6 +60,12 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
     @EpoxyAttribute
     lateinit var stringProvider: StringProvider
 
+    @EpoxyAttribute
+    lateinit var colorProvider: ColorProvider
+
+    @EpoxyAttribute
+    lateinit var drawableProvider: DrawableProvider
+
     @EpoxyAttribute
     var selected: Boolean = false
 
@@ -74,11 +81,18 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
         super.bind(holder)
         holder.view.onClick(clickListener)
         holder.view.setOnLongClickListener(onLongClickListener)
-        if (clickListener == null) {
+        if (clickListener == null && onLongClickListener == null) {
             holder.view.isClickable = false
         }
 
-        setDeviceTypeIconUseCase.execute(deviceType, holder.otherSessionDeviceTypeImageView, stringProvider)
+        holder.otherSessionDeviceTypeImageView.isSelected = selected
+        if (selected) {
+            val drawableColor = colorProvider.getColorFromAttribute(android.R.attr.colorBackground)
+            val drawable = drawableProvider.getDrawable(R.drawable.ic_check_on, drawableColor)
+            holder.otherSessionDeviceTypeImageView.setImageDrawable(drawable)
+        } else {
+            setDeviceTypeIconUseCase.execute(deviceType, holder.otherSessionDeviceTypeImageView, stringProvider)
+        }
         holder.otherSessionVerificationStatusImageView.render(roomEncryptionTrustLevel)
         holder.otherSessionNameTextView.text = sessionName
         holder.otherSessionDescriptionTextView.text = sessionDescription
@@ -86,9 +100,7 @@ abstract class OtherSessionItem : VectorEpoxyModel<OtherSessionItem.Holder>(R.la
             holder.otherSessionDescriptionTextView.setTextColor(it)
         }
         holder.otherSessionDescriptionTextView.setCompoundDrawablesWithIntrinsicBounds(sessionDescriptionDrawable, null, null, null)
-        // TODO set drawable with correct color and corners
-        val color = if (selected) R.color.alert_default_error_background else android.R.color.transparent
-        holder.otherSessionItemBackgroundView.setBackgroundColor(ContextCompat.getColor(holder.view.context, color))
+        holder.otherSessionItemBackgroundView.isSelected = selected
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index b50abaaf7d..9193479b74 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -73,6 +73,8 @@ class OtherSessionsController @Inject constructor(
                     sessionDescriptionDrawable(descriptionDrawable)
                     sessionDescriptionColor(descriptionColor)
                     stringProvider(this@OtherSessionsController.stringProvider)
+                    colorProvider(this@OtherSessionsController.colorProvider)
+                    drawableProvider(this@OtherSessionsController.drawableProvider)
                     selected(device.isSelected)
                     clickListener { device.deviceInfo.deviceId?.let { host.callback?.onItemClicked(it) } }
                     onLongClickListener(View.OnLongClickListener {
diff --git a/vector/src/main/res/drawable/bg_device_type.xml b/vector/src/main/res/drawable/bg_device_type.xml
index 88a90ccbe6..dc85b723a8 100644
--- a/vector/src/main/res/drawable/bg_device_type.xml
+++ b/vector/src/main/res/drawable/bg_device_type.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <solid android:color="?vctr_system" />
-
-</shape>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="oval">
+            <solid android:color="?attr/vctr_content_primary" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="?attr/colorSurface" />
+        </shape>
+    </item>
+</selector>
diff --git a/vector/src/main/res/drawable/bg_other_session.xml b/vector/src/main/res/drawable/bg_other_session.xml
new file mode 100644
index 0000000000..a0c988b8a2
--- /dev/null
+++ b/vector/src/main/res/drawable/bg_other_session.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/rounded_rect_shape_8" android:state_selected="true" />
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+</selector>
diff --git a/vector/src/main/res/layout/item_other_session.xml b/vector/src/main/res/layout/item_other_session.xml
index 29f6fafcbc..908a0e0073 100644
--- a/vector/src/main/res/layout/item_other_session.xml
+++ b/vector/src/main/res/layout/item_other_session.xml
@@ -12,6 +12,7 @@
         android:id="@+id/otherSessionItemBackground"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:background="@drawable/bg_other_session"
         app:layout_constraintBottom_toBottomOf="@id/otherSessionVerificationStatusImageView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 4a8289c6cc7d667324ebaea495c7270408069559 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 16:19:57 +0200
Subject: [PATCH 228/300] Adding first unit test on OtherSessionsViewModel for
 init of ViewModel

---
 .../othersessions/OtherSessionsViewModel.kt   |   1 -
 .../OtherSessionsViewModelTest.kt             | 114 ++++++++++++++++++
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
index e4c1b98288..2cd0c6af66 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModel.kt
@@ -65,7 +65,6 @@ class OtherSessionsViewModel @AssistedInject constructor(
                 }
     }
 
-    // TODO update unit tests
     override fun handle(action: OtherSessionsAction) {
         when (action) {
             is OtherSessionsAction.FilterDevices -> handleFilterDevices(action)
diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
new file mode 100644
index 0000000000..c1018003a5
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
@@ -0,0 +1,114 @@
+/*
+ * 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 im.vector.app.features.settings.devices.v2.othersessions
+
+import android.os.SystemClock
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.test.MavericksTestRule
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.GetDeviceFullInfoListUseCase
+import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeVerificationService
+import im.vector.app.test.test
+import im.vector.app.test.testDispatcher
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkAll
+import io.mockk.verifyAll
+import kotlinx.coroutines.flow.flowOf
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+private const val A_TITLE_RES_ID = 1
+
+class OtherSessionsViewModelTest {
+
+    @get:Rule
+    val mavericksTestRule = MavericksTestRule(testDispatcher = testDispatcher)
+
+    private val defaultArgs = OtherSessionsArgs(
+            titleResourceId = A_TITLE_RES_ID,
+            defaultFilter = DeviceManagerFilterType.ALL_SESSIONS,
+            excludeCurrentDevice = false,
+    )
+
+    private val fakeActiveSessionHolder = FakeActiveSessionHolder()
+    private val fakeGetDeviceFullInfoListUseCase = mockk<GetDeviceFullInfoListUseCase>()
+    private val fakeRefreshDevicesUseCaseUseCase = mockk<RefreshDevicesUseCase>()
+
+    private fun createViewModel(args: OtherSessionsArgs = defaultArgs) = OtherSessionsViewModel(
+            initialState = OtherSessionsViewState(args),
+            activeSessionHolder = fakeActiveSessionHolder.instance,
+            getDeviceFullInfoListUseCase = fakeGetDeviceFullInfoListUseCase,
+            refreshDevicesUseCase = fakeRefreshDevicesUseCaseUseCase,
+    )
+
+    @Before
+    fun setup() {
+        // Needed for internal usage of Flow<T>.throttleFirst() inside the ViewModel
+        mockkStatic(SystemClock::class)
+        every { SystemClock.elapsedRealtime() } returns 1234
+
+        givenVerificationService()
+    }
+
+    @After
+    fun tearDown() {
+        unmockkAll()
+    }
+
+    @Test
+    fun `given the viewModel has been initialized then viewState is updated with devices list`() {
+        // Given
+        val devices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(devices),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+
+        // Then
+        viewModel.test()
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+        verifyAll { fakeGetDeviceFullInfoListUseCase.execute(defaultArgs.defaultFilter, defaultArgs.excludeCurrentDevice) }
+    }
+
+    private fun givenGetDeviceFullInfoListReturns(devices: List<DeviceFullInfo>) {
+        every { fakeGetDeviceFullInfoListUseCase.execute(any(), any()) } returns flowOf(devices)
+    }
+
+    private fun givenVerificationService(): FakeVerificationService {
+        val fakeVerificationService = fakeActiveSessionHolder
+                .fakeSession
+                .fakeCryptoService
+                .fakeVerificationService
+        fakeVerificationService.givenAddListenerSucceeds()
+        fakeVerificationService.givenRemoveListenerSucceeds()
+        return fakeVerificationService
+    }
+}

From 3bba9dea25fb8adada71205bb96098a4b52bfaa4 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 16:30:40 +0200
Subject: [PATCH 229/300] Adding unit test for filter action

---
 .../OtherSessionsViewModelTest.kt             | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
index c1018003a5..41c54f9255 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
@@ -80,7 +80,7 @@ class OtherSessionsViewModelTest {
     fun `given the viewModel has been initialized then viewState is updated with devices list`() {
         // Given
         val devices = mockk<List<DeviceFullInfo>>()
-        givenGetDeviceFullInfoListReturns(devices)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
         val expectedState = OtherSessionsViewState(
                 devices = Success(devices),
                 currentFilter = defaultArgs.defaultFilter,
@@ -98,8 +98,41 @@ class OtherSessionsViewModelTest {
         verifyAll { fakeGetDeviceFullInfoListUseCase.execute(defaultArgs.defaultFilter, defaultArgs.excludeCurrentDevice) }
     }
 
-    private fun givenGetDeviceFullInfoListReturns(devices: List<DeviceFullInfo>) {
-        every { fakeGetDeviceFullInfoListUseCase.execute(any(), any()) } returns flowOf(devices)
+    @Test
+    fun `given filter devices action when handling the action then viewState is updated with filter option and devices are filtered`() {
+        // Given
+        val filterType = DeviceManagerFilterType.UNVERIFIED
+        val devices = mockk<List<DeviceFullInfo>>()
+        val filteredDevices = mockk<List<DeviceFullInfo>>()
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        givenGetDeviceFullInfoListReturns(filterType = filterType, filteredDevices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(filteredDevices),
+                currentFilter = filterType,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.FilterDevices(filterType))
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+        verifyAll {
+            fakeGetDeviceFullInfoListUseCase.execute(defaultArgs.defaultFilter, defaultArgs.excludeCurrentDevice)
+            fakeGetDeviceFullInfoListUseCase.execute(filterType, defaultArgs.excludeCurrentDevice)
+        }
+    }
+
+    private fun givenGetDeviceFullInfoListReturns(
+            filterType: DeviceManagerFilterType,
+            devices: List<DeviceFullInfo>,
+    ) {
+        every { fakeGetDeviceFullInfoListUseCase.execute(filterType, any()) } returns flowOf(devices)
     }
 
     private fun givenVerificationService(): FakeVerificationService {

From 2e99d45c829965e9790da710df7a1898704393d4 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 17:22:19 +0200
Subject: [PATCH 230/300] Adding unit test about select mode

---
 .../OtherSessionsViewModelTest.kt             | 161 +++++++++++++++++-
 1 file changed, 153 insertions(+), 8 deletions(-)

diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
index 41c54f9255..fa61918689 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
@@ -22,7 +22,9 @@ import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.settings.devices.v2.DeviceFullInfo
 import im.vector.app.features.settings.devices.v2.GetDeviceFullInfoListUseCase
 import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
 import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
+import im.vector.app.features.settings.devices.v2.list.DeviceType
 import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.fakes.FakeVerificationService
 import im.vector.app.test.test
@@ -37,8 +39,11 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 
 private const val A_TITLE_RES_ID = 1
+private const val A_DEVICE_ID = "device-id"
 
 class OtherSessionsViewModelTest {
 
@@ -71,6 +76,16 @@ class OtherSessionsViewModelTest {
         givenVerificationService()
     }
 
+    private fun givenVerificationService(): FakeVerificationService {
+        val fakeVerificationService = fakeActiveSessionHolder
+                .fakeSession
+                .fakeCryptoService
+                .fakeVerificationService
+        fakeVerificationService.givenAddListenerSucceeds()
+        fakeVerificationService.givenRemoveListenerSucceeds()
+        return fakeVerificationService
+    }
+
     @After
     fun tearDown() {
         unmockkAll()
@@ -128,6 +143,129 @@ class OtherSessionsViewModelTest {
         }
     }
 
+    @Test
+    fun `given enable select mode action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo.copy(isSelected = true))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = true,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.EnableSelectMode(A_DEVICE_ID))
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given disable select mode action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo1 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val deviceFullInfo2 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1.copy(isSelected = false), deviceFullInfo2.copy(isSelected = false))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.DisableSelectMode)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given toggle selection for device action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo.copy(isSelected = true))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.ToggleSelectionForDevice(A_DEVICE_ID))
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given select all action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo1 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val deviceFullInfo2 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1.copy(isSelected = true), deviceFullInfo2.copy(isSelected = true))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.SelectAll)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
+    @Test
+    fun `given deselect all action when handling the action then viewState is updated with correct info`() {
+        // Given
+        val deviceFullInfo1 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val deviceFullInfo2 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
+        givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
+        val expectedState = OtherSessionsViewState(
+                devices = Success(listOf(deviceFullInfo1.copy(isSelected = false), deviceFullInfo2.copy(isSelected = false))),
+                currentFilter = defaultArgs.defaultFilter,
+                excludeCurrentDevice = defaultArgs.excludeCurrentDevice,
+                isSelectModeEnabled = false,
+        )
+
+        // When
+        val viewModel = createViewModel()
+        val viewModelTest = viewModel.test()
+        viewModel.handle(OtherSessionsAction.DeselectAll)
+
+        // Then
+        viewModelTest
+                .assertLatestState { state -> state == expectedState }
+                .finish()
+    }
+
     private fun givenGetDeviceFullInfoListReturns(
             filterType: DeviceManagerFilterType,
             devices: List<DeviceFullInfo>,
@@ -135,13 +273,20 @@ class OtherSessionsViewModelTest {
         every { fakeGetDeviceFullInfoListUseCase.execute(filterType, any()) } returns flowOf(devices)
     }
 
-    private fun givenVerificationService(): FakeVerificationService {
-        val fakeVerificationService = fakeActiveSessionHolder
-                .fakeSession
-                .fakeCryptoService
-                .fakeVerificationService
-        fakeVerificationService.givenAddListenerSucceeds()
-        fakeVerificationService.givenRemoveListenerSucceeds()
-        return fakeVerificationService
+    private fun givenDeviceFullInfo(deviceId: String, isSelected: Boolean): DeviceFullInfo {
+        return DeviceFullInfo(
+                deviceInfo = DeviceInfo(
+                        deviceId = deviceId,
+                ),
+                cryptoDeviceInfo = null,
+                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+                isInactive = true,
+                isCurrentDevice = true,
+                deviceExtendedInfo = DeviceExtendedInfo(
+                        deviceType = DeviceType.MOBILE,
+                ),
+                matrixClientInfo = null,
+                isSelected = isSelected,
+        )
     }
 }

From b7f9419bd4ad21254dbdd3859f74d17e9e37e1b4 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 19 Oct 2022 17:52:55 +0200
Subject: [PATCH 231/300] Fix usage of @+id in xml file

---
 vector/src/main/res/layout/item_other_session.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/res/layout/item_other_session.xml b/vector/src/main/res/layout/item_other_session.xml
index 908a0e0073..f514cea56b 100644
--- a/vector/src/main/res/layout/item_other_session.xml
+++ b/vector/src/main/res/layout/item_other_session.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?selectableItemBackground"
-    android:paddingTop="8dp"
-    android:paddingHorizontal="8dp">
+    android:paddingHorizontal="8dp"
+    android:paddingTop="8dp">
 
     <View
         android:id="@+id/otherSessionItemBackground"
@@ -28,9 +28,9 @@
         android:background="@drawable/bg_device_type"
         android:contentDescription="@string/a11y_device_manager_device_type_mobile"
         android:padding="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/otherSessionItemBackground"
-        app:layout_constraintStart_toStartOf="@+id/otherSessionItemBackground"
-        app:layout_constraintTop_toTopOf="@+id/otherSessionItemBackground"
+        app:layout_constraintBottom_toBottomOf="@id/otherSessionItemBackground"
+        app:layout_constraintStart_toStartOf="@id/otherSessionItemBackground"
+        app:layout_constraintTop_toTopOf="@id/otherSessionItemBackground"
         tools:src="@drawable/ic_device_type_mobile" />
 
     <im.vector.app.core.ui.views.ShieldImageView
@@ -42,7 +42,7 @@
         android:background="@drawable/circle_with_border"
         android:importantForAccessibility="no"
         android:padding="6dp"
-        app:layout_constraintStart_toStartOf="@+id/otherSessionDeviceTypeImageView"
+        app:layout_constraintStart_toStartOf="@id/otherSessionDeviceTypeImageView"
         app:layout_constraintTop_toTopOf="@id/otherSessionDeviceTypeImageView"
         tools:src="@drawable/ic_shield_trusted" />
 
@@ -80,6 +80,6 @@
         android:background="?vctr_content_quinary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/otherSessionNameTextView"
-        app:layout_constraintTop_toBottomOf="@+id/otherSessionItemBackground" />
+        app:layout_constraintTop_toBottomOf="@id/otherSessionItemBackground" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 600f65025661e81e834345fde69983a612b7a244 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Thu, 20 Oct 2022 16:48:02 +0200
Subject: [PATCH 232/300] Fixing visibility of the select session action when
 empty list

---
 .../settings/devices/v2/othersessions/OtherSessionsFragment.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index 958266631e..d166a38d54 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -46,6 +46,7 @@ import im.vector.app.features.settings.devices.v2.list.OtherSessionsView
 import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INACTIVE_AFTER_DAYS
 import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
 import im.vector.app.features.themes.ThemeUtils
+import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -75,7 +76,7 @@ class OtherSessionsFragment :
             val isSelectModeEnabled = state.isSelectModeEnabled
             menu.findItem(R.id.otherSessionsSelectAll).isVisible = isSelectModeEnabled
             menu.findItem(R.id.otherSessionsDeselectAll).isVisible = isSelectModeEnabled
-            menu.findItem(R.id.otherSessionsSelect).isVisible = !isSelectModeEnabled
+            menu.findItem(R.id.otherSessionsSelect).isVisible = !isSelectModeEnabled && state.devices()?.isNotEmpty().orFalse()
         }
     }
 

From 3e1c110343096686dfe35ad02613f763f2a5dc45 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 25 Oct 2022 17:21:55 +0200
Subject: [PATCH 233/300] Updating some new string keys to make them more
 generic

---
 .../ui-strings/src/main/res/values/strings.xml    | 15 +++++++++------
 .../v2/othersessions/OtherSessionsFragment.kt     |  2 +-
 vector/src/main/res/menu/menu_other_sessions.xml  |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index 7c74162859..897c2853d8 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Cross feature -->
+    <plurals name="x_selected">
+        <item quantity="one">%1$d selected</item>
+        <item quantity="other">%1$d selected</item>
+    </plurals>
+
+    <!-- Notice -->
     <string name="notice_room_invite_no_invitee">%s\'s invitation</string>
     <string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
     <string name="notice_room_created">%1$s created the room</string>
@@ -407,6 +414,8 @@
     <string name="action_learn_more">Learn more</string>
     <string name="action_next">Next</string>
     <string name="action_got_it">Got it</string>
+    <string name="action_select_all">Select all</string>
+    <string name="action_deselect_all">Deselect all</string>
 
     <string name="copied_to_clipboard">Copied to clipboard</string>
 
@@ -3329,12 +3338,6 @@
     <string name="device_manager_other_sessions_no_inactive_sessions_found">No inactive sessions found.</string>
     <string name="device_manager_other_sessions_clear_filter">Clear Filter</string>
     <string name="device_manager_other_sessions_select">Select sessions</string>
-    <string name="device_manager_other_sessions_select_all">Select all</string>
-    <string name="device_manager_other_sessions_deselect_all">Deselect all</string>
-    <plurals name="device_manager_other_sessions_selected">
-        <item quantity="one">%1$d selected</item>
-        <item quantity="other">%1$d selected</item>
-    </plurals>
     <string name="device_manager_session_overview_signout">Sign out of this session</string>
     <string name="device_manager_session_details_title">Session details</string>
     <string name="device_manager_session_details_description">Application, device, and activity information.</string>
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
index d166a38d54..4f1c8353f5 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt
@@ -173,7 +173,7 @@ class OtherSessionsFragment :
         invalidateOptionsMenu()
         val title = if (isSelectModeEnabled) {
             val selection = devices.count { it.isSelected }
-            stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_selected, selection, selection)
+            stringProvider.getQuantityString(R.plurals.x_selected, selection, selection)
         } else {
             getString(args.titleResourceId)
         }
diff --git a/vector/src/main/res/menu/menu_other_sessions.xml b/vector/src/main/res/menu/menu_other_sessions.xml
index 0edab99127..8339286fe7 100644
--- a/vector/src/main/res/menu/menu_other_sessions.xml
+++ b/vector/src/main/res/menu/menu_other_sessions.xml
@@ -11,11 +11,11 @@
 
     <item
         android:id="@+id/otherSessionsSelectAll"
-        android:title="@string/device_manager_other_sessions_select_all"
+        android:title="@string/action_select_all"
         app:showAsAction="withText|never" />
 
     <item
         android:id="@+id/otherSessionsDeselectAll"
-        android:title="@string/device_manager_other_sessions_deselect_all"
+        android:title="@string/action_deselect_all"
         app:showAsAction="withText|never" />
 </menu>

From db17d02f36ad02b759d728827e801ea4a15702de Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 25 Oct 2022 17:25:12 +0200
Subject: [PATCH 234/300] Using host variable to make the code nicer

---
 .../settings/devices/v2/list/OtherSessionsController.kt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
index 9193479b74..8d70552101 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/OtherSessionsController.kt
@@ -72,9 +72,9 @@ class OtherSessionsController @Inject constructor(
                     sessionDescription(description)
                     sessionDescriptionDrawable(descriptionDrawable)
                     sessionDescriptionColor(descriptionColor)
-                    stringProvider(this@OtherSessionsController.stringProvider)
-                    colorProvider(this@OtherSessionsController.colorProvider)
-                    drawableProvider(this@OtherSessionsController.drawableProvider)
+                    stringProvider(host.stringProvider)
+                    colorProvider(host.colorProvider)
+                    drawableProvider(host.drawableProvider)
                     selected(device.isSelected)
                     clickListener { device.deviceInfo.deviceId?.let { host.callback?.onItemClicked(it) } }
                     onLongClickListener(View.OnLongClickListener {

From e765575cf6cde04c426723503c710af0c8940a64 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Tue, 25 Oct 2022 17:31:46 +0200
Subject: [PATCH 235/300] Renaming and creating a fixture method for
 DeviceFullInfo mocks

---
 .../OtherSessionsViewModelTest.kt             | 38 +++++-------------
 .../test/fixtures/DeviceFullInfoFixture.kt    | 40 +++++++++++++++++++
 2 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt

diff --git a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
index fa61918689..e7b8eeee9b 100644
--- a/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsViewModelTest.kt
@@ -22,11 +22,10 @@ import com.airbnb.mvrx.test.MavericksTestRule
 import im.vector.app.features.settings.devices.v2.DeviceFullInfo
 import im.vector.app.features.settings.devices.v2.GetDeviceFullInfoListUseCase
 import im.vector.app.features.settings.devices.v2.RefreshDevicesUseCase
-import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
 import im.vector.app.features.settings.devices.v2.filter.DeviceManagerFilterType
-import im.vector.app.features.settings.devices.v2.list.DeviceType
 import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.fakes.FakeVerificationService
+import im.vector.app.test.fixtures.aDeviceFullInfo
 import im.vector.app.test.test
 import im.vector.app.test.testDispatcher
 import io.mockk.every
@@ -39,8 +38,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
-import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
 
 private const val A_TITLE_RES_ID = 1
 private const val A_DEVICE_ID = "device-id"
@@ -146,7 +143,7 @@ class OtherSessionsViewModelTest {
     @Test
     fun `given enable select mode action when handling the action then viewState is updated with correct info`() {
         // Given
-        val deviceFullInfo = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val deviceFullInfo = aDeviceFullInfo(A_DEVICE_ID, isSelected = false)
         val devices: List<DeviceFullInfo> = listOf(deviceFullInfo)
         givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
         val expectedState = OtherSessionsViewState(
@@ -170,8 +167,8 @@ class OtherSessionsViewModelTest {
     @Test
     fun `given disable select mode action when handling the action then viewState is updated with correct info`() {
         // Given
-        val deviceFullInfo1 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
-        val deviceFullInfo2 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID, isSelected = true)
         val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
         givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
         val expectedState = OtherSessionsViewState(
@@ -195,7 +192,7 @@ class OtherSessionsViewModelTest {
     @Test
     fun `given toggle selection for device action when handling the action then viewState is updated with correct info`() {
         // Given
-        val deviceFullInfo = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val deviceFullInfo = aDeviceFullInfo(A_DEVICE_ID, isSelected = false)
         val devices: List<DeviceFullInfo> = listOf(deviceFullInfo)
         givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
         val expectedState = OtherSessionsViewState(
@@ -219,8 +216,8 @@ class OtherSessionsViewModelTest {
     @Test
     fun `given select all action when handling the action then viewState is updated with correct info`() {
         // Given
-        val deviceFullInfo1 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
-        val deviceFullInfo2 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID, isSelected = true)
         val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
         givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
         val expectedState = OtherSessionsViewState(
@@ -244,8 +241,8 @@ class OtherSessionsViewModelTest {
     @Test
     fun `given deselect all action when handling the action then viewState is updated with correct info`() {
         // Given
-        val deviceFullInfo1 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = false)
-        val deviceFullInfo2 = givenDeviceFullInfo(A_DEVICE_ID, isSelected = true)
+        val deviceFullInfo1 = aDeviceFullInfo(A_DEVICE_ID, isSelected = false)
+        val deviceFullInfo2 = aDeviceFullInfo(A_DEVICE_ID, isSelected = true)
         val devices: List<DeviceFullInfo> = listOf(deviceFullInfo1, deviceFullInfo2)
         givenGetDeviceFullInfoListReturns(filterType = defaultArgs.defaultFilter, devices)
         val expectedState = OtherSessionsViewState(
@@ -272,21 +269,4 @@ class OtherSessionsViewModelTest {
     ) {
         every { fakeGetDeviceFullInfoListUseCase.execute(filterType, any()) } returns flowOf(devices)
     }
-
-    private fun givenDeviceFullInfo(deviceId: String, isSelected: Boolean): DeviceFullInfo {
-        return DeviceFullInfo(
-                deviceInfo = DeviceInfo(
-                        deviceId = deviceId,
-                ),
-                cryptoDeviceInfo = null,
-                roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
-                isInactive = true,
-                isCurrentDevice = true,
-                deviceExtendedInfo = DeviceExtendedInfo(
-                        deviceType = DeviceType.MOBILE,
-                ),
-                matrixClientInfo = null,
-                isSelected = isSelected,
-        )
-    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt
new file mode 100644
index 0000000000..d5f987b5c6
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/DeviceFullInfoFixture.kt
@@ -0,0 +1,40 @@
+/*
+ * 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 im.vector.app.test.fixtures
+
+import im.vector.app.features.settings.devices.v2.DeviceFullInfo
+import im.vector.app.features.settings.devices.v2.details.extended.DeviceExtendedInfo
+import im.vector.app.features.settings.devices.v2.list.DeviceType
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel
+
+fun aDeviceFullInfo(deviceId: String, isSelected: Boolean): DeviceFullInfo {
+    return DeviceFullInfo(
+            deviceInfo = DeviceInfo(
+                    deviceId = deviceId,
+            ),
+            cryptoDeviceInfo = null,
+            roomEncryptionTrustLevel = RoomEncryptionTrustLevel.Trusted,
+            isInactive = true,
+            isCurrentDevice = true,
+            deviceExtendedInfo = DeviceExtendedInfo(
+                    deviceType = DeviceType.MOBILE,
+            ),
+            matrixClientInfo = null,
+            isSelected = isSelected,
+    )
+}

From 3632e6dc8adb5cb7c3b63cf96a5b8e7217e153a3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Oct 2022 12:32:27 +0200
Subject: [PATCH 236/300] Replace library
 `org.apache.sanselan:sanselan:0.97-incubator` with
 `org.apache.commons:commons-imaging:1.0-alpha3`

---
 dependencies.gradle                           |  2 +-
 dependencies_groups.gradle                    |  1 -
 .../session/content/ImageExifTagRemover.kt    | 35 +++++++++----------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index db4a961648..33a2096a43 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -160,7 +160,7 @@ ext.libs = [
                 'emojiGoogle'            : "com.vanniktech:emoji-google:$vanniktechEmoji"
         ],
         apache      : [
-                'commonsImaging'         : "org.apache.sanselan:sanselan:0.97-incubator"
+                'commonsImaging'         : "org.apache.commons:commons-imaging:1.0-alpha3"
         ],
         sentry: [
                 'sentryAndroid'         : "io.sentry:sentry-android:$sentry"
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index 68de2c1581..8d488ba2f8 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -176,7 +176,6 @@ ext.groups = [
                         'org.apache.ant',
                         'org.apache.commons',
                         'org.apache.httpcomponents',
-                        'org.apache.sanselan',
                         'org.bouncycastle',
                         'org.ccil.cowan.tagsoup',
                         'org.checkerframework',
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
index 3fa9ffb0e1..baa441a74d 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
@@ -17,11 +17,11 @@
 package org.matrix.android.sdk.internal.session.content
 
 import kotlinx.coroutines.withContext
-import org.apache.sanselan.Sanselan
-import org.apache.sanselan.formats.jpeg.JpegImageMetadata
-import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter
-import org.apache.sanselan.formats.tiff.constants.ExifTagConstants
-import org.apache.sanselan.formats.tiff.constants.GPSTagConstants
+import org.apache.commons.imaging.Imaging
+import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata
+import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter
+import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants
+import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.internal.util.TemporaryFileCreator
@@ -46,24 +46,23 @@ internal class ImageExifTagRemover @Inject constructor(
      */
     suspend fun removeSensitiveJpegExifTags(jpegImageFile: File): File = withContext(coroutineDispatchers.io) {
         val outputSet = tryOrNull("Unable to read JpegImageMetadata") {
-            (Sanselan.getMetadata(jpegImageFile) as? JpegImageMetadata)?.exif?.outputSet
+            (Imaging.getMetadata(jpegImageFile) as? JpegImageMetadata)?.exif?.outputSet
         } ?: return@withContext jpegImageFile
 
         tryOrNull("Unable to remove ExifData") {
             outputSet.removeField(ExifTagConstants.EXIF_TAG_GPSINFO)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION_1)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION_2)
+            outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION)
             outputSet.removeField(ExifTagConstants.EXIF_TAG_USER_COMMENT)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_ALTITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_ALTITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LONGITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LONGITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LONGITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LONGITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LATITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_LATITUDE_REF)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LATITUDE)
-            outputSet.removeField(GPSTagConstants.GPS_TAG_GPS_DEST_LATITUDE_REF)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE_REF)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LONGITUDE)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LONGITUDE_REF)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LATITUDE)
+            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LATITUDE_REF)
         } ?: return@withContext jpegImageFile
 
         val scrubbedFile = temporaryFileCreator.create()

From e8046da0ba6ca8891f94c607e82aa12f3fe0a06b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Oct 2022 12:34:03 +0200
Subject: [PATCH 237/300] Use `GpsTagConstants.ALL_GPS_TAGS` to remove all tags
 related to GPS.

---
 .../internal/session/content/ImageExifTagRemover.kt | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
index baa441a74d..274a2a85e3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
@@ -53,16 +53,9 @@ internal class ImageExifTagRemover @Inject constructor(
             outputSet.removeField(ExifTagConstants.EXIF_TAG_GPSINFO)
             outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION)
             outputSet.removeField(ExifTagConstants.EXIF_TAG_USER_COMMENT)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE_REF)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LONGITUDE)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LONGITUDE_REF)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LATITUDE)
-            outputSet.removeField(GpsTagConstants.GPS_TAG_GPS_DEST_LATITUDE_REF)
+            GpsTagConstants.ALL_GPS_TAGS.forEach { tagInfo ->
+                outputSet.removeField(tagInfo)
+            }
         } ?: return@withContext jpegImageFile
 
         val scrubbedFile = temporaryFileCreator.create()

From c8d08e21a819d24a60ff949b5bda2130441ffe08 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Oct 2022 12:36:58 +0200
Subject: [PATCH 238/300] Small refactor

---
 .../internal/session/content/ImageExifTagRemover.kt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
index 274a2a85e3..1531d70083 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/ImageExifTagRemover.kt
@@ -50,10 +50,7 @@ internal class ImageExifTagRemover @Inject constructor(
         } ?: return@withContext jpegImageFile
 
         tryOrNull("Unable to remove ExifData") {
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_GPSINFO)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION)
-            outputSet.removeField(ExifTagConstants.EXIF_TAG_USER_COMMENT)
-            GpsTagConstants.ALL_GPS_TAGS.forEach { tagInfo ->
+            tagsToRemove.forEach { tagInfo ->
                 outputSet.removeField(tagInfo)
             }
         } ?: return@withContext jpegImageFile
@@ -74,4 +71,12 @@ internal class ImageExifTagRemover @Inject constructor(
                 }
         )
     }
+
+    private val tagsToRemove
+        get() = GpsTagConstants.ALL_GPS_TAGS +
+                listOf(
+                        ExifTagConstants.EXIF_TAG_GPSINFO,
+                        ExifTagConstants.EXIF_TAG_SUBJECT_LOCATION,
+                        ExifTagConstants.EXIF_TAG_USER_COMMENT,
+                )
 }

From 307b71dbd79f7f15849ed90a19cc52d10ec3b0d5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Oct 2022 12:40:45 +0200
Subject: [PATCH 239/300] Changelog

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

diff --git a/changelog.d/7454.misc b/changelog.d/7454.misc
new file mode 100644
index 0000000000..beba9717b8
--- /dev/null
+++ b/changelog.d/7454.misc
@@ -0,0 +1 @@
+Replace org.apache.sanselan:sanselan by org.apache.commons:commons-imaging

From 1007e02ceb7125e1a3ebd8181f32b13d7caff752 Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Thu, 27 Oct 2022 03:36:25 +0000
Subject: [PATCH 240/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (2381 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index a7b0f702f9..7291650a7d 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -970,7 +970,7 @@
     <string name="downloaded_file">文件%1$s 已被下载！</string>
     <string name="message_edits">消息编辑</string>
     <string name="no_message_edits_found">未找到编辑</string>
-    <string name="room_filtering_filter_hint">过滤对话…</string>
+    <string name="room_filtering_filter_hint">过滤对话……</string>
     <string name="room_filtering_footer_title">找不到你要找的？</string>
     <string name="room_filtering_footer_create_new_room">创建新房间</string>
     <string name="room_filtering_footer_create_new_direct_message">发送新私聊消息</string>
@@ -1714,7 +1714,7 @@
     <string name="direct_room_user_list_suggestions_title">建议</string>
     <string name="direct_room_user_list_known_title">已知用户</string>
     <string name="qr_code">二维码</string>
-    <string name="add_by_qr_code">通过二维码添加</string>
+    <string name="add_by_qr_code">通过QR码添加</string>
     <string name="create_room_settings_section">房间设置</string>
     <string name="create_room_topic_hint">主题</string>
     <string name="create_room_topic_section">房间话题（可选）</string>
@@ -2419,7 +2419,7 @@
     <string name="ftue_auth_use_case_subtitle">我们会帮你建立连接</string>
     <string name="ftue_auth_use_case_title">你会与谁聊最多？</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name}也非常适合工作场所。受到世界上最安全的组织信任。</string>
-    <string name="ftue_auth_carousel_control_body">聊天消息存储位置一律由您掌控，不受外来因素干扰。技术由 Matrix 提供。</string>
+    <string name="ftue_auth_carousel_control_body">选择保存你的对话的位置，给你控制权和独立性。通过Matrix连接。</string>
     <string name="ftue_auth_carousel_secure_body">安全且独立的通信，为你提供和在家中面对面对话同样等级的隐私。</string>
     <string name="ftue_auth_carousel_encrypted_title">安全传送消息。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">向主服务器注册端点token失败：
@@ -2632,4 +2632,9 @@
     <string name="labs_enable_rich_text_editor_title">启用富文本编辑器</string>
     <string name="a11y_collapse_space_children">折叠%s孩子</string>
     <string name="a11y_expand_space_children">展开%s孩子</string>
+    <string name="labs_enable_session_manager_title">启用新的会话管理器</string>
+    <string name="onboarding_new_app_layout_spaces_title">访问空间</string>
+    <string name="onboarding_new_app_layout_welcome_title">欢迎使用新视图！</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ 此房间里有未经验证的设备，它们将无法解密你发送的消息。</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">永远不要向这个房间里未经验证的会话发送加密的消息。</string>
 </resources>
\ No newline at end of file

From b00178c013ef03178ffeeab83fb7a401bfb54f79 Mon Sep 17 00:00:00 2001
From: Jingchao Feng <fjch1997@outlook.com>
Date: Tue, 25 Oct 2022 07:30:43 +0000
Subject: [PATCH 241/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (2381 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 7291650a7d..cc2ab4b3ca 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2482,7 +2482,7 @@
     <string name="ftue_auth_use_case_join_existing_server">想要加入已有的服务器？</string>
     <string name="ftue_auth_use_case_skip_partial">跳过此问题</string>
     <string name="ftue_auth_use_case_option_one">家人和朋友</string>
-    <string name="ftue_auth_carousel_secure_title">拥有你的对话。</string>
+    <string name="ftue_auth_carousel_secure_title">拥有你的数据</string>
     <string name="attachment_type_location">位置</string>
     <string name="send_feedback_threads_title">Threads Beta反馈</string>
     <string name="beta_title_bottom_sheet_action">BETA</string>

From df16ec6cda5300677dbf5ea94f91de9514ee52b9 Mon Sep 17 00:00:00 2001
From: Nizami <nizamismidov4@gmail.com>
Date: Tue, 25 Oct 2022 09:55:37 +0000
Subject: [PATCH 242/300] Translated using Weblate (Azerbaijani)

Currently translated at 2.7% (69 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-az/strings.xml b/library/ui-strings/src/main/res/values-az/strings.xml
index 53100db285..97e6d3def6 100644
--- a/library/ui-strings/src/main/res/values-az/strings.xml
+++ b/library/ui-strings/src/main/res/values-az/strings.xml
@@ -69,4 +69,11 @@
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s %2$s üçün dəvəti qəbul etdi. Səbəb: %3$s</string>
     <string name="notice_room_withdraw_with_reason">%1$s %2$s dəvətini geri götürdü. Səbəb: %3$s</string>
     <string name="notice_room_created_by_you">Otağ yaratdınız</string>
+    <string name="denied_permission_camera">Bu əməliyyatı yerinə yetirmək üçün sistem tənzimləmələrindən Kameraya icazə verin.</string>
+    <string name="title_activity_settings">Tənzimləmələr</string>
+    <string name="notice_direct_room_join">%1$s qoşuldu</string>
+    <string name="notice_room_join_by_you">Otağa qoşuldunuz</string>
+    <string name="notice_room_invite_by_you">%1$s-ı dəvət etdiniz</string>
+    <string name="notice_direct_room_created_by_you">Müzakirə yaratdınız</string>
+    <string name="notice_room_created">%1$s otağı yaratdı</string>
 </resources>
\ No newline at end of file

From d7ebdbfdf536db1a8475ef20ea41bd9a880a30b9 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Tue, 25 Oct 2022 18:28:46 +0000
Subject: [PATCH 243/300] Translated using Weblate (Catalan)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ca/strings.xml b/library/ui-strings/src/main/res/values-ca/strings.xml
index 87be4a96a5..f3e064d2f3 100644
--- a/library/ui-strings/src/main/res/values-ca/strings.xml
+++ b/library/ui-strings/src/main/res/values-ca/strings.xml
@@ -2814,4 +2814,11 @@
     <string name="labs_enable_rich_text_editor_title">Activa l\'editor de text enriquit</string>
     <string name="device_manager_push_notifications_description">Rep notificacions en aquesta sessió.</string>
     <string name="device_manager_push_notifications_title">Notificacions</string>
+    <string name="a11y_voice_broadcast_buffering">Carregant</string>
+    <string name="a11y_pause_voice_broadcast">Pausa l\'emissió de veu</string>
+    <string name="a11y_play_voice_broadcast">Reprodueix o reprèn l\'emissió de veu</string>
+    <string name="a11y_stop_voice_broadcast_record">Atura l\'enregistrament d\'emissió de veu</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausa l\'enregistrament d\'emissió de veu</string>
+    <string name="a11y_resume_voice_broadcast_record">Reprèn l\'enregistrament d\'emissió de veu</string>
+    <string name="voice_broadcast_live">En directe</string>
 </resources>
\ No newline at end of file

From 0ef9e5358f1c058da92d08a91c43170d3d5242c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 26 Oct 2022 07:25:02 +0000
Subject: [PATCH 244/300] Translated using Weblate (Estonian)

Currently translated at 99.6% (2511 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-et/strings.xml b/library/ui-strings/src/main/res/values-et/strings.xml
index 05b01c2bde..b0e2a59636 100644
--- a/library/ui-strings/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -2805,4 +2805,11 @@
     <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Teine seade on juba võrku loginud.</string>
     <string name="qr_code_login_header_failed_e2ee_security_issue_description">Turvalise sõnumivahetuse ülesseadmisel tekkis turvaviga. Üks kolmest võib olla sattunud vale osapoole kontrolli alla: sinu koduserver, sinu internetiühendus või sinu seade;</string>
     <string name="qr_code_login_header_failed_other_description">Päring ei õnnestunud.</string>
+    <string name="a11y_voice_broadcast_buffering">Andmed on puhverdamisel</string>
+    <string name="a11y_play_voice_broadcast">Alusta või jätka ringhäälingukõne esitamist</string>
+    <string name="a11y_stop_voice_broadcast_record">Lõpeta ringhäälingukõne salvestamine</string>
+    <string name="a11y_pause_voice_broadcast_record">Peata ringhäälingukõne salvestamine</string>
+    <string name="a11y_resume_voice_broadcast_record">Jätka ringhäälingukõne salvestamist</string>
+    <string name="a11y_pause_voice_broadcast">Peata ringhäälingukõne esitamine</string>
+    <string name="voice_broadcast_live">Otse eetris</string>
 </resources>
\ No newline at end of file

From e185bdf8e7c6ef02ca670c5067b997e429f2b85a Mon Sep 17 00:00:00 2001
From: Roel ter Maat <roel.termaat@nedap.com>
Date: Wed, 26 Oct 2022 14:03:37 +0000
Subject: [PATCH 245/300] Translated using Weblate (Dutch)

Currently translated at 97.9% (2468 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-nl/strings.xml b/library/ui-strings/src/main/res/values-nl/strings.xml
index e8ede9b079..46d5f9a675 100644
--- a/library/ui-strings/src/main/res/values-nl/strings.xml
+++ b/library/ui-strings/src/main/res/values-nl/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="notice_room_invite_no_invitee">Uitnodiging van %s</string>
     <string name="notice_room_invite">%1$s heeft %2$s uitgenodigd</string>
-    <string name="notice_room_invite_you">%1$s heeft u uitgenodigd</string>
+    <string name="notice_room_invite_you">%1$s heeft je uitgenodigd</string>
     <string name="notice_room_join">%1$s is deelnemer geworden van de kamer</string>
     <string name="notice_room_leave">%1$s heeft het de kamer verlaten</string>
     <string name="notice_room_reject">%1$s heeft de uitnodiging geweigerd</string>
@@ -47,7 +47,7 @@
 \nKamers importeren</string>
     <string name="initial_sync_start_importing_account_joined_rooms">Initiële synchronisatie:
 \nGesprekken worden geladen
-\nAls u aan veel kamers deelneemt kan dit even duren</string>
+\nAls je aan veel kamers deelneemt kan dit even duren</string>
     <string name="initial_sync_start_importing_account_invited_rooms">Initiële synchronisatie:
 \nUitgenodigde kamers worden geïmporteerd</string>
     <string name="initial_sync_start_importing_account_left_rooms">Initiële synchronisatie:
@@ -59,7 +59,7 @@
     <string name="notice_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s om deelnemer te worden van de kamer ingetrokken</string>
     <string name="notice_room_invite_no_invitee_with_reason">Uitnodiging van %1$s. Reden: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s heeft %2$s uitgenodigd. Reden: %3$s</string>
-    <string name="notice_room_invite_you_with_reason">%1$s heeft u uitgenodigd. Reden: %2$s</string>
+    <string name="notice_room_invite_you_with_reason">%1$s heeft je uitgenodigd. Reden: %2$s</string>
     <string name="notice_room_join_with_reason">%1$s neemt nu deel. Reden: %2$s</string>
     <string name="notice_room_leave_with_reason">%1$s is weggegaan. Reden: %2$s</string>
     <string name="notice_room_reject_with_reason">%1$s heeft de uitnodiging geweigerd. Reden: %2$s</string>
@@ -81,8 +81,8 @@
     <string name="notice_room_canonical_alias_unset">%1$s heeft het hoofdadres voor dit gesprek verwijderd.</string>
     <string name="notice_room_guest_access_can_join">%1$s heeft gasten de toegang tot dit gesprek verleend.</string>
     <string name="notice_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
-    <string name="notice_end_to_end_ok">%1$s heeft end-to-end-versleuteling ingeschakeld.</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s heeft end-to-end-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
+    <string name="notice_end_to_end_ok">%1$s heeft eind-tot-eind-versleuteling ingeschakeld.</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s heeft eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %2$s).</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="ok">Oké</string>
     <string name="action_cancel">Annuleren</string>
@@ -124,14 +124,14 @@
     <string name="send_bug_report_include_crash_logs">Crash-logboek versturen</string>
     <string name="send_bug_report_include_screenshot">Schermafdruk versturen</string>
     <string name="send_bug_report">Probleem melden</string>
-    <string name="send_bug_report_description">Beschrijf de fout. Wat heeft u gedaan\? Wat verwachtte u dat er zou gebeuren\? Wat is er echt gebeurd\?</string>
-    <string name="send_bug_report_placeholder">Beschrijf hier uw probleem</string>
-    <string name="send_bug_report_logs_description">Om het probleem te kunnen onderzoeken worden logboeken van deze cliënt met de foutmelding verstuurd. Deze foutmelding, inclusief de logboeken en schermafdruk, zullen niet openbaar zichtbaar zijn. Indien u liever alleen de bovenstaande tekst verstuurt, haal dan het vinkje weg:</string>
-    <string name="send_bug_report_alert_message">Het ziet er naar uit dat u de telefoon in frustratie schudt. Wilt u een probleem melden\?</string>
+    <string name="send_bug_report_description">Beschrijf de fout. Wat heb je gedaan\? Wat verwachtte je dat er zou gebeuren\? Wat is er echt gebeurd\?</string>
+    <string name="send_bug_report_placeholder">Beschrijf hier jouw probleem</string>
+    <string name="send_bug_report_logs_description">Om het probleem te kunnen onderzoeken worden logboeken van deze cliënt met de foutmelding verstuurd. Deze foutmelding, inclusief de logboeken en schermafdruk, zullen niet openbaar zichtbaar zijn. Indien je liever alleen de bovenstaande tekst verstuurt, haal dan het vinkje weg:</string>
+    <string name="send_bug_report_alert_message">Het ziet er naar uit dat je de telefoon in frustratie schudt. Wil je een probleem melden\?</string>
     <string name="send_bug_report_sent">De foutmelding is verzonden</string>
     <string name="send_bug_report_failed">Versturen van foutmelding is mislukt (%s)</string>
     <string name="send_bug_report_progress">Voortgang (%s%%)</string>
-    <string name="send_bug_report_app_crashed">De toepassing is de vorige keer gecrasht. Wilt u dit melden\?</string>
+    <string name="send_bug_report_app_crashed">De toepassing is de vorige keer gecrasht. Wil je dit melden\?</string>
     <string name="join_room">Deelnemen aan kamer</string>
     <string name="username">Inlognaam</string>
     <string name="logout">Afmelden</string>
@@ -147,8 +147,8 @@
     <string name="auth_invalid_email">Dit is geen geldig e-mailadres</string>
     <string name="auth_email_already_defined">Dit e-mailadres is al in gebruik.</string>
     <string name="auth_forgot_password">Wachtwoord vergeten?</string>
-    <string name="auth_recaptcha_message">Deze server wil graag weten of u geen robot bent</string>
-    <string name="auth_reset_password_error_unauthorized">Verifiëren van het e-mailadres is mislukt: zorg dat u op de koppeling in de e-mail hebt geklikt</string>
+    <string name="auth_recaptcha_message">Deze server wil graag weten of je geen robot bent</string>
+    <string name="auth_reset_password_error_unauthorized">Verifiëren van het e-mailadres is mislukt: zorg dat je op de koppeling in de e-mail hebt geklikt</string>
     <string name="login_error_invalid_home_server">Voer een geldige URL in</string>
     <string name="login_error_bad_json">Ongeldige JSON</string>
     <string name="login_error_not_json">Bevatte geen geldige JSON</string>
@@ -164,8 +164,8 @@
     <string name="call_in_progress">Oproep gaande…</string>
     <string name="call_error_user_not_responding">De andere kant heeft niet opgenomen.</string>
     <string name="permissions_rationale_popup_title">Informatie</string>
-    <string name="permissions_rationale_msg_record_audio">${app_name} heeft toegang nodig tot uw microfoon om spraakoproepen te maken.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">${app_name} heeft toegang nodig tot uw camera en microfoon om video-oproepen te maken.
+    <string name="permissions_rationale_msg_record_audio">${app_name} heeft toegang nodig tot je microfoon om spraakoproepen te maken.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">${app_name} heeft toegang nodig tot je camera en microfoon om video-oproepen te maken.
 \n
 \nVerleen toegang op de volgende pop-ups om de oproep te maken.</string>
     <string name="yes">JA</string>
@@ -176,7 +176,7 @@
     <string name="action_reject">Afwijzen</string>
     <string name="room_jump_to_first_unread">Naar ongelezen springen</string>
     <string name="room_participants_leave_prompt_title">Gesprek verlaten</string>
-    <string name="room_participants_leave_prompt_msg">Weet u zeker dat u het gesprek wilt verlaten\?</string>
+    <string name="room_participants_leave_prompt_msg">Weet je zeker dat je het gesprek wil verlaten\?</string>
     <string name="room_participants_header_direct_chats">TWEEGESPREKKEN</string>
     <string name="room_participants_action_invite">Uitnodigen</string>
     <string name="room_participants_action_ban">Verbannen</string>
@@ -184,22 +184,22 @@
     <string name="room_participants_action_ignore">Alle berichten van deze persoon verbergen</string>
     <string name="room_participants_action_unignore">Alle berichten van deze persoon tonen</string>
     <string name="room_participants_action_mention">Vermelden</string>
-    <string name="room_participants_power_level_prompt">U kunt deze veranderingen niet ongedaan maken aangezien u de persoon tot hetzelfde niveau als uzelf promoveert.
-\nWeet u het zeker\?</string>
+    <string name="room_participants_power_level_prompt">Je kan deze veranderingen niet ongedaan maken aangezien je de persoon tot hetzelfde niveau als jezelf promoveert.
+\nWeet je het zeker\?</string>
     <string name="room_one_user_is_typing">%s is aan het typen…</string>
     <string name="room_two_users_are_typing">%1$s en %2$s zijn aan het typen…</string>
     <string name="room_many_users_are_typing">%1$s, %2$s en anderen zijn aan het typen…</string>
-    <string name="room_do_not_have_permission_to_post">U heeft geen toestemming om dit naar dit gesprek te sturen.</string>
+    <string name="room_do_not_have_permission_to_post">Je hebt geen toestemming om dit naar dit gesprek te sturen.</string>
     <string name="ssl_trust">Vertrouwen</string>
     <string name="ssl_do_not_trust">Niet vertrouwen</string>
     <string name="ssl_logout_account">Afmelden</string>
     <string name="ssl_remain_offline">Negeren</string>
     <string name="ssl_fingerprint_hash">Vingerafdruk (%s):</string>
     <string name="ssl_could_not_verify">Kan de identiteit van de externe server niet verifïeren.</string>
-    <string name="ssl_cert_not_trust">Dit kan betekenen dat iemand uw internetverkeer met slechte bedoelingen probeert te onderscheppen, of dat uw telefoon het certificaat van de server niet vertrouwt.</string>
+    <string name="ssl_cert_not_trust">Dit kan betekenen dat iemand jouw internetverkeer met slechte bedoelingen probeert te onderscheppen, of dat jouw telefoon het certificaat van de server niet vertrouwt.</string>
     <string name="ssl_cert_new_account_expl">Als de serverbeheerder heeft gezegd dat dit normaal is, wees er dan zeker van dat de vingerafdruk hieronder overeenkomt met de door de beheerder verschafte vingerafdruk.</string>
-    <string name="ssl_unexpected_existing_expl">Het certificaat is veranderd van één dat door uw telefoon werd vertrouwd naar een ander. Dit is HEEL ONGEBRUIKELIJK. Het wordt aangeraden om dit nieuwe certificaat NIET TE AANVAARDEN.</string>
-    <string name="ssl_expected_existing_expl">Het certificaat is veranderd van een vertrouwd naar een onvertrouwd certificaat. De server heeft misschien zijn certificaat vernieuwd. Contacteer de serverbeheerder voor de verwachte vingerafdruk.</string>
+    <string name="ssl_unexpected_existing_expl">Het certificaat is veranderd van één dat door jouw telefoon werd vertrouwd naar een ander. Dit is HEEL ONGEBRUIKELIJK. Het wordt aangeraden om dit nieuwe certificaat NIET TE AANVAARDEN.</string>
+    <string name="ssl_expected_existing_expl">Het certificaat is veranderd van een vertrouwd naar een onvertrouwd certificaat. De server heeft misschien zijn certificaat vernieuwd. Neem contact op met de serverbeheerder voor de verwachte vingerafdruk.</string>
     <string name="ssl_only_accept">Aanvaard het certificaat alleen als de serverbeheerder een vingerafdruk heeft gepubliceerd die overeenkomt met degene hierboven.</string>
     <string name="search_hint">Zoeken</string>
     <string name="search_members_hint">Gespreksleden filteren</string>
@@ -249,14 +249,14 @@
     <string name="settings_logged_in">Aangemeld als</string>
     <string name="settings_home_server">Server</string>
     <string name="settings_identity_server">Identiteitsserver</string>
-    <string name="account_email_validation_message">Bekijk uw e-mail en tik op de koppeling erin. Tik zodra dit gedaan is op Verdergaan.</string>
+    <string name="account_email_validation_message">Bekijk je e-mail en tik op de koppeling erin. Tik zodra dit gedaan is op Verdergaan.</string>
     <string name="account_email_already_used_error">Dit e-mailadres is al in gebruik.</string>
     <string name="account_phone_number_already_used_error">Dit telefoonnummer is al in gebruik.</string>
     <string name="settings_change_password">Wachtwoord veranderen</string>
     <string name="settings_old_password">Huidig wachtwoord</string>
     <string name="settings_new_password">Nieuw wachtwoord</string>
     <string name="settings_fail_to_update_password">Bijwerken van wachtwoord is mislukt</string>
-    <string name="settings_password_updated">Uw wachtwoord is gewijzigd</string>
+    <string name="settings_password_updated">Je wachtwoord is gewijzigd</string>
     <string name="settings_unignore_user">Alle berichten van %s tonen\?</string>
     <string name="settings_select_country">Kies een land</string>
     <string name="room_settings_topic">Onderwerp</string>
@@ -270,7 +270,7 @@
     <string name="room_settings_category_advanced_title">Geavanceerd</string>
     <string name="room_settings_room_internal_id">Interne ID van dit gesprek</string>
     <string name="room_settings_labs_pref_title">Experimenteel</string>
-    <string name="room_settings_labs_warning_message">Dit zijn experimentele functies die zich op onverwachte manieren kunnen gedragen. Wees behoedzaam bij het gebruik van deze functies.</string>
+    <string name="room_settings_labs_warning_message">Dit zijn experimentele functionaliteiten die zich op onverwachte manieren kunnen gedragen. Wees behoedzaam bij het gebruik van deze functies.</string>
     <string name="room_settings_set_main_address">Instellen als hoofdadres</string>
     <string name="room_settings_unset_main_address">Niet instellen als hoofdadres</string>
     <string name="encryption_information_decryption_error">Ontsleutelingsfout</string>
@@ -292,8 +292,8 @@
     <string name="encryption_information_not_verified">NIET geverifieerd</string>
     <string name="encryption_information_verified">Geverifieerd</string>
     <string name="encryption_information_verify">Verifiëren</string>
-    <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, contacteert u de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraagt u hem/haar of de sleutel die hij/zij ziet in zijn/haar persoonsinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
-    <string name="encryption_information_verify_device_warning2">Als het overeenkomt, drukt u op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en zou u het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
+    <string name="encryption_information_verify_device_warning">Om te verifiëren dat deze sessie vertrouwd kan worden, neem je contact op met de eigenaar via een andere methode (bv. persoonlijk of via een telefoontje) en vraag je ze of de sleutel die ze zien in hun persoonsinstellingen van deze sessie overeenkomt met de sleutel hieronder:</string>
+    <string name="encryption_information_verify_device_warning2">Als het overeenkomt, druk je op de knop ‘Verifiëren’ hieronder. Als het niet overeenkomt, dan onderschept iemand anders deze sessie en kan je het beter blokkeren. In de toekomst zal dit verificatieproces verbeterd worden.</string>
     <string name="select_room_directory">Kamermap kiezen</string>
     <string name="directory_server_placeholder">Servernaam</string>
     <string name="directory_server_all_rooms_on_server">Alle gesprekken op server %s</string>
@@ -324,12 +324,12 @@
     <string name="notification_listening_for_events">Luisteren naar gebeurtenissen</string>
     <string name="settings_notification_ringtone">Meldingsgeluid</string>
     <string name="settings_12_24_timestamps">Tijdsaanduidingen in 12-uursformaat weergeven</string>
-    <string name="widget_delete_message_confirmation">Weet u zeker dat u deze widget uit dit gesprek wilt verwijderen\?</string>
+    <string name="widget_delete_message_confirmation">Weet je zeker dat je deze widget uit dit gesprek wilt verwijderen\?</string>
     <string name="widget_integration_unable_to_create">Kan widget niet aanmaken.</string>
     <string name="widget_integration_failed_to_send_request">Versturen van verzoek mislukt.</string>
     <string name="widget_integration_positive_power_level">Het machtsniveau moet een positief geheel getal zijn.</string>
-    <string name="widget_integration_must_be_in_room">U zit niet in dit gesprek.</string>
-    <string name="widget_integration_no_permission_in_room">U heeft geen toestemming om dat in dit gesprek te doen.</string>
+    <string name="widget_integration_must_be_in_room">Je zit niet in dit gesprek.</string>
+    <string name="widget_integration_no_permission_in_room">Je hebt geen toestemming om dat in dit gesprek te doen.</string>
     <string name="widget_integration_missing_room_id">room_id ontbreekt in het verzoek.</string>
     <string name="widget_integration_missing_user_id">user_id ontbreekt in het verzoek.</string>
     <string name="widget_integration_room_not_visible">Gesprek %s is niet zichtbaar.</string>
@@ -344,8 +344,8 @@
     <string name="settings_containing_my_user_name">Berichten die mijn inlognaam bevatten</string>
     <string name="settings_analytics">Statistische gegevens</string>
     <string name="settings_labs_native_camera">Systeemcamera gebruiken</string>
-    <string name="you_added_a_new_device">U heeft een nieuwe sessie ‘%s’ toegevoegd, die versleutelingssleutels aanvraagt.</string>
-    <string name="your_unverified_device_requesting">Uw ongeverifieerde sessie ‘%s’ vraagt versleutelingssleutels aan.</string>
+    <string name="you_added_a_new_device">Je hebt een nieuwe sessie ‘%s’ toegevoegd, die versleutelingssleutels aanvraagt.</string>
+    <string name="your_unverified_device_requesting">Jouw ongeverifieerde sessie ‘%s’ vraagt versleutelingssleutels aan.</string>
     <string name="start_verification">Verificatie starten</string>
     <string name="command_error">Opdrachtfout</string>
     <string name="unrecognized_command">Onbekende opdracht: %s</string>
@@ -354,8 +354,8 @@
     <string name="encrypted_message">Versleuteld bericht</string>
     <string name="loading">Laden…</string>
     <string name="send_bug_report_rage_shake">Schudden om een probleem te melden</string>
-    <string name="start_voice_call_prompt_msg">Weet u zeker dat u een spraakoproep wilt beginnen\?</string>
-    <string name="start_video_call_prompt_msg">Weet u zeker dat u een video-oproep wilt beginnen\?</string>
+    <string name="start_voice_call_prompt_msg">Weet je zeker dat je een spraakoproep wilt beginnen\?</string>
+    <string name="start_video_call_prompt_msg">Weet je zeker dat je een video-oproep wilt beginnen\?</string>
     <plurals name="membership_changes">
         <item quantity="one">%d verandering in lidmaatschap</item>
         <item quantity="other">%d veranderingen in lidmaatschap</item>
@@ -365,7 +365,7 @@
         <item quantity="one">%d deelnemer</item>
         <item quantity="other">%d deelnemers</item>
     </plurals>
-    <string name="room_participants_ban_prompt_msg">Als een persoon wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat hij opnieuw lid wordt.</string>
+    <string name="room_participants_ban_prompt_msg">Als een persoon wordt verbannen, wordt deze uit deze kamer verwijderd en wordt er voorkomen dat ze opnieuw lid worden.</string>
     <plurals name="room_new_messages_notification">
         <item quantity="one">%d nieuw bericht</item>
         <item quantity="other">%d nieuwe berichten</item>
@@ -387,40 +387,40 @@
     <string name="group_details_home">Thuis</string>
     <string name="rooms">Gesprekken</string>
     <string name="invited">Uitgenodigd</string>
-    <string name="has_been_removed">%2$s heeft u uit %1$s gezet</string>
-    <string name="has_been_banned">%2$s heeft u uit %1$s verbannen</string>
+    <string name="has_been_removed">%2$s heeft je uit %1$s gezet</string>
+    <string name="has_been_banned">%2$s heeft je uit %1$s verbannen</string>
     <string name="reason_colon">Reden: %1$s</string>
     <string name="avatar">Avatar</string>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="one">%d ongelezen bericht waarin u vermeld bent</item>
-        <item quantity="other">%d ongelezen berichten waarin u vermeld bent</item>
+        <item quantity="one">%d ongelezen bericht waarin je vermeld bent</item>
+        <item quantity="other">%d ongelezen berichten waarin je vermeld bent</item>
     </plurals>
     <string name="title_activity_choose_sticker">Verstuur een sticker</string>
     <string name="option_send_sticker">Sticker versturen</string>
-    <string name="no_sticker_application_dialog_content">U heeft momenteel geen stickerpakketten ingeschakeld.
+    <string name="no_sticker_application_dialog_content">Je hebt momenteel geen stickerpakketten ingeschakeld.
 \n
-\nWilt u er nu een paar toevoegen\?</string>
+\nWil je er nu een paar toevoegen\?</string>
     <string name="settings_deactivate_account_section">Account deactiveren</string>
     <string name="settings_deactivate_my_account">Mijn account deactiveren</string>
     <string name="settings_opt_in_of_analytics">Statistische gegevens (analytics) versturen</string>
     <string name="settings_opt_in_of_analytics_summary">${app_name} verzamelt anonieme statistische gegevens (analytics) om het voor ons mogelijk te maken om de app te verbeteren.</string>
     <string name="widget_integration_missing_parameter">Er ontbreekt een vereiste parameter.</string>
-    <string name="dialog_user_consent_content">Om de %1$s-server verder te blijven gebruiken, dient u de voorwaarden te lezen en ermee akkoord te gaan.</string>
+    <string name="dialog_user_consent_content">Om de %1$s-server verder te blijven gebruiken, dien je de voorwaarden te lezen en ermee akkoord te gaan.</string>
     <string name="dialog_user_consent_submit">Nu doorlezen</string>
     <string name="deactivate_account_title">Account deactiveren</string>
-    <string name="deactivate_account_content">Dit zal uw account voorgoed onbruikbaar maken. U zult zich niet meer kunnen aanmelden, en niemand anders zal met dezelfde persoon-ID kunnen registreren. Dit zal er voor zorgen dat uw account alle gesprekken verlaat waar deze momenteel lid van is, en het verwijdert de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>
+    <string name="deactivate_account_content">Dit zal je account voorgoed onbruikbaar maken. Je zal je niet meer kunnen aanmelden, en niemand anders zal met dezelfde persoon-ID kunnen registreren. Dit zal er voor zorgen dat jouw account alle gesprekken verlaat waar deze momenteel lid van is, en het verwijdert de accountgegevens van de identiteitsserver. <b>Deze actie is onomkeerbaar.</b>
 \n
-\nHet deactiveren van uw account <b>zal er niet standaard voor zorgen dat de berichten die u hebt verzonden worden vergeten.</b> Indien u wilt dat wij de berichten vergeten, vinkt u het vakje hieronder aan.
+\nHet deactiveren van je account <b>zal er niet standaard voor zorgen dat de berichten die je hebt verzonden worden vergeten.</b> Indien je wil dat wij de berichten vergeten, vink je het vakje hieronder aan.
 \n
-\nDe zichtbaarheid van berichten in Matrix is gelijkaardig aan e-mails. Het vergeten van uw berichten betekent dat berichten die u verstuurd heeft niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.</string>
+\nDe zichtbaarheid van berichten in Matrix is gelijkaardig aan e-mails. Het vergeten van jouw berichten betekent dat berichten die je verstuurd hebt niet meer gedeeld worden met nieuwe of ongeregistreerde gebruikers, maar geregistreerde gebruikers die al toegang hebben tot deze berichten zullen alsnog toegang hebben tot hun eigen kopie ervan.</string>
     <string name="deactivate_account_delete_checkbox">Vergeet alle berichten die ik heb verstuurd wanneer mijn account gedeactiveerd is (<b>Let op:</b> dit zal er voor zorgen dat toekomstige personen een onvolledig beeld krijgen van gesprekken)</string>
     <string name="deactivate_account_submit">Account deactiveren</string>
     <string name="action_download">Downloaden</string>
-    <string name="e2e_re_request_encryption_key">Beveiligingssleutels van uw sessies <u>opnieuw aanvragen</u>.</string>
+    <string name="e2e_re_request_encryption_key">Beveiligingssleutels van je sessies <u>opnieuw aanvragen</u>.</string>
     <string name="e2e_re_request_encryption_key_dialog_content">Start ${app_name} op een ander apparaat dat het bericht kan ontsleutelen, zodat het de sleutels naar deze sessie kan sturen.</string>
     <string name="option_send_voice">Spraakbericht versturen</string>
     <string name="error_no_external_application_found">Sorry, er is geen externe toepassing gevonden om deze actie te voltooien.</string>
-    <string name="error_empty_field_your_password">Voer uw wachtwoord in.</string>
+    <string name="error_empty_field_your_password">Voer je wachtwoord in.</string>
     <string name="send_bug_report_description_in_english">Beschrijf het probleem in het Engels, indien mogelijk.</string>
     <string name="settings_preview_media_before_sending">Media bekijken vóór het versturen</string>
     <string name="command_description_emote">Geeft activiteit weer</string>
@@ -433,7 +433,7 @@
     <string name="command_description_part_room">Gesprek verlaten</string>
     <string name="command_description_topic">Onderwerp van het gesprek instellen</string>
     <string name="command_description_remove_user">Stuurt persoon met gegeven ID eruit</string>
-    <string name="command_description_nick">Wijzigt uw weergavenaam</string>
+    <string name="command_description_nick">Wijzig je weergavenaam</string>
     <string name="command_description_markdown">Markdown aan/uit</string>
     <string name="room_tombstone_versioned_description">Dit gesprek is vervangen en is niet langer actief.</string>
     <string name="room_tombstone_continuation_link">Het gesprek wordt hier voortgezet</string>
@@ -445,7 +445,7 @@
         <item quantity="other">%d geselecteerd</item>
     </plurals>
     <string name="command_description_clear_scalar_token">Om Matrix-appbeheer te herstellen</string>
-    <string name="resource_limit_contact_admin">contact op te nemen met uw dienstbeheerder</string>
+    <string name="resource_limit_contact_admin">contact op te nemen met je dienstbeheerder</string>
     <string name="resource_limit_soft_default">Deze server heeft een van zijn bronlimieten overschreden, dus <b>sommige personen zullen zich niet kunnen aanmelden</b>.</string>
     <string name="resource_limit_hard_default">Deze server heeft een van zijn bronlimieten overschreden.</string>
     <string name="resource_limit_soft_mau"> Deze server heeft zijn limiet voor maandelijks actieve personen overschreden, dus <b>sommige personen zullen zich niet kunnen aanmelden</b>.</string>
@@ -460,11 +460,11 @@
     <string name="settings_call_ringtone_title">Beltoon voor inkomende oproepen</string>
     <string name="settings_call_ringtone_dialog_title">Selecteer beltoon voor oproepen:</string>
     <string name="room_participants_action_remove">Eruit sturen</string>
-    <string name="settings_inline_url_preview_summary">Voorvertoning van koppelingen in het gesprek tonen (als uw server deze functie ondersteunt).</string>
+    <string name="settings_inline_url_preview_summary">Voorvertoning van koppelingen in het gesprek tonen (als je server deze functionaliteit ondersteunt).</string>
     <string name="settings_send_typing_notifs">Typmeldingen versturen</string>
-    <string name="settings_send_typing_notifs_summary">Laat andere personen weten dat u aan het typen bent.</string>
+    <string name="settings_send_typing_notifs_summary">Laat andere personen weten dat je aan het typen bent.</string>
     <string name="settings_send_markdown">Markdown-opmaak</string>
-    <string name="settings_send_markdown_summary">Maak berichten op met Markdown-syntax voordat ze verstuurd worden. Hiermee kunt u uitgebreide opmaak gebruiken, zoals sterretjes voor schuingedrukte tekst.</string>
+    <string name="settings_send_markdown_summary">Maak berichten op met Markdown-syntax voordat ze verstuurd worden. Hiermee kan je uitgebreide opmaak gebruiken, zoals sterretjes voor schuingedrukte tekst.</string>
     <string name="settings_show_read_receipts">Leesbevestigingen weergeven</string>
     <string name="settings_show_read_receipts_summary">Tik op de leesbevestigingen voor een uitgebreide lijst.</string>
     <string name="settings_show_join_leave_messages">Toetredingen en verlatingen weergeven</string>
@@ -473,18 +473,18 @@
     <string name="settings_show_avatar_display_name_changes_messages_summary">Omvat veranderingen in avatar en weergavenaam.</string>
     <string name="title_activity_keys_backup_setup">Sleutelback-up</string>
     <string name="title_activity_keys_backup_restore">Sleutelback-up gebruiken</string>
-    <string name="sign_out_bottom_sheet_warning_no_backup">Indien u zich nu afmeldt, zult u uw versleutelde berichten verliezen</string>
-    <string name="sign_out_bottom_sheet_warning_backing_up">Sleutelback-up is bezig. Indien u zich nu afmeldt, zult u de toegang tot uw versleutelde berichten verliezen.</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">Veilige sleutelback-up dient actief te zijn op al uw sessies om de toegang tot uw versleutelde berichten niet te verliezen.</string>
+    <string name="sign_out_bottom_sheet_warning_no_backup">Indien je jezelf nu afmeldt, zal je jouw versleutelde berichten verliezen</string>
+    <string name="sign_out_bottom_sheet_warning_backing_up">Sleutelback-up is bezig. Indien je jezelf nu afmeldt, zal je de toegang tot jouw versleutelde berichten verliezen.</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">Veilige sleutelback-up dient actief te zijn op al je sessies om de toegang tot je versleutelde berichten niet te verliezen.</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">Ik wil mijn versleutelde berichten niet</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">Sleutels worden geback-upt…</string>
-    <string name="are_you_sure">Weet u het zeker\?</string>
+    <string name="are_you_sure">Weet je het zeker\?</string>
     <string name="backup">Back-up maken</string>
-    <string name="sign_out_bottom_sheet_will_lose_secure_messages">U zult de toegang tot uw versleutelde berichten verliezen, tenzij u eerst een back-up van uw sleutels maakt vooraleer u zich afmeldt.</string>
+    <string name="sign_out_bottom_sheet_will_lose_secure_messages">Je zal de toegang tot je versleutelde berichten verliezen, tenzij je eerst een back-up van je sleutels maakt voordat je jezelf afmeldt.</string>
     <string name="action_skip">Overslaan</string>
     <string name="done">Klaar</string>
     <string name="action_ignore">Negeren</string>
-    <string name="action_sign_out_confirmation_simple">Weet u zeker dat u zich wilt afmelden\?</string>
+    <string name="action_sign_out_confirmation_simple">Weet je zeker dat je jezelf wilt afmelden\?</string>
     <string name="action_mark_room_read">Markeren als gelezen</string>
     <string name="auth_login_sso">Aanmelden met unieke aanmelding</string>
     <string name="video_call_in_progress">Video-oproep gaande…</string>
@@ -494,7 +494,7 @@
     <string name="settings_troubleshoot_diagnostic">Diagnostische probleemoplossingsinformatie</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Testen uitvoeren</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Bezig met uitvoeren… (%1$d van %2$d)</string>
-    <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose is oké. Als u nog steeds geen meldingen ontvangt, gelieve dan een bugmelding in te dienen om ons te helpen onderzoeken.</string>
+    <string name="settings_troubleshoot_diagnostic_success_status">Basisdiagnose is oké. Als je nog steeds geen meldingen ontvangt, gelieve dan een bugmelding in te dienen om ons te helpen onderzoeken.</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Er zijn één of meer tests mislukt, probeer de aanbevolen oplossing(en).</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">Er zijn één of meer tests mislukt, gelieve een bugmelding in te dienen om ons te helpen onderzoeken.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Systeeminstellingen.</string>
@@ -503,8 +503,8 @@
 \nGelieve deze te controleren.</string>
     <string name="open_settings">Instellingen openen</string>
     <string name="settings_troubleshoot_test_account_settings_title">Accountinstellingen.</string>
-    <string name="settings_troubleshoot_test_account_settings_success">Meldingen zijn ingeschakeld voor uw account.</string>
-    <string name="settings_troubleshoot_test_account_settings_failed">Meldingen zijn uitgeschakeld voor uw account.
+    <string name="settings_troubleshoot_test_account_settings_success">Meldingen zijn ingeschakeld voor jouw account.</string>
+    <string name="settings_troubleshoot_test_account_settings_failed">Meldingen zijn uitgeschakeld voor jouw account.
 \nGelieve de accountinstellingen te controleren.</string>
     <string name="settings_troubleshoot_test_account_settings_quickfix">Inschakelen</string>
     <string name="settings_troubleshoot_test_device_settings_title">Sessie-instellingen.</string>
@@ -514,7 +514,7 @@
     <string name="settings_troubleshoot_test_device_settings_quickfix">Inschakelen</string>
     <string name="settings_troubleshoot_test_bing_settings_title">Aangepaste instellingen.</string>
     <string name="settings_troubleshoot_test_bing_settings_success_with_warn">Sommige soorten berichten zijn stil (ze geven een geluidsloze melding).</string>
-    <string name="settings_troubleshoot_test_bing_settings_failed">Sommige meldingen zijn uitgeschakeld in uw aangepaste instellingen.</string>
+    <string name="settings_troubleshoot_test_bing_settings_failed">Sommige meldingen zijn uitgeschakeld in je aangepaste instellingen.</string>
     <string name="settings_troubleshoot_test_play_services_title">Play-diensten controleren</string>
     <string name="settings_troubleshoot_test_play_services_success">De APK van Google Play Services is beschikbaar en up-to-date.</string>
     <string name="settings_troubleshoot_test_play_services_failed">${app_name} maakt gebruikt van Google Play Services om pushberichten af te leveren, maar dit lijkt niet juist geconfigureerd te zijn:
@@ -528,7 +528,7 @@
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nDeze fout is onafhankelijk van ${app_name}. Volgens Google betekent deze fout dat het apparaat te veel apps heeft geregistreerd met FCM. De fout treedt enkel op ingeval er een enorm aantal apps is, dus zou dit de gemiddelde persoon niet mogen hinderen.</string>
     <string name="settings_troubleshoot_test_fcm_failed_service_not_available">[%1$s]
-\nDeze fout is onafhankelijk van ${app_name}. Ze kan verschillende oorzaken hebben. Misschien werkt het als u het later opnieuw probeert. U kunt ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van uw apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
+\nDeze fout is onafhankelijk van ${app_name}. Ze kan verschillende oorzaken hebben. Misschien werkt het als je het later opnieuw probeert. Je kan ook controleren of het gegevensverbruik van Google Play Services niet wordt beperkt in de systeeminstellingen, of dat de klok van je apparaat wel juist staat, of dat het misschien aan een aangepaste ROM ligt.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing">[%1$s]
 \nDeze fout is onafhankelijk van ${app_name}. Er is geen Google-account verbonden met de telefoon. Open het accountbeheer en voeg er een Google-account toe.</string>
     <string name="settings_troubleshoot_test_fcm_failed_account_missing_quick_fix">Account toevoegen</string>
@@ -538,13 +538,13 @@
 \n%1$s</string>
     <string name="settings_troubleshoot_test_service_boot_title">Starten bij opstarten van apparaat</string>
     <string name="settings_troubleshoot_test_service_boot_success">De dienst zal starten wanneer het apparaat wordt herstart.</string>
-    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en u zult geen meldingen ontvangen tot u ${app_name} hebt geopend.</string>
+    <string name="settings_troubleshoot_test_service_boot_failed">De dienst zal niet starten wanneer het apparaat wordt herstart en je zal geen meldingen ontvangen tot je ${app_name} hebt geopend.</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">Starten bij opstarten inschakelen</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">Achtergrondbeperkingen controleren</string>
     <string name="settings_troubleshoot_test_bg_restricted_success">Achtergrondbeperkingen zijn uitgeschakeld voor ${app_name}. Deze test dient uitgevoerd te worden met een mobiele verbinding (geen wifi).
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_failed">Achtergrondbeperkingen zijn ingeschakeld voor ${app_name}.
-\nAl wat de app probeert te doen zal in de achtergrond hevig beperkt worden; dit kan het correct functioneren van meldingen beïnvloeden.
+\nAlles wat de app probeert te doen zal in de achtergrond hevig beperkt worden; dit kan het correct functioneren van meldingen beïnvloeden.
 \n%1$s</string>
     <string name="settings_troubleshoot_test_bg_restricted_quickfix">Beperkingen uitschakelen</string>
     <string name="settings_troubleshoot_test_battery_title">Accuoptimalisatie</string>
@@ -566,7 +566,7 @@
     <string name="settings_default_media_source">Standaardmediabron</string>
     <string name="media_source_choose">Kiezen</string>
     <string name="settings_play_shutter_sound">Sluitergeluid afspelen</string>
-    <string name="encryption_export_notice">Maak een wachtwoord aan om de geëxporteerde sleutels mee te versleutelen. U heeft dit wachtwoord nodig om de sleutels te kunnen importeren.</string>
+    <string name="encryption_export_notice">Maak een wachtwoord aan om de geëxporteerde sleutels mee te versleutelen. Je hebt dit wachtwoord nodig om de sleutels te kunnen importeren.</string>
     <string name="encryption_message_recovery">Herstel van versleutelde berichten</string>
     <string name="encryption_settings_manage_message_recovery_summary">Sleutelback-up beheren</string>
     <plurals name="notification_compat_summary_line_for_room">
@@ -599,27 +599,27 @@
     <string name="passphrase_passphrase_does_not_match">Wachtwoorden komen niet overeen</string>
     <string name="passphrase_empty_error_message">Voer een wachtwoord in</string>
     <string name="passphrase_passphrase_too_weak">Wachtwoord is te zwak</string>
-    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als u wilt dat ${app_name} een herstelsleutel genereert.</string>
-    <string name="keys_backup_setup_step1_title">Verlies nooit uw versleutelde berichten</string>
-    <string name="keys_backup_setup_step1_description">Berichten in versleutelde gesprekken worden beveiligd met end-to-end-versleuteling. Enkel de ontvanger(s) en u hebben de sleutels om deze berichten te lezen.
+    <string name="keys_backup_passphrase_not_empty_error_message">Verwijder het wachtwoord als je wil dat ${app_name} een herstelsleutel genereert.</string>
+    <string name="keys_backup_setup_step1_title">Verlies nooit jouw versleutelde berichten</string>
+    <string name="keys_backup_setup_step1_description">Berichten in versleutelde gesprekken worden beveiligd met eind-to-eind-versleuteling. Enkel de ontvanger(s) en jij hebben de sleutels om deze berichten te lezen.
 \n
-\nMaak een veilige back-up van uw sleutels om ze niet te verliezen.</string>
+\nMaak een veilige back-up van jouw sleutels om ze niet te verliezen.</string>
     <string name="keys_backup_setup">Begin sleutelback-up te gebruiken</string>
     <string name="keys_backup_setup_step1_advanced">(Geavanceerd)</string>
     <string name="keys_backup_setup_step1_manual_export">Sleutels handmatig exporteren</string>
-    <string name="keys_backup_setup_step2_text_title">Beveilig uw back-up met een wachtwoord.</string>
-    <string name="keys_backup_setup_step2_text_description">We bewaren een versleutelde kopie van uw sleutels op onze server. Bescherm uw back-up met een wachtwoord om deze veilig te houden.
+    <string name="keys_backup_setup_step2_text_title">Beveilig je back-up met een wachtwoord.</string>
+    <string name="keys_backup_setup_step2_text_description">We bewaren een versleutelde kopie van jouw sleutels op onze server. Bescherm je back-up met een wachtwoord om deze veilig te houden.
 \n
-\nVoor een maximale beveiliging zou deze sleutel moeten verschillen van uw accountwachtwoord.</string>
+\nVoor een maximale beveiliging zou deze sleutel moeten verschillen van je accountwachtwoord.</string>
     <string name="keys_backup_setup_step2_button_title">Wachtwoord instellen</string>
     <string name="keys_backup_setup_creating_backup">Back-up wordt aangemaakt</string>
-    <string name="keys_backup_setup_step1_recovery_key_alternative">Of beveilig uw back-up met een herstelsleutel, en bewaar deze op een veilige plaats.</string>
+    <string name="keys_backup_setup_step1_recovery_key_alternative">Of beveilig je back-up met een herstelsleutel, en bewaar deze op een veilige plaats.</string>
     <string name="keys_backup_setup_step2_skip_button_title">(Geavanceerd) Instellen met herstelsleutel</string>
     <string name="keys_backup_setup_step3_success_title">Klaar!</string>
-    <string name="keys_backup_setup_step3_text_line1">Uw sleutels worden geback-upt.</string>
-    <string name="keys_backup_setup_step3_text_line2">Uw herstelsleutel is een veiligheidsnet - u kunt deze gebruiken om de toegang tot uw versleutelde berichten te herstellen indien u uw wachtwoord vergeet.
-\nBewaar uw herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
-    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewaar uw herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
+    <string name="keys_backup_setup_step3_text_line1">Jouw sleutels worden geback-upt.</string>
+    <string name="keys_backup_setup_step3_text_line2">Jouw herstelsleutel is een veiligheidsnet - je kan deze gebruiken om de toegang tot jouw versleutelde berichten te herstellen indien je jouw wachtwoord vergeet.
+\nBewaar je herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
+    <string name="keys_backup_setup_step3_text_line2_no_passphrase">Bewaar je herstelsleutel op een heel veilige plaats, zoals een wachtwoordbeheerder (of een kluis)</string>
     <string name="keys_backup_setup_step3_button_title">Klaar</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">Ik heb een kopie gemaakt</string>
     <string name="keys_backup_setup_step3_copy_button_title">Herstelsleutel opslaan</string>
@@ -630,23 +630,23 @@
     <string name="keys_backup_setup_step3_generating_key_status">Herstelsleutel wordt gegenereerd met wachtwoord, dit proces kan enkele seconden duren.</string>
     <string name="recovery_key">Herstelsleutel</string>
     <string name="unexpected_error">Onverwachte fout</string>
-    <string name="keys_backup_setup_skip_title">Weet u het zeker\?</string>
-    <string name="keys_backup_setup_skip_msg">U kunt de toegang tot uw berichten verliezen indien u zich afmeldt of dit apparaat verliest.</string>
+    <string name="keys_backup_setup_skip_title">Weet je het zeker\?</string>
+    <string name="keys_backup_setup_skip_msg">Je kunt de toegang tot je berichten verliezen indien je jezelf afmeldt of dit apparaat verliest.</string>
     <string name="keys_backup_restore_is_getting_backup_version">Back-upversie wordt opgehaald…</string>
-    <string name="keys_backup_restore_with_passphrase">Gebruik uw herstelwachtwoord om uw versleutelde berichtgeschiedenis te ontgrendelen</string>
-    <string name="keys_backup_restore_use_recovery_key">uw herstelsleutel gebruiken</string>
-    <string name="keys_backup_restore_with_passphrase_helper_with_link">Als u uw herstelwachtwoord niet meer weet, kunt u %s.</string>
-    <string name="keys_backup_restore_with_recovery_key">Gebruik uw herstelsleutel om uw versleutelde berichtgeschiedenis te ontgrendelen</string>
+    <string name="keys_backup_restore_with_passphrase">Gebruik je herstelwachtwoord om jouw versleutelde berichtgeschiedenis te ontgrendelen</string>
+    <string name="keys_backup_restore_use_recovery_key">jouw herstelsleutel gebruiken</string>
+    <string name="keys_backup_restore_with_passphrase_helper_with_link">Als je jouw herstelwachtwoord niet meer weet, kan je %s.</string>
+    <string name="keys_backup_restore_with_recovery_key">Gebruik je herstelsleutel om jouw versleutelde berichtgeschiedenis te ontgrendelen</string>
     <string name="keys_backup_restore_key_enter_hint">Voer de herstelsleutel in</string>
-    <string name="keys_backup_restore_with_key_helper">Herstelsleutel verloren\? U kunt er een nieuwe instellen in de instellingen.</string>
-    <string name="keys_backup_passphrase_error_decrypt">De back-up kan met dit wachtwoord niet ontsleuteld worden: controleer of u het juiste herstelwachtwoord heeft ingevoerd.</string>
+    <string name="keys_backup_restore_with_key_helper">Herstelsleutel verloren\? Je kan er een nieuwe instellen in de instellingen.</string>
+    <string name="keys_backup_passphrase_error_decrypt">De back-up kan met dit wachtwoord niet ontsleuteld worden: controleer of je het juiste herstelwachtwoord hebt ingevoerd.</string>
     <string name="keys_backup_restoring_waiting_message">Back-up wordt hersteld:</string>
     <string name="keys_backup_restoring_computing_key_waiting_message">Herstelsleutel wordt berekend…</string>
     <string name="keys_backup_restoring_downloading_backup_waiting_message">Sleutels worden gedownload…</string>
     <string name="keys_backup_restoring_importing_keys_waiting_message">Sleutels worden geïmporteerd…</string>
     <string name="keys_backup_unlock_button">Geschiedenis ontgrendelen</string>
     <string name="keys_backup_recovery_code_empty_error_message">Voer een herstelsleutel in</string>
-    <string name="keys_backup_recovery_code_error_decrypt">De back-up kan met deze herstelsleutel niet ontsleuteld worden: controleer of u de juiste herstelsleutel heeft ingevoerd.</string>
+    <string name="keys_backup_recovery_code_error_decrypt">De back-up kan met deze herstelsleutel niet ontsleuteld worden: controleer of je de juiste herstelsleutel hebt ingevoerd.</string>
     <string name="keys_backup_restore_success_title">Back-up hersteld %s!</string>
     <plurals name="keys_backup_restore_success_description_part1">
         <item quantity="one">Back-up met %d sleutel hersteld.</item>
@@ -661,18 +661,18 @@
     <string name="keys_backup_settings_delete_backup_button">Back-up verwijderen</string>
     <string name="keys_backup_settings_status_ok">Sleutelback-up is correct ingesteld voor deze sessie.</string>
     <string name="keys_backup_settings_status_ko">Sleutelback-up is niet actief op deze sessie.</string>
-    <string name="keys_backup_settings_status_not_setup">Uw sleutels worden niet geback-upt vanaf deze sessie.</string>
+    <string name="keys_backup_settings_status_not_setup">Jouw sleutels worden niet geback-upt vanaf deze sessie.</string>
     <string name="keys_backup_settings_signature_from_unknown_device">De back-up heeft een ondertekening van een onbekende sessie met ID %s.</string>
     <string name="keys_backup_settings_valid_signature_from_this_device">De back-up heeft een geldige ondertekening van deze sessie.</string>
     <string name="keys_backup_settings_valid_signature_from_verified_device">De back-up heeft een geldige ondertekening van de geverifieerde sessie %s.</string>
     <string name="keys_backup_settings_valid_signature_from_unverified_device">De back-up heeft een geldige ondertekening van de ongeverifieerde sessie %s</string>
     <string name="keys_backup_settings_invalid_signature_from_verified_device">De back-up heeft een ongeldige ondertekening van de geverifieerde sessie %s</string>
     <string name="keys_backup_settings_invalid_signature_from_unverified_device">De back-up heeft een ongeldige ondertekening van de ongeverifieerde sessie %s</string>
-    <string name="keys_backup_settings_untrusted_backup">Herstel nu met uw wachtwoord of herstelsleutel om sleutelback-up op deze sessie te gebruiken.</string>
+    <string name="keys_backup_settings_untrusted_backup">Herstel nu met je wachtwoord of herstelsleutel om sleutelback-up op deze sessie te gebruiken.</string>
     <string name="keys_backup_settings_deleting_backup">Back-up wordt verwijderd…</string>
     <string name="keys_backup_settings_delete_confirm_title">Back-up verwijderen</string>
-    <string name="keys_backup_settings_delete_confirm_message">Uw geback-upte versleutelingssleutels verwijderen van de server\? U zult uw herstelsleutel niet meer kunnen gebruiken om de versleutelde berichtgeschiedenis te lezen.</string>
-    <string name="keys_backup_banner_recover_line1">Verlies nooit uw versleutelde berichten</string>
+    <string name="keys_backup_settings_delete_confirm_message">Jouw geback-upte versleutelingssleutels verwijderen van de server\? Je zal jouw herstelsleutel niet meer kunnen gebruiken om de versleutelde berichtgeschiedenis te lezen.</string>
+    <string name="keys_backup_banner_recover_line1">Verlies nooit je versleutelde berichten</string>
     <string name="keys_backup_banner_recover_line2">Sleutelback-up gebruiken</string>
     <string name="keys_backup_banner_update_line1">Nieuwe sleutels voor versleutelde berichten</string>
     <string name="keys_backup_banner_update_line2">Beheren in sleutelback-up</string>
@@ -687,21 +687,21 @@
     <string name="keys_backup_info_title_signature">Ondertekening</string>
     <string name="error_jitsi_not_supported_on_old_device">Sorry, vergadergesprekken met Jitsi worden nog niet ondersteund op oudere apparaten (met een Android-versie lager dan 6.0)</string>
     <string name="encryption_information_unknown_ip">onbekend IP-adres</string>
-    <string name="you_added_a_new_device_with_info">Een nieuwe sessie vraagt versleutelingssleutels aan. 
-\nSessienaam: %1$s 
-\nLaatst gezien: %2$s 
-\nAls u zich niet heeft aangemeld op een andere sessie, negeer dan dit verzoek.</string>
-    <string name="your_unverified_device_requesting_with_info">Een ongeverifieerde sessie vraagt versleutelingssleutels aan. 
-\nSessienaam: %1$s 
-\nLaatst gezien: %2$s 
-\nAls u zich niet heeft aangemeld op een andere sessie, negeer dan dit verzoek.</string>
+    <string name="you_added_a_new_device_with_info">Een nieuwe sessie vraagt versleutelingssleutels aan.
+\nSessienaam: %1$s
+\nLaatst gezien: %2$s
+\nAls je jezelf niet hebt aangemeld op een andere sessie, negeer dan dit verzoek.</string>
+    <string name="your_unverified_device_requesting_with_info">Een ongeverifieerde sessie vraagt versleutelingssleutels aan.
+\nSessienaam: %1$s
+\nLaatst gezien: %2$s
+\nAls je jezelf niet hebt aangemeld op een andere sessie, negeer dan dit verzoek.</string>
     <string name="share_without_verifying_short_label">Delen</string>
     <string name="key_share_request">Sleuteldeelverzoek</string>
     <string name="ignore_request_short_label">Negeren</string>
     <string name="sas_verified">Geverifieerd!</string>
     <string name="sas_got_it">Ik snap het</string>
     <string name="sas_incoming_request_notif_title">Verificatieverzoek</string>
-    <string name="sas_incoming_request_notif_content">%s wil uw sessie verifiëren</string>
+    <string name="sas_incoming_request_notif_content">%s wil je sessie verifiëren</string>
     <string name="sas_error_unknown">Onbekende fout</string>
     <string name="none">Geen</string>
     <string name="action_revoke">Intrekken</string>
@@ -712,17 +712,17 @@
     <string name="settings_background_fdroid_sync_mode">Synchroniseren op de achtergrond</string>
     <string name="settings_background_fdroid_sync_mode_battery">Geoptimaliseerd voor batterij</string>
     <string name="settings_background_fdroid_sync_mode_battery_description">${app_name} zal op een batterijzuinige manier synchroniseren op de achtergrond.
-\nAfhankelijk van de staat van uw apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
+\nAfhankelijk van de staat van je apparaat kan het besturingssysteem de synchronisatie uitstellen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time">Geoptimaliseerd voor snelheid</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} zal periodiek op de achtergrond synchroniseren (configureerbaar).
-\nDit heeft een negatieve impact op uw batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
+\nDit heeft een negatieve impact op je batterij- en datagebruik. Er zal een melding getoond worden ter informatie.</string>
     <string name="settings_background_fdroid_sync_mode_disabled">Geen achtergrondssynchronisatie</string>
-    <string name="settings_background_fdroid_sync_mode_disabled_description">U zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
+    <string name="settings_background_fdroid_sync_mode_disabled_description">Je zal geen melding van berichten ontvangen als de app zich in de achtergrond bevindt.</string>
     <string name="settings_integrations">Integraties</string>
     <string name="settings_integrations_summary">Gebruik een integratiebeheerder om bots, bruggen, widgets en stickerpakketten te beheren.
-\nIntegratiebeheerders ontvangen configuratiedata en kunnen widgets aanpassen, gespreksuitnodigingen versturen en bestuursniveaus instellen namens u.</string>
+\nIntegratiebeheerders ontvangen configuratiedata en kunnen widgets aanpassen, gespreksuitnodigingen versturen en bestuursniveaus instellen namens jou.</string>
     <string name="settings_discovery_category">Ontdekken</string>
-    <string name="settings_discovery_manage">Beheer uw ontdekkingsinstellingen.</string>
+    <string name="settings_discovery_manage">Beheer jouw ontdekkingsinstellingen.</string>
     <string name="settings_integration_allow">Integraties toestaan</string>
     <string name="settings_integration_manager">Integratiebeheerder</string>
     <string name="room_widget_activity_title">Widget</string>
@@ -735,10 +735,10 @@
     <string name="room_widget_reload">Widget herladen</string>
     <string name="room_widget_open_in_browser">Openen in browser</string>
     <string name="room_widget_revoke_access">Toegang intrekken voor mij</string>
-    <string name="room_widget_permission_display_name">Uw weergavenaam</string>
-    <string name="room_widget_permission_avatar_url">Uw profielfoto-URL</string>
-    <string name="room_widget_permission_user_id">Uw persoon-ID</string>
-    <string name="room_widget_permission_theme">Uw thema</string>
+    <string name="room_widget_permission_display_name">Jouw weergavenaam</string>
+    <string name="room_widget_permission_avatar_url">Jouw profielfoto-URL</string>
+    <string name="room_widget_permission_user_id">Jouw persoon-ID</string>
+    <string name="room_widget_permission_theme">Jouw thema</string>
     <string name="room_widget_permission_widget_id">Widget-ID</string>
     <string name="room_widget_permission_room_id">Gespreks-ID</string>
     <string name="room_widget_resource_permission_title">Deze widget wil gebruik maken van de volgende bronnen:</string>
@@ -747,25 +747,25 @@
     <string name="room_widget_webview_access_camera">Camera gebruiken</string>
     <string name="room_widget_webview_access_microphone">Microfoon gebruiken</string>
     <string name="room_widget_webview_read_protected_media">DRM-beschermde media lezen</string>
-    <string name="widget_integration_review_terms">Om verder te gaan dient u de dienstvoorwaarden te aanvaarden.</string>
-    <string name="keys_backup_setup_override_backup_prompt_tile">Er bestaat al een back-up op uw server</string>
-    <string name="keys_backup_setup_override_backup_prompt_description">Het lijkt erop dat u al een back-up van uw herstelsleutel heeft uit een andere sessie. Wilt u deze vervangen door degene die u nu aanmaakt\?</string>
+    <string name="widget_integration_review_terms">Om verder te gaan dien je de dienstvoorwaarden te aanvaarden.</string>
+    <string name="keys_backup_setup_override_backup_prompt_tile">Er bestaat al een back-up op je server</string>
+    <string name="keys_backup_setup_override_backup_prompt_description">Het lijkt erop dat je al een back-up van je herstelsleutel heeft uit een andere sessie. Wilt je deze vervangen door degene die je nu aanmaakt\?</string>
     <string name="keys_backup_setup_override_replace">Vervangen</string>
     <string name="keys_backup_setup_override_stop">Stoppen</string>
     <string name="keys_backup_settings_checking_backup_state">Back-upstatus wordt gecontroleerd</string>
-    <string name="identity_server_not_defined">U gebruikt geen identiteitsserver</string>
-    <string name="error_user_already_logged_in">Het lijkt er op dat u probeert verbinding te maken met een andere server. Wil je uitloggen\?</string>
+    <string name="identity_server_not_defined">Je gebruikt geen identiteitsserver</string>
+    <string name="error_user_already_logged_in">Het lijkt er op dat je probeert verbinding te maken met een andere server. Wil je uitloggen\?</string>
     <string name="edit">Bewerken</string>
     <string name="reply">Beantwoorden</string>
     <string name="global_retry">Opnieuw proberen</string>
-    <string name="send_you_invite">Heeft u een uitnodiging gestuurd</string>
+    <string name="send_you_invite">Heeft je een uitnodiging gestuurd</string>
     <string name="invited_by">Uitgenodigd door %s</string>
-    <string name="room_list_catchup_empty_title">U bent helemaal bij!</string>
-    <string name="room_list_catchup_empty_body">U hebt geen ongelezen berichten meer</string>
+    <string name="room_list_catchup_empty_title">Je bent helemaal bij!</string>
+    <string name="room_list_catchup_empty_body">Je hebt geen ongelezen berichten meer</string>
     <string name="room_list_people_empty_title">Gesprekken</string>
-    <string name="room_list_people_empty_body">Uw directe gesprekken zullen hier worden weergegeven. Gebruik de + knop rechts onder om een gesprek te starten.</string>
+    <string name="room_list_people_empty_body">Jouw directe gesprekken zullen hier worden weergegeven. Gebruik de + knop rechts onder om een gesprek te starten.</string>
     <string name="room_list_rooms_empty_title">Kamers</string>
-    <string name="room_list_rooms_empty_body">Uw kamers zullen hier worden weergegeven. Gebruik de + knop rechtsonder om een bestaande kamer te openen of een nieuwe aan te maken.</string>
+    <string name="room_list_rooms_empty_body">Jouw kamers zullen hier worden weergegeven. Gebruik de + knop rechtsonder om een bestaande kamer te openen of een nieuwe aan te maken.</string>
     <string name="title_activity_emoji_reaction_picker">Reacties</string>
     <string name="action_agree">Bevestigen</string>
     <string name="message_add_reaction">Reactie Toevoegen</string>
@@ -775,7 +775,7 @@
     <string name="event_redacted_by_admin_reason">Gebeurtenis gemodereerd door gesprek beheerder</string>
     <string name="malformed_message">Niet correcte gebeurtenis, kan niet weergeven</string>
     <string name="create_new_room">Nieuwe kamer aanmaken</string>
-    <string name="error_no_network">Geen netwerk. Controleer uw internet verbinding.</string>
+    <string name="error_no_network">Geen netwerk. Controleer je internet verbinding.</string>
     <string name="action_change">Wijzigen</string>
     <string name="change_room_directory_network">Netwerk wijzigen</string>
     <string name="please_wait">Even wachten…</string>
@@ -787,8 +787,8 @@
     <string name="create_room_public_title">Publiek</string>
     <string name="create_room_public_description">Iedereen kan deelnemer worden van deze kamer</string>
     <string name="action_play">Afspelen</string>
-    <string name="notice_room_canonical_alias_unset_by_you">U heeft het hoofdadres voor dit gesprek verwijderd.</string>
-    <string name="notice_room_invite_with_reason_by_you">U heeft %1$s uitgenodigd. Reden: %2$s</string>
+    <string name="notice_room_canonical_alias_unset_by_you">Je hebt het hoofdadres voor dit gesprek verwijderd.</string>
+    <string name="notice_room_invite_with_reason_by_you">Je hebt %1$s uitgenodigd. Reden: %2$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">Jouw uitnodiging. Reden: %1$s</string>
     <string name="event_status_sent_message">Bericht verstuurd</string>
     <string name="initial_sync_start_downloading">Initiële synchronisatie:
@@ -797,36 +797,36 @@
 \nAan het wachten op een antwoord van de server…</string>
     <string name="room_displayname_empty_room_was">Lege kamer (was %s)</string>
     <string name="power_level_moderator">Moderator</string>
-    <string name="notice_direct_room_third_party_invite_by_you">U heeft %1$s uitgenodigd</string>
+    <string name="notice_direct_room_third_party_invite_by_you">Je hebt %1$s uitgenodigd</string>
     <string name="notice_direct_room_third_party_invite">%1$s nodigde %2$s uit</string>
     <string name="notice_room_server_acl_updated_no_change">Geen verandering.</string>
-    <string name="notice_made_future_direct_room_visibility_by_you">U heeft toekomstige berichten zichtbaar gemaakt voor %1$s</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Je hebt toekomstige berichten zichtbaar gemaakt voor %1$s</string>
     <string name="notice_made_future_direct_room_visibility">%1$s heeft toekomstige berichten zichtbaar gemaakt voor %2$s</string>
-    <string name="notice_ended_call_by_you">U hebt de oproep beëindigd.</string>
-    <string name="notice_answered_call_by_you">U hebt de oproep beantwoord.</string>
-    <string name="notice_display_name_changed_from_by_you">U heeft uw schermnaam gewijzigd van %1$s naar %2$s</string>
-    <string name="notice_display_name_set_by_you">U heeft uw schermnaam ingesteld op %1$s</string>
-    <string name="notice_avatar_url_changed_by_you">U heeft uw avatar aangepast</string>
-    <string name="notice_room_reject_by_you">U heeft de uitnodiging geweigerd</string>
-    <string name="notice_direct_room_leave_by_you">U heeft de kamer verlaten</string>
+    <string name="notice_ended_call_by_you">Je hebt de oproep beëindigd.</string>
+    <string name="notice_answered_call_by_you">Je hebt de oproep beantwoord.</string>
+    <string name="notice_display_name_changed_from_by_you">Je hebt je schermnaam gewijzigd van %1$s naar %2$s</string>
+    <string name="notice_display_name_set_by_you">Je hebt je schermnaam ingesteld op %1$s</string>
+    <string name="notice_avatar_url_changed_by_you">Je hebt je avatar aangepast</string>
+    <string name="notice_room_reject_by_you">Je hebt de uitnodiging geweigerd</string>
+    <string name="notice_direct_room_leave_by_you">Je hebt de kamer verlaten</string>
     <string name="notice_direct_room_leave">%1$s heeft de kamer verlaten</string>
-    <string name="notice_room_leave_by_you">U heeft de kamer verlaten</string>
-    <string name="notice_room_invite_by_you">U heeft %1$s uitgenodigd</string>
-    <string name="notice_direct_room_created_by_you">U heeft de discussie aangemaakt</string>
+    <string name="notice_room_leave_by_you">Je hebt de kamer verlaten</string>
+    <string name="notice_room_invite_by_you">Je hebt %1$s uitgenodigd</string>
+    <string name="notice_direct_room_created_by_you">Je hebt de discussie aangemaakt</string>
     <string name="notice_direct_room_created">%1$s heeft de discussie aangemaakt</string>
-    <string name="notice_room_created_by_you">U heeft de kamer aangemaakt</string>
+    <string name="notice_room_created_by_you">Je hebt de kamer aangemaakt</string>
     <string name="notice_room_created">%1$s heeft de kamer aangemaakt</string>
-    <string name="notice_room_invite_no_invitee_by_you">Uw uitnodiging</string>
-    <string name="notice_room_ban_with_reason_by_you">U heeft %1$s verbannen. Reden: %2$s</string>
-    <string name="notice_room_unban_with_reason_by_you">U heeft de verbanning van %1$s opgeheven. Reden: %2$s</string>
-    <string name="notice_room_remove_with_reason_by_you">U heeft %1$s eruit getrapt. Reden: %2$s</string>
-    <string name="notice_room_reject_with_reason_by_you">U heeft de uitnodiging geweigerd. Reden: %1$s</string>
-    <string name="notice_direct_room_leave_with_reason_by_you">U bent vertrokken. Reden: %1$s</string>
+    <string name="notice_room_invite_no_invitee_by_you">Je uitnodiging</string>
+    <string name="notice_room_ban_with_reason_by_you">Je hebt %1$s verbannen. Reden: %2$s</string>
+    <string name="notice_room_unban_with_reason_by_you">Je hebt de verbanning van %1$s opgeheven. Reden: %2$s</string>
+    <string name="notice_room_remove_with_reason_by_you">Je hebt %1$s eruit getrapt. Reden: %2$s</string>
+    <string name="notice_room_reject_with_reason_by_you">Je hebt de uitnodiging geweigerd. Reden: %1$s</string>
+    <string name="notice_direct_room_leave_with_reason_by_you">Je bent vertrokken. Reden: %1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s is vertrokken. Reden: %2$s</string>
-    <string name="notice_room_leave_with_reason_by_you">U heeft de kamer verlaten. Reden: %1$s</string>
-    <string name="notice_direct_room_join_with_reason_by_you">U heeft zich aangesloten. Reden: %1$s</string>
+    <string name="notice_room_leave_with_reason_by_you">Je hebt de kamer verlaten. Reden: %1$s</string>
+    <string name="notice_direct_room_join_with_reason_by_you">Je hebt je aangesloten. Reden: %1$s</string>
     <string name="notice_direct_room_join_with_reason">%1$s heeft zich aangesloten. Reden: %2$s</string>
-    <string name="notice_room_join_with_reason_by_you">U heeft zich aangesloten bij de kamer. Reden: %1$s</string>
+    <string name="notice_room_join_with_reason_by_you">Je hebt je aangesloten bij de kamer. Reden: %1$s</string>
     <plurals name="room_displayname_four_and_more_members">
         <item quantity="one">%1$s, %2$s, %3$s en %4$d andere</item>
         <item quantity="other">%1$s, %2$s, %3$s en %4$d anderen</item>
@@ -835,75 +835,75 @@
     <string name="room_displayname_3_members">%1$s, %2$s en %3$s</string>
     <string name="notice_power_level_diff">%1$s van %2$s naar %3$s</string>
     <string name="notice_power_level_changed">%1$s heeft het machtigingsniveau van %2$s aangepast.</string>
-    <string name="notice_power_level_changed_by_you">U heeft het machtigingsniveau van %1$s aangepast.</string>
+    <string name="notice_power_level_changed_by_you">Je hebt het machtigingsniveau van %1$s aangepast.</string>
     <string name="power_level_custom_no_value">Speciaal</string>
     <string name="power_level_custom">Speciaal (%1$d)</string>
     <string name="power_level_default">Standaardlid</string>
     <string name="power_level_admin">Beheerder</string>
-    <string name="notice_widget_modified_by_you">U heeft de widget %1$s aangepast</string>
+    <string name="notice_widget_modified_by_you">Je hebt de widget %1$s aangepast</string>
     <string name="notice_widget_modified">%1$s heeft de widget %2$s aangepast</string>
-    <string name="notice_widget_removed_by_you">U heeft de widget %1$s verwijderd</string>
+    <string name="notice_widget_removed_by_you">Je hebt de widget %1$s verwijderd</string>
     <string name="notice_widget_removed">%1$s heeft de widget %2$s verwijderd</string>
-    <string name="notice_widget_added_by_you">U heeft de widget %1$s toegevoegd</string>
+    <string name="notice_widget_added_by_you">Je hebt de widget %1$s toegevoegd</string>
     <string name="notice_widget_added">%1$s heeft de widget %2$s toegevoegd</string>
-    <string name="notice_room_third_party_registered_invite_by_you">U heeft de uitnodiging voor %1$s geaccepteerd</string>
-    <string name="notice_direct_room_third_party_revoked_invite_by_you">U heeft de uitnodiging voor %1$s ingetrokken</string>
+    <string name="notice_room_third_party_registered_invite_by_you">Je hebt de uitnodiging voor %1$s geaccepteerd</string>
+    <string name="notice_direct_room_third_party_revoked_invite_by_you">Je hebt de uitnodiging voor %1$s ingetrokken</string>
     <string name="notice_direct_room_third_party_revoked_invite">%1$s heeft de uitnodiging voor %2$s ingetrokken</string>
-    <string name="notice_room_third_party_revoked_invite_by_you">U heeft de uitnodiging voor %1$s ingetrokken om zich bij de kamer aan te sluiten</string>
-    <string name="notice_room_third_party_invite_by_you">U heeft een uitnodiging gestuurd naar %1$s om zich bij de kamer aan te sluiten</string>
-    <string name="notice_room_avatar_removed_by_you">U heeft de kameravatar verwijderd</string>
+    <string name="notice_room_third_party_revoked_invite_by_you">Je hebt de uitnodiging voor %1$s ingetrokken om zich bij de kamer aan te sluiten</string>
+    <string name="notice_room_third_party_invite_by_you">Je hebt een uitnodiging gestuurd naar %1$s om zich bij de kamer aan te sluiten</string>
+    <string name="notice_room_avatar_removed_by_you">Je hebt de kameravatar verwijderd</string>
     <string name="notice_room_avatar_removed">%1$s heeft de kameravatar verwijderd</string>
-    <string name="notice_room_topic_removed_by_you">U heeft het kameronderwerp verwijderd</string>
-    <string name="notice_room_name_removed_by_you">U heeft de kamernaam verwijderd</string>
-    <string name="notice_room_update_by_you">U heeft de kamer geüpgraded.</string>
-    <string name="notice_call_candidates_by_you">U verstuurde data om het gesprek op te zetten.</string>
+    <string name="notice_room_topic_removed_by_you">Je hebt het kameronderwerp verwijderd</string>
+    <string name="notice_room_name_removed_by_you">Je hebt de kamernaam verwijderd</string>
+    <string name="notice_room_update_by_you">Je hebt de kamer geüpgraded.</string>
+    <string name="notice_call_candidates_by_you">Je verstuurde data om het gesprek op te zetten.</string>
     <string name="notice_call_candidates">%s verstuurde data om het gesprek op te zetten.</string>
-    <string name="notice_placed_voice_call_by_you">U heeft een audiogesprek geopend.</string>
-    <string name="notice_placed_video_call_by_you">U heeft een videogesprek geopend.</string>
-    <string name="notice_room_name_changed_by_you">U heeft de kamernaam veranderd naar: %1$s</string>
-    <string name="notice_room_avatar_changed_by_you">U heeft de kamerafbeelding aangepast</string>
+    <string name="notice_placed_voice_call_by_you">Je hebt een audiogesprek geopend.</string>
+    <string name="notice_placed_video_call_by_you">Je hebt een videogesprek geopend.</string>
+    <string name="notice_room_name_changed_by_you">Je hebt de kamernaam veranderd naar: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Je hebt de kamerafbeelding aangepast</string>
     <string name="notice_room_avatar_changed">%1$s heeft de kamerafbeelding aangepast</string>
-    <string name="notice_room_topic_changed_by_you">U heeft het onderwerp gewijzigd naar: %1$s</string>
-    <string name="notice_display_name_removed_by_you">U heeft uw weergavenaam verwijderd (voorheen %1$s)</string>
-    <string name="notice_room_withdraw_by_you">U heeft de uitnodiging van %1$s ingetrokken</string>
-    <string name="notice_room_ban_by_you">U heeft %1$s verbannen</string>
-    <string name="notice_room_unban_by_you">U heeft de verbanning van %1$s opgeheven</string>
-    <string name="notice_room_remove_by_you">U heeft %1$s eruit getrapt</string>
-    <string name="notice_direct_room_join_by_you">U sloot zich aan</string>
+    <string name="notice_room_topic_changed_by_you">Je hebt het onderwerp gewijzigd naar: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Je hebt je weergavenaam verwijderd (voorheen %1$s)</string>
+    <string name="notice_room_withdraw_by_you">Je hebt de uitnodiging van %1$s ingetrokken</string>
+    <string name="notice_room_ban_by_you">Je hebt %1$s verbannen</string>
+    <string name="notice_room_unban_by_you">Je hebt de verbanning van %1$s opgeheven</string>
+    <string name="notice_room_remove_by_you">Je hebt %1$s verwijderd</string>
+    <string name="notice_direct_room_join_by_you">Je sloot je aan</string>
     <string name="notice_direct_room_join">%1$s sluit aan</string>
-    <string name="notice_room_join_by_you">U heeft de kamer betreden</string>
-    <string name="voice_message_tap_to_stop_toast">Druk op uw opname om te stoppen of om te luisteren</string>
+    <string name="notice_room_join_by_you">Je hebt de kamer betreden</string>
+    <string name="voice_message_tap_to_stop_toast">Druk op je opname om te stoppen of om te luisteren</string>
     <string name="voice_message_release_to_send_toast">Houd ingedrukt om op te nemen, laat los om te versturen</string>
     <string name="a11y_delete_recorded_voice_message">Verwijder opname</string>
     <string name="a11y_recording_voice_message">Stembericht aan het opnemen</string>
     <string name="a11y_pause_voice_message">Pauzeer stembericht</string>
     <string name="a11y_play_voice_message">Speel stembericht af</string>
-    <string name="upgrade_room_for_restricted">Iedereen in %s kan de ruimte vinden en betreden - het is niet nodig om iedereen handmatig uit te nodigen. U kunt dit op elk moment aanpassen in de kamer instellingen.</string>
+    <string name="upgrade_room_for_restricted">Iedereen in %s kan de ruimte vinden en betreden - het is niet nodig om iedereen handmatig uit te nodigen. Je kan dit op elk moment aanpassen in de kamer instellingen.</string>
     <string name="voice_message_reply_content">Stembericht (%1$s)</string>
     <string name="error_voice_message_cannot_reply_or_edit">Kan niet antwoorden of aanpassen als stembericht actief is</string>
     <string name="error_voice_message_unable_to_record">Kan stembericht niet opnemen</string>
     <string name="error_voice_message_unable_to_play">Kan stembericht niet afspelen</string>
-    <string name="notice_room_guest_access_can_join_by_you">U heeft gasten de toegang tot dit gesprek verleend.</string>
-    <string name="notice_room_canonical_alias_set_by_you">U heeft het hoofdadres voor dit gesprek ingesteld op %1$s.</string>
-    <string name="notice_room_aliases_added_and_removed_by_you">U heeft %1$s als gespreksadres toegevoegd en %2$s verwijderd.</string>
+    <string name="notice_room_guest_access_can_join_by_you">Je hebt gasten de toegang tot dit gesprek verleend.</string>
+    <string name="notice_room_canonical_alias_set_by_you">Je hebt het hoofdadres voor dit gesprek ingesteld op %1$s.</string>
+    <string name="notice_room_aliases_added_and_removed_by_you">Je hebt %1$s als gespreksadres toegevoegd en %2$s verwijderd.</string>
     <plurals name="notice_room_aliases_removed_by_you">
-        <item quantity="one">U heeft %1$s als gespreksadres verwijderd.</item>
-        <item quantity="other">U heeft %1$s als gespreksadressen verwijderd.</item>
+        <item quantity="one">Je hebt %1$s als gespreksadres verwijderd.</item>
+        <item quantity="other">Je hebt %1$s als gespreksadressen verwijderd.</item>
     </plurals>
     <plurals name="notice_room_aliases_added_by_you">
-        <item quantity="one">U heeft %1$s als kameradres toegevoegd.</item>
-        <item quantity="other">U heeft %1$s als kameradressen toegevoegd.</item>
+        <item quantity="one">Je hebt %1$s als kameradres toegevoegd.</item>
+        <item quantity="other">Je hebt %1$s als kameradressen toegevoegd.</item>
     </plurals>
-    <string name="notice_room_withdraw_with_reason_by_you">U heeft de uitnodiging van %1$s ingetrokken. Reden: %2$s</string>
-    <string name="notice_room_third_party_registered_invite_with_reason_by_you">U heeft de uitnodiging voor %1$s aanvaard. Reden: %2$s</string>
+    <string name="notice_room_withdraw_with_reason_by_you">Je hebt de uitnodiging van %1$s ingetrokken. Reden: %2$s</string>
+    <string name="notice_room_third_party_registered_invite_with_reason_by_you">Je hebt de uitnodiging voor %1$s aanvaard. Reden: %2$s</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 Alle servers zijn uitgesloten van deelname! Deze kamer kan niet meer gebruikt worden.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Servers die overeenkomen met IP-tekens zijn nu verbannen.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• Servers die overeenkomen met IP-tekens zijn nu toegestaan.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Servers die overeenkomen met IP-letters zijn verbannen.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• Servers die overeenkomen met IP-tekens zijn toegestaan.</string>
     <string name="notice_room_server_acl_set_title">%s heeft de server ACL\'s voor deze kamer ingesteld.</string>
-    <string name="notice_room_server_acl_set_title_by_you">U heeft de server ACL\'s voor deze kamer ingesteld.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">U heeft de server ACL\'s voor deze kamer aangepast.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Je hebt de server ACL\'s voor deze kamer ingesteld.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Je hebt de server ACL\'s voor deze kamer aangepast.</string>
     <string name="notice_room_server_acl_updated_title">%s heeft de server ACL\'s voor deze kamer aangepast.</string>
     <string name="notice_room_server_acl_updated_was_allowed">• Servers die overeenkomen met %s zijn verwijderd uit de toegestane lijst.</string>
     <string name="notice_room_server_acl_updated_allowed">• Servers die overeenkomen met %s zijn nu toegestaan.</string>
@@ -911,9 +911,9 @@
     <string name="notice_room_server_acl_updated_banned">• Servers die overeenkomen met %s zijn nu verbannen.</string>
     <string name="notice_room_server_acl_set_allowed">• Servers die overeenkomen met %s zijn toegestaan.</string>
     <string name="notice_room_server_acl_set_banned">• Servers die overeenkomen met %s zijn verbannen.</string>
-    <string name="notice_direct_room_update_by_you">U heeft hier geüpgraded.</string>
+    <string name="notice_direct_room_update_by_you">Je hebt hier geüpgraded.</string>
     <string name="notice_direct_room_update">%s heeft hier geüpgraded.</string>
-    <string name="notice_made_future_room_visibility_by_you">U heeft toekomstige kamergeschiedenis zichtbaar gemaakt voor %1$s</string>
+    <string name="notice_made_future_room_visibility_by_you">Je hebt toekomstige kamergeschiedenis zichtbaar gemaakt voor %1$s</string>
     <string name="voice_message_n_seconds_warning_toast">%1$ds over</string>
     <string name="direct_room_created_summary_item">%s is toegetreden.</string>
     <string name="sent_verification_conclusion">Conclusie Bevestiging</string>
@@ -958,7 +958,7 @@
     <string name="bootstrap_finish_title">Klaar!</string>
     <string name="message_key">Berichtsleutel</string>
     <string name="recovery_passphrase">Herstelwachtwoordzin</string>
-    <string name="verification_cancelled">Bevestiging Geannuleerd</string>
+    <string name="verification_cancelled">Verificatie geannuleerd</string>
     <string name="settings_key_requests">Sleutelverzoeken</string>
     <string name="delete_event_dialog_title">Verwijderen Bevestigen</string>
     <string name="settings_account_data">Accountgegevens</string>
@@ -988,7 +988,7 @@
     <string name="verification_request_other_cancelled">%s heeft geannuleerd</string>
     <string name="verification_request_you_accepted">Jij hebt geaccepteerd</string>
     <string name="verification_request_other_accepted">%s heeft geaccepteerd</string>
-    <string name="verification_request_you_cancelled">U heeft geannuleerd</string>
+    <string name="verification_request_you_cancelled">Je hebt geannuleerd</string>
     <string name="verification_conclusion_not_secure">Niet beveiligd</string>
     <string name="verification_sas_match">Ze komen overeen</string>
     <string name="create_room_encryption_title">Versleuteling inschakelen</string>
@@ -1055,13 +1055,13 @@
     <string name="settings_notification_other">Overige</string>
     <string name="room_settings_none">Geen</string>
     <string name="room_participants_action_ignore_title">Persoon negeren</string>
-    <string name="room_participants_power_level_demote_warning_title">Uzelf degraderen\?</string>
+    <string name="room_participants_power_level_demote_warning_title">Jezelf degraderen\?</string>
     <string name="room_participants_action_cancel_invite">Uitnodiging annuleren</string>
     <string name="call_hold_action">In de wacht zetten</string>
     <string name="login_error_ssl_other">SSL-fout.</string>
     <string name="call_switch_camera">Camera wisselen</string>
     <string name="sound_device_wireless_headset">Draadloze Koptelefoon</string>
-    <string name="spaces_header">Ruimten</string>
+    <string name="spaces_header">Spaces</string>
     <string name="action_switch">Wisselen</string>
     <string name="upgrade">Opwaarderen</string>
     <string name="space_suggested">Aanbevolen</string>
@@ -1169,10 +1169,10 @@
     <string name="send_file_step_idle">Wachten…</string>
     <string name="push_gateway_item_format">Formaat:</string>
     <string name="push_gateway_item_url">Url:</string>
-    <string name="push_gateway_item_device_name">sessie_naam:</string>
-    <string name="push_gateway_item_app_display_name">app_weergave_naam:</string>
-    <string name="push_gateway_item_push_key">push_key:</string>
-    <string name="push_gateway_item_app_id">app_id:</string>
+    <string name="push_gateway_item_device_name">Sessie weergavenaam:</string>
+    <string name="push_gateway_item_app_display_name">App weergavenaam:</string>
+    <string name="push_gateway_item_push_key">Push key:</string>
+    <string name="push_gateway_item_app_id">App ID:</string>
     <string name="settings_preferences">Voorkeuren</string>
     <string name="settings_general_title">Algemeen</string>
     <string name="active_widget_view_action">BEKIJKEN</string>
@@ -1186,36 +1186,36 @@
     <string name="dialog_title_success">Succes</string>
     <string name="action_copy">Kopiëren</string>
     <string name="denied_permission_camera">Geef toestemming om de camera te gebruiken via de systeeminstellingen om deze actie uit te voeren.</string>
-    <string name="denied_permission_generic">Sommige rechten ontbreken om deze actie uit te voeren, geeft a.u.b. toestemming via de systeeminstellingen.</string>
+    <string name="denied_permission_generic">Sommige rechten ontbreken om deze actie uit te voeren, geeft toestemming via de systeeminstellingen.</string>
     <string name="spaces">Ruimten</string>
     <string name="start_chatting">Begin met chatten</string>
     <string name="action_reset">Herstellen</string>
     <string name="action_dismiss">Afwijzen</string>
     <string name="system_theme">Systeemstandaard</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">U heeft end-to-end-versleuteling ingeschakeld (onbekend algoritme %1$s).</string>
-    <string name="notice_end_to_end_ok_by_you">U heeft end-to-end-versleuteling ingeschakeld.</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">U heeft gasten de toegang tot het gesprek verhinderd.</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">Je hebt eind-tot-eind-versleuteling ingeschakeld (onbekend algoritme %1$s).</string>
+    <string name="notice_end_to_end_ok_by_you">Je hebt eind-tot-eind-versleuteling ingeschakeld.</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">Je hebt gasten de toegang tot het gesprek verhinderd.</string>
     <string name="notice_direct_room_guest_access_forbidden">%1$s heeft gasten de toegang tot het gesprek verhinderd.</string>
-    <string name="notice_room_guest_access_forbidden_by_you">U heeft gasten de toegang tot het gesprek verhinderd.</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">U heeft hier gasten toegelaten.</string>
+    <string name="notice_room_guest_access_forbidden_by_you">Je hebt gasten de toegang tot het gesprek verhinderd.</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">Je hebt hier gasten toegelaten.</string>
     <string name="notice_direct_room_guest_access_can_join">%1$s heeft hier gasten toegelaten.</string>
-    <string name="notice_room_canonical_alias_no_change_by_you">U heeft het gespreksadres gewijzigd.</string>
+    <string name="notice_room_canonical_alias_no_change_by_you">Je hebt het gespreksadres gewijzigd.</string>
     <string name="notice_room_canonical_alias_no_change">%1$s heeft het gespreksadres gewijzigd.</string>
-    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">U heeft het hoofdadres en alternatieve gespreksadres gewijzigd.</string>
+    <string name="notice_room_canonical_alias_main_and_alternative_changed_by_you">Je hebt het hoofdadres en alternatieve gespreksadres gewijzigd.</string>
     <string name="notice_room_canonical_alias_main_and_alternative_changed">%1$s heeft het hoofdadres en alternatieve gespreksadres gewijzigd.</string>
-    <string name="notice_room_canonical_alias_alternative_changed_by_you">U heeft het alternatieve gespreksadres gewijzigd.</string>
+    <string name="notice_room_canonical_alias_alternative_changed_by_you">Je hebt het alternatieve gespreksadres gewijzigd.</string>
     <string name="notice_room_canonical_alias_alternative_changed">%1$s heeft het alternatieve gespreksadres gewijzigd.</string>
     <plurals name="notice_room_canonical_alias_alternative_removed_by_you">
-        <item quantity="one">U heeft alternatief gespreksadres %1$s verwijderd.</item>
-        <item quantity="other">U heeft alternatieve gespreksadressen %1$s verwijderd.</item>
+        <item quantity="one">Je hebt alternatief gespreksadres %1$s verwijderd.</item>
+        <item quantity="other">Je hebt alternatieve gespreksadressen %1$s verwijderd.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_removed">
         <item quantity="one">%1$s heeft %2$s als alternatief gespreksadres verwijderd.</item>
         <item quantity="other">%1$s heeft %2$s als alternatieve gespreksadressen verwijderd.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added_by_you">
-        <item quantity="one">U heeft %1$s als alternatief gespreksadres toegevoegd.</item>
-        <item quantity="other">U heeft %1$s als alternatieve gespreksadressen toegevoegd.</item>
+        <item quantity="one">Je hebt %1$s als alternatief gespreksadres toegevoegd.</item>
+        <item quantity="other">Je hebt %1$s als alternatieve gespreksadressen toegevoegd.</item>
     </plurals>
     <plurals name="notice_room_canonical_alias_alternative_added">
         <item quantity="one">%1$s heeft %2$s als alternatief gespreksadres toegevoegd.</item>
@@ -1224,31 +1224,31 @@
     <string name="login_splash_submit">Aan de slag</string>
     <string name="space_settings_permissions_title">Spacerechten</string>
     <string name="room_settings_permissions_title">Gespreksrechten</string>
-    <string name="space_participants_unban_prompt_msg">Door de verbanning op te heffen kan deze gebruiker opnieuw deelnemer worden van de ruimte.</string>
-    <string name="room_participants_unban_prompt_msg">Door de verbanning op te heffen kan deze gebruiker opnieuw deelnemer worden van de kamer.</string>
-    <string name="space_participants_ban_prompt_msg">Door deze persoon te verbannen zal hij/zij verwijderd worden uit deze space en voorkomen dat hij/zij opnieuw toetreedt.</string>
+    <string name="space_participants_unban_prompt_msg">Door de verbanning op te heffen kan deze persoon opnieuw deelnemer worden van de space.</string>
+    <string name="room_participants_unban_prompt_msg">Door de verbanning op te heffen kan deze persoon opnieuw deelnemer worden van de kamer.</string>
+    <string name="space_participants_ban_prompt_msg">Door deze persoon te verbannen zullen ze verwijderd worden uit deze space en voorkomen dat ze opnieuw toetreden.</string>
     <string name="room_participants_ban_reason">Reden voor verbanning</string>
-    <string name="space_participants_remove_prompt_msg">De gebruiker zal worden verwijderd uit deze ruimte.
+    <string name="space_participants_remove_prompt_msg">De persoon zal worden verwijderd uit deze space.
 \n
-\nOm te voorkomen dat ze opnieuw toetreden, kunt u ze verbannen.</string>
-    <string name="room_participants_remove_prompt_msg">Door deze persoon te verwijderen zal hij/zij niet meer in dit gesprek zitten.
+\nOm te voorkomen dat ze opnieuw toetreden, kan je ze verbannen.</string>
+    <string name="room_participants_remove_prompt_msg">De persoon zal worden verwijderd van deze kamer.
 \n
-\nOm te voorkomen dat hij/zij opnieuw toetreedt, kun je hem/haar ook verbannen.</string>
+\nOm te voorkomen dat ze opnieuw toetreden, kan je ze verbannen.</string>
     <string name="room_participants_remove_reason">Reden voor verwijdering</string>
-    <string name="room_participants_action_cancel_invite_prompt_msg">Weet u zeker dat u uitnodiging voor deze persoon wilt annuleren\?</string>
-    <string name="room_participants_action_unignore_prompt_msg">Als u deze persoon niet negeert, worden alle berichten van deze persoon opnieuw weergegeven.</string>
+    <string name="room_participants_action_cancel_invite_prompt_msg">Weet je zeker dat je de uitnodiging voor deze persoon wilt annuleren\?</string>
+    <string name="room_participants_action_unignore_prompt_msg">Als je deze persoon niet negeert, worden alle berichten van deze persoon opnieuw weergegeven.</string>
     <string name="room_participants_action_ignore_prompt_msg">Door deze persoon te negeren worden zijn/haar berichten verwijderd uit gesprekken die jullie delen.
 \n
-\nU kunt deze actie op elk moment ongedaan maken in de algemene instellingen.</string>
-    <string name="room_participants_power_level_demote_warning_prompt">U kunt deze wijziging niet ongedaan maken omdat uzelf degradeert, als u de laatste persoon met rechten bent in het gesprek zal het onmogelijk zijn om opnieuw rechten te krijgen.</string>
-    <string name="room_participants_leave_private_warning">Deze kamer is niet publiek. U kunt niet opnieuw deelnemer worden zonder uitnodiging.</string>
-    <string name="permissions_denied_add_contact">Toegang verlenen tot uw contactpersonen.</string>
-    <string name="permissions_denied_qr_code">Om de QR-code te scannen moet u toegang verlenen tot de camera.</string>
+\nJe kan deze actie op elk moment ongedaan maken in de algemene instellingen.</string>
+    <string name="room_participants_power_level_demote_warning_prompt">Je kan deze wijziging niet ongedaan maken omdat je jezelf degradeert, als je de laatste persoon met rechten bent in het gesprek zal het onmogelijk zijn om opnieuw rechten te krijgen.</string>
+    <string name="room_participants_leave_private_warning">Deze kamer is niet publiek. Je kan niet opnieuw deelnemer worden zonder uitnodiging.</string>
+    <string name="permissions_denied_add_contact">Toegang verlenen tot je contactpersonen.</string>
+    <string name="permissions_denied_qr_code">Om de QR-code te scannen moet je toegang verlenen tot de camera.</string>
     <string name="call_remove_jitsi_widget_progress">Oproep beëindigen…</string>
     <string name="call_ended_invite_timeout_title">Geen antwoord</string>
-    <string name="call_ended_user_busy_description">De persoon die u heeft gebeld is bezet.</string>
+    <string name="call_ended_user_busy_description">De persoon die je hebt gebeld is bezet.</string>
     <string name="call_ended_user_busy_title">Persoon bezet</string>
-    <string name="call_held_by_you">U heeft de oproep in de wacht gezet</string>
+    <string name="call_held_by_you">Je hebt de oproep in de wacht gezet</string>
     <string name="call_held_by_user">%s heeft de oproep in de wacht gezet</string>
     <string name="audio_call_with_participant">Bellen met %s</string>
     <string name="video_call_with_participant">Videobellen met %s</string>
@@ -1272,7 +1272,7 @@
     <string name="call_format_turn_hd_off">HD uitschakelen</string>
     <string name="call_select_sound_device">Geluidsapparaat Selecteren</string>
     <string name="call_failed_no_connection_description">Kan geen realtime verbinding tot stand brengen.
-\nVraag de beheerder van uw server om een TURN-server te configureren om gesprekken betrouwbaar te laten werken.</string>
+\nVraag de beheerder van jouw server om een TURN-server te configureren om gesprekken betrouwbaar te laten werken.</string>
     <string name="call_failed_no_connection">${app_name} Oproep Mislukt</string>
     <string name="hs_client_url">Server API URL</string>
     <string name="send_bug_report_include_key_share_history">Sleutel deelverzoekgeschiedenis versturen</string>
@@ -1284,36 +1284,36 @@
     <string name="dialog_edit_hint">Nieuwe waarde</string>
     <string name="failed_to_remove_widget">Widget verwijderen mislukt</string>
     <string name="failed_to_add_widget">Widget toevoegen mislukt</string>
-    <string name="cannot_call_yourself_with_invite">U kunt uzelf niet bellen, wacht totdat deelnemers de uitnodiging accepteren</string>
-    <string name="cannot_call_yourself">U kunt niet met uzelf bellen</string>
-    <string name="audio_video_meeting_description">Vergaderingen gebruiken beveiligings- en toestemmingsbeleid van Jitsi. Alle huidige personen in het gesprek zullen een uitnodiging zien terwijl uw vergadering bezig is.</string>
+    <string name="cannot_call_yourself_with_invite">Je kunt jezelf niet bellen, wacht totdat deelnemers de uitnodiging accepteren</string>
+    <string name="cannot_call_yourself">Je kunt niet met jezelf bellen</string>
+    <string name="audio_video_meeting_description">Vergaderingen gebruiken beveiligings- en toestemmingsbeleid van Jitsi. Alle huidige personen in het gesprek zullen een uitnodiging zien terwijl je vergadering bezig is.</string>
     <string name="audio_meeting">Geluidsvergadering starten</string>
     <string name="video_meeting">Videoconferentie starten</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">U mist de rechten om een oproep te starten</string>
-    <string name="no_permissions_to_start_webrtc_call">U mist de rechten om een oproep in dit gesprek te starten</string>
-    <string name="no_permissions_to_start_conf_call_in_direct_room">U mist de rechten om een vergadering te starten</string>
-    <string name="no_permissions_to_start_conf_call">U mist de rechten om een vergadering in dit gesprek te starten</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Je mist de rechten om een oproep te starten</string>
+    <string name="no_permissions_to_start_webrtc_call">Je mist de rechten om een oproep in dit gesprek te starten</string>
+    <string name="no_permissions_to_start_conf_call_in_direct_room">Je mist de rechten om een vergadering te starten</string>
+    <string name="no_permissions_to_start_conf_call">Je mist de rechten om een vergadering in dit gesprek te starten</string>
     <string name="missing_permissions_title">Ontbrekende rechten</string>
     <string name="denied_permission_voice_message">Geef toestemming om de microfoon te gebruiken om stemberichten te versturen.</string>
     <string name="secure_backup_reset_all">Alles herstellen</string>
-    <string name="direct_room_created_summary_item_by_you">U bent toegetreden.</string>
+    <string name="direct_room_created_summary_item_by_you">Je bent toegetreden.</string>
     <string name="login_reset_password_mail_confirmation_notice">Er is een verificatie e-mail verzonden naar %1$s.</string>
     <string name="login_reset_password_mail_confirmation_title">Controleer je inbox</string>
     <string name="login_reset_password_error_not_found">Dit e-mailadres is niet aan een account gekoppeld</string>
-    <string name="login_reset_password_warning_content">Als u uw wachtwoord wijzigt, worden alle end-to-end-versleutelingssleutels voor al uw sessies opnieuw ingesteld, waardoor de gecodeerde chatgeschiedenis onleesbaar wordt. Stel een back-up sleutel in of exporteer uw kamersleutels uit een andere sessie voordat u uw wachtwoord opnieuw instelt.</string>
-    <string name="login_reset_password_notice">Er wordt een verificatie-e-mail naar uw inbox gestuurd om het instellen van uw nieuwe wachtwoord te bevestigen.</string>
+    <string name="login_reset_password_warning_content">Als je jouw wachtwoord wijzigt, worden alle eind-tot-eind-versleutelingssleutels voor al je sessies opnieuw ingesteld, waardoor de gecodeerde chatgeschiedenis onleesbaar wordt. Stel een back-up sleutel in of exporteer je kamersleutels uit een andere sessie voordat je jouw wachtwoord opnieuw instelt.</string>
+    <string name="login_reset_password_notice">Er wordt een verificatie-e-mail naar jouw inbox gestuurd om het instellen van je nieuwe wachtwoord te bevestigen.</string>
     <string name="login_reset_password_on">Wachtwoord opnieuw instellen op %1$s</string>
     <string name="login_login_with_email_error">Dit e-mailadres is niet gekoppeld aan een account.</string>
     <string name="login_registration_not_supported">De applicatie kan geen account aanmaken op deze server.
 \n
-\nWilt u zich aanmelden met een webclient\?</string>
+\nWil je jezelf aanmelden met een webclient\?</string>
     <string name="login_registration_disabled">Sorry, deze server accepteert geen nieuwe accounts.</string>
     <string name="login_mode_not_supported">De applicatie kan niet inloggen op deze server. De thuisserver ondersteunt de volgende aanmeldingstype(s): %1$s.
 \n
 \nWil je inloggen met een webclient\?</string>
     <string name="login_sso_error_message">Er is een fout opgetreden bij het laden van de pagina: %1$s (%2$d)</string>
-    <string name="login_server_url_form_common_notice">Voer het adres in van de server die u wilt gebruiken</string>
-    <string name="login_server_url_form_modular_notice">Voer het adres in van de Modular Element of de server die u wilt gebruiken</string>
+    <string name="login_server_url_form_common_notice">Voer het adres in van de server die je wil gebruiken</string>
+    <string name="login_server_url_form_modular_notice">Voer het adres in van de Modular Element of de server die je wil gebruiken</string>
     <string name="login_server_url_form_modular_text">Premium hosting voor organisaties</string>
     <string name="login_server_url_form_modular_hint">Element Matrix Services-adres</string>
     <string name="login_clear_homeserver_history">Geschiedenis wissen</string>
@@ -1331,21 +1331,21 @@
     <string name="login_server_matrix_org_text">Word gratis lid met miljoenen anderen op de grootste openbare server</string>
     <string name="login_server_text">Net als e-mail hebben accounts één thuis, hoewel je met iedereen kunt praten</string>
     <string name="login_server_title">Selecteer een server</string>
-    <string name="login_splash_text3">Breid en pas uw ervaring aan</string>
+    <string name="login_splash_text3">Breid uit en personaliseer je ervaring</string>
     <string name="login_splash_text2">Houd gesprekken privé met versleuteling</string>
     <string name="login_splash_text1">Chat direct met mensen of in groepen</string>
-    <string name="login_splash_title">Het is jouw gesprek. Bezet het.</string>
-    <string name="direct_room_join_rules_invite_by_you">U heeft deze op enkel uitnodiging gemaakt.</string>
+    <string name="login_splash_title">Het is jouw gesprek. Bezit het.</string>
+    <string name="direct_room_join_rules_invite_by_you">Je hebt deze op enkel uitnodiging gemaakt.</string>
     <string name="direct_room_join_rules_invite">%1$s heeft dit alleen op uitnodiging gemaakt.</string>
     <string name="room_join_rules_invite_by_you">Je hebt de kamer alleen op uitnodiging gemaakt.</string>
     <string name="room_join_rules_invite">%1$s heeft de kamer alleen voor uitnodigingen ingesteld.</string>
-    <string name="room_join_rules_public_by_you">U heeft de kamer openbaar gemaakt voor iedereen die de link kent.</string>
-    <string name="no_ignored_users">U negeert geen enkele persoon</string>
+    <string name="room_join_rules_public_by_you">Je heb de kamer openbaar gemaakt voor iedereen die de link kent.</string>
+    <string name="no_ignored_users">Je negeert geen enkele persoon</string>
     <string name="room_join_rules_public">%1$s heeft de kamer openbaar gemaakt voor iedereen die de link kent.</string>
     <string name="help_long_click_on_room_for_more_options">Klik lang op een kamer om meer opties te zien</string>
     <string name="reaction_search_type_hint">Schrijf trefwoorden om een reactie te vinden.</string>
     <string name="command_description_spoiler">Stuurt het gegeven bericht als een spoiler</string>
-    <string name="notice_member_no_changes_by_you">U heeft geen wijzigingen aangebracht</string>
+    <string name="notice_member_no_changes_by_you">Je hebt geen wijzigingen aangebracht</string>
     <string name="notice_member_no_changes">%1$s heeft geen wijzigingen aangebracht</string>
     <string name="room_list_quick_actions_room_settings">Kamer instellingen</string>
     <string name="room_list_quick_actions_leave">Verlaat de kamer</string>
@@ -1356,15 +1356,15 @@
     <string name="room_list_quick_actions_notifications_all_noisy">Alle belangrijke berichten</string>
     <string name="content_reported_as_inappropriate_content">Deze inhoud is als ongepast gerapporteerd.
 \n
-\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls je geen inhoud van deze persoon meer wilt zien, kan je deze negeren om hun berichten te verbergen.</string>
     <string name="content_reported_as_inappropriate_title">Gemeld als ongepast</string>
     <string name="content_reported_as_spam_content">Deze inhoud is gerapporteerd als spam.
 \n
-\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls je geen inhoud van deze persoon meer wilt zien, kan je deze negeren om hun berichten te verbergen.</string>
     <string name="content_reported_as_spam_title">Gerapporteerd als spam</string>
     <string name="content_reported_content">Deze inhoud is gemeld.
 \n
-\nAls u geen inhoud van deze persoon meer wilt zien, kunt u deze negeren om hun berichten te verbergen.</string>
+\nAls je geen inhoud van deze persoon meer wilt zien, kan je deze negeren om hun berichten te verbergen.</string>
     <string name="report_content_custom_hint">Reden voor het rapporteren van deze inhoud</string>
     <string name="report_content_custom_title">Deze inhoud rapporteren</string>
     <string name="uploads_files_no_result">Er zijn geen bestanden in deze kamer</string>
@@ -1394,49 +1394,49 @@
     <string name="a11y_create_menu_open">Open het menu kamer maken</string>
     <string name="a11y_open_drawer">Open de navigatielade</string>
     <string name="error_network_timeout">Het lijkt erop dat de server er te lang over doet om te reageren. Dit kan worden veroorzaakt door een slechte verbinding of een fout met de server. Probeer het over een tijdje opnieuw.</string>
-    <string name="error_terms_not_accepted">Probeer het opnieuw zodra u de algemene voorwaarden van uw homeserver hebt geaccepteerd.</string>
-    <string name="labs_allow_extended_logging_summary">Uitgebreide logboeken helpen ontwikkelaars door meer logboeken te verstrekken wanneer u een RageShake verzendt. Zelfs wanneer ingeschakeld, registreert de toepassing geen berichtinhoud of andere privégegevens.</string>
+    <string name="error_terms_not_accepted">Probeer het opnieuw zodra je de algemene voorwaarden van je homeserver hebt geaccepteerd.</string>
+    <string name="labs_allow_extended_logging_summary">Uitgebreide logboeken helpen ontwikkelaars door meer logboeken te verstrekken wanneer je een RageShake verzendt. Zelfs wanneer ingeschakeld, registreert de toepassing geen berichtinhoud of andere privégegevens.</string>
     <string name="labs_allow_extended_logging">Uitgebreide logboeken inschakelen</string>
-    <string name="settings_agree_to_terms">Ga akkoord met de servicevoorwaarden van de identiteitsserver (%s), zodat u vindbaar bent op e-mailadres of telefoonnummer.</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">U deelt momenteel e-mailadressen of telefoonnummers op de identiteitsserver %1$s. U moet opnieuw verbinding maken met %2$s om ze niet meer te delen.</string>
+    <string name="settings_agree_to_terms">Ga akkoord met de servicevoorwaarden van de identiteitsserver (%s), zodat je vindbaar bent op e-mailadres of telefoonnummer.</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">Je deelt momenteel e-mailadressen of telefoonnummers op de identiteitsserver %1$s. Je moet opnieuw verbinding maken met %2$s om ze niet meer te delen.</string>
     <string name="settings_text_message_sent_wrong_code">De verificatiecode is niet correct.</string>
     <string name="settings_text_message_sent">Er is een sms-bericht verzonden naar %s. Voer de verificatiecode in die deze bevat.</string>
-    <string name="settings_discovery_no_terms">De door u gekozen identiteitsserver heeft geen servicevoorwaarden. Ga alleen verder als je de eigenaar van de service vertrouwt</string>
+    <string name="settings_discovery_no_terms">De door jouw gekozen identiteitsserver heeft geen servicevoorwaarden. Ga alleen verder als je de eigenaar van de service vertrouwt</string>
     <string name="settings_discovery_no_terms_title">Identiteitsserver heeft geen servicevoorwaarden</string>
     <string name="settings_discovery_please_enter_server">Voer de URL van de identiteitsserver in</string>
     <string name="settings_discovery_bad_identity_server">Kan geen verbinding maken met identiteitsserver</string>
     <string name="settings_discovery_enter_identity_server">Voer een identiteitsserver URL in</string>
-    <string name="identity_server_consent_dialog_content_question">Gaat u akkoord met het versturen van deze informatie\?</string>
-    <string name="identity_server_consent_dialog_content_3">Om bestaande contacten te ontdekken, moet u contactgegevens (e-mailadressen en telefoonnummers) naar uw identiteitsserver sturen. We hashen uw gegevens voordat ze worden verzonden vanwege privacy.</string>
+    <string name="identity_server_consent_dialog_content_question">Ga je akkoord met het versturen van deze informatie\?</string>
+    <string name="identity_server_consent_dialog_content_3">Om bestaande contacten te ontdekken, moet je contactgegevens (e-mailadressen en telefoonnummers) naar je identiteitsserver sturen. We hashen je gegevens voordat ze worden verzonden vanwege privacy.</string>
     <string name="identity_server_consent_dialog_title_2">Stuur e-mailadressen en telefoonnummers naar %s</string>
     <string name="settings_discovery_consent_action_give_consent">Toestemming geven</string>
     <string name="settings_discovery_consent_action_revoke">Mijn toestemming intrekken</string>
-    <string name="legals_home_server_title">Uw thuisserverbeleid</string>
-    <string name="login_error_homeserver_from_url_not_found">Kan geen server bereiken op de URL %s. Controleer uw link of kies handmatig een server.</string>
-    <string name="settings_discovery_consent_notice_off_2">Uw contacten zijn privé. Om personen van uw contacten te ontdekken, hebben we uw toestemming nodig om contactgegevens naar uw identiteitsserver te sturen.</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">We hebben u een bevestigingsmail gestuurd naar %s, controleer eerst uw e-mail en klik op de bevestigingslink</string>
-    <string name="settings_discovery_confirm_mail">We hebben u een bevestigingsmail gestuurd naar %s, controleer uw e-mail en klik op de bevestigingslink</string>
-    <string name="settings_discovery_no_mails">Ontdekkingsopties verschijnen zodra u een e-mail heeft toegevoegd.</string>
-    <string name="settings_discovery_identity_server_info">U gebruikt momenteel %1$s om te ontdekken en vindbaar te zijn voor bestaande contacten die u kent.</string>
-    <string name="navigate_to_room_when_already_in_the_room">U bekijkt deze kamer al!</string>
-    <string name="room_preview_no_preview_join">Er kan geen voorbeeld van deze kamer worden bekeken. Wilt u deelnemen\?</string>
+    <string name="legals_home_server_title">Jouw thuisserverbeleid</string>
+    <string name="login_error_homeserver_from_url_not_found">Kan geen server bereiken op de URL %s. Controleer je link of kies handmatig een server.</string>
+    <string name="settings_discovery_consent_notice_off_2">Jouw contacten zijn privé. Om personen van je contacten te ontdekken, hebben we jouw toestemming nodig om contactgegevens naar je identiteitsserver te sturen.</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">We hebben een e-mail gestuurd naar %s, controleer eerst je e-mail en klik op de bevestigingslink</string>
+    <string name="settings_discovery_confirm_mail">We hebben een e-mail gestuurd naar %s, controleer je e-mail en klik op de bevestigingslink</string>
+    <string name="settings_discovery_no_mails">Ontdekkingsopties verschijnen zodra je een e-mailadres hebt toegevoegd.</string>
+    <string name="settings_discovery_identity_server_info">Je gebruikt momenteel %1$s om te ontdekken en vindbaar te zijn voor bestaande contacten die je kent.</string>
+    <string name="navigate_to_room_when_already_in_the_room">Je bekijkt deze kamer al!</string>
+    <string name="room_preview_no_preview_join">Er kan geen voorbeeld van deze kamer worden bekeken. Wil je toetreden\?</string>
     <string name="room_preview_not_found">Deze kamer is op dit moment niet toegankelijk.
-\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of u toegang heeft.</string>
-    <string name="command_description_avatar_for_room">Verander uw avatar alleen in deze huidige kamer</string>
-    <string name="command_description_nick_for_room">Verander uw schermnaam alleen in de huidige kamer</string>
-    <string name="other_spaces_or_rooms_you_might_not_know">Andere spaces of kamers die u misschien niet kent</string>
-    <string name="space_you_know_that_contains_this_room">Space die u kent die deze kamer bevat</string>
-    <string name="room_alias_local_address_subtitle">Stel adressen in voor deze kamer zodat personen deze kamer kunnen vinden via uw server (%1$s)</string>
-    <string name="analytics_opt_in_list_item_3">U kunt dit op elk moment uitschakelen in de instellingen</string>
-    <string name="settings_mentions_and_keywords_encryption_notice">U krijgt geen meldingen voor vermeldingen en trefwoorden in versleutelde kamers op uw mobiel.</string>
-    <string name="error_threepid_auth_failed">Zorg ervoor dat u op de link heeft geklikt in de e-mail die we u hebben gestuurd.</string>
-    <string name="settings_discovery_consent_notice_on">U hebt uw toestemming gegeven om e-mails en telefoonnummers naar deze identiteitsserver te sturen om andere personen van uw contacten te ontdekken.</string>
+\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of je toegang hebt.</string>
+    <string name="command_description_avatar_for_room">Verander je afbeelding alleen in deze kamer</string>
+    <string name="command_description_nick_for_room">Verander je weergavenaam alleen in de huidige kamer</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">Andere spaces of kamers die je misschien niet kent</string>
+    <string name="space_you_know_that_contains_this_room">Space die je kent die deze kamer bevat</string>
+    <string name="room_alias_local_address_subtitle">Stel adressen in voor deze kamer zodat personen deze kamer kunnen vinden via jouw server (%1$s)</string>
+    <string name="analytics_opt_in_list_item_3">Je kan dit op elk moment uitschakelen in de instellingen</string>
+    <string name="settings_mentions_and_keywords_encryption_notice">Je krijgt geen meldingen voor vermeldingen en trefwoorden in versleutelde kamers op je mobiel.</string>
+    <string name="error_threepid_auth_failed">Zorg ervoor dat je op de link hebt geklikt in de e-mail die we je hebben gestuurd.</string>
+    <string name="settings_discovery_consent_notice_on">Je hebt toestemming gegeven om e-mails en telefoonnummers naar deze identiteitsserver te sturen om andere personen van je contacten te ontdekken.</string>
     <string name="settings_discovery_consent_title">E-mailadressen en telefoonnummers versturen</string>
     <string name="settings_discovery_msisdn_title">Vindbare telefoonnummers</string>
-    <string name="settings_discovery_disconnect_identity_server_info">Als u de verbinding met uw identiteitsserver verbreekt, betekent dit dat u niet door andere personen kan worden gevonden en dat u anderen niet per e-mail of telefoon kunt uitnodigen.</string>
-    <string name="settings_discovery_no_msisdn">Ontdekkingsopties verschijnen zodra u een telefoonnummer heeft toegevoegd.</string>
+    <string name="settings_discovery_disconnect_identity_server_info">Als je de verbinding met je identiteitsserver verbreekt, betekent dit dat je niet door andere personen kan worden gevonden en dat je anderen niet per e-mail of telefoon kan uitnodigen.</string>
+    <string name="settings_discovery_no_msisdn">Ontdekkingsopties verschijnen zodra je een telefoonnummer hebt toegevoegd.</string>
     <string name="settings_discovery_emails_title">Vindbare e-mailadressen</string>
-    <string name="settings_discovery_identity_server_info_none">U gebruikt momenteel geen identiteitsserver. Om te ontdekken en vindbaar te zijn door bestaande contacten die u kent, configureert u er een hieronder.</string>
+    <string name="settings_discovery_identity_server_info_none">Je gebruikt momenteel geen identiteitsserver. Om te ontdekken en vindbaar te zijn door bestaande contacten die Je kent, configureer je er een hieronder.</string>
     <string name="settings_discovery_no_policy_provided">Geen beleid geleverd door de identiteitsserver</string>
     <string name="settings_discovery_hide_identity_server_policy_title">Identiteitsserverbeleid verbergen</string>
     <string name="settings_discovery_show_identity_server_policy_title">Identiteitsserverbeleid weergeven</string>
@@ -1460,7 +1460,7 @@
     <string name="room_filtering_footer_open_room_directory">Bekijk de kamer directory</string>
     <string name="room_filtering_footer_create_new_direct_message">Een nieuw privébericht versturen</string>
     <string name="room_filtering_footer_create_new_room">Nieuwe kamer aanmaken</string>
-    <string name="room_filtering_footer_title">Kunt u niet vinden wat u zoekt\?</string>
+    <string name="room_filtering_footer_title">Kan je niet vinden wat je zoekt\?</string>
     <string name="no_message_edits_found">Geen bewerkingen gevonden</string>
     <string name="downloaded_file">Bestand %1$s is gedownload!</string>
     <string name="send_file_step_compressing_video">Video comprimeren %d%%</string>
@@ -1471,14 +1471,14 @@
     <string name="settings_labs_show_hidden_events_in_timeline">Verborgen gebeurtenissen op de tijdlijn weergeven</string>
     <string name="give_feedback">Geef feedback</string>
     <string name="feedback_failed">De feedback kan niet worden verzonden (%s)</string>
-    <string name="feedback_sent">Bedankt, uw feedback is succesvol verzonden</string>
-    <string name="you_may_contact_me">U kunt contact met mij opnemen als u vervolgvragen heeft</string>
-    <string name="send_feedback_space_info">U gebruikt een bètaversie van spaces. Uw feedback zal helpen bij het informeren van de volgende versies. Uw platform en inlognaam worden genoteerd om ons te helpen uw feedback zoveel mogelijk te gebruiken.</string>
+    <string name="feedback_sent">Bedankt, je feedback is succesvol verzonden</string>
+    <string name="you_may_contact_me">Je kan contact met mij opnemen als je vervolgvragen hebt</string>
+    <string name="send_feedback_space_info">Je gebruikt een bètaversie van spaces. Jouw feedback zal helpen bij het informeren van de volgende versies. Jouw platform en inlognaam worden genoteerd om ons te helpen jouw feedback zoveel mogelijk te gebruiken.</string>
     <string name="send_feedback_space_title">Spaces feedback</string>
     <string name="send_suggestion_failed">De suggestie kan niet worden verzonden (%s)</string>
     <string name="send_suggestion_sent">Bedankt, de suggestie is succesvol verzonden</string>
-    <string name="send_suggestion_report_placeholder">Beschrijf hier uw suggestie</string>
-    <string name="send_suggestion_content">Schrijf hieronder uw suggestie.</string>
+    <string name="send_suggestion_report_placeholder">Beschrijf hier jouw suggestie</string>
+    <string name="send_suggestion_content">Schrijf hieronder jouw suggestie.</string>
     <string name="send_suggestion">Een voorstel doen</string>
     <string name="preference_system_settings">Systeeminstellingen</string>
     <string name="preference_versions">Versies</string>
@@ -1500,7 +1500,7 @@
 \n
 \n%s</string>
     <string name="create_room_topic_section">Kameronderwerp (optioneel)</string>
-    <string name="create_new_space">Nieuwe ruimte aanmaken</string>
+    <string name="create_new_space">Nieuwe space aanmaken</string>
     <string name="settings_show_redacted_summary">Geeft een plaatsvervangende melding weer voor verwijderde berichten.</string>
     <string name="settings_show_redacted">Verwijderde berichten weergeven</string>
     <string name="secure_backup_setup">Beveiligde back-up instellen</string>
@@ -1519,9 +1519,9 @@
     <string name="notification_unread_notified_messages_in_room_and_invitation">%1$s in %2$s en %3$s</string>
     <string name="directory_add_a_new_server_error_already_added">Deze server is al aanwezig in de lijst</string>
     <string name="directory_add_a_new_server_error">Kan deze server of de kamerlijst niet vinden</string>
-    <string name="directory_add_a_new_server_prompt">Voer de naam in van een nieuwe server die u wilt verkennen.</string>
+    <string name="directory_add_a_new_server_prompt">Voer de naam in van een nieuwe server die je wil verkennen.</string>
     <string name="directory_add_a_new_server">Een nieuwe server toevoegen</string>
-    <string name="directory_your_server">Uw server</string>
+    <string name="directory_your_server">Jouw server</string>
     <plurals name="encryption_import_room_keys_success">
         <item quantity="one">Sleutel %1$d/%2$d geïmporteerd met succes.</item>
         <item quantity="other">%1$d/%2$d sleutels met succes geïmporteerd.</item>
@@ -1562,7 +1562,7 @@
     <string name="room_alias_published_alias_add_manually">Een nieuw adres handmatig publiceren</string>
     <string name="room_alias_published_other">Andere gepubliceerde adressen:</string>
     <string name="room_alias_published_alias_main">Dit is het hoofdadres</string>
-    <string name="room_alias_published_alias_subtitle">Gepubliceerde adressen kunnen door iedereen op elke server worden gebruikt om lid te worden van uw kamer. Om een adres te publiceren, moet het eerst als lokaal adres worden ingesteld.</string>
+    <string name="room_alias_published_alias_subtitle">Gepubliceerde adressen kunnen door iedereen op elke server worden gebruikt om lid te worden van jouw kamer. Om een adres te publiceren, moet het eerst als lokaal adres worden ingesteld.</string>
     <string name="room_alias_published_alias_title">Gepubliceerde adressen</string>
     <string name="space_settings_alias_subtitle">Adressen van deze kamer bekijken en beheren.</string>
     <string name="space_settings_alias_title">Ruimte-adressen</string>
@@ -1574,27 +1574,27 @@
     <string name="room_settings_access_rules_pref_dialog_title">Wie heeft toegang\?</string>
     <string name="room_settings_room_read_history_dialog_subtitle">Wijzigingen in wie geschiedenis kan lezen, zijn alleen van toepassing op toekomstige berichten in deze kamer. De zichtbaarheid van de bestaande historie blijft ongewijzigd.</string>
     <string name="room_settings_room_notifications_account_settings">Account instellingen</string>
-    <string name="room_settings_room_notifications_manage_notifications">U kunt meldingen beheren in %1$s.</string>
+    <string name="room_settings_room_notifications_manage_notifications">Je kan meldingen beheren in %1$s.</string>
     <string name="room_settings_room_notifications_encryption_notice">Houd er rekening mee dat vermeldingen en trefwoordmeldingen niet beschikbaar zijn in versleutelde kamers op mobiel.</string>
     <string name="room_settings_room_notifications_notify_me">Informeer mij voor</string>
-    <string name="settings_emails_and_phone_numbers_summary">Beheer e-mailadressen en telefoonnummers die aan uw Matrix-account zijn gekoppeld</string>
+    <string name="settings_emails_and_phone_numbers_summary">Beheer e-mailadressen en telefoonnummers die aan je Matrix-account zijn gekoppeld</string>
     <string name="settings_emails_and_phone_numbers_title">E-mailadressen en telefoonnummers</string>
     <string name="disabled_integration_dialog_content">Schakel hiervoor \'Integraties toestaan\' in bij Instellingen.</string>
     <string name="disabled_integration_dialog_title">Integraties zijn uitgeschakeld</string>
     <string name="legals_no_policy_provided">Deze server biedt geen beleid.</string>
     <string name="legals_third_party_notices">Bibliotheken van derden</string>
-    <string name="legals_identity_server_title">Uw identiteitsserverbeleid</string>
+    <string name="legals_identity_server_title">Jouw identiteitsserverbeleid</string>
     <string name="legals_application_title">${app_name}-beleid</string>
     <string name="analytics_opt_in_list_item_2">We delen <b>geen</b> informatie met derden</string>
     <string name="analytics_opt_in_list_item_1">We registreren of profileren <b>geen</b> accountgegevens</string>
     <string name="analytics_opt_in_content_link">hier</string>
-    <string name="analytics_opt_in_content">Help ons problemen te identificeren en ${app_name} te verbeteren door anonieme gebruiksgegevens te delen. Om inzicht te krijgen in hoe mensen meerdere apparaten gebruiken, genereren we een willekeurige identificatie die door uw apparaten wordt gedeeld.
+    <string name="analytics_opt_in_content">Help ons problemen te identificeren en ${app_name} te verbeteren door anonieme gebruiksgegevens te delen. Om inzicht te krijgen in hoe mensen meerdere apparaten gebruiken, genereren we een willekeurige identificatie die door jouw apparaten wordt gedeeld.
 \n
-\nU kunt al onze voorwaarden %s lezen.</string>
+\nJe kan al onze voorwaarden %s lezen.</string>
     <string name="analytics_opt_in_title">Help ${app_name} verbeteren</string>
-    <string name="reset_secure_backup_warning">Dit zal uw huidige sleutel of zin vervangen.</string>
-    <string name="reset_secure_backup_title">Genereer een nieuwe beveiligingssleutel of stel een nieuwe beveiligingszin in voor uw bestaande back-up.</string>
-    <string name="settings_secure_backup_section_info">Bescherm uzelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op uw server.</string>
+    <string name="reset_secure_backup_warning">Dit zal jouw huidige sleutel of zin vervangen.</string>
+    <string name="reset_secure_backup_title">Genereer een nieuwe beveiligingssleutel of stel een nieuwe beveiligingszin in voor je bestaande back-up.</string>
+    <string name="settings_secure_backup_section_info">Bescherm jezelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op je server.</string>
     <string name="settings_secure_backup_enter_to_setup">Instellen op dit apparaat</string>
     <string name="settings_secure_backup_reset">Beveiligde back-up resetten</string>
     <string name="settings_secure_backup_setup">Beveiligde back-up instellen</string>
@@ -1616,23 +1616,23 @@
     <string name="settings_messages_in_e2e_group_chat">Versleutelde berichten in groepsgesprekken</string>
     <string name="settings_messages_in_e2e_one_to_one">Versleutelde berichten in één-op-één gesprekken</string>
     <string name="settings_troubleshoot_test_notification_notification_clicked">Er is op de melding geklikt!</string>
-    <string name="settings_troubleshoot_test_notification_notice">Klik op de melding. Als u de melding niet ziet, controleer dan de systeeminstellingen.</string>
-    <string name="settings_troubleshoot_test_push_notification_content">U bekijkt de melding! Klik hier!</string>
+    <string name="settings_troubleshoot_test_notification_notice">Klik op de melding. Als je de melding niet ziet, controleer dan de systeeminstellingen.</string>
+    <string name="settings_troubleshoot_test_push_notification_content">Je bekijkt de melding! Klik hier!</string>
     <string name="settings_troubleshoot_test_push_loop_failed">Kan push niet ontvangen. Oplossing zou kunnen zijn om de applicatie opnieuw te installeren.</string>
     <string name="settings_troubleshoot_test_push_loop_success">De applicatie ontvangt PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">De applicatie wacht op de PUSH</string>
     <string name="settings_notification_keyword_contains_invalid_character">Trefwoorden mogen \'%s\' niet bevatten</string>
     <string name="settings_notification_keyword_contains_dot">Trefwoorden mogen niet beginnen met \'.\'</string>
     <string name="settings_notification_new_keyword">Nieuw trefwoord toevoegen</string>
-    <string name="settings_notification_your_keywords">Uw trefwoorden</string>
+    <string name="settings_notification_your_keywords">Jouw trefwoorden</string>
     <string name="settings_notification_notify_me_for">Breng me op de hoogte voor</string>
     <string name="settings_notification_mentions_and_keywords">Vermeldingen en trefwoorden</string>
     <string name="settings_notification_default">Standaardmeldingen</string>
     <string name="settings_notification_emails_enable_for_email">E-mailmeldingen inschakelen voor %s</string>
-    <string name="settings_notification_emails_no_emails">Om e-mail met melding te ontvangen, koppelt u een e-mail aan uw Matrix-account</string>
+    <string name="settings_notification_emails_no_emails">Om e-mail met melding te ontvangen, koppel je een e-mailadres aan je Matrix-account</string>
     <string name="settings_notification_emails_category">E-mail notificatie</string>
-    <string name="settings_emails_empty">Er is geen e-mailadres toegevoegd aan uw account</string>
-    <string name="settings_phone_number_empty">Er is geen telefoonnummer toegevoegd aan uw account</string>
+    <string name="settings_emails_empty">Er is geen e-mailadres toegevoegd aan je account</string>
+    <string name="settings_phone_number_empty">Er is geen telefoonnummer toegevoegd aan je account</string>
     <string name="shortcut_disabled_reason_sign_out">De sessie is afgemeld!</string>
     <string name="shortcut_disabled_reason_room_left">De kamer is verlaten!</string>
     <string name="room_settings_mention_and_keyword_only">Alleen vermeldingen en trefwoorden</string>
@@ -1660,8 +1660,8 @@
     <string name="room_permissions_invite_users">Personen uitnodigen</string>
     <string name="room_permissions_send_messages">Berichten sturen</string>
     <string name="room_permissions_default_role">Standaardrol</string>
-    <string name="space_permissions_notice_read_only">U bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van deze space te wijzigen</string>
-    <string name="room_permissions_notice_read_only">U bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van de kamer te wijzigen</string>
+    <string name="space_permissions_notice_read_only">Je bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van deze space te wijzigen</string>
+    <string name="room_permissions_notice_read_only">Je bent niet gemachtigd om de rollen bij te werken die nodig zijn om verschillende delen van de kamer te wijzigen</string>
     <string name="space_permissions_notice">Selecteer de rollen die nodig zijn om verschillende delen van deze space te wijzigen</string>
     <string name="room_permissions_notice">Selecteer de rollen die nodig zijn om verschillende delen van de kamer te veranderen</string>
     <string name="space_settings_permissions_subtitle">Bekijk en update de rollen die nodig zijn om verschillende delen van de kamer te veranderen.</string>
@@ -1669,8 +1669,8 @@
     <string name="login_error_homeserver_from_url_not_found_enter_manual">Kies server</string>
     <string name="action_not_now">Niet nu</string>
     <string name="action_enable">Inschakelen</string>
-    <string name="notification_listening_for_notifications">Luisteren naar notificaties</string>
-    <string name="room_error_access_unauthorized">U mag niet deelnemen aan deze kamer</string>
+    <string name="notification_listening_for_notifications">Luisteren naar meldingen</string>
+    <string name="room_error_access_unauthorized">Je mag niet toetreden tot deze kamer</string>
     <string name="dev_tools_success_state_event">Gebeurtenis status verzonden!</string>
     <string name="dev_tools_success_event">Gebeurtenis verzonden!</string>
     <string name="dev_tools_error_malformed_event">Misvormde gebeurtenis</string>
@@ -1706,7 +1706,7 @@
     <string name="a11y_import_key_from_file">Sleutel importeren uit bestand</string>
     <string name="a11y_open_widget">Widgets openen</string>
     <string name="authentication_error">Authenticatie mislukt</string>
-    <string name="re_authentication_default_confirm_text">${app_name} vereist dat u uw inloggegevens invoert om deze actie uit te voeren.</string>
+    <string name="re_authentication_default_confirm_text">${app_name} vereist dat je jouw inloggegevens invoert om deze actie uit te voeren.</string>
     <string name="re_authentication_activity_title">Opnieuw authenticatie nodig</string>
     <string name="call_slide_to_end_conference">Schuif om het gesprek te beëindigen</string>
     <string name="call_transfer_unknown_person">Onbekend persoon</string>
@@ -1737,20 +1737,20 @@
     <string name="call_tile_call_back">Terugbellen</string>
     <string name="call_tile_ended">Dit gesprek is beëindigd</string>
     <string name="call_tile_other_declined">%1$s heeft dit gesprek geweigerd</string>
-    <string name="call_tile_you_declined_this_call">U heeft deze oproep geweigerd</string>
+    <string name="call_tile_you_declined_this_call">Je hebt deze oproep geweigerd</string>
     <string name="warning_unsaved_change_discard">Veranderingen ongedaan maken</string>
     <string name="warning_unsaved_change">Er zijn niet opgeslagen wijzigingen. De wijzigingen negeren\?</string>
     <string name="warning_room_not_created_yet">De kamer is nog niet aangemaakt. Het aanmaken van een kamer annuleren\?</string>
     <string name="universal_link_malformed">De link was verkeerd ingedeeld</string>
     <string name="qr_code_not_scanned">QR-code niet gescand!</string>
     <string name="invalid_qr_code_uri">Ongeldige QR-code (ongeldige URI)!</string>
-    <string name="cannot_dm_self">U kunt uzelf niet DM\'en!</string>
+    <string name="cannot_dm_self">Je kan jezelf niet DM\'en!</string>
     <string name="share_by_text">Deel via tekst</string>
     <string name="room_error_not_found">Kan deze kamer niet vinden. Zorg ervoor dat het bestaat.</string>
-    <string name="error_opening_banned_room">U kunt geen kamer openen waar u uit bent verbannen.</string>
-    <string name="settings_security_pin_code_change_pin_summary">Wijzig uw huidige pincode</string>
+    <string name="error_opening_banned_room">Je kan geen kamer openen waar je uit bent verbannen.</string>
+    <string name="settings_security_pin_code_change_pin_summary">Wijzig je huidige pincode</string>
     <string name="settings_security_pin_code_change_pin_title">Verander pincode</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">Elke keer dat u ${app_name} opent, is een pincode vereist.</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">Elke keer dat je ${app_name} opent, is een pincode vereist.</string>
     <string name="settings_security_pin_code_grace_period_summary_on">Pincode is vereist na 2 minuten ${app_name} niet te hebben gebruikt.</string>
     <string name="settings_security_pin_code_grace_period_title">Pincode vereist na 2 minuten</string>
     <string name="settings_security_pin_code_notifications_summary_off">Geef alleen het aantal ongelezen berichten weer in een eenvoudige melding.</string>
@@ -1759,16 +1759,16 @@
     <string name="settings_security_pin_code_use_biometrics_summary_off">Pincode is de enige manier om ${app_name} te ontgrendelen.</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">Schakel apparaatspecifieke biometrische gegevens in, zoals vingerafdrukken en gezichtsherkenning.</string>
     <string name="settings_security_pin_code_use_biometrics_title">Biometrische gegevens inschakelen</string>
-    <string name="settings_security_pin_code_summary">Als u uw pincode opnieuw wilt instellen, tikt u op Pincode vergeten om uit te loggen en opnieuw in te stellen.</string>
+    <string name="settings_security_pin_code_summary">Als je jouw pincode opnieuw wilt instellen, tik je op Pincode vergeten om uit te loggen en opnieuw in te stellen.</string>
     <string name="settings_security_pin_code_title">Pincode inschakelen</string>
     <string name="settings_security_application_protection_screen_title">Beveiliging configureren</string>
     <string name="settings_security_application_protection_summary">Beveilig de toegang met pincode en biometrie.</string>
     <string name="settings_security_application_protection_title">Toegang beveiligen</string>
-    <string name="auth_pin_reset_content">Om uw pincode opnieuw in te stellen, moet u opnieuw inloggen en een nieuwe maken.</string>
-    <string name="auth_pin_title">Voer uw pincode in</string>
+    <string name="auth_pin_reset_content">Om je pincode opnieuw in te stellen, moet je opnieuw inloggen en een nieuwe maken.</string>
+    <string name="auth_pin_title">Voer je pincode in</string>
     <string name="create_pin_confirm_failure">Kan pincode niet valideren. Tik voor een nieuwe.</string>
     <string name="create_pin_title">Kies een pincode voor beveiliging</string>
-    <string name="too_many_pin_failures">Te veel fouten, u bent uitgelogd</string>
+    <string name="too_many_pin_failures">Te veel fouten, je bent uitgelogd</string>
     <string name="wrong_pin_message_last_remaining_attempt">Waarschuwing! Laatste resterende poging voor uitloggen!</string>
     <plurals name="entries">
         <item quantity="one">%d invoer</item>
@@ -1778,49 +1778,49 @@
         <item quantity="one">Verkeerde code, %d resterende poging</item>
         <item quantity="other">Verkeerde code, %d resterende pogingen</item>
     </plurals>
-    <string name="alert_push_are_disabled_description">Controleer uw instellingen om pushmeldingen in te schakelen</string>
+    <string name="alert_push_are_disabled_description">Controleer je instellingen om pushmeldingen in te schakelen</string>
     <string name="alert_push_are_disabled_title">Pushmeldingen zijn uitgeschakeld</string>
     <string name="failed_to_unban">Kan persoon verbanning niet opheffen</string>
     <string name="member_banned_by">Verbannen door %1$s</string>
     <string name="three_pid_revoke_invite_dialog_content">Uitnodiging voor %1$s intrekken\?</string>
     <string name="phone_book_perform_lookup">Zoeken naar contacten op Matrix</string>
-    <string name="empty_contact_book">Uw contactenboek is leeg</string>
-    <string name="loading_contact_book">Uw contacten ophalen…</string>
+    <string name="empty_contact_book">Jouw contactenboek is leeg</string>
+    <string name="loading_contact_book">Jouw contacten ophalen…</string>
     <string name="save_recovery_key_chooser_hint">Herstelsleutel opslaan in</string>
     <string name="disclaimer_positive_button">LEER MEER</string>
     <string name="disclaimer_negative_button">BEGREPEN</string>
-    <string name="disclaimer_content">We zijn verheugd om aan te kondigen dat we van naam zijn veranderd! Uw app is up-to-date en u bent ingelogd op uw account.</string>
+    <string name="disclaimer_content">We zijn verheugd om aan te kondigen dat we van naam zijn veranderd! Jouw app is up-to-date en je bent ingelogd op jouw account.</string>
     <string name="disclaimer_title">Riot is nu Element!</string>
     <string name="notice_crypto_unable_to_decrypt_merged">Wachten op versleutelingsgeschiedenis</string>
-    <string name="crypto_error_withheld_generic">U heeft geen toegang tot dit bericht omdat de afzender de sleutels met opzet niet heeft verzonden</string>
-    <string name="crypto_error_withheld_blacklisted">U heeft geen toegang tot dit bericht omdat u bent geblokkeerd door de afzender</string>
-    <string name="crypto_error_withheld_unverified">U heeft geen toegang tot dit bericht omdat uw sessie niet wordt vertrouwd door de afzender</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Vanwege end-to-end-versleuteling moet u mogelijk wachten op het bericht van iemand omdat de versleutelingssleutels niet correct naar u zijn verzonden.</string>
+    <string name="crypto_error_withheld_generic">Je hebt geen toegang tot dit bericht omdat de afzender de sleutels met opzet niet heeft verzonden</string>
+    <string name="crypto_error_withheld_blacklisted">Je hebt geen toegang tot dit bericht omdat je bent geblokkeerd door de afzender</string>
+    <string name="crypto_error_withheld_unverified">Je hebt geen toegang tot dit bericht omdat jouw sessie niet wordt vertrouwd door de afzender</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Vanwege eind-tot-eind-versleuteling moet je mogelijk wachten op het bericht van iemand omdat de versleutelingssleutels niet correct naar jou zijn verzonden.</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Wachten op dit bericht, dit kan even duren</string>
-    <string name="notice_crypto_unable_to_decrypt_final">U heeft geen toegang tot dit bericht</string>
+    <string name="notice_crypto_unable_to_decrypt_final">Je hebt geen toegang tot dit bericht</string>
     <string name="room_settings_set_avatar">Avatar instellen</string>
     <string name="room_settings_save_success">Je hebt de kamerinstellingen met succes gewijzigd</string>
-    <string name="set_a_security_phrase_again_notice">Voer uw beveiligingszin nogmaals in om deze te bevestigen.</string>
-    <string name="set_a_security_phrase_notice">Voer een beveiligingszin in die alleen u kent en die wordt gebruikt om geheimen op uw server te beveiligen.</string>
+    <string name="set_a_security_phrase_again_notice">Voer jouw beveiligingszin nogmaals in om deze te bevestigen.</string>
+    <string name="set_a_security_phrase_notice">Voer een beveiligingszin in die alleen jij kent en die wordt gebruikt om geheimen op jouw server te beveiligen.</string>
     <string name="set_a_security_phrase_title">Stel een beveiligingszin in</string>
-    <string name="bottom_sheet_save_your_recovery_key_content">Bewaar uw beveiligingssleutel ergens veilig, zoals een wachtwoordbeheerder of een kluis.</string>
-    <string name="bottom_sheet_save_your_recovery_key_title">Bewaar uw beveiligingssleutel</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Voer een geheime zin in die alleen u kent en genereer een sleutel voor back-up.</string>
+    <string name="bottom_sheet_save_your_recovery_key_content">Bewaar jouw beveiligingssleutel ergens veilig, zoals een wachtwoordbeheerder of een kluis.</string>
+    <string name="bottom_sheet_save_your_recovery_key_title">Bewaar jouw beveiligingssleutel</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">Voer een geheime zin in die alleen jij kent en genereer een sleutel voor back-up.</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">Gebruik een beveiligingszin</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">Genereer een beveiligingssleutel om ergens veilig op te slaan, zoals een wachtwoordbeheerder of een kluis.</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">Een beveiligingssleutel gebruiken</string>
-    <string name="bottom_sheet_setup_secure_backup_subtitle">Bescherm uzelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op uw server.</string>
+    <string name="bottom_sheet_setup_secure_backup_subtitle">Bescherm jezelf tegen verlies van toegang tot versleutelde berichten en gegevens door een back-up te maken van versleutelingssleutels op je server.</string>
     <string name="a11y_start_camera">Start de camera</string>
     <string name="a11y_stop_camera">Stop de camera</string>
     <string name="a11y_unmute_microphone">Dempen van de microfoon opheffen</string>
     <string name="a11y_mute_microphone">De microfoon dempen</string>
     <string name="identity_server_set_alternative_notice_no_default">Voer de URL van een identiteitsserver in</string>
-    <string name="identity_server_set_alternative_notice">U kunt ook een andere identiteitsserver URL invoeren</string>
-    <string name="identity_server_set_default_notice">Uw server (%1$s) stelt voor om %2$s te gebruiken voor uw identiteitsserver</string>
+    <string name="identity_server_set_alternative_notice">Je kan ook een andere identiteitsserver URL invoeren</string>
+    <string name="identity_server_set_default_notice">Je server (%1$s) stelt voor om %2$s te gebruiken voor jouw identiteitsserver</string>
     <string name="identity_server_user_consent_not_provided">De toestemming van de persoon is niet gegeven.</string>
     <string name="identity_server_error_no_current_binding_error">Er is geen huidige associatie met dit id.</string>
     <string name="identity_server_error_binding_error">De associatie heeft gefaald.</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">Voor uw privacy ondersteunt ${app_name} alleen het versturen van gehashte e-mailadressen en telefoonnummers van personen.</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">Voor je privacy ondersteunt ${app_name} alleen het versturen van gehashte e-mailadressen en telefoonnummers van personen.</string>
     <string name="identity_server_error_terms_not_signed">Accepteer eerst de voorwaarden van de identiteitsserver in de instellingen.</string>
     <string name="identity_server_error_no_identity_server_configured">Configureer eerst een identiteitsserver.</string>
     <string name="identity_server_error_outdated_home_server">Deze operatie is niet mogelijk. De server is verouderd.</string>
@@ -1829,11 +1829,11 @@
     <string name="open_terms_of">Open voorwaarden van %s</string>
     <string name="choose_locale_loading_locales">Beschikbare talen laden…</string>
     <string name="choose_locale_other_locales_title">Andere beschikbare talen</string>
-    <string name="user_code_info_text">Deel deze code met mensen zodat ze deze kunnen scannen om u toe te voegen en te beginnen met chatten.</string>
+    <string name="user_code_info_text">Deel deze code met mensen zodat ze deze kunnen scannen om je toe te voegen en te beginnen met chatten.</string>
     <string name="user_code_my_code">Mijn code</string>
     <string name="user_code_share">Mijn code delen</string>
     <string name="user_code_scan">Een QR-code scannen</string>
-    <string name="invite_users_to_room_failure">We kunnen geen personen uitnodigen. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.</string>
+    <string name="invite_users_to_room_failure">We kunnen geen personen uitnodigen. Controleer de personen die je wil uitnodigen en probeer het opnieuw.</string>
     <plurals name="invitations_sent_to_one_and_more_users">
         <item quantity="one">Uitnodigingen verzonden naar %1$s en nog één</item>
         <item quantity="other">Uitnodigingen verzonden naar %1$s en %2$d meer</item>
@@ -1845,19 +1845,19 @@
     <string name="invite_friends_text">Hé, praat met me op ${app_name}: %s</string>
     <string name="invite_friends">Vrienden uitnodigen</string>
     <string name="add_people">Mensen toevoegen</string>
-    <string name="create_room_dm_failure">We kunnen je DM niet maken. Controleer de personen die u wilt uitnodigen en probeer het opnieuw.</string>
-    <string name="external_link_confirmation_message">De link %1$s brengt u naar een andere site: %2$s.
+    <string name="create_room_dm_failure">We kunnen je DM niet maken. Controleer de personen die je wilt uitnodigen en probeer het opnieuw.</string>
+    <string name="external_link_confirmation_message">De link %1$s brengt je naar een andere site: %2$s.
 \n
-\nWeet u zeker dat u door wilt gaan\?</string>
+\nWeet je zeker dat je door wilt gaan\?</string>
     <string name="external_link_confirmation_title">Dubbelcheck deze link</string>
     <string name="error_empty_field_choose_password">Kies een wachtwoord.</string>
     <string name="error_empty_field_choose_user_name">Kies een inlognaam.</string>
     <string name="failed_to_initialize_cross_signing">Kan kruislingsondertekenen niet instellen</string>
-    <string name="confirm_your_identity_quad_s">Bevestig uw identiteit door deze login te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
-    <string name="confirm_your_identity">Bevestig uw identiteit door deze login van een van uw andere sessies te verifiëren en toegang te verlenen tot versleutelde berichten.</string>
+    <string name="confirm_your_identity_quad_s">Bevestig je identiteit door deze login te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
+    <string name="confirm_your_identity">Bevestig je identiteit door deze login van een van uw andere sessies te verifiëren en toegang te verlenen tot versleutelde berichten.</string>
     <string name="cross_signing_verify_by_emoji">Interactief verifiëren door Emoji</string>
     <string name="cross_signing_verify_by_text">Handmatig verifiëren via tekst</string>
-    <string name="verify_this_session">Verifieer de nieuwe login voor toegang tot uw account: %1$s</string>
+    <string name="verify_this_session">Verifieer de nieuwe login voor toegang tot je account: %1$s</string>
     <string name="verify_other_sessions">Verifieer al je sessies om ervoor te zorgen dat je account en berichten veilig zijn</string>
     <string name="review_logins">Bekijk waar je bent ingelogd</string>
     <string name="encrypted_unverified">Versleuteld door een niet-geverifieerd apparaat</string>
@@ -1866,34 +1866,34 @@
     <string name="command_snow">Stuurt het gegeven bericht met sneeuwval</string>
     <string name="command_confetti">Stuurt het gegeven bericht met confetti</string>
     <plurals name="secure_backup_reset_devices_you_can_verify">
-        <item quantity="one">Laat het apparaat zien waarmee u nu kunt verifiëren</item>
-        <item quantity="other">%d apparaten weergeven waarmee u nu kunt verifiëren</item>
+        <item quantity="one">Laat het apparaat zien waarmee je nu kan verifiëren</item>
+        <item quantity="other">%d apparaten weergeven waarmee je nu kan verifiëren</item>
     </plurals>
-    <string name="secure_backup_reset_no_history">U start opnieuw op zonder geschiedenis, geen berichten, vertrouwde apparaten of vertrouwde personen</string>
+    <string name="secure_backup_reset_no_history">Je start opnieuw op zonder geschiedenis, geen berichten, vertrouwde apparaten of vertrouwde personen</string>
     <string name="secure_backup_reset_if_you_reset_all">Als je alles reset</string>
-    <string name="secure_backup_reset_all_no_other_devices">Doe dit alleen als u geen ander apparaat heeft waarmee u dit apparaat kunt verifiëren.</string>
+    <string name="secure_backup_reset_all_no_other_devices">Doe dit alleen als je geen ander apparaat hebt waarmee je dit apparaat kunt verifiëren.</string>
     <string name="bad_passphrase_key_reset_all_action">Alle herstelopties vergeten of verloren\? Alles resetten</string>
     <string name="failed_to_access_secure_storage">Kan geen toegang krijgen tot beveiligde opslag</string>
-    <string name="enter_secret_storage_input_key">Selecteer uw herstelsleutel of voer deze handmatig in door deze te typen of te plakken vanaf uw klembord</string>
+    <string name="enter_secret_storage_input_key">Selecteer je herstelsleutel of voer deze handmatig in door deze te typen of te plakken vanaf je klembord</string>
     <string name="use_recovery_key">Herstelsleutel gebruiken</string>
-    <string name="enter_secret_storage_passphrase_or_key">Gebruik uw %1$s of gebruik uw %2$s om door te gaan.</string>
+    <string name="enter_secret_storage_passphrase_or_key">Gebruik je %1$s of gebruik je %2$s om door te gaan.</string>
     <string name="command_description_discard_session_not_handled">Alleen ondersteund in versleutelde kamers</string>
     <string name="command_description_discard_session">Dwingt dat de huidige uitgaande groepssessie in een versleutelde kamer wordt weggegooid</string>
-    <string name="use_latest_app">Gebruik de nieuwste ${app_name} op uw andere apparaten:</string>
+    <string name="use_latest_app">Gebruik de nieuwste ${app_name} op je andere apparaten:</string>
     <string name="or_other_mx_capable_client">of een andere Matrix client die kruislingsondetekenen ondersteunt</string>
     <string name="app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
     <string name="app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
-    <string name="use_other_session_content_description">Gebruik de nieuwste ${app_name} op uw andere apparaten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} voor Android of een andere Matrix-client die geschikt is voor kruislingsondertekenen</string>
+    <string name="use_other_session_content_description">Gebruik de nieuwste ${app_name} op je andere apparaten, ${app_name} Web, ${app_name} Desktop, ${app_name} iOS, ${app_name} voor Android of een andere Matrix-client die geschikt is voor kruislings ondertekenen</string>
     <string name="change_password_summary">Stel een nieuw accountwachtwoord in…</string>
     <string name="error_saving_media_file">Kan mediabestand niet opslaan</string>
-    <string name="settings_security_prevent_screenshots_summary">Als u deze instelling inschakelt, wordt de FLAG_SECURE aan alle activiteiten toegevoegd. Start de toepassing opnieuw om de wijziging door te voeren.</string>
+    <string name="settings_security_prevent_screenshots_summary">Als je deze instelling inschakelt, wordt de FLAG_SECURE aan alle activiteiten toegevoegd. Start de applicatie opnieuw om de wijziging door te voeren.</string>
     <string name="settings_security_prevent_screenshots_title">Voorkom screenshots van de applicatie</string>
     <string name="bootstrap_migration_backup_recovery_key">Sleutel Back-up herstelsleutel</string>
-    <string name="bootstrap_migration_with_passphrase_helper_with_link">Weet u uw Key Back-up wachtwoordzin niet, u kunt %s.</string>
-    <string name="bootstrap_migration_use_recovery_key">gebruik uw Backup-herstelsleutel</string>
-    <string name="bootstrap_migration_enter_backup_password">Voer uw Sleutel Back-up wachtwoordzin in om door te gaan.</string>
+    <string name="bootstrap_migration_with_passphrase_helper_with_link">Weet je jouw Key Back-up wachtwoordzin niet, je kan %s.</string>
+    <string name="bootstrap_migration_use_recovery_key">gebruik je Backup-herstelsleutel</string>
+    <string name="bootstrap_migration_enter_backup_password">Voer je Sleutel Back-up wachtwoordzin in om door te gaan.</string>
     <string name="bootstrap_progress_storing_in_sss">Sleutelback-up geheim opslaan in SSSS</string>
     <string name="bootstrap_progress_generating_ssss_recovery">SSSS sleutel genereren uit herstelsleutel</string>
     <string name="bootstrap_progress_generating_ssss_with_info">SSSS sleutel genereren op basis van wachtwoordzin (%s)</string>
@@ -1903,8 +1903,8 @@
     <string name="bootstrap_progress_checking_backup">Back-upsleutel controleren</string>
     <string name="recovery_key_empty_error_message">Voer een herstelsleutel in</string>
     <string name="bootstrap_invalid_recovery_key">Het is geen geldige herstelsleutel</string>
-    <string name="bootstrap_enter_recovery">Voer uw %s in om door te gaan</string>
-    <string name="security_prompt_text">Verifieer uzelf en anderen om uw chats veilig te houden</string>
+    <string name="bootstrap_enter_recovery">Voer je %s in om door te gaan</string>
+    <string name="security_prompt_text">Verifieer jezelf en anderen om jouw chats veilig te houden</string>
     <string name="upgrade_security">Encryptie upgrade beschikbaar</string>
     <string name="auth_invalid_login_deactivated_account">Dit account is gedeactiveerd.</string>
     <string name="auth_invalid_login_param_space_in_password">Onjuiste inlognaam en/of wachtwoord. Het ingevoerde wachtwoord begint of eindigt met spaties, controleer dit alstublieft.</string>
@@ -1915,24 +1915,24 @@
     <string name="qr_code_scanned_self_verif_notice">Bijna klaar! Toont het andere apparaat een vinkje\?</string>
     <string name="add_a_topic_link_text">Een onderwerp toevoegen</string>
     <string name="room_created_summary_no_topic_creation_text">%s om mensen te laten weten waar deze kamer over gaat.</string>
-    <string name="this_is_the_beginning_of_dm">Dit is het begin van uw privéberichtgeschiedenis met %s.</string>
+    <string name="this_is_the_beginning_of_dm">Dit is het begin van jouw privéberichtgeschiedenis met %s.</string>
     <string name="this_is_the_beginning_of_room_no_name">Dit is het begin van dit gesprek.</string>
     <string name="this_is_the_beginning_of_room">Dit is het begin van %s.</string>
-    <string name="room_created_summary_item_by_you">U hebt de kamer gemaakt en geconfigureerd.</string>
+    <string name="room_created_summary_item_by_you">Je hebt de kamer gemaakt en geconfigureerd.</string>
     <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 chat zijn end-to-end-versleuteld.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Berichten in deze chat zijn eind-tot-eind-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.
+    <string name="bootstrap_cancel_text">Als je nu annuleert, kan je versleutelde berichten en gegevens kwijtraken als je de toegang tot uw aanmeldingen verliest.
 \n
-\nU kunt ook Veilige back-up instellen en uw sleutels beheren in Instellingen.</string>
-    <string name="bootstrap_crosssigning_save_cloud">Kopieer het naar uw persoonlijke cloudopslag</string>
+\nJe kan ook Veilige back-up instellen en uw sleutels beheren in Instellingen.</string>
+    <string name="bootstrap_crosssigning_save_cloud">Kopieer het naar je persoonlijke cloudopslag</string>
     <string name="bootstrap_crosssigning_save_usb">Bewaar het op een USB-stick of back-upstation</string>
     <string name="bootstrap_crosssigning_print_it">Print het uit en bewaar het ergens veilig</string>
-    <string name="bootstrap_cross_signing_success">Uw %2$s en %1$s zijn nu ingesteld.
+    <string name="bootstrap_cross_signing_success">Jouw %2$s en %1$s zijn nu ingesteld.
 \n
-\nHoud ze veilig! U heeft ze nodig om versleutelde berichten te ontgrendelen en informatie te beveiligen als u al uw actieve sessies verliest.</string>
+\nHoud ze veilig! Je hebt ze nodig om versleutelde berichten te ontgrendelen en informatie te beveiligen als je al jouw actieve sessies verliest.</string>
     <string name="bootstrap_crosssigning_progress_key_backup">Sleutelback-up instellen</string>
     <string name="bootstrap_crosssigning_progress_save_ssk">Zelfondertekenende sleutel synchroniseren</string>
     <string name="bootstrap_crosssigning_progress_save_usk">Persoonssleutel synchroniseren</string>
@@ -1943,25 +1943,25 @@
     <string name="keep_it_safe">Hou het veilig</string>
     <string name="bootstrap_loading_title">Herstel instellen.</string>
     <string name="bootstrap_loading_text">Dit kan enkele seconden duren, even geduld a.u.b.</string>
-    <string name="bootstrap_info_text_2">Voer een beveiligingszin in die alleen u kent en die wordt gebruikt om geheimen op uw server te beveiligen.</string>
-    <string name="bootstrap_dont_reuse_pwd">Gebruik niet uw accountwachtwoord.</string>
-    <string name="enter_account_password">Voer uw %s in om door te gaan.</string>
-    <string name="verify_cancelled_notice">Verificatie is geannuleerd. U kunt de verificatie opnieuw starten.</string>
+    <string name="bootstrap_info_text_2">Voer een beveiligingszin in die alleen jij kent en die wordt gebruikt om geheimen op jouw server te beveiligen.</string>
+    <string name="bootstrap_dont_reuse_pwd">Gebruik niet je accountwachtwoord.</string>
+    <string name="enter_account_password">Voer je %s in om door te gaan.</string>
+    <string name="verify_cancelled_notice">Verificatie is geannuleerd. Je kan de verificatie opnieuw starten.</string>
     <string name="verify_not_me_self_verification">Een van de volgende zaken kan worden aangetast:
 \n
-\n- Uw wachtwoord
-\n- Uw server
+\n- Jouw wachtwoord
+\n- Jouw server
 \n- Dit apparaat, of het andere apparaat
 \n- De internetverbinding die elk apparaat gebruikt
 \n
-\nWe raden u aan uw wachtwoord en herstelsleutel onmiddellijk in Instellingen te wijzigen.</string>
-    <string name="verify_cancel_other">U verifieert %1$s (%2$s) niet als u nu annuleert. Begin opnieuw in hun profiel.</string>
-    <string name="verify_cancel_self_verification_from_untrusted">Als u annuleert, kunt u geen versleutelde berichten op dit apparaat lezen en zullen andere personen het niet vertrouwen</string>
-    <string name="verify_cancel_self_verification_from_trusted">Als u annuleert, kunt u geen versleutelde berichten lezen op je nieuwe apparaat en zullen andere personen het niet vertrouwen</string>
-    <string name="verify_new_session_compromized">Uw account is mogelijk gecompromitteerd</string>
+\nWe raden je aan jouw wachtwoord en herstelsleutel onmiddellijk in Instellingen te wijzigen.</string>
+    <string name="verify_cancel_other">Je verifieert %1$s (%2$s) niet als je nu annuleert. Begin opnieuw in hun profiel.</string>
+    <string name="verify_cancel_self_verification_from_untrusted">Als je annuleert, kan je geen versleutelde berichten op dit apparaat lezen en zullen andere personen het niet vertrouwen</string>
+    <string name="verify_cancel_self_verification_from_trusted">Als je annuleert, kan je geen versleutelde berichten lezen op je nieuwe apparaat en zullen andere personen het niet vertrouwen</string>
+    <string name="verify_new_session_compromized">Jouw account is mogelijk gecompromitteerd</string>
     <string name="verify_new_session_was_not_me">Dit was ik niet</string>
-    <string name="verify_new_session_notice">Gebruik deze sessie om uw nieuwe te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
-    <string name="new_session">Nieuwe login. Was u dit\?</string>
+    <string name="verify_new_session_notice">Gebruik deze sessie om je nieuwe te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
+    <string name="new_session">Nieuwe login. Was jij dit\?</string>
     <string name="e2e_use_keybackup">Ontgrendel de geschiedenis van versleutelde berichten</string>
     <string name="settings_export_trail">Exportcontrole</string>
     <string name="login_default_session_public_name">${app_name} Android</string>
@@ -1970,7 +1970,7 @@
     <string name="event_redacted_by_user_reason_with_reason">Gebeurtenis verwijderd door persoon, reden: %1$s</string>
     <string name="delete_event_dialog_reason_hint">Reden voor redigeren</string>
     <string name="delete_event_dialog_reason_checkbox">Geef een reden op</string>
-    <string name="delete_event_dialog_content">Weet u zeker dat u deze gebeurtenis wilt verwijderen (wissen)\? Houd er rekening mee dat als u een kamer naam of onderwerpwijziging verwijdert, de wijziging ongedaan kan worden gemaakt.</string>
+    <string name="delete_event_dialog_content">Weet je zeker dat je deze gebeurtenis wil verwijderen (wissen)\? Houd er rekening mee dat als je een kamer naam of onderwerpwijziging verwijdert, de wijziging ongedaan kan worden gemaakt.</string>
     <string name="send_images_and_video_with_original_size">Media versturen in het originele formaat</string>
     <plurals name="send_videos_with_original_size">
         <item quantity="one">Stuur video in het originele formaat</item>
@@ -1980,7 +1980,7 @@
         <item quantity="one">Stuur afbeelding in het originele formaat</item>
         <item quantity="other">Stuur afbeeldingen in het originele formaat</item>
     </plurals>
-    <string name="share_confirm_room">Wilt u deze bijlage naar %1$s sturen\?</string>
+    <string name="share_confirm_room">Wil je deze bijlage naar %1$s sturen\?</string>
     <string name="enter_secret_storage_invalid">Kan geen geheimen vinden in opslag</string>
     <string name="verification_use_passphrase">Als je geen toegang hebt tot een bestaande sessie</string>
     <string name="verification_cannot_access_other_session">Een herstelwachtwoordzin of -sleutel gebruiken</string>
@@ -1990,8 +1990,8 @@
     <string name="no_connectivity_to_the_server_indicator_airplane">Vliegtuigmodus is ingeschakeld</string>
     <string name="no_connectivity_to_the_server_indicator">Verbinding met de server is verbroken</string>
     <string name="qr_code_scanned_by_other_notice">Bijna klaar! Toont %s een vinkje\?</string>
-    <string name="verification_profile_device_untrust_info">Totdat deze persoon deze sessie vertrouwt, worden berichten die van en naar de sessie worden verzonden, gelabeld met waarschuwingen. U kunt het ook handmatig verifiëren.</string>
-    <string name="verification_profile_device_new_signing">%1$s (%2$s) aangemeld met een nieuwe sessie:</string>
+    <string name="verification_profile_device_untrust_info">Totdat deze persoon deze sessie vertrouwt, worden berichten die van en naar deze sessie worden verzonden, gelabeld met waarschuwingen. Je kan het ook handmatig verifiëren.</string>
+    <string name="verification_profile_device_new_signing">%1$s (%2$s) is aangemeld met een nieuwe sessie:</string>
     <string name="verification_profile_device_verified_because">Deze sessie wordt vertrouwd voor veilig berichtenverkeer omdat %1$s (%2$s) deze heeft geverifieerd:</string>
     <string name="room_member_profile_failed_to_get_devices">Kan geen sessies ophalen</string>
     <string name="verification_open_other_to_verify">Gebruik een bestaande sessie om deze te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
@@ -2000,39 +2000,39 @@
         <item quantity="one">%d actieve sessie</item>
         <item quantity="other">%d actieve sessies</item>
     </plurals>
-    <string name="settings_active_sessions_unverified_device_desc">Verifieer deze sessie om hem als vertrouwd te markeren en verleen hem toegang tot versleutelde berichten. Als u zich niet bij deze sessie hebt aangemeld, is uw account mogelijk gehackt:</string>
-    <string name="settings_active_sessions_verified_device_desc">Deze sessie wordt vertrouwd voor veilige berichten omdat u deze heeft geverifieerd:</string>
+    <string name="settings_active_sessions_unverified_device_desc">Verifieer deze sessie om als vertrouwd te markeren en toegang te verlenen tot versleutelde berichten. Als jij je niet bij deze sessie hebt aangemeld, is jouw account mogelijk gehackt:</string>
+    <string name="settings_active_sessions_verified_device_desc">Deze sessie wordt vertrouwd voor veilige berichten omdat je deze hebt geverifieerd:</string>
     <string name="settings_failed_to_get_crypto_device_info">Geen cryptografische informatie beschikbaar</string>
     <string name="settings_server_default_room_version">Standaardversie</string>
     <string name="settings_server_room_versions">Kamerversies 👓</string>
     <string name="settings_server_upload_size_unknown">De limiet is onbekend.</string>
-    <string name="settings_server_upload_size_content">Uw server accepteert bijlagen (bestanden, media, enz.) met een grootte tot %s.</string>
+    <string name="settings_server_upload_size_content">Jouw server accepteert bijlagen (bestanden, media, enz.) met een grootte tot %s.</string>
     <string name="settings_server_upload_size_title">Server limiet voor het uploaden van bestanden</string>
     <string name="settings_server_version">Serverversie</string>
     <string name="settings_server_name">Server naam</string>
     <string name="settings_active_sessions_signout_device">Afmelden voor deze sessie</string>
     <string name="settings_active_sessions_show_all">Alle sessies tonen</string>
-    <string name="settings_hs_admin_e2e_disabled">Uw serverbeheerder heeft standaard end-to-end versleuteling uitgeschakeld in privékamers en privéberichten.</string>
+    <string name="settings_hs_admin_e2e_disabled">Jouw serverbeheerder heeft standaard eind-tot-eind versleuteling uitgeschakeld in privékamers en privéberichten.</string>
     <string name="encryption_information_dg_xsigning_disabled">Kruisondertekenen is niet ingeschakeld</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">Kruisondertekenen is ingeschakeld.
+    <string name="encryption_information_dg_xsigning_not_trusted">Kruislings ondertekenen is ingeschakeld.
 \nSleutels worden niet vertrouwd</string>
-    <string name="encryption_information_dg_xsigning_trusted">Kruisondertekenen is ingeschakeld
+    <string name="encryption_information_dg_xsigning_trusted">Kruislings ondertekenen is ingeschakeld
 \nSleutels zijn vertrouwd.
 \nPrivésleutels zijn niet bekend</string>
     <string name="encryption_information_dg_xsigning_complete">Kruisondertekening is ingeschakeld
 \nPrivésleutels op het apparaat.</string>
-    <string name="verification_conclusion_ok_self_notice">Uw nieuwe sessie is nu geverifieerd. Het heeft toegang tot uw gecodeerde berichten en andere personen zullen het als vertrouwd zien.</string>
-    <string name="verification_conclusion_ok_notice">Berichten met deze persoon zijn end-to-end-versleuteld en kunnen niet door derden worden gelezen.</string>
+    <string name="verification_conclusion_ok_self_notice">Jouw nieuwe sessie is nu geverifieerd. Het heeft toegang tot jouw gecodeerde berichten en andere personen zullen het als vertrouwd zien.</string>
+    <string name="verification_conclusion_ok_notice">Berichten met deze persoon zijn eind-tot-eind-versleuteld en kunnen niet door derden worden gelezen.</string>
     <string name="verification_code_notice">Vergelijk de code met die op het scherm van de andere persoon.</string>
     <string name="verification_emoji_notice">Vergelijk de unieke emoji en zorg ervoor dat ze in dezelfde volgorde verschijnen.</string>
     <string name="verification_request_start_notice">Doe dit voor de zekerheid persoonlijk of gebruik een andere manier om te communiceren.</string>
-    <string name="verification_request_notice">Om veilig te zijn, verifieert u %s door een eenmalige code te controleren.</string>
+    <string name="verification_request_notice">Om veilig te zijn, verifieer je %s door een eenmalige code te controleren.</string>
     <string name="room_settings_enable_encryption_dialog_content">Eenmaal ingeschakeld, kan versleuteling voor een kamer niet worden uitgeschakeld. Berichten die in een versleutelde kamer worden verzonden, kunnen niet door de server worden gezien, alleen door de deelnemers van de kamer. Het inschakelen van versleuteling kan voorkomen dat veel bots en koppelingen correct werken.</string>
-    <string name="room_settings_enable_encryption_no_permission">U bent niet gemachtigd om versleuteling in deze kamer in te schakelen.</string>
-    <string name="room_settings_enable_encryption">End-to-end-versleuteling inschakelen…</string>
+    <string name="room_settings_enable_encryption_no_permission">Je bent niet gemachtigd om versleuteling in deze kamer in te schakelen.</string>
+    <string name="room_settings_enable_encryption">Eind-tot-eind-versleuteling inschakelen…</string>
     <string name="command_description_rainbow_emote">Verzendt de gegeven emote gekleurd als een regenboog</string>
     <string name="command_description_rainbow">Stuurt het gegeven bericht gekleurd als een regenboog</string>
-    <string name="verify_cannot_cross_sign">Deze sessie kan deze verificatie niet delen met uw andere sessies.
+    <string name="verify_cannot_cross_sign">Deze sessie kan deze verificatie niet delen met jouw andere sessies.
 \nDe verificatie wordt lokaal opgeslagen en gedeeld in een toekomstige versie van de app.</string>
     <string name="rendering_event_error_exception">${app_name} heeft een probleem ondervonden bij het weergeven van de inhoud van het gebeurtenis met id \'%1$s\'</string>
     <string name="rendering_event_error_type_of_event_not_handled">${app_name} verwerkt geen gebeurtenissen van het type \'%1$s\'</string>
@@ -2043,40 +2043,40 @@
     <string name="room_member_power_level_moderator_in">Moderator in %1$s</string>
     <string name="room_member_power_level_admin_in">Beheerder in %1$s</string>
     <string name="room_profile_leaving_room">De kamer verlaten…</string>
-    <string name="direct_room_profile_encrypted_subtitle">Berichten hier zijn end-to-end-versleuteld.
+    <string name="direct_room_profile_encrypted_subtitle">Berichten hier zijn eind-tot-eind-versleuteld.
 \n
-\nUw berichten zijn beveiligd met sloten en alleen u en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
-    <string name="room_profile_encrypted_subtitle">Berichten in deze kamer zijn end-to-end-versleuteld.
+\nJouw berichten zijn beveiligd met sloten en alleen jij en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
+    <string name="room_profile_encrypted_subtitle">Berichten in deze kamer zijn eind-tot-eind-versleuteld.
 \n
-\nUw berichten zijn beveiligd met sloten en alleen u en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
-    <string name="direct_room_profile_not_encrypted_subtitle">Berichten hier zijn niet end-to-end-versleuteld.</string>
-    <string name="room_profile_not_encrypted_subtitle">Berichten in deze kamer zijn niet end-to-end-versleuteld.</string>
+\nJouw berichten zijn beveiligd met sloten en alleen jij en de ontvanger hebben de unieke sleutels om ze te ontgrendelen.</string>
+    <string name="direct_room_profile_not_encrypted_subtitle">Berichten hier zijn niet eind-tot-eind-versleuteld.</string>
+    <string name="room_profile_not_encrypted_subtitle">Berichten in deze kamer zijn niet eind-tot-eind-versleuteld.</string>
     <string name="verification_request_waiting_for">Wachten op %s…</string>
     <string name="verification_no_scan_emoji_title">Verifieer door emoji\'s te vergelijken</string>
     <string name="verification_scan_self_emoji_subtitle">Verifieer door emoji te vergelijken</string>
-    <string name="verification_scan_emoji_subtitle">Als u niet persoonlijk aanwezig bent, vergelijk dan emoji\'s</string>
+    <string name="verification_scan_emoji_subtitle">Als je niet persoonlijk aanwezig bent, vergelijk dan emoji\'s</string>
     <string name="verification_scan_with_this_device">Scannen met dit apparaat</string>
     <string name="verification_scan_their_code">Scan hun code</string>
-    <string name="verification_scan_self_notice">Scan de code met uw ander apparaat of wissel en scan met dit apparaat</string>
+    <string name="verification_scan_self_notice">Scan de code met je andere apparaat of wissel en scan met dit apparaat</string>
     <string name="verification_scan_notice">Scan de code met het apparaat van de andere persoon om elkaar veilig te verifiëren</string>
     <string name="verification_verify_device">Deze sessie verifiëren</string>
     <string name="sent_a_reaction">Gereageerd met: %s</string>
-    <string name="verification_conclusion_compromised">"Een van de volgende zaken kan worden aangetast:
+    <string name="verification_conclusion_compromised">Een van de volgende zaken kan worden aangetast:
 \n
-\n  - Uw server
-\n  - De server waarmee de gebruiker die u verifieert is verbonden
-\n  - De internetverbinding van u of de andere personen
-\n  - Het apparaat van u of van andere personen"</string>
+\n - Jouw server
+\n - De server waarmee de gebruiker die je verifieert is verbonden
+\n - De internetverbinding van jou of de andere personen
+\n - Het apparaat van jou of van andere personen</string>
     <string name="verification_sas_do_not_match">Ze komen niet overeen</string>
     <string name="verification_conclusion_warning">Niet-vertrouwd inloggen</string>
-    <string name="login_error_threepid_denied">Uw e-maildomein is niet geautoriseerd om op deze server te registreren</string>
+    <string name="login_error_threepid_denied">Jouw e-maildomein is niet geautoriseerd om op deze server te registreren</string>
     <string name="create_space_in_progress">Ruimte aanmaken…</string>
     <string name="create_room_in_progress">Kamer aanmaken…</string>
     <string name="create_room_alias_invalid">Sommige tekens zijn niet toegestaan</string>
     <string name="create_room_alias_empty">Geef een kameradres op</string>
     <string name="create_room_alias_already_in_use">Dit adres is al in gebruik</string>
     <string name="create_space_alias_hint">Ruimte-adres</string>
-    <string name="create_room_disable_federation_description">U kunt dit inschakelen als de kamer alleen wordt gebruikt voor samenwerking met interne teams op uw server. Dit kan later niet meer worden gewijzigd.</string>
+    <string name="create_room_disable_federation_description">Je kan dit inschakelen als de kamer alleen wordt gebruikt voor samenwerking met interne teams op jouw server. Dit kan later niet meer worden gewijzigd.</string>
     <string name="create_room_disable_federation_title">Blokkeer iedereen die geen deel uitmaakt van %s om ooit deel te nemen aan deze kamer</string>
     <string name="hide_advanced">Verberg geavanceerd</string>
     <string name="show_advanced">Geavanceerd weergeven</string>
@@ -2090,87 +2090,87 @@
     <string name="settings_rageshake_detection_threshold_summary">Schud je telefoon om de detectiedrempel te testen</string>
     <string name="settings_developer_mode_summary">De ontwikkelaarsmodus activeert verborgen functies en kan de applicatie ook minder stabiel maken. Alleen voor ontwikkelaars!</string>
     <string name="bug_report_error_too_short">De beschrijving is te kort</string>
-    <string name="permalink_malformed">Uw matrix.to link is onjuist opgemaakt</string>
-    <string name="soft_logout_sso_not_same_user_error">De huidige sessie is voor gebruiker %1$s en u geeft inloggegevens op voor persoon %2$s. Dit wordt niet ondersteund door ${app_name}.
-\nWis eerst de gegevens en meld u vervolgens opnieuw aan met een ander account.</string>
-    <string name="soft_logout_clear_data_dialog_e2e_warning_content">U raakt de toegang tot beveiligde berichten kwijt, tenzij u zich aanmeldt om uw versleutelingssleutels te herstellen.</string>
+    <string name="permalink_malformed">Jouw matrix.to link is onjuist opgemaakt</string>
+    <string name="soft_logout_sso_not_same_user_error">De huidige sessie is voor gebruiker %1$s en je geeft inloggegevens op voor persoon %2$s. Dit wordt niet ondersteund door ${app_name}.
+\nWis eerst de gegevens en meld je vervolgens opnieuw aan met een ander account.</string>
+    <string name="soft_logout_clear_data_dialog_e2e_warning_content">Je raakt de toegang tot beveiligde berichten kwijt, tenzij je jezelf aanmeldt om jouw versleutelingssleutels te herstellen.</string>
     <string name="soft_logout_clear_data_dialog_content">Alle gegevens wissen die momenteel op dit apparaat zijn opgeslagen\?
-\nMeld u opnieuw aan om toegang te krijgen tot uw accountgegevens en berichten.</string>
+\nMeld je opnieuw aan om toegang te krijgen tot je accountgegevens en berichten.</string>
     <string name="soft_logout_clear_data_submit">Alle gegevens wissen</string>
-    <string name="soft_logout_clear_data_notice">Waarschuwing: uw persoonlijke gegevens (inclusief versleutelingssleutels) zijn nog steeds opgeslagen op dit apparaat.
+    <string name="soft_logout_clear_data_notice">Waarschuwing: jouw persoonlijke gegevens (inclusief versleutelingssleutels) zijn nog steeds opgeslagen op dit apparaat.
 \n
-\nWis het als u klaar bent met het gebruik van dit apparaat of als u zich wilt aanmelden bij een ander account.</string>
+\nWis het als je klaar bent met het gebruik van dit apparaat of als je jezelf wilt aanmelden bij een ander account.</string>
     <string name="soft_logout_clear_data_title">Persoonlijke gegevens wissen</string>
     <string name="soft_logout_signin_e2e_warning_notice">Log in om versleutelingssleutels te herstellen die exclusief op dit apparaat zijn opgeslagen. Je hebt ze nodig om al uw beveiligde berichten op elk apparaat te lezen.</string>
-    <string name="soft_logout_signin_notice">Uw server (%1$s) beheerder heeft u uitgelogd van uw account %2$s (%3$s).</string>
+    <string name="soft_logout_signin_notice">Je server (%1$s) beheerder heeft je uitgelogd van jouw account %2$s (%3$s).</string>
     <string name="soft_logout_title">Je bent uitgelogd</string>
     <string name="signed_out_submit">Opnieuw inloggen</string>
     <string name="signed_out_notice">Het kan verschillende redenen hebben:
 \n
-\n• U heeft uw wachtwoord bij een andere sessie gewijzigd.
+\n• Je hebt je wachtwoord bij een andere sessie gewijzigd.
 \n
-\n• U heeft deze sessie verwijderd uit een andere sessie.
+\n• Je hebt deze sessie verwijderd uit een andere sessie.
 \n
-\n• De beheerder van uw server heeft uw toegang om veiligheidsredenen ongeldig gemaakt.</string>
+\n• De beheerder van je server heeft jouw toegang om veiligheidsredenen ongeldig gemaakt.</string>
     <string name="signed_out_title">Je bent uitgelogd</string>
-    <string name="autodiscover_well_known_error">Kan geen geldige server vinden. Controleer uw ID a.u.b.</string>
+    <string name="autodiscover_well_known_error">Kan geen geldige server vinden. Controleer je ID</string>
     <string name="login_signin_matrix_id_error_invalid_matrix_id">Dit is geen geldige persoon-ID. Verwacht formaat: \'@persoon:server.org\'</string>
-    <string name="login_signin_matrix_id_password_notice">Als u uw wachtwoord niet weet, gaat u terug om het opnieuw in te stellen.</string>
+    <string name="login_signin_matrix_id_password_notice">Als je jouw wachtwoord niet weet, ga je terug om het opnieuw in te stellen.</string>
     <string name="login_signin_matrix_id_notice">Als je een account aanmaakt op een server, gebruik dan je Matrix ID (bijv. @persoon:domein.nl) en wachtwoord hieronder.</string>
     <string name="login_signin_matrix_id_title">Aanmelden met Matrix ID</string>
     <string name="login_connect_using_matrix_id_submit">Aanmelden met Matrix ID</string>
     <plurals name="login_error_limit_exceeded_retry_after">
-        <item quantity="one">Er zijn te veel verzoeken verzonden. Je kunt het over %1$d seconde opnieuw proberen…</item>
-        <item quantity="other">Er zijn te veel verzoeken verzonden. Je kunt het over %1$d seconden opnieuw proberen…</item>
+        <item quantity="one">Er zijn te veel verzoeken verzonden. Je kan het over %1$d seconde opnieuw proberen…</item>
+        <item quantity="other">Er zijn te veel verzoeken verzonden. Je kan het over %1$d seconden opnieuw proberen…</item>
     </plurals>
-    <string name="login_error_outdated_homeserver_warning_content">Deze server draait op een oude versie. Vraag uw server beheerder om te upgraden. U kunt doorgaan, maar sommige functies werken mogelijk niet correct.</string>
+    <string name="login_error_outdated_homeserver_warning_content">Deze server draait op een oude versie. Vraag je server beheerder om te upgraden. Je kan doorgaan, maar sommige functionaliteiten werken mogelijk niet correct.</string>
     <string name="login_validation_code_is_not_correct">De ingevoerde code is niet correct. Gelieve dit te controleren.</string>
     <string name="login_wait_for_email_notice">We hebben zojuist een e-mail gestuurd naar %1$s.
 \nKlik op de link die deze bevat om door te gaan met het aanmaken van een account.</string>
-    <string name="login_wait_for_email_title">Controleer uw e-mail</string>
+    <string name="login_wait_for_email_title">Controleer je e-mail</string>
     <string name="login_terms_title">Accepteer de voorwaarden om door te gaan</string>
     <string name="login_a11y_captcha_container">Voer de captcha uitdaging uit</string>
     <string name="login_a11y_choose_other">Selecteer een aangepaste server</string>
     <string name="login_a11y_choose_modular">Selecteer Element Matrix Services</string>
-    <string name="login_signup_cancel_confirmation_content">Uw account is nog niet aangemaakt. Het registratieproces stoppen\?</string>
+    <string name="login_signup_cancel_confirmation_content">Jouw account is nog niet aangemaakt. Het registratieproces stoppen\?</string>
     <string name="login_signup_error_user_in_use">Deze inlognaam is in gebruik</string>
     <string name="login_signin_username_hint">Inlognaam of e-mailadres</string>
-    <string name="login_signup_to">Meld u aan bij %1$s</string>
+    <string name="login_signup_to">Meld je aan bij %1$s</string>
     <string name="login_msisdn_error_other">Telefoonnummer lijkt ongeldig. Controleer het alstublieft</string>
     <string name="login_msisdn_error_not_international">Internationale telefoonnummers moeten beginnen met \'+\'</string>
     <string name="login_msisdn_notice">Gebruik het internationale formaat (telefoonnummer moet beginnen met \'+\')</string>
-    <string name="login_msisdn_confirm_notice">We hebben zojuist een code naar %1$s gestuurd. Voer het hieronder in om te verifiëren dat u het bent.</string>
+    <string name="login_msisdn_confirm_notice">We hebben zojuist een code naar %1$s gestuurd. Voer het hieronder in om te verifiëren dat jij het bent.</string>
     <string name="login_msisdn_confirm_title">Telefoonnummer bevestigen</string>
     <string name="login_set_msisdn_optional_hint">Telefoon nummer (optioneel)</string>
     <string name="login_set_msisdn_notice2">Gebruik het internationale formaat.</string>
-    <string name="login_set_msisdn_notice">Stel een telefoonnummer in om optioneel toe te staan dat mensen die u kent u kunnen ontdekken.</string>
+    <string name="login_set_msisdn_notice">Stel een telefoonnummer in om optioneel toe te staan dat mensen die je kent jou kunnen ontdekken.</string>
     <string name="login_set_msisdn_title">Telefoonnummer instellen</string>
     <string name="does_not_look_like_valid_email">Lijkt niet op een geldig e-mailadres</string>
-    <string name="login_set_email_notice">Stel een e-mail in om uw account te herstellen. Later kunt u optioneel toelaten dat mensen die u kent u via uw e-mail ontdekken.</string>
+    <string name="login_set_email_notice">Stel een e-mail in om je account te herstellen. Later kan je optioneel toestaan dat mensen die je kent jou via je e-mail ontdekken.</string>
     <string name="login_set_email_title">E-mailadres instellen</string>
-    <string name="login_reset_password_cancel_confirmation_content">Uw wachtwoord is nog niet gewijzigd.
+    <string name="login_reset_password_cancel_confirmation_content">Jouw wachtwoord is nog niet gewijzigd.
 \n
 \nHet proces voor het wijzigen van het wachtwoord stoppen\?</string>
     <string name="login_reset_password_success_submit">Terug naar Inloggen</string>
-    <string name="login_reset_password_success_notice_2">U bent bij alle sessies uitgelogd en ontvangt geen pushmeldingen meer. Log opnieuw in op elk apparaat om meldingen weer in te schakelen.</string>
+    <string name="login_reset_password_success_notice_2">Je bent bij alle sessies uitgelogd en ontvangt geen pushmeldingen meer. Log opnieuw in op elk apparaat om meldingen weer in te schakelen.</string>
     <string name="login_reset_password_success_notice">Je wachtwoord is gereset.</string>
     <string name="login_reset_password_mail_confirmation_submit">Ik heb mijn e-mailadres geverifieerd</string>
-    <string name="login_reset_password_mail_confirmation_notice_2">Tik op de link om uw nieuwe wachtwoord te bevestigen. Klik hieronder als u de link hebt gevolgd die erin staat.</string>
-    <string name="ftue_auth_carousel_secure_title">Word eigenaar van uw gesprekken.</string>
-    <string name="create_space">Ruimte aanmaken</string>
-    <string name="create_spaces_loading_message">Ruimte aanmaken…</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Tik op de link om je nieuwe wachtwoord te bevestigen. Klik hieronder als je de link hebt gevolgd die erin staat.</string>
+    <string name="ftue_auth_carousel_secure_title">Word eigenaar van jouw gesprekken.</string>
+    <string name="create_space">Space aanmaken</string>
+    <string name="create_spaces_loading_message">Space aanmaken…</string>
     <string name="activity_create_space_title">Een ruimte aanmaken</string>
     <string name="dev_tools_event_content_hint">Gebeurtenis inhoud</string>
     <string name="upgrade_room_for_restricted_note">Houd er rekening mee dat bij het upgraden een nieuwe versie van de kamer wordt gemaakt. Alle huidige berichten blijven in deze gearchiveerde kamer.</string>
-    <string name="upgrade_room_for_restricted_no_param">Iedereen in een ouderkamer kan deze kamer vinden en er lid van worden. Het is niet nodig om iedereen handmatig uit te nodigen. U kunt dit op elk moment wijzigen in de kamer instellingen.</string>
+    <string name="upgrade_room_for_restricted_no_param">Iedereen in een ouderspace kan deze kamer vinden en er lid van worden. Het is niet nodig om iedereen handmatig uit te nodigen. Je kan dit op elk moment wijzigen in de kamer instellingen.</string>
     <string name="upgrade_room_warning">Het upgraden van een kamer is een geavanceerde actie en wordt meestal aanbevolen wanneer een kamer onstabiel is vanwege bugs, ontbrekende functies of beveiligingsproblemen.
 \nDit heeft meestal alleen invloed op hoe de kamer op de server wordt verwerkt.</string>
     <string name="space_settings_manage_rooms">Beheer kamers</string>
-    <string name="space_leave_prompt_msg_as_admin">U bent de enige beheerder van deze kamer. Als u het verlaat, betekent dit dat niemand er controle over heeft.</string>
+    <string name="space_leave_prompt_msg_as_admin">Je bent de enige beheerder van deze kamer. Als je het verlaat, betekent dit dat niemand er controle over heeft.</string>
     <string name="room_alias_preview_not_found">Deze alias is momenteel niet toegankelijk.
-\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of u toegang heeft.</string>
+\nProbeer het later opnieuw of vraag een kamerbeheerder om te controleren of je toegang hebt.</string>
     <string name="share_space_link_message">Word lid van mijn kamer %1$s %2$s</string>
-    <string name="create_spaces_join_info_help">Als u lid wilt worden van een bestaande kamer, heeft u een uitnodiging nodig.</string>
+    <string name="create_spaces_join_info_help">Als je lid wil worden van een bestaande kamer, heb je een uitnodiging nodig.</string>
     <string name="event_status_delete_all_failed_dialog_message">Weet je zeker dat je alle niet verzonden berichten in deze kamer wilt verwijderen\?</string>
     <string name="labs_auto_report_uisi">Automatisch rapport versleutelingsfouten.</string>
     <string name="tooltip_attachment_poll">Poll maken</string>
@@ -2179,7 +2179,7 @@
     <string name="tooltip_attachment_file">Upload bestand</string>
     <string name="tooltip_attachment_gallery">Afbeeldingen en video\'s versturen</string>
     <string name="tooltip_attachment_photo">Open camera</string>
-    <string name="delete_poll_dialog_content">Weet u zeker dat u deze poll wilt verwijderen\? U kunt het niet meer herstellen nadat het is verwijderd.</string>
+    <string name="delete_poll_dialog_content">Weet je zeker dat je deze poll wilt verwijderen\? Je kan het niet meer herstellen nadat het is verwijderd.</string>
     <string name="delete_poll_dialog_title">Poll verwijderen</string>
     <string name="poll_end_room_list_preview">Poll beëindigd</string>
     <string name="poll_response_room_list_preview">Stem uitgebracht</string>
@@ -2216,65 +2216,65 @@
     <string name="create_poll_question_hint">Vraag of onderwerp</string>
     <string name="create_poll_question_title">Poll vraag of onderwerp</string>
     <string name="create_poll_title">Poll maken</string>
-    <string name="restart_the_application_to_apply_changes">Start de toepassing opnieuw om de wijziging door te voeren.</string>
+    <string name="restart_the_application_to_apply_changes">Start de applicatie opnieuw om de wijziging door te voeren.</string>
     <string name="labs_enable_latex_maths">LaTeX wiskunde inschakelen</string>
     <string name="link_this_email_with_your_account">%s in Instellingen om uitnodigingen rechtstreeks in ${app_name} te ontvangen.</string>
-    <string name="link_this_email_settings_link">Koppel deze e-mail aan uw account</string>
-    <string name="this_invite_to_this_space_was_sent">Deze uitnodiging voor deze space is verzonden naar %s die niet is gekoppeld aan uw account</string>
-    <string name="this_invite_to_this_room_was_sent">Deze uitnodiging voor deze kamer is verzonden naar %s die niet is gekoppeld aan uw account</string>
+    <string name="link_this_email_settings_link">Koppel deze e-mail aan je account</string>
+    <string name="this_invite_to_this_space_was_sent">Deze uitnodiging voor deze space is verzonden naar %s die niet is gekoppeld aan jouw account</string>
+    <string name="this_invite_to_this_room_was_sent">Deze uitnodiging voor deze kamer is verzonden naar %s die niet is gekoppeld aan jouw account</string>
     <string name="a11y_stop_voice_message">Stop met opnemen</string>
     <string name="voice_message_slide_to_cancel">Schuif om te annuleren</string>
     <string name="a11y_start_voice_message">Spraakbericht opnemen</string>
     <string name="error_failed_to_join_room">Sorry, er is een fout opgetreden bij het proberen deel te nemen aan: %s</string>
     <string name="room_upgrade_to_recommended_version">Upgrade naar de aanbevolen kamerversie</string>
     <string name="room_using_unstable_room_version">In deze kamer wordt versie %s gebruikt, die door deze server als onstabiel is gemarkeerd.</string>
-    <string name="upgrade_room_no_power_to_manage">U heeft toestemming nodig om een kamer te upgraden</string>
+    <string name="upgrade_room_no_power_to_manage">Je hebt toestemming nodig om een kamer te upgraden</string>
     <string name="upgrade_room_update_parent_space">Bovenliggende space automatisch bijwerken</string>
     <string name="upgrade_room_auto_invite">Personen automatisch uitnodigen</string>
-    <string name="upgrade_public_room_from_to">U update de kamer van %1$s naar %2$s.</string>
+    <string name="upgrade_public_room_from_to">Je update de kamer van %1$s naar %2$s.</string>
     <string name="upgrade_private_room">Upgrade privékamer</string>
     <string name="upgrade_public_room">Upgrade openbare kamer</string>
     <string name="upgrade_required">Upgrade vereist</string>
     <string name="it_may_take_some_time">Even geduld, het kan even duren.</string>
     <string name="joining_replacement_room">Deelnemen aan vervangende kamer</string>
     <string name="unnamed_room">Naamloze kamer</string>
-    <string name="this_space_has_no_rooms_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en u een uitnodiging nodig heeft.</string>
-    <string name="this_space_has_no_rooms_not_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en u een uitnodiging nodig heeft.
-\nU heeft geen rechten om kamers toe te voegen.</string>
+    <string name="this_space_has_no_rooms_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en je een uitnodiging nodig hebt.</string>
+    <string name="this_space_has_no_rooms_not_admin">Sommige kamers zijn mogelijk verborgen omdat ze privé zijn en je een uitnodiging nodig hebt.
+\nJe hebt geen rechten om kamers toe te voegen.</string>
     <string name="this_space_has_no_rooms">Deze space heeft geen kamers</string>
-    <string name="spaces_no_server_support_description">Neem contact op met uw server beheerder voor meer informatie</string>
+    <string name="spaces_no_server_support_description">Neem contact op met jouw serverbeheerder voor meer informatie</string>
     <string name="spaces_no_server_support_title">Het lijkt erop dat je server nog geen Spaces ondersteunt</string>
     <string name="spaces_feeling_experimental_subspace">Experimenteel voelen\?
-\nU kunt bestaande spaces aan een space toevoegen.</string>
-    <string name="all_rooms_youre_in_will_be_shown_in_home">Alle kamers waarin u deelneemt, worden weergegeven in Home.</string>
+\nJe kan bestaande spaces aan een space toevoegen.</string>
+    <string name="all_rooms_youre_in_will_be_shown_in_home">Alle kamers waarin je deelneemt, worden weergegeven in Home.</string>
     <string name="preference_show_all_rooms_in_home">Alle kamers op startscherm weergeven</string>
     <string name="space_manage_rooms_and_spaces">Kamers en spaces beheren</string>
     <string name="space_mark_as_suggested">Markeren als aanbevolen</string>
     <string name="space_mark_as_not_suggested">Markeren als niet aanbevolen</string>
     <string name="looking_for_someone_not_in_space">Op zoek naar iemand die niet in %s zit\?</string>
-    <string name="user_invites_you">%s nodigt u uit</string>
-    <string name="labs_auto_report_uisi_desc">Uw systeem verzendt automatisch logboeken wanneer er een fout optreedt die niet kan worden ontsleuteld</string>
-    <string name="you_are_invited">U bent uitgenodigd</string>
+    <string name="user_invites_you">%s nodigt je uit</string>
+    <string name="labs_auto_report_uisi_desc">Jouw systeem verzendt automatisch logboeken wanneer er een fout optreedt die niet kan worden ontsleuteld</string>
+    <string name="you_are_invited">Je bent uitgenodigd</string>
     <string name="spaces_beta_welcome_to_spaces_desc">Spaces zijn een nieuwe manier om kamers en mensen te groeperen.</string>
-    <string name="space_add_space_to_any_space_you_manage">Voeg een space toe aan elke space die u beheert.</string>
+    <string name="space_add_space_to_any_space_you_manage">Voeg een space toe aan elke space die jij beheert.</string>
     <string name="space_add_existing_spaces">Bestaande spaces toevoegen</string>
     <string name="space_add_existing_rooms_only">Bestaande kamers toevoegen</string>
     <string name="space_add_existing_rooms">Bestaande kamers en space toevoegen</string>
-    <string name="space_leave_prompt_msg_private">U kunt pas weer deelnemen als u opnieuw wordt uitgenodigd.</string>
-    <string name="space_leave_prompt_msg_only_you">U bent de enige persoon hier. Als u weggaat, kan niemand meer meedoen, ook u niet.</string>
-    <string name="space_leave_prompt_msg_with_name">Weet u zeker dat u %s wilt verlaten\?</string>
+    <string name="space_leave_prompt_msg_private">Je kan pas weer deelnemen als je opnieuw wordt uitgenodigd.</string>
+    <string name="space_leave_prompt_msg_only_you">Je bent de enige persoon hier. Als je weggaat, kan niemand meer meedoen, ook jij niet.</string>
+    <string name="space_leave_prompt_msg_with_name">Weet je zeker dat je %s wil verlaten\?</string>
     <string name="leave_space">Verlaat</string>
     <string name="space_add_child_title">Kamers toevoegen</string>
     <string name="space_explore_activity_title">Kamers ontdekken</string>
     <plurals name="space_people_you_know">
-        <item quantity="one">%d persoon die u kent is al lid geworden</item>
-        <item quantity="other">%d mensen die u kent zijn al lid geworden</item>
+        <item quantity="one">%d persoon die je kent is al lid geworden</item>
+        <item quantity="other">%d mensen die je kent zijn al lid geworden</item>
     </plurals>
     <string name="discovery_section">Ontdek (%s)</string>
     <string name="finish_setup">Installatie voltooien</string>
     <string name="discovery_invite">Nodig uit via e-mail, vind contacten en meer…</string>
     <string name="finish_setting_up_discovery">Voltooi het instellen van detectie.</string>
-    <string name="create_space_identity_server_info_none">U gebruikt momenteel geen identiteitsserver. Om teamgenoten uit te nodigen en door hen vindbaar te zijn, configureert u er hieronder een.</string>
+    <string name="create_space_identity_server_info_none">Je gebruikt momenteel geen identiteitsserver. Om teamgenoten uit te nodigen en door hen vindbaar te zijn, configureet je er hieronder een.</string>
     <string name="join_anyway">Doe toch mee</string>
     <string name="join_space">Space deelnemen</string>
     <string name="skip_for_now">Voor nu overslaan</string>
@@ -2285,37 +2285,37 @@
     <string name="invite_by_link">Deel link</string>
     <string name="invite_by_username_or_mail">Uitnodigen via inlognaam of e-mailadres</string>
     <string name="invite_by_email">uitnodiging via e-mail</string>
-    <string name="invite_people_to_your_space_desc">Het is alleen u op dit moment. %s zal nog beter zijn met anderen.</string>
+    <string name="invite_people_to_your_space_desc">Het is alleen jij op dit moment. %s zal nog beter zijn met anderen.</string>
     <string name="invite_to_space">Uitnodigen voor %s</string>
     <string name="invite_people_menu">Mensen uitnodigen</string>
-    <string name="invite_people_to_your_space">Nodig mensen uit voor uw space</string>
-    <string name="create_spaces_room_private_header_desc">Laten we voor elk van hen een kamer maken. U kunt later ook meer toevoegen, inclusief reeds bestaande.</string>
-    <string name="create_spaces_room_private_header">Aan welke dingen werkt u\?</string>
-    <string name="create_spaces_invite_public_header_desc">Zorg ervoor dat de juiste mensen toegang hebben tot %s bedrijf. U kunt later meer uitnodigen.</string>
-    <string name="create_spaces_invite_public_header">Wie zijn uw teamgenoten\?</string>
-    <string name="create_spaces_room_public_header_desc">We zullen kamers voor hen maken. U kunt later ook meer toevoegen.</string>
-    <string name="create_spaces_room_public_header">Wat zijn enkele discussies die u wilt voeren in %s\?</string>
+    <string name="invite_people_to_your_space">Nodig mensen uit voor jouw space</string>
+    <string name="create_spaces_room_private_header_desc">Laten we voor elk van hen een kamer maken. Je kan er later ook meer toevoegen, inclusief reeds bestaande.</string>
+    <string name="create_spaces_room_private_header">Aan welke dingen werk jij\?</string>
+    <string name="create_spaces_invite_public_header_desc">Zorg ervoor dat de juiste mensen toegang hebben tot %s bedrijf. Je kan er later meer uitnodigen.</string>
+    <string name="create_spaces_invite_public_header">Wie zijn jouw teamgenoten\?</string>
+    <string name="create_spaces_room_public_header_desc">We zullen kamers voor hen maken. Je kan later ook meer toevoegen.</string>
+    <string name="create_spaces_room_public_header">Wat zijn enkele discussies die je wil voeren in %s\?</string>
     <string name="create_space_error_empty_field_space_name">Geef het een naam om door te gaan.</string>
-    <string name="create_spaces_details_private_header">Voeg wat details toe om mensen te helpen het te identificeren. U kunt deze op elk moment wijzigen.</string>
-    <string name="create_spaces_details_public_header">Voeg wat details toe om het te laten opvallen. U kunt deze op elk moment wijzigen.</string>
-    <string name="space_type_private_desc">Alleen op uitnodiging, het beste voor uzelf of teams</string>
+    <string name="create_spaces_details_private_header">Voeg wat details toe om mensen te helpen het te identificeren. Je kan deze op elk moment wijzigen.</string>
+    <string name="create_spaces_details_public_header">Voeg wat details toe om het te laten opvallen. Je kan deze op elk moment wijzigen.</string>
+    <string name="space_type_private_desc">Alleen op uitnodiging, het beste voor jezelf of teams</string>
     <string name="space_type_public_desc">Open voor iedereen, het beste voor gemeenschappen</string>
-    <string name="create_spaces_private_teammates">Een privé-ruimte voor u en uw teamgenoten</string>
+    <string name="create_spaces_private_teammates">Een privé-ruimte voor jou en jouw teamgenoten</string>
     <string name="create_spaces_me_and_teammates">Ik en teamgenoten</string>
     <string name="create_spaces_organise_rooms">Een privé space om je kamers te organiseren</string>
     <string name="create_spaces_just_me">Alleen ik</string>
     <string name="create_spaces_make_sure_access">Zorg ervoor dat de juiste mensen toegang hebben tot %s.</string>
-    <string name="create_spaces_who_are_you_working_with">Met wie werkt u samen\?</string>
-    <string name="create_spaces_you_can_change_later">U kunt dit later wijzigen</string>
-    <string name="create_spaces_choose_type_label">Wat voor soort ruimte wilt u aanmaken\?</string>
-    <string name="your_private_space">Uw privé-ruimte</string>
-    <string name="your_public_space">Uw openbare ruimte</string>
+    <string name="create_spaces_who_are_you_working_with">Met wie werk je samen\?</string>
+    <string name="create_spaces_you_can_change_later">Je kan dit later wijzigen</string>
+    <string name="create_spaces_choose_type_label">Wat voor soort ruimte wil je aanmaken\?</string>
+    <string name="your_private_space">Jouw privé-ruimte</string>
+    <string name="your_public_space">Jouw openbare ruimte</string>
     <string name="add_space">Space toevoegen</string>
     <string name="private_space">Privé space</string>
     <string name="public_space">Openbare space</string>
     <string name="event_status_delete_all_failed_dialog_title">Niet verzonden berichten verwijderen</string>
     <string name="event_status_failed_messages_warning">Berichten kunnen niet worden verzonden</string>
-    <string name="event_status_cancel_sending_dialog_message">Wilt u het versturen van een bericht annuleren\?</string>
+    <string name="event_status_cancel_sending_dialog_message">Wil je het versturen van een bericht annuleren\?</string>
     <string name="event_status_a11y_delete_all">Alle mislukte berichten verwijderen</string>
     <string name="command_description_upgrade_room">Upgrade een kamer naar een nieuwe versie</string>
     <string name="command_description_leave_room">Verlaat kamer met gegeven id (of huidige kamer indien leeg)</string>
@@ -2325,11 +2325,11 @@
     <string name="room_member_override_nick_color">Kleur weergavenaam overschrijven</string>
     <string name="login_splash_already_have_account">Ik heb al een account</string>
     <string name="ftue_auth_carousel_encrypted_title">Veilig berichtenverkeer.</string>
-    <string name="ftue_auth_carousel_control_title">U heeft de controle.</string>
+    <string name="ftue_auth_carousel_control_title">Jij hebt de controle.</string>
     <string name="tooltip_attachment_location">Deel locatie</string>
     <string name="location_share_external">Open met</string>
-    <string name="location_not_available_dialog_content">${app_name} kan geen toegang krijgen tot uw locatie. Probeer het later opnieuw.</string>
-    <string name="location_not_available_dialog_title">${app_name} heeft geen toegang tot uw locatie</string>
+    <string name="location_not_available_dialog_content">${app_name} kan geen toegang krijgen tot jouw locatie. Probeer het later opnieuw.</string>
+    <string name="location_not_available_dialog_title">${app_name} heeft geen toegang tot jouw locatie</string>
     <string name="location_activity_title_preview">Locatie</string>
     <string name="location_activity_title_static_sharing">Deel locatie</string>
     <string name="closed_poll_option_description">Resultaten worden pas onthuld als je de poll beëindigt</string>
@@ -2345,36 +2345,36 @@
     <string name="encryption_has_been_misconfigured">Versleuteling is verkeerd geconfigureerd.</string>
     <string name="sent_location">Hun locatie gedeeld</string>
     <string name="login_splash_create_account">Account aanmaken</string>
-    <string name="ftue_auth_carousel_workplace_title">Berichten voor uw team.</string>
-    <string name="ftue_auth_carousel_encrypted_body">End-to-end versleuteld en geen telefoonnummer vereist. Geen advertenties of dataverzameling.</string>
-    <string name="ftue_auth_carousel_control_body">Kies waar je gesprekken worden bewaard, zodat u controle en onafhankelijkheid heeft. Verbonden via Matrix.</string>
-    <string name="ftue_auth_carousel_secure_body">Veilige en onafhankelijke communicatie die u dezelfde mate van privacy geeft als een persoonlijk gesprek in uw eigen huis.</string>
+    <string name="ftue_auth_carousel_workplace_title">Berichten voor jouw team.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Eind-tot-eind versleuteld en geen telefoonnummer vereist. Geen advertenties of dataverzameling.</string>
+    <string name="ftue_auth_carousel_control_body">Kies waar je gesprekken worden bewaard, zodat je controle en onafhankelijkheid hebt. Verbonden via Matrix.</string>
+    <string name="ftue_auth_carousel_secure_body">Veilige en onafhankelijke communicatie die je dezelfde mate van privacy geeft als een persoonlijk gesprek in je eigen huis.</string>
     <string name="attachment_type_location">Locatie</string>
-    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt versturen. Klik om instellingen te openen.</string>
-    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat u geen berichten kunt versturen. Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
+    <string name="room_unsupported_e2e_algorithm_as_admin">De versleuteling is verkeerd geconfigureerd, zodat je geen berichten kunt versturen. Klik om instellingen te openen.</string>
+    <string name="room_unsupported_e2e_algorithm">De versleuteling is verkeerd geconfigureerd, zodat je geen berichten kunt versturen. Neem contact op met een beheerder om de versleuteling in een geldige staat te herstellen.</string>
     <string name="message_bubbles">Berichtbubbels weergeven</string>
     <string name="location_timeline_failed_to_load_map">Kan kaart niet laden</string>
     <string name="a11y_static_map_image">Kaart</string>
     <string name="labs_enable_thread_messages_desc">Let op: app wordt opnieuw gestart</string>
     <string name="labs_enable_thread_messages">Discussieberichten inschakelen</string>
     <string name="ftue_auth_use_case_connect_to_server">Verbinding maken met server</string>
-    <string name="ftue_auth_use_case_join_existing_server">Wilt u lid worden van een bestaande server\?</string>
+    <string name="ftue_auth_use_case_join_existing_server">Wil je lid worden van een bestaande server\?</string>
     <string name="ftue_auth_use_case_skip_partial">Sla deze vraag over</string>
     <string name="ftue_auth_use_case_skip">Nog niet zeker\? %s</string>
     <string name="ftue_auth_use_case_option_three">Gemeenschappen</string>
     <string name="ftue_auth_use_case_option_two">Teams</string>
     <string name="ftue_auth_use_case_option_one">Vrienden en familie</string>
-    <string name="ftue_auth_use_case_subtitle">We helpen u om verbinding te maken</string>
-    <string name="ftue_auth_use_case_title">Met wie gaat u het meest chatten\?</string>
-    <string name="navigate_to_thread_when_already_in_the_thread">U bekijkt deze discussie al!</string>
+    <string name="ftue_auth_use_case_subtitle">We helpen je om verbinding te maken</string>
+    <string name="ftue_auth_use_case_title">Met wie ga je het meest chatten\?</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">Je bekijkt deze thread al!</string>
     <string name="view_in_room">Bekijk in kamer</string>
-    <string name="reply_in_thread">Reageren in discussie</string>
+    <string name="reply_in_thread">Reageren in thread</string>
     <string name="command_not_supported_in_threads">Het commando \"%s\" wordt herkend maar niet ondersteund in discussies.</string>
-    <string name="search_thread_from_a_thread">Van een discussie</string>
+    <string name="search_thread_from_a_thread">Van een thread</string>
     <string name="thread_list_empty_notice">Tip: Tik lang op een bericht en gebruik \"%s\".</string>
     <string name="thread_list_empty_subtitle">Discussies helpen je gesprekken on-topic te houden en gemakkelijk bij te houden.</string>
-    <string name="thread_list_empty_title">Houd discussies georganiseerd met discussielijnen</string>
-    <string name="thread_list_modal_my_threads_subtitle">Toont alle discussies waaraan u heeft deelgenomen</string>
+    <string name="thread_list_empty_title">Houd discussies georganiseerd met threads</string>
+    <string name="thread_list_modal_my_threads_subtitle">Toont alle discussies waaraan je hebt deelgenomen</string>
     <string name="thread_list_modal_my_threads_title">Mijn discussies</string>
     <string name="thread_list_modal_all_threads_subtitle">Toont alle discussies van de huidige kamer</string>
     <string name="thread_list_modal_all_threads_title">Alle discussies</string>
@@ -2384,7 +2384,7 @@
     <string name="room_threads_filter">Discussies in de kamer filteren</string>
     <string name="action_thread_copy_link_to_thread">Kopieer link naar discussie</string>
     <string name="action_thread_view_in_room">Bekijk in kamer</string>
-    <string name="action_view_threads">Discussies bekijken</string>
+    <string name="action_view_threads">Thead bekijken</string>
     <string name="room_message_autocomplete_users">Personen</string>
     <string name="error_forbidden_digits_only_username">De server accepteert geen inlognaam met alleen cijfers.</string>
     <string name="room_message_autocomplete_notification">Kamer notificatie</string>
@@ -2408,24 +2408,24 @@
     <string name="a11y_location_share_pin_on_map">Pin van geselecteerde locatie op kaart</string>
     <string name="ftue_personalize_skip_this_step">Sla deze stap over</string>
     <string name="ftue_personalize_submit">Opslaan en doorgaan</string>
-    <string name="ftue_personalize_complete_subtitle">U kunt op elk moment bij de instellingen uw profiel bijwerken</string>
+    <string name="ftue_personalize_complete_subtitle">Je kan op elk moment bij de instellingen jouw profiel bijwerken</string>
     <string name="ftue_personalize_complete_title">Ziet er goed uit!</string>
     <string name="ftue_personalize_lets_go">Laten we beginnen</string>
-    <string name="ftue_profile_picture_subtitle">Tijd om een gezicht bij uw naam te voegen</string>
+    <string name="ftue_profile_picture_subtitle">Tijd om een gezicht bij je naam te voegen</string>
     <string name="ftue_profile_picture_title">Voeg een profielfoto toe</string>
-    <string name="ftue_display_name_entry_footer">U kunt dit later wijzigen</string>
+    <string name="ftue_display_name_entry_footer">Je kunt dit later wijzigen</string>
     <string name="ftue_display_name_entry_title">Weergavenaam</string>
     <string name="ftue_display_name_title">Kies een weergavenaam</string>
-    <string name="ftue_account_created_subtitle">Uw account %s is aangemaakt</string>
+    <string name="ftue_account_created_subtitle">Jouw account %s is aangemaakt</string>
     <string name="ftue_account_created_congratulations_title">Gefeliciteerd!</string>
     <string name="ftue_account_created_take_me_home">Breng me naar het begin</string>
     <string name="ftue_account_created_personalize">Personaliseer profiel</string>
-    <string name="threads_notice_migration_message">We komen dichter bij het uitbrengen van een openbare bèta voor Discussies.
+    <string name="threads_notice_migration_message">We komen dichter bij het uitbrengen van een openbare bèta voor Threads.
 \n
 \nTerwijl we ons erop voorbereiden, moeten we enkele wijzigingen aanbrengen: discussies die vóór dit punt zijn gemaakt, worden weergegeven als gewone antwoorden.
 \n
-\nDit zal een eenmalige overgang zijn, aangezien Discussies nu deel uitmaken van de Matrix-specificatie.</string>
-    <string name="threads_notice_migration_title">Discussies die bèta naderen 🎉</string>
+\nDit zal een eenmalige overgang zijn, aangezien Threads nu deel uitmaken van de Matrix-specificatie.</string>
+    <string name="threads_notice_migration_title">Threads benaderen bèta 🎉</string>
     <string name="room_notification_more_than_two_users_are_typing">%1$s, %2$s en anderen</string>
     <string name="room_notification_two_users_are_typing">%1$s en %2$s</string>
     <string name="action_disable">Uitzetten</string>
@@ -2437,7 +2437,7 @@
     <string name="location_share_live_select_duration_option_3">8 uur</string>
     <string name="location_share_live_select_duration_option_2">1 uur</string>
     <string name="location_share_live_select_duration_option_1">15 minuten</string>
-    <string name="location_share_live_select_duration_title">Deel uw live locatie voor</string>
+    <string name="location_share_live_select_duration_title">Deel jouw live locatie voor</string>
     <string name="audio_message_file_size">(%1$s)</string>
     <string name="audio_message_reply_content">%1$s (%2$s)</string>
     <string name="error_audio_message_unable_to_play">%1$s kan niet worden afgeluisterd</string>
@@ -2448,17 +2448,17 @@
     <string name="sent_live_location">Hun live locatie gedeeld</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name} is ook geweldig voor op de werkplek. Het wordt vertrouwd door \'s werelds veiligste organisaties.</string>
     <string name="beta">BÈTA</string>
-    <string name="send_feedback_threads_info">Discussies zijn werk in uitvoering met nieuwe, opwindende aankomende functies, zoals verbeterde meldingen. We horen graag uw feedback!</string>
+    <string name="send_feedback_threads_info">Threads zijn werk in uitvoering met nieuwe, opwindende aankomende functies, zoals verbeterde meldingen. We horen graag jouw feedback!</string>
     <string name="send_feedback_threads_title">Discussies Beta-feedback</string>
     <string name="give_feedback_threads">Geef feedback</string>
     <string name="beta_title_bottom_sheet_action">BÈTA</string>
-    <string name="settings_presence_user_always_appears_offline_summary">Indien ingeschakeld, verschijnt u altijd offline voor andere personen, zelfs wanneer u de applicatie gebruikt.</string>
+    <string name="settings_presence_user_always_appears_offline_summary">Indien ingeschakeld, verschijn je altijd offline voor andere personen, zelfs wanneer je de applicatie gebruikt.</string>
     <string name="settings_presence_user_always_appears_offline">Offline modus</string>
     <string name="settings_presence">Aanwezigheid</string>
-    <string name="threads_labs_enable_notice_message">Uw server ondersteunt momenteel geen discussies, dus deze functie kan onbetrouwbaar zijn. Sommige berichten in een discussie zijn mogelijk niet betrouwbaar beschikbaar. %sWilt u toch discussies inschakelen\?</string>
-    <string name="threads_labs_enable_notice_title">Discussies bèta</string>
-    <string name="threads_beta_enable_notice_message">Discussies helpen uw gesprekken on-topic te houden en gemakkelijk bij te houden. %s Als u discussies inschakelt, wordt de app vernieuwd. Bij sommige accounts kan dit langer duren.</string>
-    <string name="threads_beta_enable_notice_title">Discussies bèta</string>
+    <string name="threads_labs_enable_notice_message">Jouw server ondersteunt momenteel geen threads, dus deze functionaliteit kan onbetrouwbaar zijn. Sommige berichten in een thread zijn mogelijk niet betrouwbaar beschikbaar. %sWil je threads toch inschakelen\?</string>
+    <string name="threads_labs_enable_notice_title">Threads bèta</string>
+    <string name="threads_beta_enable_notice_message">Threads helpen je gesprekken on-topic te houden en gemakkelijk bij te houden. %s Als je threads inschakelt, wordt de app vernieuwd. Bij sommige accounts kan dit langer duren.</string>
+    <string name="threads_beta_enable_notice_title">Threads bèta</string>
     <string name="action_learn_more">Leer meer</string>
     <string name="action_try_it_out">Probeer het uit</string>
     <string name="screen_sharing_notification_description">Scherm delen is bezig</string>
@@ -2482,7 +2482,7 @@
     <string name="location_share_live_until">Live tot %1$s</string>
     <string name="location_share_live_view">Bekijk live locatie</string>
     <string name="location_share_live_ended">Live locatie beëindigd</string>
-    <string name="space_explore_filter_no_result_description">Sommige resultaten zijn mogelijk verborgen omdat ze privé zijn en u hiervoor een uitnodiging nodig heeft.</string>
+    <string name="space_explore_filter_no_result_description">Sommige resultaten zijn mogelijk verborgen omdat ze privé zijn en je hiervoor een uitnodiging nodig hebt.</string>
     <string name="space_explore_filter_no_result_title">Geen resultaten gevonden</string>
     <string name="space_leave_radio_button_none">Verlaat geen</string>
     <string name="space_leave_radio_button_all">Verlaat alles</string>
@@ -2493,7 +2493,7 @@
     <string name="time_unit_minute_short">min</string>
     <string name="time_unit_hour_short">u</string>
     <string name="live_location_labs_promotion_switch_title">Locatie delen inschakelen</string>
-    <string name="live_location_labs_promotion_description">Let op: dit is een labfunctie met een tijdelijke implementatie. Dit betekent dat u uw locatiegeschiedenis niet kunt verwijderen en dat geavanceerde gebruikers uw locatiegeschiedenis kunnen zien, zelfs nadat u stopt met het delen van uw live locatie met deze ruimte.</string>
+    <string name="live_location_labs_promotion_description">Let op: dit is een labfunctie met een tijdelijke implementatie. Dit betekent dat je jouw locatiegeschiedenis niet kunt verwijderen en dat geavanceerde gebruikers jouw locatiegeschiedenis kunnen zien, zelfs nadat je stopt met het delen van je live locatie met deze ruimte.</string>
     <string name="live_location_labs_promotion_title">Live locatie delen</string>
     <string name="settings_troubleshoot_test_current_gateway">Huidige gateway: %s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
@@ -2512,9 +2512,9 @@
     <string name="settings_notification_method">Meldingsmethode</string>
     <string name="unifiedpush_distributor_background_sync">Achtergrondsynchronisatie</string>
     <string name="unifiedpush_distributor_fcm_fallback">Google Services</string>
-    <string name="unifiedpush_getdistributors_dialog_title">Kies hoe u meldingen wilt ontvangen</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Kies hoe je meldingen wil ontvangen</string>
     <string name="settings_security_pin_code_use_biometrics_error">Kan biometrische authenticatie niet inschakelen.</string>
-    <string name="auth_biometric_key_invalidated_message">Biometrische authenticatie is uitgeschakeld omdat er onlangs een nieuwe biometrische authenticatiemethode is toegevoegd. U kunt het weer inschakelen in Instellingen.</string>
+    <string name="auth_biometric_key_invalidated_message">Biometrische authenticatie is uitgeschakeld omdat er onlangs een nieuwe biometrische authenticatiemethode is toegevoegd. Je kan het weer inschakelen in Instellingen.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Meldingsmethode resetten</string>
     <string name="push_gateway_item_profile_tag">Profieltag:</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">Kan eindpunt token niet registreren op server:
@@ -2525,7 +2525,7 @@
     <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="send_your_first_msg_to_invite">Stuur je 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>
     <plurals name="room_removed_messages">
@@ -2533,49 +2533,49 @@
         <item quantity="other">%d berichten verwijderd</item>
     </plurals>
     <string name="live_location_share_location_item_share">Deel locatie</string>
-    <string name="live_location_not_enough_permission_dialog_description">U moet de juiste rechten hebben om de live locatie in deze kamer te delen.</string>
-    <string name="live_location_not_enough_permission_dialog_title">U heeft geen toestemming om de live locatie te delen</string>
+    <string name="live_location_not_enough_permission_dialog_description">Je moet de juiste rechten hebben om de live locatie in deze kamer te delen.</string>
+    <string name="live_location_not_enough_permission_dialog_title">Je hebt geen toestemming om de live locatie te delen</string>
     <string name="permalink_unsupported_groups">Kan deze link niet openen: communities zijn vervangen door spaces</string>
     <string name="ftue_auth_login_username_entry">Gebruikersnaam / E-mailadres / Telefoonnummer</string>
-    <string name="ftue_auth_captcha_title">Bent u een mens\?</string>
+    <string name="ftue_auth_captcha_title">Ben je een mens\?</string>
     <string name="ftue_auth_password_reset_email_confirmation_subtitle">Volg de instructies die naar %s zijn verstuurd</string>
     <string name="ftue_auth_password_reset_confirmation">Wachtwoord reset</string>
     <string name="ftue_auth_forgot_password">Wachtwoord vergeten</string>
-    <string name="ftue_auth_email_resend_email">Email opnieuw verzenden</string>
+    <string name="ftue_auth_email_resend_email">E-mail opnieuw verzenden</string>
     <string name="ftue_auth_email_verification_footer">Geen e-mail ontvangen\?</string>
     <string name="ftue_auth_email_verification_subtitle">Volg de instructies die naar %s zijn gestuurd</string>
-    <string name="ftue_auth_email_verification_title">Verifieer uw e-mailadres</string>
+    <string name="ftue_auth_email_verification_title">Verifieer je e-mailadres</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Code nogmaals versturen</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Er is een code verzonden naar %s</string>
-    <string name="ftue_auth_phone_confirmation_title">Bevestig uw telefoonnummer</string>
+    <string name="ftue_auth_phone_confirmation_title">Bevestig je telefoonnummer</string>
     <string name="ftue_auth_sign_out_all_devices">Alle apparaten uitloggen</string>
     <string name="ftue_auth_reset_password">Reset wachtwoord</string>
     <string name="ftue_auth_new_password_subtitle">Zorg ervoor dat het 8 tekens of meer zijn.</string>
     <string name="ftue_auth_new_password_title">Kies een nieuw wachtwoord</string>
     <string name="ftue_auth_new_password_entry_title">Nieuw wachtwoord</string>
-    <string name="ftue_auth_reset_password_breaker_title">Controleer uw e-mail.</string>
-    <string name="ftue_auth_reset_password_email_subtitle">%s stuurt u een verificatielink</string>
+    <string name="ftue_auth_reset_password_breaker_title">Controleer je e-mail.</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s stuurt je een verificatielink</string>
     <string name="ftue_auth_phone_confirmation_entry_title">Bevestigingscode</string>
     <string name="ftue_auth_phone_entry_title">Telefoonnummer</string>
-    <string name="ftue_auth_phone_subtitle">%s moet uw account verifiëren</string>
-    <string name="ftue_auth_phone_title">Vul uw telefoonnummer in</string>
+    <string name="ftue_auth_phone_subtitle">%s moet je account verifiëren</string>
+    <string name="ftue_auth_phone_title">Vul je telefoonnummer in</string>
     <string name="ftue_auth_email_entry_title">E-mail</string>
-    <string name="ftue_auth_email_subtitle">%s moet uw account verifiëren</string>
-    <string name="ftue_auth_email_title">Vul uw e-mailadres in</string>
+    <string name="ftue_auth_email_subtitle">%s moet jouw account verifiëren</string>
+    <string name="ftue_auth_email_title">Vul jouw e-mailadres in</string>
     <string name="ftue_auth_terms_subtitle">Lees de voorwaarden en het beleid van %s door</string>
     <string name="ftue_auth_terms_title">Serverbeleiden</string>
     <string name="ftue_auth_choose_server_ems_cta">Neem contact op</string>
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) is een robuuste en betrouwbare hostingservice voor snelle, veilige en realtime communicatie. Ontdek hoe op <a href="${ftue_ems_url}">element.io/ems</a></string>
-    <string name="ftue_auth_choose_server_ems_title">Wilt u uw eigen server hosten\?</string>
+    <string name="ftue_auth_choose_server_ems_title">Wil je jouw eigen server hosten\?</string>
     <string name="ftue_auth_choose_server_entry_hint">Server URL</string>
-    <string name="ftue_auth_choose_server_subtitle">Wat is het adres van uw server\? Dit is als uw huis voor al uw data</string>
-    <string name="ftue_auth_choose_server_title">Selecteer uw server</string>
+    <string name="ftue_auth_choose_server_subtitle">Wat is het adres van jouw server\? Dit is als een huis voor al jouw data</string>
+    <string name="ftue_auth_choose_server_title">Selecteer je server</string>
     <string name="ftue_auth_welcome_back_title">Welkom terug!</string>
     <string name="ftue_auth_create_account_edit_server_selection">Bewerk</string>
     <string name="ftue_auth_create_account_sso_section_header">Of</string>
-    <string name="ftue_auth_create_account_choose_server_header">Waar uw gesprekken zijn opgeslagen</string>
+    <string name="ftue_auth_create_account_choose_server_header">Waar jouw gesprekken worden opgeslagen</string>
     <string name="ftue_auth_create_account_password_entry_footer">Moet 8 tekens of meer zijn</string>
-    <string name="ftue_auth_create_account_username_entry_footer">Anderen kunnen u ontdekken %s</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Anderen kunnen je ontdekken %s</string>
     <string name="ftue_auth_create_account_title">Maak een account aan</string>
     <string name="font_size_use_system">Systeemstandaard gebruiken</string>
     <string name="font_size_section_manually">Handmatig kiezen</string>
@@ -2585,11 +2585,11 @@
     <string name="labs_enable_element_call_permission_shortcuts">Snelkoppelingen voor Element Oproep machtigingen inschakelen</string>
     <string name="live_location_description">Live locatie</string>
     <string name="verify_invalid_qr_notice">Deze QR-code lijkt misvormd. Probeer te verifiëren met een andere methode.</string>
-    <string name="crosssigning_cannot_verify_this_session_desc">U hebt geen toegang tot de gecodeerde berichtgeschiedenis. Reset uw Veilige Berichten Back-up en verificatiesleutels om opnieuw te beginnen.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Je hebt geen toegang tot de gecodeerde berichtgeschiedenis. Reset je Veilige Berichten Back-up en verificatiesleutels om opnieuw te beginnen.</string>
     <string name="crosssigning_cannot_verify_this_session">Kan dit apparaat niet verifiëren</string>
-    <string name="ftue_auth_choose_server_sign_in_subtitle">Wat is het adres van uw server\?</string>
-    <string name="ftue_auth_sign_in_choose_server_header">Waar uw conversaties leven</string>
-    <string name="updating_your_data">Uw gegevens bijwerken…</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Wat is het adres van jouw server\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Waar jouw gesprekken zijn opgeslagen</string>
+    <string name="updating_your_data">Jouw gegevens bijwerken…</string>
     <plurals name="search_space_multiple_parents">
         <item quantity="one">%1$s en %2$d andere</item>
         <item quantity="other">%1$s en %2$d andere</item>
@@ -2599,7 +2599,7 @@
     <string name="location_share_loading_map_error">Kan kaart niet laden
 \nDeze server is mogelijk niet geconfigureerd om kaarten weer te geven.</string>
     <string name="a11y_open_settings">Open instellingen</string>
-    <string name="device_manager_sessions_other_description">Voor de beste beveiliging verifieert u uw sessies en meldt u zich af bij elke sessie die u niet meer herkent of gebruikt.</string>
+    <string name="device_manager_sessions_other_description">Voor de beste beveiliging verifieer je jouw sessies en meld je jezelf af bij elke sessie die je niet meer herkent of gebruikt.</string>
     <string name="device_manager_sessions_other_title">Andere sessies</string>
     <string name="settings_sessions_list">Sessies</string>
     <string name="a11y_open_spaces">Lijst met publieke spaces</string>
@@ -2618,18 +2618,18 @@
     <string name="create_room">Kamer creëren</string>
     <string name="start_chat">Gesprek starten</string>
     <string name="all_chats">Alle gesprekken</string>
-    <string name="onboarding_new_app_layout_feedback_message">U kunt feedback geven via het menu rechtsboven.</string>
-    <string name="onboarding_new_app_layout_spaces_message">Krijg sneller en gemakkelijker toegang tot uw ruimten (rechtsonder).</string>
-    <string name="onboarding_new_app_layout_welcome_message">Om ${app_name} te versimpelen zijn tabbladen nu optioneel. U kunt ze beheren in het menu rechtsboven.</string>
-    <string name="home_empty_no_unreads_message">Hier zullen uw ongelezen berichten verschijnen wanneer u deze heeft.</string>
+    <string name="onboarding_new_app_layout_feedback_message">Je kan feedback geven via het menu rechtsboven.</string>
+    <string name="onboarding_new_app_layout_spaces_message">Krijg sneller en gemakkelijker toegang tot jouw spaces (rechtsonder).</string>
+    <string name="onboarding_new_app_layout_welcome_message">Om ${app_name} te versimpelen zijn tabbladen nu optioneel. Je kan ze beheren in het menu rechtsboven.</string>
+    <string name="home_empty_no_unreads_message">Hier zullen jouw ongelezen berichten verschijnen wanneer je deze hebt.</string>
     <string name="home_empty_no_rooms_message">De allesomvattende beveiligde chat-app voor teams, vrienden en organisaties. Maak een gesprek aan of word deelnemer van een bestaande kamer om te beginnen.</string>
-    <string name="home_empty_space_no_rooms_message">Ruimten zijn een nieuwe manier om kamers en personen te groeperen. Voeg een bestaande kamer toe, of maak een nieuwe aan via de knop rechtsonder.</string>
+    <string name="home_empty_space_no_rooms_message">Spaces zijn een nieuwe manier om kamers en personen te groeperen. Voeg een bestaande kamer toe, of maak een nieuwe aan via de knop rechtsonder.</string>
     <plurals name="device_manager_inactive_sessions_description">
-        <item quantity="one">Overweeg uit te loggen van oude sessies (%1$d of meer dagen) welke u niet meer gebruikt.</item>
-        <item quantity="other">Overweeg uit te loggen van oude sessies (%1$d of meer dagen) welke u niet meer gebruikt.</item>
+        <item quantity="one">Overweeg uit te loggen van oude sessies (%1$d of meer dagen) welke je niet meer gebruikt.</item>
+        <item quantity="other">Overweeg uit te loggen van oude sessies (%1$d of meer dagen) welke je niet meer gebruikt.</item>
     </plurals>
     <string name="device_manager_unverified_sessions_description">Verifieer of log uit van ongeverifieerde sessies.</string>
-    <string name="device_manager_header_section_security_recommendations_description">Verbeter uw accountbeveiliging door deze aanbevelingen te volgen.</string>
+    <string name="device_manager_header_section_security_recommendations_description">Verbeter je accountbeveiliging door deze aanbevelingen te volgen.</string>
     <plurals name="device_manager_other_sessions_description_inactive">
         <item quantity="one">Al %1$d+ dag inactief (%2$s)</item>
         <item quantity="other">Al %1$d+ dagen inactief (%2$s)</item>
@@ -2653,8 +2653,8 @@
     <string name="device_manager_verify_session">Sessie verifiëren</string>
     <string name="timeline_error_room_not_found">Sorry, deze kamer kon niet worden gevonden.
 \nProbeer het later opnieuw. %s</string>
-    <string name="invites_empty_message">Dit is waar uw nieuwe verzoeken en uitnodigingen zullen verschijnen.</string>
-    <string name="space_list_empty_message">Ruimten zijn een nieuwe manier om kamers en personen te groeperen. Maak een ruimte aan om te beginnen.</string>
+    <string name="invites_empty_message">Dit is waar jouw nieuwe verzoeken en uitnodigingen zullen verschijnen.</string>
+    <string name="space_list_empty_message">Spaces zijn een nieuwe manier om kamers en personen te groeperen. Maak een space aan om te beginnen.</string>
     <string name="device_manager_verification_status_unverified">Ongeverifieerde sessie</string>
     <string name="device_manager_verification_status_verified">Geverifieerde sessie</string>
     <string name="a11y_device_manager_device_type_unknown">Onbekend apparaattype</string>
@@ -2663,8 +2663,102 @@
     <string name="a11y_device_manager_device_type_mobile">Mobiel</string>
     <string name="invites_empty_title">Niets nieuws.</string>
     <string name="invites_title">Uitnodigingen</string>
-    <string name="space_list_empty_title">Nog geen ruimten.</string>
+    <string name="space_list_empty_title">Nog geen spaces.</string>
     <string name="a11y_collapse_space_children">%s subitems inklappen</string>
     <string name="a11y_expand_space_children">%s subitems uitvouwen</string>
-    <string name="change_space">Ruimte aanpassen</string>
-</resources>
+    <string name="change_space">Space veranderen</string>
+    <string name="command_description_table_flip">Voeg (╯°□°）╯︵ ┻━┻ toe voor elk platte tekst bericht</string>
+    <string name="attachment_type_voice_broadcast">Spraakuitzending</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} heeft toestemming nodig om notificaties te laten zien.
+\nGeef alsjeblieft toestemming.</string>
+    <string name="labs_enable_rich_text_editor_summary">Probeer de rich-text-editor (platte tekst-modus binnenkort beschikbaar)</string>
+    <string name="labs_enable_rich_text_editor_title">Rich-text-editor inschakelen</string>
+    <string name="labs_enable_deferred_dm_title">Uitgestelde privéberichten inschakelen</string>
+    <string name="labs_enable_new_app_layout_summary">Een vereenvoudigde Element met optionele tabs</string>
+    <string name="labs_enable_new_app_layout_title">Nieuwe layout inschakelen</string>
+    <string name="qr_code_login_confirm_security_code">Bevestigen</string>
+    <string name="qr_code_login_try_again">Opnieuw proberen</string>
+    <string name="qr_code_login_signing_in">Je wordt ingelogd</string>
+    <string name="qr_code_login_connecting_to_device">Verbinden met apparaat</string>
+    <string name="qr_code_login_scan_qr_code_button">Scan QR-code</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">Inloggen op een mobiel apparaat\?</string>
+    <string name="qr_code_login_show_qr_code_button">Toon QR-code op dit apparaat</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Begin op het inlogscherm</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Begin op het inlogscherm</string>
+    <string name="qr_code_login_new_device_instruction_2">Ga naar Instellingen -&gt; Veiligheid &amp; privacy</string>
+    <string name="qr_code_login_new_device_instruction_1">Open de app op je andere apparaat</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">Het inloggen is afgebroken op het andere apparaat.</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">Die QR-code is ongeldig.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">Het andere apparaat moet ingelogd zijn.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">Het andere apparaat is al ingelogd.</string>
+    <string name="qr_code_login_header_failed_other_description">De aanvraag is mislukt.</string>
+    <string name="qr_code_login_header_failed_denied_description">De aanvraag is op het andere apparaat geweigerd.</string>
+    <string name="qr_code_login_header_failed_timeout_description">De verbinding kon niet in de benodigde tijd tot stand worden gebracht.</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">Verbinden met dit apparaat wordt niet ondersteund.</string>
+    <string name="qr_code_login_header_failed_title">Verbinding mislukt</string>
+    <string name="qr_code_login_header_connected_title">Beveiligde verbinding tot stand gebracht</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">Scan de onderstaande QR-code met je uitgelogde apparaat.</string>
+    <string name="qr_code_login_header_show_qr_code_title">Inloggen met QR-code</string>
+    <string name="qr_code_login_header_scan_qr_code_description">Gebruik de camera op dit apparaat om de op het andere apparaat getoonde QR-code te scannen:</string>
+    <string name="qr_code_login_header_scan_qr_code_title">Scan QR-code</string>
+    <string name="device_manager_learn_more_sessions_verified_title">Geverifieerde sessies</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">Niet-geverifieerde sessies</string>
+    <string name="device_manager_learn_more_sessions_inactive">Inactieve sessies zijn sessies die je al een tijd niet gebruikt hebt, maar deze blijven encryptiesleutels ontvangen.
+\n
+\nVerwijder inactieve sessies om de veiligheid en prestaties te verbeteren. Het helpt je ook met het herkennen van mogelijk verdachte nieuwe sessies.</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">Inactieve sessies</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">Je kan dit apparaat gebruiken om in te loggen op een ander apparaat met een QR-code. Er zijn twee manier om dit te doen:</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">Log in met QR-code</string>
+    <string name="device_manager_session_rename_warning">Wees bewust dat sessienamen ook zichtbaar zijn voor personen met wie je communiceert.</string>
+    <string name="device_manager_session_rename_edit_hint">Sessienaam</string>
+    <string name="device_manager_session_details_device_ip_address">IP-adres</string>
+    <string name="device_manager_session_details_device_operating_system">Besturingssysteem</string>
+    <string name="device_manager_session_details_application_version">Versie</string>
+    <string name="device_manager_session_details_application_name">Naam</string>
+    <string name="device_manager_session_details_application">Applicatie</string>
+    <string name="device_manager_session_details_session_name">Sessienaam</string>
+    <string name="device_manager_push_notifications_description">Ontvang pushnotificaties op deze sessie.</string>
+    <string name="device_manager_push_notifications_title">Pushnotificaties</string>
+    <string name="device_manager_session_details_title">Sessiedetails</string>
+    <string name="device_manager_session_overview_signout">Uitloggen voor deze sessie</string>
+    <string name="device_manager_other_sessions_clear_filter">Filter wissen</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">Geen inactieve sessies gevonden.</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">Geen niet-geverifieerde sessies gevonden.</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">Geen geverifieerde sessies gevonden.</string>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">Inactief</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">Niet geverifieerd</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">Geverifieerd</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="one">%1$d dag of langer inactief</item>
+        <item quantity="other">%1$d dagen of langer inactief</item>
+    </plurals>
+    <string name="device_manager_filter_option_inactive">Inactief</string>
+    <string name="device_manager_filter_option_unverified_description">Niet klaar voor veilige communicatie</string>
+    <string name="device_manager_filter_option_unverified">Niet geverifieerd</string>
+    <string name="device_manager_filter_option_verified_description">Klaar voor veilige communicatie</string>
+    <string name="device_manager_filter_option_verified">Geverifieerd</string>
+    <string name="device_manager_filter_option_all_sessions">Alle sessies</string>
+    <string name="device_manager_device_title">Apparaat</string>
+    <string name="device_manager_session_title">Sessie</string>
+    <string name="device_manager_current_session_title">Huidige Sessie</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">Niet geverifeerd · Jouw huidige sessie</string>
+    <string name="device_manager_verification_status_detail_current_session_unverified">Verifieer je huidige sessie voor verbeterde veilige communicatie.</string>
+    <string name="device_manager_verification_status_detail_other_session_verified">Deze sessie is klaar voor veilige communicatie.</string>
+    <string name="device_manager_verification_status_detail_current_session_verified">Je huidige sessie is klaar voor veilige communicatie.</string>
+    <string name="device_manager_verification_status_unknown">Onbekende verificatiestatus</string>
+    <string name="a11y_voice_broadcast_buffering">Bufferen</string>
+    <string name="voice_broadcast_live">Live</string>
+    <string name="key_authenticity_not_guaranteed">De authenticiteit van dit versleutelde bericht kan niet worden gegarandeerd op dit apparaat.</string>
+    <string name="settings_security_incognito_keyboard_title">Incognito toetsenbord</string>
+    <string name="login_scan_qr_code">Scan QR-code</string>
+    <string name="push_gateway_item_enabled">Ingeschakeld:</string>
+    <string name="push_gateway_item_device_id">Sessie ID:</string>
+    <string name="error_check_network">Er is iets fout gegaan. Controleer je netwerkverbinding en probeer het opnieuw.</string>
+    <string name="some_devices_will_not_be_able_to_decrypt">⚠ Er zijn niet-geverifieerde apparaten in deze kamer. Deze zullen niet in staat zijn de door jouw verzonden berichten te ontsleutelen.</string>
+    <string name="encryption_never_send_to_unverified_devices_in_room">Stuur nooit versleutelde berichten naar niet-geverifieerde sessie in deze kamer.</string>
+    <string name="grant_permission">Toestemming geven</string>
+    <string name="permissions_rationale_msg_notification">${app_name} heeft toestemming nodig om notificaties te laten zien. Notificaties kunnen je berichten, uitnodigen, etc. tonen. 
+\n
+\nGeeft toestemming bij de volgende pop-ups om notificaties te kunnen zien.</string>
+    <string name="action_got_it">Begrepen</string>
+</resources>
\ No newline at end of file

From 2a0b1ab97b2d0e969c1f1064cd8bc130236c134f Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Wed, 26 Oct 2022 05:08:57 +0000
Subject: [PATCH 246/300] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
index efee012faa..913dacd8bb 100644
--- a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
@@ -2814,4 +2814,11 @@
     <string name="qr_code_login_header_failed_other_description">A requisição falhou.</string>
     <string name="labs_enable_voice_broadcast_summary">Seja capaz de gravar e enviar broadcast de voz em timeline de sala.</string>
     <string name="labs_enable_voice_broadcast_title">Broadcast de voz (sob desenvolvimento ativo)</string>
+    <string name="a11y_voice_broadcast_buffering">Buffering</string>
+    <string name="a11y_pause_voice_broadcast">Pausar broadcast de voz</string>
+    <string name="a11y_play_voice_broadcast">Tocar ou retomar broadcast de voz</string>
+    <string name="a11y_stop_voice_broadcast_record">Parar gravação de broadcast de voz</string>
+    <string name="a11y_pause_voice_broadcast_record">Pausar gravação de broadcast de voz</string>
+    <string name="a11y_resume_voice_broadcast_record">Retomar gravação de broadcast de voz</string>
+    <string name="voice_broadcast_live">Ao vivo</string>
 </resources>
\ No newline at end of file

From ae30f29782fae3f31d4efd5b5306367b6ec7ba93 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Tue, 25 Oct 2022 13:25:57 +0000
Subject: [PATCH 247/300] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-uk/strings.xml b/library/ui-strings/src/main/res/values-uk/strings.xml
index 941e2cc0e1..ac659aca41 100644
--- a/library/ui-strings/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -2922,4 +2922,11 @@
     <string name="qr_code_login_header_failed_other_description">Запит не виконаний.</string>
     <string name="labs_enable_voice_broadcast_summary">Можливість записувати та надсилати голосові повідомлення до стрічки кімнати.</string>
     <string name="labs_enable_voice_broadcast_title">Увімкнути голосові повідомлення (в активній розробці)</string>
+    <string name="a11y_voice_broadcast_buffering">Буферизація</string>
+    <string name="a11y_pause_voice_broadcast">Призупинити голосове повідомлення</string>
+    <string name="a11y_play_voice_broadcast">Відтворити або поновити відтворення голосового повідомлення</string>
+    <string name="a11y_stop_voice_broadcast_record">Припинити запис голосового повідомлення</string>
+    <string name="a11y_pause_voice_broadcast_record">Призупинити запис голосового повідомлення</string>
+    <string name="a11y_resume_voice_broadcast_record">Відновити запис голосового повідомлення</string>
+    <string name="voice_broadcast_live">Наживо</string>
 </resources>
\ No newline at end of file

From 8c72a76c06ad37fa16e4491d9079f9149edf6c28 Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Thu, 27 Oct 2022 03:38:05 +0000
Subject: [PATCH 248/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (2381 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index cc2ab4b3ca..7291650a7d 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2482,7 +2482,7 @@
     <string name="ftue_auth_use_case_join_existing_server">想要加入已有的服务器？</string>
     <string name="ftue_auth_use_case_skip_partial">跳过此问题</string>
     <string name="ftue_auth_use_case_option_one">家人和朋友</string>
-    <string name="ftue_auth_carousel_secure_title">拥有你的数据</string>
+    <string name="ftue_auth_carousel_secure_title">拥有你的对话。</string>
     <string name="attachment_type_location">位置</string>
     <string name="send_feedback_threads_title">Threads Beta反馈</string>
     <string name="beta_title_bottom_sheet_action">BETA</string>

From 5d4215744af9a12b65f0608fc151cdca61b7cac8 Mon Sep 17 00:00:00 2001
From: Jingchao Feng <fjch1997@outlook.com>
Date: Thu, 27 Oct 2022 03:41:05 +0000
Subject: [PATCH 249/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (2381 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 7291650a7d..5ab883eff7 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2299,7 +2299,7 @@
     <string name="room_member_override_nick_color">覆盖显示名称颜色</string>
     <string name="ftue_auth_reset_password_breaker_title">检查你的电子邮件。</string>
     <string name="ftue_auth_email_entry_title">电子邮件</string>
-    <string name="ftue_auth_carousel_control_title">你已掌控你的资料。</string>
+    <string name="ftue_auth_carousel_control_title">一切由您掌控</string>
     <string name="beta">BETA</string>
     <string name="location_share_live_select_duration_title">分享你的实时位置</string>
     <string name="a11y_location_share_locate_button">缩放到当前位置</string>

From 77f7b41cb27717711d588b26aaa5ea6b60e58697 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 25 Oct 2022 12:21:06 +0200
Subject: [PATCH 250/300] Build android-sdk-6.2.2

---
 tools/jitsi/build_jisti_libs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh
index 445dc5e0fe..ed06142375 100755
--- a/tools/jitsi/build_jisti_libs.sh
+++ b/tools/jitsi/build_jisti_libs.sh
@@ -30,7 +30,7 @@ cd jitsi-meet
 
 # Changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md
 
-git checkout android-sdk-5.0.2
+git checkout android-sdk-6.2.2
 
 echo
 echo "##################################################"

From a1278ee2f218b0d9bc622565fadb52fbb5c512a8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 30 May 2022 21:07:26 +0200
Subject: [PATCH 251/300] Update the recipe.

---
 docs/jitsi.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/jitsi.md b/docs/jitsi.md
index 4dd06effdb..d6c93c49aa 100644
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -93,4 +93,4 @@ url "https://github.com/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.
 
 - Build the project and perform the sanity tests again.
 
-- Update the file `/CHANGES.md` to notify about the library upgrade, and create a regular PR for project Element Android.
+- Create a PR for project Element Android and add a changelog file `<PR_NUMBER>.misc` to notify about the library upgrade.

From 4515dcdfe9226e0454f496e80589b254cfdcce65 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Oct 2022 15:14:19 +0200
Subject: [PATCH 252/300] Update Jitsi and WebRtc dependencies to
 android-sdk-6.2.2

---
 build.gradle        | 4 ++--
 vector/build.gradle | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6ccb83e703..7e7da48295 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,9 +96,9 @@ allprojects {
         }
         // Jitsi repo
         maven {
-            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-5.0.2"
+            url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2"
             // Note: to test Jitsi release you can use a local file like this:
-            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-3.10.0"
+            // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-6.2.2"
             content {
                 groups.jitsi.regex.each { includeGroupByRegex it }
                 groups.jitsi.group.each { includeGroup it }
diff --git a/vector/build.gradle b/vector/build.gradle
index 0b884f4d99..23dfa8fbc7 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -246,10 +246,10 @@ dependencies {
     // WebRTC
     // org.webrtc:google-webrtc is for development purposes only
     // implementation 'org.webrtc:google-webrtc:1.0.+'
-    implementation('com.facebook.react:react-native-webrtc:1.94.2-jitsi-10227332@aar')
-
+    implementation('com.facebook.react:react-native-webrtc:1.106.1-jitsi-12039821@aar')
     // Jitsi
-    api('org.jitsi.react:jitsi-meet-sdk:5.0.2') {
+    // Note: version is 6.2.0, but built from the tag `android-sdk-6.2.2`.
+    api('org.jitsi.react:jitsi-meet-sdk:6.2.0') {
         exclude group: 'com.google.firebase'
         exclude group: 'com.google.android.gms'
         exclude group: 'com.android.installreferrer'

From 16a5046601c85c3b5e8ebefd0ece1579ac8813ff Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 31 May 2022 13:11:27 +0200
Subject: [PATCH 253/300] Add a DebugJitsiActivity for debug build only. It's
 quite useless...

---
 vector-app/src/debug/AndroidManifest.xml      |  1 +
 .../app/features/debug/DebugMenuActivity.kt   |  4 ++
 .../debug/jitsi/DebugJitsiActivity.kt         | 45 ++++++++++++++++++
 .../debug/res/layout/activity_debug_jitsi.xml | 47 +++++++++++++++++++
 .../debug/res/layout/activity_debug_menu.xml  |  6 +++
 5 files changed, 103 insertions(+)
 create mode 100644 vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt
 create mode 100644 vector-app/src/debug/res/layout/activity_debug_jitsi.xml

diff --git a/vector-app/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml
index a7867f4081..be2aadbeaf 100644
--- a/vector-app/src/debug/AndroidManifest.xml
+++ b/vector-app/src/debug/AndroidManifest.xml
@@ -4,6 +4,7 @@
     <application>
         <activity android:name="im.vector.app.features.debug.TestLinkifyActivity" />
         <activity android:name="im.vector.app.features.debug.DebugPermissionActivity" />
+        <activity android:name="im.vector.app.features.debug.jitsi.DebugJitsiActivity" />
         <activity android:name="im.vector.app.features.debug.analytics.DebugAnalyticsActivity" />
         <activity android:name="im.vector.app.features.debug.settings.DebugPrivateSettingsActivity" />
         <activity android:name="im.vector.app.features.debug.sas.DebugSasEmojiActivity" />
diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index f431192efd..92c7ebffdc 100644
--- a/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -35,6 +35,7 @@ import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.core.utils.toast
 import im.vector.app.features.debug.analytics.DebugAnalyticsActivity
 import im.vector.app.features.debug.features.DebugFeaturesSettingsActivity
+import im.vector.app.features.debug.jitsi.DebugJitsiActivity
 import im.vector.app.features.debug.leak.DebugMemoryLeaksActivity
 import im.vector.app.features.debug.sas.DebugSasEmojiActivity
 import im.vector.app.features.debug.settings.DebugPrivateSettingsActivity
@@ -121,6 +122,9 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
         views.debugPermission.setOnClickListener {
             startActivity(Intent(this, DebugPermissionActivity::class.java))
         }
+        views.debugJitsi.setOnClickListener {
+            startActivity(Intent(this, DebugJitsiActivity::class.java))
+        }
     }
 
     private fun openPrivateSettings() {
diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt
new file mode 100644
index 0000000000..5c6c5d1898
--- /dev/null
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/jitsi/DebugJitsiActivity.kt
@@ -0,0 +1,45 @@
+/*
+ * 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 im.vector.app.features.debug.jitsi
+
+import android.annotation.SuppressLint
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.application.databinding.ActivityDebugJitsiBinding
+import org.jitsi.meet.sdk.JitsiMeet
+
+@AndroidEntryPoint
+class DebugJitsiActivity : VectorBaseActivity<ActivityDebugJitsiBinding>() {
+
+    override fun getBinding() = ActivityDebugJitsiBinding.inflate(layoutInflater)
+
+    override fun getCoordinatorLayout() = views.coordinatorLayout
+
+    @SuppressLint("SetTextI18n")
+    override fun initUiAndData() {
+        val isCrashReportingDisabled = JitsiMeet.isCrashReportingDisabled(this)
+        views.status.text = "Jitsi crash reporting is disabled: $isCrashReportingDisabled"
+
+        views.splash.setOnClickListener {
+            JitsiMeet.showSplashScreen(this)
+        }
+
+        views.dev.setOnClickListener {
+            JitsiMeet.showDevOptions()
+        }
+    }
+}
diff --git a/vector-app/src/debug/res/layout/activity_debug_jitsi.xml b/vector-app/src/debug/res/layout/activity_debug_jitsi.xml
new file mode 100644
index 0000000000..0a13594854
--- /dev/null
+++ b/vector-app/src/debug/res/layout/activity_debug_jitsi.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinatorLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="im.vector.app.features.debug.jitsi.DebugJitsiActivity"
+    tools:ignore="HardcodedText">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:divider="@drawable/linear_divider"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:padding="@dimen/layout_horizontal_margin"
+            android:showDividers="middle">
+
+            <TextView
+                android:id="@+id/status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="Status" />
+
+            <Button
+                android:id="@+id/splash"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Splash"
+                android:textAllCaps="false" />
+
+            <Button
+                android:id="@+id/dev"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Dev options"
+                android:textAllCaps="false" />
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/vector-app/src/debug/res/layout/activity_debug_menu.xml b/vector-app/src/debug/res/layout/activity_debug_menu.xml
index b5efe0302c..d8d1efb8d1 100644
--- a/vector-app/src/debug/res/layout/activity_debug_menu.xml
+++ b/vector-app/src/debug/res/layout/activity_debug_menu.xml
@@ -186,6 +186,12 @@
                 android:layout_height="wrap_content"
                 android:text="Permissions" />
 
+            <Button
+                android:id="@+id/debug_jitsi"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Jitsi" />
+
         </LinearLayout>
 
     </ScrollView>

From 461d07a4c352bf8aa74707a0af26c04f30893b5e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Oct 2022 14:35:55 +0200
Subject: [PATCH 254/300] changelog

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

diff --git a/changelog.d/6195.misc b/changelog.d/6195.misc
new file mode 100644
index 0000000000..96fd553d5c
--- /dev/null
+++ b/changelog.d/6195.misc
@@ -0,0 +1 @@
+Upgrade Jitsi SDK to 6.2.2 and WebRtc to 1.106.1-jitsi-12039821.

From acd02d1d9949ac3af1b035d12ff0cec1d95202eb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 25 Oct 2022 12:34:12 +0200
Subject: [PATCH 255/300] Improve comment

---
 tools/jitsi/build_jisti_libs.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh
index ed06142375..91c32fc597 100755
--- a/tools/jitsi/build_jisti_libs.sh
+++ b/tools/jitsi/build_jisti_libs.sh
@@ -25,11 +25,7 @@ export LIBRE_BUILD=true
 
 cd jitsi-meet
 
-# This is commit after version 2.2.2, which does not compile
-# git checkout 5a934c071a5cbe64de275a25d0ed62d8193cdd03
-
-# Changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md
-
+# Get the latest version from the changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md
 git checkout android-sdk-6.2.2
 
 echo

From ac4785a0ddf476da0118ce7b8ca16d1de2a3cd02 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 26 Oct 2022 15:11:06 +0200
Subject: [PATCH 256/300] Fix lint issue

---
 vector/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index b0cd202d12..b7401079e4 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <!-- Jitsi SDK is now API23+ -->
-    <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react,com.reactnativecommunity.clipboard,com.swmansion.gesturehandler.react,org.linusu,org.reactnative.maskedview,com.reactnativepagerview,com.swmansion.reanimated,com.th3rdwave.safeareacontext,com.swmansion.rnscreens,org.devio.rn.splashscreen,com.reactnativecommunity.webview" />
+    <uses-sdk tools:overrideLibrary="org.jitsi.meet.sdk,com.oney.WebRTCModule,com.learnium.RNDeviceInfo,com.reactnativecommunity.asyncstorage,com.ocetnik.timer,com.calendarevents,com.reactnativecommunity.netinfo,com.kevinresol.react_native_default_preference,com.rnimmersive,com.corbt.keepawake,com.BV.LinearGradient,com.horcrux.svg,com.oblador.performance,com.reactnativecommunity.slider,com.brentvatne.react,com.reactnativecommunity.clipboard,com.swmansion.gesturehandler.react,org.linusu,org.reactnative.maskedview,com.reactnativepagerview,com.swmansion.reanimated,com.th3rdwave.safeareacontext,com.swmansion.rnscreens,org.devio.rn.splashscreen,com.reactnativecommunity.webview,org.wonday.orientation" />
 
     <!-- Adding CAMERA permission prevents Chromebooks to see the application on the PlayStore -->
     <!-- Tell that the Camera is not mandatory to install the application -->

From f93f43bf8bf758fceb681ad2e6a9eda91e10ad81 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Oct 2022 14:20:01 +0200
Subject: [PATCH 257/300] Fix issue with Jitsi compilation Error was lots of
 `Duplicate class org.checkerframework.common.reflection.qual.MethodVal found
 in modules jetified-checker-3.1 (org.checkerframework:checker:3.1.1) and
 jetified-checker-qual-3.12.0 (org.checkerframework:checker-qual:3.12.0)
 Cannot use latest 3.15.0 since it required min API 26.

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

diff --git a/vector/build.gradle b/vector/build.gradle
index 23dfa8fbc7..9857f88479 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -305,6 +305,11 @@ dependencies {
         exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
     }
 
+    // Fix issue with Jitsi. Inspired from https://github.com/android/android-test/issues/861#issuecomment-872067868
+    // Error was lots of `Duplicate class org.checkerframework.common.reflection.qual.MethodVal found in modules jetified-checker-3.1 (org.checkerframework:checker:3.1.1) and jetified-checker-qual-3.12.0 (org.checkerframework:checker-qual:3.12.0)
+    //noinspection GradleDependency Cannot use latest 3.15.0 since it required min API 26.
+    implementation "org.checkerframework:checker:3.11.0"
+
     androidTestImplementation libs.androidx.testCore
     androidTestImplementation libs.androidx.testRunner
     androidTestImplementation libs.androidx.testRules

From 1b5852fbcb5b7dcac8d9ff451a6fc366a0cdd8ad Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 27 Oct 2022 14:27:48 +0200
Subject: [PATCH 258/300] API break, replace `leave()` by  broadcast

---
 .../app/features/call/conference/VectorJitsiActivity.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index 4d107ac414..ff6d743969 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -28,6 +28,7 @@ import androidx.core.app.PictureInPictureModeChangedInfo
 import androidx.core.util.Consumer
 import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.airbnb.mvrx.Fail
 import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.Success
@@ -40,6 +41,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityJitsiBinding
 import im.vector.lib.core.utils.compat.getParcelableExtraCompat
 import kotlinx.parcelize.Parcelize
+import org.jitsi.meet.sdk.BroadcastIntentHelper
 import org.jitsi.meet.sdk.JitsiMeet
 import org.jitsi.meet.sdk.JitsiMeetActivityDelegate
 import org.jitsi.meet.sdk.JitsiMeetActivityInterface
@@ -105,7 +107,6 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     override fun onDestroy() {
         val currentConf = JitsiMeet.getCurrentConference()
-        jitsiMeetView?.leave()
         jitsiMeetView?.dispose()
         // Fake emitting CONFERENCE_TERMINATED event when currentConf is not null (probably when closing the PiP screen).
         if (currentConf != null) {
@@ -128,7 +129,8 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
     }
 
     private fun handleLeaveConference() {
-        jitsiMeetView?.leave()
+        val leaveBroadcastIntent = BroadcastIntentHelper.buildHangUpIntent()
+        LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(leaveBroadcastIntent)
     }
 
     private fun handleConfirmSwitching(action: JitsiCallViewEvents.ConfirmSwitchingConference) {

From 6b34bb20868f9bf72e03d8fba93aa9e766f2fd3a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Oct 2022 16:10:40 +0200
Subject: [PATCH 259/300] Fix issue with Back button not working when
 conference is not joined yet.

---
 .../call/conference/ConferenceEvent.kt        | 12 +++++++
 .../call/conference/VectorJitsiActivity.kt    | 33 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt b/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
index 08612fe573..670cd10ac4 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/ConferenceEvent.kt
@@ -24,6 +24,7 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.facebook.react.bridge.JavaOnlyMap
+import im.vector.app.config.Config
 import org.jitsi.meet.sdk.BroadcastEmitter
 import org.jitsi.meet.sdk.BroadcastEvent
 import org.jitsi.meet.sdk.JitsiMeet
@@ -35,6 +36,7 @@ sealed class ConferenceEvent(open val data: Map<String, Any>) {
     data class Terminated(override val data: Map<String, Any>) : ConferenceEvent(data)
     data class WillJoin(override val data: Map<String, Any>) : ConferenceEvent(data)
     data class Joined(override val data: Map<String, Any>) : ConferenceEvent(data)
+    object ReadyToClose : ConferenceEvent(emptyMap())
 
     fun extractConferenceUrl(): String? {
         return data[CONFERENCE_URL_DATA_KEY] as? String
@@ -84,14 +86,24 @@ class ConferenceEventObserver(
 
     private fun onBroadcastReceived(intent: Intent) {
         val event = BroadcastEvent(intent)
+        safeLog("onBroadcastReceived: Event received (type ${event.type})", event.data)
         val conferenceEvent = when (event.type) {
             BroadcastEvent.Type.CONFERENCE_JOINED -> ConferenceEvent.Joined(event.data)
             BroadcastEvent.Type.CONFERENCE_TERMINATED -> ConferenceEvent.Terminated(event.data)
             BroadcastEvent.Type.CONFERENCE_WILL_JOIN -> ConferenceEvent.WillJoin(event.data)
+            BroadcastEvent.Type.READY_TO_CLOSE -> ConferenceEvent.ReadyToClose
             else -> null
         }
         if (conferenceEvent != null) {
             onBroadcastEvent(conferenceEvent)
         }
     }
+
+    private fun safeLog(message: String, sensitiveData: Any?) {
+        if (Config.LOW_PRIVACY_LOG_ENABLE) {
+            Timber.v("$message: $sensitiveData")
+        } else {
+            Timber.v(message)
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index ff6d743969..b91bc93fb0 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -19,6 +19,7 @@ package im.vector.app.features.call.conference
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
@@ -46,6 +47,7 @@ import org.jitsi.meet.sdk.JitsiMeet
 import org.jitsi.meet.sdk.JitsiMeetActivityDelegate
 import org.jitsi.meet.sdk.JitsiMeetActivityInterface
 import org.jitsi.meet.sdk.JitsiMeetConferenceOptions
+import org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService
 import org.jitsi.meet.sdk.JitsiMeetView
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.util.JsonDict
@@ -68,6 +70,13 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     private val jitsiViewModel: JitsiCallViewModel by viewModel()
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val intent = Intent("onConfigurationChanged")
+        intent.putExtra("newConfig", newConfig)
+        this.sendBroadcast(intent)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         addOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
@@ -107,16 +116,26 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
 
     override fun onDestroy() {
         val currentConf = JitsiMeet.getCurrentConference()
+        handleLeaveConference()
         jitsiMeetView?.dispose()
         // Fake emitting CONFERENCE_TERMINATED event when currentConf is not null (probably when closing the PiP screen).
         if (currentConf != null) {
             ConferenceEventEmitter(this).emitConferenceEnded()
         }
+        JitsiMeetOngoingConferenceService.abort(this)
         JitsiMeetActivityDelegate.onHostDestroy(this)
         removeOnPictureInPictureModeChangedListener(pictureInPictureModeChangedInfoConsumer)
         super.onDestroy()
     }
 
+    // Activity lifecycle methods
+    //
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        @Suppress("DEPRECATION")
+        super.onActivityResult(requestCode, resultCode, data)
+        JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data)
+    }
+
     override fun onBackPressed() {
         JitsiMeetActivityDelegate.onBackPressed()
     }
@@ -224,10 +243,17 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         Timber.v("Broadcast received: $event")
         when (event) {
             is ConferenceEvent.Terminated -> onConferenceTerminated(event.data)
-            else -> Unit
+            is ConferenceEvent.Joined -> onConferenceJoined(event.data)
+            is ConferenceEvent.ReadyToClose -> onReadyToClose()
+            is ConferenceEvent.WillJoin -> Unit
         }
     }
 
+    private fun onConferenceJoined(extraData: Map<String, Any>) {
+        // Launch the service for the ongoing notification.
+        JitsiMeetOngoingConferenceService.launch(this, HashMap(extraData))
+    }
+
     private fun onConferenceTerminated(data: JsonDict) {
         Timber.v("JitsiMeetViewListener.onConferenceTerminated()")
         // Do not finish if there is an error
@@ -236,6 +262,11 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         }
     }
 
+    private fun onReadyToClose() {
+        Timber.v("SDK is ready to close")
+        finish()
+    }
+
     companion object {
         fun newIntent(context: Context, roomId: String, widgetId: String, enableVideo: Boolean): Intent {
             return Intent(context, VectorJitsiActivity::class.java).apply {

From 46d1795276848febc04d611a8c6b4007af7a510f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 27 Oct 2022 16:16:54 +0200
Subject: [PATCH 260/300] Fix crash due to missing notification Thread: main,
 Exception: java.lang.RuntimeException: Unable to start service
 org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService@3d1f0bc with Intent {
 cmp=im.vector.app.debug/org.jitsi.meet.sdk.JitsiMeetOngoingConferenceService
 (has extras) }: java.lang.IllegalArgumentException: Invalid notification (no
 valid small icon): Notification(channel=JitsiOngoingConferenceChannel pri=0
 contentView=null vibrate=null sound=null defaults=0x0 flags=0xa
 color=0x00000000 category=call actions=2 vis=PUBLIC semFlags=0x0
 semPriority=0 semMissedCount=0)

---
 .../vector/app/features/debug/DebugMenuActivity.kt  |   6 +++---
 .../app/features/notifications/NotificationUtils.kt |  10 +++++-----
 .../{ic_status_bar.png => ic_notification.png}      | Bin
 .../{ic_status_bar.png => ic_notification.png}      | Bin
 .../{ic_status_bar.png => ic_notification.png}      | Bin
 .../{ic_status_bar.png => ic_notification.png}      | Bin
 .../{ic_status_bar.png => ic_notification.png}      | Bin
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename vector/src/main/res/drawable-hdpi/{ic_status_bar.png => ic_notification.png} (100%)
 rename vector/src/main/res/drawable-mdpi/{ic_status_bar.png => ic_notification.png} (100%)
 rename vector/src/main/res/drawable-xhdpi/{ic_status_bar.png => ic_notification.png} (100%)
 rename vector/src/main/res/drawable-xxhdpi/{ic_status_bar.png => ic_notification.png} (100%)
 rename vector/src/main/res/drawable-xxxhdpi/{ic_status_bar.png => ic_notification.png} (100%)

diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 92c7ebffdc..af63e6eae0 100644
--- a/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -179,7 +179,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                 .setContentText("Content")
                 // No effect because it's a group summary notif
                 .setNumber(33)
-                .setSmallIcon(R.drawable.ic_status_bar)
+                .setSmallIcon(R.drawable.ic_notification)
                 // This provocate the badge issue: no badge for group notification
                 .setGroup("GroupKey")
                 .setGroupSummary(true)
@@ -212,7 +212,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                         // For shortcut on long press on launcher icon
                         .setBadgeIconType(NotificationCompat.BADGE_ICON_NONE)
                         .setStyle(messagingStyle1)
-                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setSmallIcon(R.drawable.ic_notification)
                         .setGroup("GroupKey")
                         .build()
         )
@@ -224,7 +224,7 @@ class DebugMenuActivity : VectorBaseActivity<ActivityDebugMenuBinding>() {
                         .setContentTitle("Title 2")
                         .setContentText("Content 2")
                         .setStyle(messagingStyle2)
-                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setSmallIcon(R.drawable.ic_notification)
                         .setGroup("GroupKey")
                         .build()
         )
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index 7e91a89603..bf1b23093d 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -582,7 +582,7 @@ class NotificationUtils @Inject constructor(
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
         val openRoomIntent = buildOpenRoomIntent(roomInfo.roomId)
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         val channelID = if (roomInfo.shouldBing) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
         return NotificationCompat.Builder(context, channelID)
@@ -695,7 +695,7 @@ class NotificationUtils @Inject constructor(
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         val channelID = if (inviteNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
@@ -775,7 +775,7 @@ class NotificationUtils @Inject constructor(
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
         // Build the pending intent for when the notification is clicked
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         val channelID = if (simpleNotifiableEvent.noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID
 
@@ -890,7 +890,7 @@ class NotificationUtils @Inject constructor(
             lastMessageTimestamp: Long
     ): Notification {
         val accentColor = ContextCompat.getColor(context, R.color.notification_accent_color)
-        val smallIcon = R.drawable.ic_status_bar
+        val smallIcon = R.drawable.ic_notification
 
         return NotificationCompat.Builder(context, if (noisy) NOISY_NOTIFICATION_CHANNEL_ID else SILENT_NOTIFICATION_CHANNEL_ID)
                 .setOnlyAlertOnce(true)
@@ -980,7 +980,7 @@ class NotificationUtils @Inject constructor(
                 NotificationCompat.Builder(context, NOISY_NOTIFICATION_CHANNEL_ID)
                         .setContentTitle(stringProvider.getString(R.string.app_name))
                         .setContentText(stringProvider.getString(R.string.settings_troubleshoot_test_push_notification_content))
-                        .setSmallIcon(R.drawable.ic_status_bar)
+                        .setSmallIcon(R.drawable.ic_notification)
                         .setLargeIcon(getBitmap(context, R.drawable.element_logo_green))
                         .setColor(ContextCompat.getColor(context, R.color.notification_accent_color))
                         .setPriority(NotificationCompat.PRIORITY_MAX)
diff --git a/vector/src/main/res/drawable-hdpi/ic_status_bar.png b/vector/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-hdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-mdpi/ic_status_bar.png b/vector/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-mdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-xhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-xhdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-xxhdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png b/vector/src/main/res/drawable-xxxhdpi/ic_notification.png
similarity index 100%
rename from vector/src/main/res/drawable-xxxhdpi/ic_status_bar.png
rename to vector/src/main/res/drawable-xxxhdpi/ic_notification.png

From fbabe5087502abda4e2e05bda1217becf18d953e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 28 Oct 2022 16:41:44 +0200
Subject: [PATCH 261/300] Fix vulnerability

---
 .../vector/app/features/call/conference/VectorJitsiActivity.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
index b91bc93fb0..62cc3c1439 100644
--- a/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/call/conference/VectorJitsiActivity.kt
@@ -74,7 +74,7 @@ class VectorJitsiActivity : VectorBaseActivity<ActivityJitsiBinding>(), JitsiMee
         super.onConfigurationChanged(newConfig)
         val intent = Intent("onConfigurationChanged")
         intent.putExtra("newConfig", newConfig)
-        this.sendBroadcast(intent)
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

From 901e6ab272a33e90194a2621622711d95d216d0b Mon Sep 17 00:00:00 2001
From: Nizami <nizamismidov4@gmail.com>
Date: Fri, 28 Oct 2022 15:33:23 +0000
Subject: [PATCH 262/300] Translated using Weblate (Azerbaijani)

Currently translated at 4.6% (117 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-az/strings.xml b/library/ui-strings/src/main/res/values-az/strings.xml
index 97e6d3def6..e4d3d5bdf3 100644
--- a/library/ui-strings/src/main/res/values-az/strings.xml
+++ b/library/ui-strings/src/main/res/values-az/strings.xml
@@ -76,4 +76,57 @@
     <string name="notice_room_invite_by_you">%1$s-ı dəvət etdiniz</string>
     <string name="notice_direct_room_created_by_you">Müzakirə yaratdınız</string>
     <string name="notice_room_created">%1$s otağı yaratdı</string>
+    <string name="notification_noisy_notifications">Səsli bildirişlər</string>
+    <string name="notification_listening_for_notifications">Bildirişləri dinləmək</string>
+    <string name="create_spaces_default_public_room_name">Ümumi</string>
+    <string name="settings_general_title">Ümumi</string>
+    <string name="room_participants_action_ignore_prompt_msg">Bu istifadəçiyə məhəl qoymamaq onun mesajlarını paylaşdığınız otaqlardan siləcək.
+\n
+\nBu əməliyyatı istənilən vaxt ümumi tənzimləmələrdə geri qaytara bilərsiniz.</string>
+    <string name="denied_permission_generic">Bu tələbi yerinə yetirmək üçün bəzi icazələr yoxdur, lütfən, sistem tənzimləmələrindən icazələr verin.</string>
+    <string name="notice_room_avatar_removed_by_you">Otaq avatarını sildiniz</string>
+    <string name="notice_room_avatar_removed">%1$s otaq avatarını sildi</string>
+    <string name="notice_room_topic_removed_by_you">Otaq mövzusunu sildiniz</string>
+    <string name="notice_room_name_removed_by_you">Otağın adını sildiniz</string>
+    <string name="notice_room_server_acl_allow_is_empty">🎉 Bütün serverlərin iştirakı qadağandır! Bu otaq artıq istifadə edilə bilməz.</string>
+    <string name="notice_room_server_acl_updated_no_change">Dəyişiklik yoxdur.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">Bu otaq üçün server ACL-lərini dəyişdirdiniz.</string>
+    <string name="notice_room_server_acl_set_banned">• %s ilə uyğunlaşan serverlər qadağan edilib.</string>
+    <string name="notice_room_server_acl_set_title_by_you">Bu otaq üçün server ACL-lərini təyin etdiniz.</string>
+    <string name="notice_room_server_acl_set_title">%s bu otaq üçün server ACL-lərini təyin etdi.</string>
+    <string name="notice_direct_room_update_by_you">Burada təkmilləşdirdiniz.</string>
+    <string name="notice_direct_room_update">%s burada təkmilləşdi.</string>
+    <string name="notice_room_update_by_you">Bu otağı təkmilləşdirdiniz.</string>
+    <string name="notice_made_future_direct_room_visibility_by_you">Gələcək mesajları %1$s üçün görünən etdiniz</string>
+    <string name="notice_made_future_direct_room_visibility">%1$s gələcək mesajları %2$s üçün görünən etdi</string>
+    <string name="notice_made_future_room_visibility_by_you">Gələcək otaq tarixçəsini %1$s üçün görünən etdiniz</string>
+    <string name="notice_ended_call_by_you">Zəngi bitirdiniz.</string>
+    <string name="notice_answered_call_by_you">Zəngə cavab verdiniz.</string>
+    <string name="notice_call_candidates_by_you">Zəngi qurmaq üçün məlumat göndərdiniz.</string>
+    <string name="notice_call_candidates">%s zəngi qurmaq üçün məlumat göndərdi.</string>
+    <string name="notice_placed_voice_call_by_you">Səsli zəng etdiniz.</string>
+    <string name="notice_placed_video_call_by_you">Video zəng etdiniz.</string>
+    <string name="notice_room_name_changed_by_you">Otağın adını buna dəyişdiniz: %1$s</string>
+    <string name="notice_room_avatar_changed_by_you">Otaq avatarını dəyişdiniz</string>
+    <string name="notice_room_avatar_changed">%1$s otaq avatarını dəyişdi</string>
+    <string name="notice_room_topic_changed_by_you">Mövzunu buna dəyişdiniz: %1$s</string>
+    <string name="notice_display_name_removed_by_you">Ekran adınızı sildiniz (bu, %1$s idi)</string>
+    <string name="notice_display_name_changed_from_by_you">%1$s ekran adınızı %2$s olaraq dəyişdiniz</string>
+    <string name="notice_display_name_set_by_you">Ekran adınızı %1$s qoydunuz</string>
+    <string name="notice_avatar_url_changed_by_you">Avatarınızı dəyişdirmisiniz</string>
+    <string name="notice_room_withdraw_by_you">%1$s dəvətini geri götürdünüz</string>
+    <string name="notice_room_ban_by_you">%1$s adlı istifadəçini qadağan etdiniz</string>
+    <string name="notice_room_unban_by_you">%1$s adlı istifadəçini qadağan etdiniz</string>
+    <string name="notice_room_remove_by_you">%1$s adlı istifadəçini qovdunuz</string>
+    <string name="notice_room_reject_by_you">Dəvəti rədd etdiniz</string>
+    <string name="notice_direct_room_leave_by_you">Otağı tərk etdiniz</string>
+    <string name="notice_direct_room_leave">%1$s otaqdan çıxdı</string>
+    <string name="notice_room_leave_by_you">Otağı tərk etdiniz</string>
+    <string name="notice_direct_room_join_by_you">Qoşuldunuz</string>
+    <string name="notice_direct_room_created">%1$s müzakirə yaratdı</string>
+    <string name="notice_room_invite_no_invitee_by_you">Sizin dəvətiniz</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d seçildi</item>
+        <item quantity="other">%1$d seçildi</item>
+    </plurals>
 </resources>
\ No newline at end of file

From af187c479744878c0a3826f30eafbeece150e449 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Fri, 28 Oct 2022 09:50:12 +0000
Subject: [PATCH 263/300] Translated using Weblate (German)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 546d7a4e9c..a400c5faae 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -467,12 +467,12 @@
     <string name="widget_integration_positive_power_level">Berechtigungslevel muss eine positive ganze Zahl sein.</string>
     <string name="widget_integration_must_be_in_room">Du bist nicht Mitglied in diesem Raum.</string>
     <string name="widget_integration_no_permission_in_room">Du hast keine Berechtigung, diese Aktion in diesem Raum auszuführen.</string>
-    <string name="widget_integration_missing_room_id">Anfrage beinhaltet keine Raum-ID.</string>
+    <string name="widget_integration_missing_room_id">room_id fehlt in der Anfrage.</string>
     <string name="widget_integration_room_not_visible">Raum %s ist nicht sichtbar.</string>
     <string name="room_add_matrix_apps">Integrationen hinzufügen</string>
     <string name="settings_notification_ringtone">Benachrichtigungston</string>
     <string name="widget_integration_failed_to_send_request">Anfrage konnte nicht gesendet werden.</string>
-    <string name="widget_integration_missing_user_id">Anfrage enthält keine user_id.</string>
+    <string name="widget_integration_missing_user_id">user_id fehlt in der Anfrage.</string>
     <string name="light_theme">Helles Design</string>
     <string name="dark_theme">Dunkles Design</string>
     <string name="black_theme">Schwarzes Design</string>
@@ -1625,8 +1625,8 @@
     <string name="settings_call_show_confirmation_dialog_summary">Bitte um Bestätigung, bevor du einen Anruf tätigst</string>
     <string name="bottom_sheet_setup_secure_backup_submit">Einrichten</string>
     <string name="no_permissions_to_start_conf_call">Dir fehlt die Berechtigung in diesem Raum eine Konferenz zu starten</string>
-    <string name="video_meeting">Starte eine Videokonferenz</string>
-    <string name="audio_meeting">Starte eine Audiokonferenz</string>
+    <string name="video_meeting">Beginne eine Videokonferenz</string>
+    <string name="audio_meeting">Beginne eine Audiokonferenz</string>
     <string name="audio_video_meeting_description">Konferenzen nutzen die Jitsi-Sicherheits- und Berechtigungsrichtlinien. Alle im Raum Anwesenden können während der Konferenz beitreten.</string>
     <string name="cannot_call_yourself">Du kannst dich nicht selbst anrufen</string>
     <string name="cannot_call_yourself_with_invite">Du kannst dich nicht selbst anrufen, warte bis Teilnehmer die Einladung annehmen</string>
@@ -1672,7 +1672,7 @@
     <string name="sent_a_poll">Umfrage</string>
     <string name="sent_a_reaction">Reagierte mit: %s</string>
     <string name="universal_link_malformed">Der Link war fehlerhaft</string>
-    <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu starten</string>
+    <string name="no_permissions_to_start_webrtc_call">Du bist nicht berechtigt, einen Anruf in diesem Raum zu beginnen</string>
     <string name="sent_verification_conclusion">Ergebnis der Überprüfung</string>
     <string name="delete_account_data_warning">Kontodaten vom Typ %1$s löschen\?
 \n
@@ -1683,7 +1683,7 @@
     <string name="settings_troubleshoot_test_push_loop_waiting_for_push">Die Applikation wartet auf den PUSH</string>
     <string name="settings_troubleshoot_test_push_loop_title">Push testen</string>
     <string name="search_banned_user_hint">Gebannte Nutzer filtern</string>
-    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du bist nicht berechtigt einen Anruf zu starten</string>
+    <string name="no_permissions_to_start_webrtc_call_in_direct_room">Du bist nicht berechtigt einen Anruf zu beginnen</string>
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du hast keine Berechtigung ein Konferenzgespräch zu starten</string>
     <string name="settings_security_pin_code_notifications_summary_on">Details wie Raumnamen und Nachrichteninhalt zeigen.</string>
     <string name="settings_security_pin_code_notifications_title">Inhalt in Benachrichtigungen anzeigen</string>
@@ -2332,12 +2332,12 @@
     <string name="location_not_available_dialog_content">${app_name} konnte nicht auf deinen Standort zugreifen. Bitte versuche es später noch einmal.</string>
     <string name="location_not_available_dialog_title">${app_name} konnte nicht auf deinen Standort zugreifen</string>
     <string name="location_activity_title_preview">Standort</string>
-    <string name="closed_poll_option_description">Ergebnisse werden erst angezeigt, wenn du die Umfrage beendest</string>
-    <string name="closed_poll_option_title">Geschlossene Umfrage</string>
-    <string name="open_poll_option_description">Ergebnisse werden direkt nach Stimmabgabe angezeigt</string>
-    <string name="open_poll_option_title">Offene Umfrage</string>
-    <string name="poll_type_title">Umfragetyp</string>
-    <string name="edit_poll_title">Umfrage bearbeiten</string>
+    <string name="closed_poll_option_description">Die Ergebnisse werden erst sichtbar, sobald du die Umfrage beendest</string>
+    <string name="closed_poll_option_title">Abgeschlossene Abstimmung</string>
+    <string name="open_poll_option_description">Abstimmende können die Ergebnisse nach Stimmabgabe sehen</string>
+    <string name="open_poll_option_title">Laufende Abstimmung</string>
+    <string name="poll_type_title">Abstimmungsart</string>
+    <string name="edit_poll_title">Abstimmung bearbeiten</string>
     <string name="poll_no_votes_cast">Keine Stimmen abgegeben</string>
     <string name="login_splash_create_account">Konto erstellen</string>
     <string name="ftue_auth_carousel_workplace_title">Kommunikation für dein Team.</string>
@@ -2820,4 +2820,19 @@
     <string name="a11y_stop_voice_broadcast_record">Stoppe Aufzeichnung der Sprachübertragung</string>
     <string name="a11y_pause_voice_broadcast_record">Pausiere Aufzeichnung der Sprachübertragung</string>
     <string name="voice_broadcast_live">Live</string>
+    <string name="attachment_type_selector_sticker">Sticker</string>
+    <string name="device_manager_other_sessions_select">Sitzungen auswählen</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Standort</string>
+    <string name="attachment_type_selector_poll">Umfragen</string>
+    <string name="attachment_type_selector_voice_broadcast">Sprachübertragung</string>
+    <string name="attachment_type_selector_file">Anhänge</string>
+    <string name="attachment_type_selector_gallery">Fotobibliothek</string>
+    <string name="action_deselect_all">Alle abwählen</string>
+    <string name="action_select_all">Alle auswählen</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d ausgewählt</item>
+        <item quantity="other">%1$d ausgewählt</item>
+    </plurals>
 </resources>
\ No newline at end of file

From aa485eed10b336d506ce08dfbaada7b2f9e52713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Thu, 27 Oct 2022 09:32:22 +0000
Subject: [PATCH 264/300] Translated using Weblate (Estonian)

Currently translated at 99.6% (2523 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-et/strings.xml b/library/ui-strings/src/main/res/values-et/strings.xml
index b0e2a59636..9bfbbe8eeb 100644
--- a/library/ui-strings/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -2812,4 +2812,19 @@
     <string name="a11y_resume_voice_broadcast_record">Jätka ringhäälingukõne salvestamist</string>
     <string name="a11y_pause_voice_broadcast">Peata ringhäälingukõne esitamine</string>
     <string name="voice_broadcast_live">Otse eetris</string>
+    <string name="device_manager_other_sessions_select">Vali sessioonid</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kaamera</string>
+    <string name="attachment_type_selector_location">Asukoht</string>
+    <string name="attachment_type_selector_poll">Küsitlused</string>
+    <string name="attachment_type_selector_voice_broadcast">Ringhäälingukõne</string>
+    <string name="attachment_type_selector_file">Manused</string>
+    <string name="attachment_type_selector_sticker">Kleepsud</string>
+    <string name="attachment_type_selector_gallery">Fotode kogu</string>
+    <string name="action_deselect_all">Eemalda kõik valikud</string>
+    <string name="action_select_all">Vali kõik</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d valitud</item>
+        <item quantity="other">%1$d valitud</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 0422505cc7295b0b6fbedfe423e51d2decdb3d6c Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Thu, 27 Oct 2022 19:21:56 +0000
Subject: [PATCH 265/300] Translated using Weblate (Persian)

Currently translated at 99.2% (2511 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fa/strings.xml b/library/ui-strings/src/main/res/values-fa/strings.xml
index dbf3658887..f2701519e7 100644
--- a/library/ui-strings/src/main/res/values-fa/strings.xml
+++ b/library/ui-strings/src/main/res/values-fa/strings.xml
@@ -2726,4 +2726,80 @@
     <string name="grant_permission">اعطای دسترسی</string>
     <string name="labs_enable_rich_text_editor_summary">ویرایشگر متن غنی را بیازمایید (حالت متن خام به زودی)</string>
     <string name="labs_enable_rich_text_editor_title">به کار انداختن ویرایشگر متن غنی</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">برای آشکارسازی وضعیت تأیید نشست کنونیتان، تأییدش کنید.</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">کارساز خانگی از ورود با کد QR پشتیبانی نمی‌کند.</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">ورود روی افزارهٔ دیگر لغو شد.</string>
+    <string name="labs_enable_session_manager_summary">دید و واپایش بیش‌تری روی نشست‌هایتان داشته باشید.</string>
+    <string name="qr_code_login_header_failed_denied_description">درخواست روی افزارهٔ دیگر رد شد.</string>
+    <string name="qr_code_login_header_failed_timeout_description">پیوند در مدّت مقرّر کامل نشد‌.</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">افزارهٔ دیگر باید وارد شده باشد.</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">افزارهٔ دیگر از پیش وارد شده.</string>
+    <string name="qr_code_login_new_device_instruction_2">به تنظیمات -&gt; امنیت و محرمانگی بروید</string>
+    <string name="qr_code_login_new_device_instruction_1">کاره را روی افزارهٔ دیگرتان بگشایید</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">پیوند دادن با این افزاره پشتیبانی نمی‌شود.</string>
+    <string name="labs_enable_voice_broadcast_title">به کار انداختن پخش صدا (زیر توسعهٔ فعّال)</string>
+    <string name="qr_code_login_show_qr_code_button">نمایش کد QR روی این افزاره</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">آغاز در صفحهٔ ورود</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">گزینش‌«ورود با کد QR»</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">آغاز در صفحهٔ ورود</string>
+    <string name="device_manager_push_notifications_description">گرفتن آگاهی‌های ارسالی روی این نشست.</string>
+    <string name="a11y_play_voice_broadcast">پخش یا مکث پخش صدا</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">کد QR نامعتبر است.</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">وارد شدن در افزاره‌ای همراه؟</string>
+    <string name="qr_code_login_header_show_qr_code_title">ورود با کد QR</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">ورود با کد QR</string>
+    <string name="a11y_stop_voice_broadcast_record">توقّف ضبط پخش صدا</string>
+    <string name="a11y_pause_voice_broadcast_record">مکث ضبط پخش صدا</string>
+    <string name="a11y_resume_voice_broadcast_record">از سر گیری ضبط پخش صدا</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">گزینش «نمایش کد QR»</string>
+    <string name="qr_code_login_new_device_instruction_3">گزینش «نمایش کد QR»</string>
+    <string name="labs_enable_client_info_recording_title">به کار انداختن ضبط اطّلاعات کارخواه</string>
+    <string name="labs_enable_session_manager_title">به کار انداختن مدیر نشست جدید</string>
+    <string name="a11y_pause_voice_broadcast">مکث پخش صدا</string>
+    <string name="qr_code_login_header_failed_other_description">درخواست شکست خورد.</string>
+    <string name="qr_code_login_signing_in">وارد کردنتان</string>
+    <string name="qr_code_login_connecting_to_device">وصل شدن به افزاره</string>
+    <string name="qr_code_login_scan_qr_code_button">پویش کد QR</string>
+    <string name="qr_code_login_header_connected_title">اتّصال امن برقرار شده</string>
+    <string name="qr_code_login_header_scan_qr_code_title">پویش کد QR</string>
+    <string name="login_scan_qr_code">پویش کد QR</string>
+    <string name="rich_text_editor_format_underline">اعمال قالب زیرخط‌دار</string>
+    <string name="rich_text_editor_format_strikethrough">اعمال قالب خط‌خورده</string>
+    <string name="rich_text_editor_format_italic">اعمال قالب کج</string>
+    <string name="rich_text_editor_format_bold">اعمال قالب توپر</string>
+    <string name="device_manager_verification_status_unknown">وضعیت تأیید نامعلوم</string>
+    <string name="device_manager_other_sessions_select">گزینش نشست‌ها</string>
+    <string name="attachment_type_selector_voice_broadcast">پخش صدا</string>
+    <string name="attachment_type_selector_gallery">کتابخانهٔ عکس</string>
+    <string name="qr_code_login_try_again">دوباره تلاش کنید</string>
+    <string name="qr_code_login_status_no_match">مطابق نیستند؟</string>
+    <string name="qr_code_login_header_failed_title">اتّصال ناموفّق</string>
+    <string name="device_manager_session_details_device_operating_system">سیستم‌عامل</string>
+    <string name="device_manager_push_notifications_title">آگاهی‌های ارسالی</string>
+    <string name="push_gateway_item_device_id">شناسهٔ نشست:</string>
+    <string name="attachment_type_selector_contact">آشنا</string>
+    <string name="attachment_type_selector_camera">دوربین</string>
+    <string name="attachment_type_selector_location">مکان</string>
+    <string name="attachment_type_selector_poll">نظرسنجی‌ها</string>
+    <string name="attachment_type_selector_file">پیوست‌ها</string>
+    <string name="attachment_type_selector_sticker">برچسب‌ها</string>
+    <string name="a11y_voice_broadcast_buffering">میانگیری</string>
+    <string name="voice_broadcast_live">زنده</string>
+    <string name="qr_code_login_confirm_security_code">تأیید</string>
+    <string name="three">۳</string>
+    <string name="two">۲</string>
+    <string name="one">۱</string>
+    <string name="device_manager_session_details_device_model">مدل</string>
+    <string name="device_manager_session_details_device_browser">مرورگر</string>
+    <string name="device_manager_session_details_application_url">نشانی</string>
+    <string name="device_manager_session_details_application_version">نگارش</string>
+    <string name="device_manager_session_details_application_name">نام</string>
+    <string name="device_manager_session_details_application">برنامه</string>
+    <string name="push_gateway_item_enabled">به کار افتاده:</string>
+    <string name="action_deselect_all">ناگزینش همه</string>
+    <string name="action_select_all">گزینش همه</string>
+    <plurals name="x_selected">
+        <item quantity="one">۱ گزیده</item>
+        <item quantity="other">%1$d گزیده</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 619d3ffc471ecb71502cf48a8e10515a16ecaa09 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Thu, 27 Oct 2022 15:02:04 +0000
Subject: [PATCH 266/300] Translated using Weblate (Indonesian)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-in/strings.xml b/library/ui-strings/src/main/res/values-in/strings.xml
index 622a7d3949..6ed423bb70 100644
--- a/library/ui-strings/src/main/res/values-in/strings.xml
+++ b/library/ui-strings/src/main/res/values-in/strings.xml
@@ -2769,4 +2769,18 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="a11y_pause_voice_broadcast_record">Jeda rekaman siaran suara</string>
     <string name="a11y_resume_voice_broadcast_record">Lanjutkan rekaman siaran suara</string>
     <string name="voice_broadcast_live">Langsung</string>
+    <string name="device_manager_other_sessions_select">Pilih sesi</string>
+    <string name="attachment_type_selector_contact">Kontak</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Lokasi</string>
+    <string name="attachment_type_selector_poll">Pemungutan suara</string>
+    <string name="attachment_type_selector_voice_broadcast">Siaran suara</string>
+    <string name="attachment_type_selector_file">Lampiran</string>
+    <string name="attachment_type_selector_sticker">Stiker</string>
+    <string name="attachment_type_selector_gallery">Pustaka foto</string>
+    <string name="action_deselect_all">Batalkan semua pilihan</string>
+    <string name="action_select_all">Pilih semua</string>
+    <plurals name="x_selected">
+        <item quantity="other">%1$d dipilih</item>
+    </plurals>
 </resources>
\ No newline at end of file

From e50d9ff45dd38808e3ab9f35cab6eb52b8a2ce43 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 27 Oct 2022 09:52:30 +0000
Subject: [PATCH 267/300] Translated using Weblate (Italian)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-it/strings.xml b/library/ui-strings/src/main/res/values-it/strings.xml
index c95d2aebce..5cc509e8b9 100644
--- a/library/ui-strings/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -2812,4 +2812,19 @@
     <string name="a11y_pause_voice_broadcast_record">Sospendi registrazione trasmissione vocale</string>
     <string name="a11y_resume_voice_broadcast_record">Riprendi registrazione trasmissione vocale</string>
     <string name="voice_broadcast_live">In diretta</string>
+    <string name="device_manager_other_sessions_select">Seleziona sessioni</string>
+    <string name="attachment_type_selector_contact">Contatto</string>
+    <string name="attachment_type_selector_camera">Fotocamera</string>
+    <string name="attachment_type_selector_location">Posizione</string>
+    <string name="attachment_type_selector_poll">Sondaggi</string>
+    <string name="attachment_type_selector_voice_broadcast">Trasmissione vocale</string>
+    <string name="attachment_type_selector_file">Allegati</string>
+    <string name="attachment_type_selector_sticker">Adesivi</string>
+    <string name="attachment_type_selector_gallery">Album di foto</string>
+    <string name="action_deselect_all">Deseleziona tutto</string>
+    <string name="action_select_all">Seleziona tutto</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d selezionato</item>
+        <item quantity="other">%1$d selezionati</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 342065fbf0ae3e7349b8b81498d6ce0aa68ab7a6 Mon Sep 17 00:00:00 2001
From: Dag Haaland <dh@verji.com>
Date: Thu, 27 Oct 2022 13:41:01 +0000
Subject: [PATCH 268/300] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 46.2% (1170 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-nb-rNO/strings.xml b/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
index 7af718d920..067dbbbc28 100644
--- a/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
+++ b/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
@@ -36,7 +36,7 @@
     <string name="copied_to_clipboard">Kopiert til utklippstavle</string>
     <string name="dialog_title_warning">Advarsel</string>
     <string name="dialog_title_error">Feil</string>
-    <string name="bottom_action_people">Folk</string>
+    <string name="bottom_action_people">Personer</string>
     <string name="bottom_action_rooms">Rom</string>
     <string name="invitations_header">Invitasjoner</string>
     <string name="low_priority_header">Lavprioritet</string>
@@ -65,10 +65,6 @@
     <string name="action_remove">Fjern</string>
     <string name="action_join">Bli med</string>
     <string name="action_reject">Avvis</string>
-
-
-
-
     <string name="room_participants_action_invite">Inviter</string>
     <string name="room_participants_action_ban">Utesteng</string>
     <string name="room_participants_action_unban">Opphev utestengelse</string>
@@ -265,7 +261,6 @@
     <string name="room_one_user_is_typing">%s skriver …</string>
     <string name="search_hint">Søk</string>
     <string name="search_members_hint">Filtrer rommets medlemmer</string>
-
     <string name="room_settings_all_messages">Alle meldinger</string>
     <string name="settings_olm_version">olm-versjon</string>
     <string name="settings_deactivate_account_section">Deaktiver kontoen</string>
@@ -314,8 +309,6 @@
     <string name="notification_noisy">Bråkete</string>
     <string name="encrypted_message">Kryptert melding</string>
     <string name="rooms">Rom</string>
-
-
     <string name="reason_colon">Årsak: %1$s</string>
     <string name="x_plus">%d+</string>
     <string name="keys_backup_setup">Begynn å bruke Nøkkelsikkerhetskopiering</string>
@@ -379,7 +372,6 @@
     <string name="sign_out_bottom_sheet_will_lose_secure_messages">Du kommer til å miste tilgang til dine enkrypterte meldinger med mindre du sikkerhetskopierer nøklene dine før du logger av.</string>
     <string name="view_decrypted_source">Se dekryptert kilde</string>
     <string name="report_content">Rapporter innhold</string>
-
     <string name="action_sign_out_confirmation_simple">Er du sikker på at vil logge ut\?</string>
     <string name="action_voice_call">Telefonsamtale</string>
     <string name="action_video_call">Videosamtale</string>
@@ -393,7 +385,6 @@
     <string name="system_alerts_header">Systemadvarsler</string>
     <string name="direct_chats_header">Samtaler</string>
     <string name="matrix_only_filter">Bare matrix-kontakter</string>
-
     <string name="send_bug_report_include_crash_logs">Send kjæsjlogg</string>
     <string name="send_bug_report_include_screenshot">Send skjermbilde</string>
     <string name="send_bug_report_description">Vennligst forklar feilen. Hva gjorde du\? Hva forventet du at skulle skje\? Hva skjedde i stedet\?</string>
@@ -446,7 +437,6 @@
     <string name="auth_invalid_email">Dette ser ikke ut som en gyldig E-postadresse</string>
     <string name="login_error_ssl_other">SSL-feil.</string>
     <string name="login_error_limit_exceeded">For mange forespørsler har blitt sendt</string>
-
     <string name="room_participants_leave_prompt_title">Forlat rommet</string>
     <string name="room_participants_header_direct_chats">Direktemeldinger</string>
     <string name="room_participants_action_ignore_title">Ignorer bruker</string>
@@ -600,13 +590,10 @@
     <string name="no_permissions_to_start_conf_call_in_direct_room">Du har ikke tillatelse til å starte en konferansesamtale</string>
     <string name="action_reset">Tilbakestill</string>
     <string name="auth_accept_policies">Vennligst gjennomgå og godta retningslinjene til denne hjemmeserveren:</string>
-
     <string name="auth_reset_password_error_unauthorized">Klarte ikke verifisere e-postadressen: Pass på at du har klikket på lenken i e-posten</string>
     <string name="auth_recaptcha_message">Denne hjemmetjeneren vil vite om du er en robot</string>
-
     <string name="call_failed_no_connection_description">Klarte ikke å starte en sanntidskopling.
 \nVennligst be hjemmetjeneradministratoren din om å sette opp en TURN server så samtaler blir mer stabile.</string>
-
     <string name="login_error_not_json">Inneholdt ikke gyldig JSON</string>
     <string name="login_error_bad_json">Ugyldig JSON</string>
     <string name="set_a_security_phrase_hint">Sikkerhetsfrase</string>
@@ -702,7 +689,6 @@
     <string name="settings_app_info_link_title">App info</string>
     <string name="settings_phone_number_empty">Ingen telefonnummer er lagt til kontoen din</string>
     <string name="room_settings_add_homescreen_shortcut">Legg til på startskjerm</string>
-
     <string name="ssl_only_accept">Godta bare sertifikatet hvis serveradministratoren har publisert et fingeravtrykk som samsvarer med det over.</string>
     <string name="ssl_expected_existing_expl">Sertifikatet er endret fra en tidligere klarert til en som ikke er klarert. Serveren kan ha fornyet sertifikatet. Kontakt serveradministratoren for forventet fingeravtrykk.</string>
     <string name="ssl_unexpected_existing_expl">Sertifikatet har endret seg fra et som telefonen din klarerte. Dette er veldig uvanlig. Det anbefales at du IKKE godtar dette nye sertifikatet.</string>
@@ -734,19 +720,14 @@
     <string name="room_participants_action_mention">Nevne</string>
     <string name="room_participants_action_cancel_invite">Avbryt invitasjonen</string>
     <string name="room_participants_leave_prompt_msg">Er du sikker på at du vil forlate rommet\?</string>
-
     <string name="room_jump_to_first_unread">Gå til første uleste melding.</string>
     <string name="list_members">Liste medlemmer</string>
     <string name="permissions_denied_add_contact">Tillat tillatelse til å få tilgang til kontaktene dine.</string>
     <string name="permissions_denied_qr_code">For å skanne en QR-kode, må du gi tilgang til kameraet.</string>
-
     <string name="permissions_rationale_msg_camera_and_audio">${app_name} trenger tillatelse for å få tilgang til kameraet og mikrofonen for å utføre videosamtaler.
 \n
 \nTillat tilgang til de neste popup-vinduene for å kunne ringe.</string>
-
     <string name="permissions_rationale_msg_record_audio">${app_name} trenger tillatelse for å få tilgang til mikrofonen din for å utføre lydanrop.</string>
-
-
     <string name="incoming_voice_call">Innkommende taleanrop</string>
     <string name="incoming_video_call">Innkommende videosamtale</string>
     <string name="call_ended">Anrop avsluttet</string>
@@ -770,7 +751,6 @@
     <string name="start_chatting">Begynn å chatte</string>
     <string name="settings_troubleshoot_test_fcm_failed_too_many_registration">[%1$s]
 \nDenne feilen er utenfor kontroll av ${app_name}, og ifølge Google indikerer denne feilen at enheten har for mange apper registrert hos FCM. Feilen oppstår bare i tilfeller der det er ekstremt mange apper, så det bør ikke påvirke gjennomsnittsbrukeren.</string>
-
     <string name="call_error_user_not_responding">Ekstern vert kunne ikke plukke opp.</string>
     <string name="video_call_in_progress">Pågående videosamtale…</string>
     <string name="call_in_progress">Pågående samtale…</string>
@@ -1137,7 +1117,6 @@
     <string name="settings_integrations_summary">Bruk en integrasjonshåndterer til å administrere botter, broer, widgets og klistremerkepakker.
 \nIntegrasjonshåndterere mottar konfigurasjonsdata, og kan endre moduler, sende rominvitasjoner og angi maktnivåer på dine vegne.</string>
     <string name="settings_set_sync_delay">Forsinkelse mellom hver synkronisering</string>
-
     <string name="settings_set_sync_timeout">Tidsavbrudd for synkroniseringsforespørsel</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">Du vil ikke bli varslet om innkommende meldinger når appen er i bakgrunnen.</string>
     <string name="settings_background_fdroid_sync_mode_real_time_description">${app_name} vil synkroniseres i bakgrunnen med jevne mellomrom på presis tid (konfigurerbar).
@@ -1251,7 +1230,6 @@
     <string name="spaces_no_server_support_description">Ta kontakt med din hjemmetjener -administrator for mer informasjon</string>
     <string name="this_space_has_no_rooms_not_admin">Noen rom kan være skjult fordi de er private, og du trenger en invitasjon.
 \nDu har ikke tillatelse til å legge til rom.</string>
-
     <string name="upgrade_required">Oppgradering kreves</string>
     <string name="upgrade_public_room">Oppgrader offentlig rom</string>
     <string name="upgrade_private_room">Oppgrader privat rom</string>
@@ -1275,4 +1253,4 @@
     <string name="notice_display_name_set">%1$s endret visningsnavnet sitt til %2$s</string>
     <string name="notice_room_ban">%1$s utestengte %2$s</string>
     <string name="notice_room_invite_no_invitee">%ss invitasjon</string>
-</resources>
+</resources>
\ No newline at end of file

From f487ec3948aba5eb861ac4dc9c44246074883f8a Mon Sep 17 00:00:00 2001
From: Jozef Gaal <preklady@mayday.sk>
Date: Thu, 27 Oct 2022 10:39:29 +0000
Subject: [PATCH 269/300] Translated using Weblate (Slovak)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sk/strings.xml b/library/ui-strings/src/main/res/values-sk/strings.xml
index 3c86ea5d3b..393bb83426 100644
--- a/library/ui-strings/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -2875,4 +2875,20 @@
     <string name="a11y_pause_voice_broadcast_record">Pozastaviť nahrávanie hlasového vysielania</string>
     <string name="a11y_resume_voice_broadcast_record">Pokračovať v nahrávaní hlasového vysielania</string>
     <string name="voice_broadcast_live">Naživo</string>
+    <string name="device_manager_other_sessions_select">Vyberte relácie</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Poloha</string>
+    <string name="attachment_type_selector_poll">Ankety</string>
+    <string name="attachment_type_selector_voice_broadcast">Hlasové vysielanie</string>
+    <string name="attachment_type_selector_file">Prílohy</string>
+    <string name="attachment_type_selector_sticker">Nálepky</string>
+    <string name="attachment_type_selector_gallery">Knižnica fotografií</string>
+    <string name="action_deselect_all">Zrušiť výber všetkých</string>
+    <string name="action_select_all">Vybrať všetko</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d vybraté</item>
+        <item quantity="few">%1$d vybraté</item>
+        <item quantity="other">%1$d vybraných</item>
+    </plurals>
 </resources>
\ No newline at end of file

From bd7a2ae02bca5885713f357d92ce25314adb9891 Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 27 Oct 2022 18:36:41 +0000
Subject: [PATCH 270/300] Translated using Weblate (Swedish)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sv/strings.xml b/library/ui-strings/src/main/res/values-sv/strings.xml
index af66ba5ce0..eaa327e977 100644
--- a/library/ui-strings/src/main/res/values-sv/strings.xml
+++ b/library/ui-strings/src/main/res/values-sv/strings.xml
@@ -2810,7 +2810,7 @@
     <string name="a11y_stop_voice_broadcast_record">Avsluta inspelning av röstsändning</string>
     <string name="a11y_pause_voice_broadcast_record">Pausa inspelning av röstsändning</string>
     <string name="a11y_resume_voice_broadcast_record">Återuppta inspelning av röstsändning</string>
-    <string name="voice_broadcast_live">Realtid</string>
+    <string name="voice_broadcast_live">Live</string>
     <string name="qr_code_login_header_scan_qr_code_title">Skanna QR-kod</string>
     <string name="three">3</string>
     <string name="two">2</string>
@@ -2821,4 +2821,19 @@
     <string name="onboarding_new_app_layout_spaces_message">Kom åt dina utrymmen (nere till höger) snabbare och enklare än någonsin förut.</string>
     <string name="onboarding_new_app_layout_spaces_title">Kom åt utrymmen</string>
     <string name="onboarding_new_app_layout_welcome_message">För att förenkla din ${app_name} så är flikar nu valfria. Hantera dem i menyn uppe till höger.</string>
+    <string name="device_manager_other_sessions_select">Välj sessioner</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Plats</string>
+    <string name="attachment_type_selector_poll">Omröstningar</string>
+    <string name="attachment_type_selector_voice_broadcast">Röstsändning</string>
+    <string name="attachment_type_selector_file">Bilagor</string>
+    <string name="attachment_type_selector_sticker">Dekaler</string>
+    <string name="attachment_type_selector_gallery">Fotobibliotek</string>
+    <string name="action_deselect_all">Avmarkera alla</string>
+    <string name="action_select_all">Välj alla</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d vald</item>
+        <item quantity="other">%1$d valda</item>
+    </plurals>
 </resources>
\ No newline at end of file

From e08e6e1442741ec292e660fd49c9b121793a45c8 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 27 Oct 2022 15:49:47 +0000
Subject: [PATCH 271/300] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-uk/strings.xml b/library/ui-strings/src/main/res/values-uk/strings.xml
index ac659aca41..f633a0ef2f 100644
--- a/library/ui-strings/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -2929,4 +2929,21 @@
     <string name="a11y_pause_voice_broadcast_record">Призупинити запис голосового повідомлення</string>
     <string name="a11y_resume_voice_broadcast_record">Відновити запис голосового повідомлення</string>
     <string name="voice_broadcast_live">Наживо</string>
+    <string name="device_manager_other_sessions_select">Вибрати сеанси</string>
+    <string name="attachment_type_selector_contact">Контакт</string>
+    <string name="attachment_type_selector_camera">Камера</string>
+    <string name="attachment_type_selector_location">Місце перебування</string>
+    <string name="attachment_type_selector_poll">Опитування</string>
+    <string name="attachment_type_selector_voice_broadcast">Голосові повідомлення</string>
+    <string name="attachment_type_selector_file">Вкладення</string>
+    <string name="attachment_type_selector_sticker">Наліпки</string>
+    <string name="attachment_type_selector_gallery">Фотобібліотека</string>
+    <string name="action_deselect_all">Скасувати вибір усіх</string>
+    <plurals name="x_selected">
+        <item quantity="one">Вибрано %1$d</item>
+        <item quantity="few">Вибрано %1$d</item>
+        <item quantity="many">Вибрано %1$d</item>
+        <item quantity="other">Вибрано %1$d</item>
+    </plurals>
+    <string name="action_select_all">Вибрати все</string>
 </resources>
\ No newline at end of file

From 7d298ea729171d9081a893a36f273627a27c7b42 Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Thu, 27 Oct 2022 03:41:14 +0000
Subject: [PATCH 272/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 94.5% (2381 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 5ab883eff7..06cf5e067b 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2299,7 +2299,7 @@
     <string name="room_member_override_nick_color">覆盖显示名称颜色</string>
     <string name="ftue_auth_reset_password_breaker_title">检查你的电子邮件。</string>
     <string name="ftue_auth_email_entry_title">电子邮件</string>
-    <string name="ftue_auth_carousel_control_title">一切由您掌控</string>
+    <string name="ftue_auth_carousel_control_title">一切由您掌控。</string>
     <string name="beta">BETA</string>
     <string name="location_share_live_select_duration_title">分享你的实时位置</string>
     <string name="a11y_location_share_locate_button">缩放到当前位置</string>

From 68b3f407a47964176d777eb5499f4482db938b5d Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Thu, 27 Oct 2022 19:24:24 +0000
Subject: [PATCH 273/300] Translated using Weblate (Persian)

Currently translated at 100.0% (79 of 79 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fa/
---
 fastlane/metadata/android/fa/changelogs/40105040.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/metadata/android/fa/changelogs/40105040.txt b/fastlane/metadata/android/fa/changelogs/40105040.txt
index 69bd6bf93c..a33ad09422 100644
--- a/fastlane/metadata/android/fa/changelogs/40105040.txt
+++ b/fastlane/metadata/android/fa/changelogs/40105040.txt
@@ -1,2 +1,2 @@
-تغییرات اصلی در این نسخه: قابلیت‌های جدید در تنظیمات آزمایشی: پردازشگر متن غنی، مدیریت دستگاه‌ جدید، پخش صدا. هنوز فعالانه در حال توسعه‌اند.
-لیست کامل تغییرات: https://github.com/vector-im/element-android/releases
+تغییرات اصلی در این نگارش: قابلیت‌های جدید در تنظیمات آزمایشگاه‌ها: نگارندهٔ متن غنی، مدیریت افزارهٔ جدید، پخش صدا. هنوز زیر توسعهٔ فعّال!
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases

From ce35472824a6f99c6c1e5609286457615fdc8e0f Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Mon, 31 Oct 2022 12:39:38 +0100
Subject: [PATCH 274/300] Fix share actions from outside the app (#7473)

---
 changelog.d/7400.bugfix                                         | 1 +
 .../home/room/detail/composer/MessageComposerFragment.kt        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/7400.bugfix

diff --git a/changelog.d/7400.bugfix b/changelog.d/7400.bugfix
new file mode 100644
index 0000000000..51c0708308
--- /dev/null
+++ b/changelog.d/7400.bugfix
@@ -0,0 +1 @@
+Fix share actions using share dialog.
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
index afa9c84353..d3b323966f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
@@ -231,7 +231,7 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
                 .onEach { onTypeSelected(it.attachmentType) }
                 .launchIn(lifecycleScope)
 
-        if (savedInstanceState != null) {
+        if (savedInstanceState == null) {
             handleShareData()
         }
     }

From 76ead3f344a8d25ec763e0f8e7ab32e82660aaf3 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Mon, 31 Oct 2022 16:16:42 +0100
Subject: [PATCH 275/300] Fix new line and enter key presses deleting existing
 text in some keyboards (#7437)

---
 changelog.d/7357.bugfix                                       | 1 +
 .../home/room/detail/composer/MessageComposerFragment.kt      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/7357.bugfix

diff --git a/changelog.d/7357.bugfix b/changelog.d/7357.bugfix
new file mode 100644
index 0000000000..697c92b31e
--- /dev/null
+++ b/changelog.d/7357.bugfix
@@ -0,0 +1 @@
+New line and Enter hardware key presses deleting existing text in some keyboards.
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
index d3b323966f..2bbd5c3474 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
@@ -294,11 +294,11 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
                     !keyEvent.isShiftPressed &&
                     keyEvent.keyCode == KeyEvent.KEYCODE_ENTER &&
                     resources.configuration.keyboard != Configuration.KEYBOARD_NOKEYS
-            val result = if (isSendAction || externalKeyboardPressedEnter) {
+            val sendMessageWithEnter = externalKeyboardPressedEnter && vectorPreferences.sendMessageWithEnter()
+            val result = if (isSendAction || sendMessageWithEnter) {
                 sendTextMessage(v.text)
                 true
             } else false
-            composer.setTextIfDifferent(null)
             result
         }
 

From 8267c570df5a49f9583913dbfbf5e3c883c1c129 Mon Sep 17 00:00:00 2001
From: Jingchao Feng <fjch1997@outlook.com>
Date: Tue, 1 Nov 2022 03:46:17 +0000
Subject: [PATCH 276/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.2% (2474 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 06cf5e067b..f8c3584a38 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2290,7 +2290,7 @@
     <string name="settings_troubleshoot_test_current_gateway">当前网关：%s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">网关</string>
     <string name="give_feedback_threads">提供反馈</string>
-    <string name="ftue_auth_carousel_workplace_title">为你的团队传递消息。</string>
+    <string name="ftue_auth_carousel_workplace_title">为您的团队服务</string>
     <string name="threads_beta_enable_notice_title">消息列beta</string>
     <string name="thread_list_title">消息列</string>
     <string name="settings_show_latest_profile_description">为所有消息显示最新资料信息（头像和显示名称）。</string>

From 355bfd5a4c4b9d42f3f4603e51d75b70e22d4d0d Mon Sep 17 00:00:00 2001
From: PotLice <metiozero@outlook.com>
Date: Tue, 1 Nov 2022 03:45:46 +0000
Subject: [PATCH 277/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.2% (2474 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index f8c3584a38..4b8f201ae4 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -151,7 +151,7 @@
     <string name="notice_room_guest_access_can_join_by_you">你已允许访客加入房间。</string>
     <string name="notice_room_guest_access_forbidden_by_you">你已禁止访客加入房间。</string>
     <string name="notice_end_to_end_ok_by_you">你已开启端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm_by_you">你已开启端到端加密（无法识别的算法%1$s）。</string>
+    <string name="notice_end_to_end_unknown_algorithm_by_you">你已开启端到端加密（无法识别的算法 %1$s）。</string>
     <string name="notice_direct_room_leave_with_reason_by_you">你已离开。理由：%1$s</string>
     <string name="notice_direct_room_leave_with_reason">%1$s 已离开。理由：%2$s</string>
     <string name="notice_direct_room_join_with_reason_by_you">你已加入。理由：%1$s</string>
@@ -170,10 +170,10 @@
     <string name="notice_direct_room_join">%1$s 已加入</string>
     <string name="notice_direct_room_created_by_you">你创建了讨论</string>
     <string name="notice_direct_room_created">%1$s 创建了讨论</string>
-    <string name="notice_direct_room_guest_access_forbidden_by_you">你已阻止客人加入房间。</string>
-    <string name="notice_direct_room_guest_access_forbidden">%1$s已阻止客人加入房间。</string>
-    <string name="notice_direct_room_guest_access_can_join_by_you">你已允许客人加入这里。</string>
-    <string name="notice_direct_room_guest_access_can_join">%1$s 已允许客人加入这里。</string>
+    <string name="notice_direct_room_guest_access_forbidden_by_you">你已阻止访客加入房间。</string>
+    <string name="notice_direct_room_guest_access_forbidden">%1$s 已阻止访客加入房间。</string>
+    <string name="notice_direct_room_guest_access_can_join_by_you">你已允许访客加入这里。</string>
+    <string name="notice_direct_room_guest_access_can_join">%1$s 已允许访客加入这里。</string>
     <string name="call_notification_answer">接受</string>
     <string name="call_notification_reject">拒绝</string>
     <string name="call_notification_hangup">挂断</string>
@@ -2105,7 +2105,7 @@
     <string name="call_tile_video_active">活跃视频通话</string>
     <string name="call_tile_voice_active">活跃语音通话</string>
     <string name="link_this_email_with_your_account">在 ${app_name} 中直接接收邀请的设置 %s。</string>
-    <string name="link_this_email_settings_link">将此邮箱与您的账户相链接</string>
+    <string name="link_this_email_settings_link">将此电子邮件地址与您的帐户相关联</string>
     <string name="this_invite_to_this_space_was_sent">加入这个空间的邀请被发送至 %s，此邮箱未与您的账户相关联</string>
     <string name="this_invite_to_this_room_was_sent">加入这个房间的邀请被发送至 %s，此邮箱未与您的账户相关联</string>
     <string name="all_rooms_youre_in_will_be_shown_in_home">你所在的全部房间将显示在主页上。</string>
@@ -2277,14 +2277,14 @@
     <string name="room_threads_filter">在房间中筛选子区</string>
     <string name="action_thread_copy_link_to_thread">复制子区的链接</string>
     <string name="action_thread_view_in_room">在房间中查看</string>
-    <string name="room_message_autocomplete_notification">群组通知</string>
+    <string name="room_message_autocomplete_notification">房间通知</string>
     <string name="threads_notice_migration_message">我们越来越接近将消息列发布为公开Beta版。
 \n
 \n在我们为此准备时，我们需要做一些变动：在此之前创建的消息列将会被显示为普通回复。
 \n
 \n这会是一次性的过渡，因为消息列现在是Matrix规范的一部分了。</string>
     <plurals name="message_reaction_show_more">
-        <item quantity="other">还有%1$d个</item>
+        <item quantity="other">%1$d 更多</item>
     </plurals>
     <string name="live_location_labs_promotion_description">请注意：这是一个使用临时实现的实验室功能。这意味着你将无法删除你的位置历史，并且在你停止与这个房间分享你的实时位置后，高级用户仍能看到你的位置历史。</string>
     <string name="settings_troubleshoot_test_current_gateway">当前网关：%s</string>
@@ -2307,27 +2307,27 @@
     <string name="poll_no_votes_cast">无投票</string>
     <string name="ftue_auth_email_verification_title">验证你的电子邮件</string>
     <plurals name="room_removed_messages">
-        <item quantity="other">%d条消息已移除</item>
+        <item quantity="other">%d 条消息已移除</item>
     </plurals>
     <string name="live_location_labs_promotion_switch_title">启用位置分享</string>
     <string name="live_location_labs_promotion_title">实时位置共享</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_success">当前端点：%s</string>
     <string name="settings_troubleshoot_test_current_endpoint_title">端点</string>
-    <string name="settings_troubleshoot_test_current_distributor">目前正在使用%s。</string>
+    <string name="settings_troubleshoot_test_current_distributor">目前正在使用 %s。</string>
     <string name="settings_troubleshoot_test_current_distributor_title">方式</string>
     <plurals name="settings_troubleshoot_test_distributors_many">
-        <item quantity="other">找到%d种方式。</item>
+        <item quantity="other">找到 %d 个方式。</item>
     </plurals>
     <string name="settings_troubleshoot_test_distributors_fdroid">除了后台同步，没有发现其他方法。</string>
-    <string name="settings_troubleshoot_test_distributors_gplay">找不到除了Google Play服务以外的方式。</string>
+    <string name="settings_troubleshoot_test_distributors_gplay">找不到除了 Google Play 服务以外的方式。</string>
     <string name="settings_troubleshoot_test_distributors_title">可用方式</string>
     <string name="settings_notification_method">通知方式</string>
     <string name="unifiedpush_distributor_background_sync">后台同步</string>
-    <string name="unifiedpush_distributor_fcm_fallback">Google服务</string>
+    <string name="unifiedpush_distributor_fcm_fallback">Google 服务</string>
     <string name="unifiedpush_getdistributors_dialog_title">选择如何接收通知</string>
     <string name="screen_sharing_notification_description">屏幕共享进行中</string>
-    <string name="screen_sharing_notification_title">${app_name}屏幕共享</string>
+    <string name="screen_sharing_notification_title">${app_name} 屏幕共享</string>
     <string name="room_message_autocomplete_users">用户</string>
     <string name="room_message_notify_everyone">通知整个房间</string>
     <string name="message_reaction_show_less">显示更少</string>
@@ -2536,8 +2536,8 @@
         <item quantity="other">%1$s与其他%2$d人</item>
     </plurals>
     <string name="updating_your_data">正在更新你的数据……</string>
-    <string name="labs_enable_element_call_permission_shortcuts_summary">自动批准Element通话组件，授予相机/麦克风权限</string>
-    <string name="labs_enable_element_call_permission_shortcuts">启用Element通话权限捷径</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">自动允许 Element 通话小部件并授予相机/麦克风访问权限</string>
+    <string name="labs_enable_element_call_permission_shortcuts">启用 Element 通话权限快捷方式</string>
     <string name="live_location_description">实时位置</string>
     <string name="verify_invalid_qr_notice">这个QR码看起来不正常。请尝试用另一个方法验证。</string>
     <string name="crosssigning_cannot_verify_this_session_desc">你无法访问加密消息历史。重置你的安全消息备份和验证密钥以重新开始。</string>
@@ -2551,7 +2551,7 @@
     <string name="a11y_open_settings">打开设置</string>
     <string name="all_chats">全部聊天</string>
     <string name="device_manager_sessions_other_description">为获得最佳安全性，请验证你的会话，并从任何你不认识或不再使用的会话登出。</string>
-    <string name="device_manager_sessions_other_title">其他会话</string>
+    <string name="device_manager_sessions_other_title">其它会话</string>
     <string name="settings_sessions_list">会话</string>
     <string name="a11y_open_spaces">打开空间列表</string>
     <string name="a11y_create_message">创建新对话或房间</string>
@@ -2597,22 +2597,22 @@
     <plurals name="device_manager_inactive_sessions_description">
         <item quantity="other">请考虑从不再使用的旧会话（%1$d天或更久）登出。</item>
     </plurals>
-    <string name="home_empty_no_rooms_title">欢迎来到${app_name}，
+    <string name="home_empty_no_rooms_title">欢迎来到 ${app_name}，
 \n%s。</string>
-    <string name="home_empty_no_unreads_message">未读消息会在这里显示。</string>
+    <string name="home_empty_no_unreads_message">当您有一些未读消息时，这里会显示您的未读消息。</string>
     <string name="onboarding_new_app_layout_feedback_title">提供反馈</string>
     <string name="onboarding_new_app_layout_feedback_message">点击右上角查看反馈选项。</string>
     <string name="onboarding_new_app_layout_button_try">试用</string>
     <string name="space_list_empty_message">空间是对房间和人进行分组的新方式。创建一个空间来开始吧。</string>
     <string name="labs_enable_new_app_layout_title">启用新布局</string>
     <string name="device_manager_session_details_device_ip_address">IP地址</string>
-    <string name="device_manager_other_sessions_recommendation_description_unverified">验证你的会话以增强消息传输的安全性，或从那些你不认识或不再使用的会话登出。</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">验证您的会话以增强安全消息传递或从您不再识别或不再使用的会话中登出。</string>
     <string name="device_manager_filter_option_unverified_description">尚未准备好安全收发消息</string>
     <string name="device_manager_filter_option_verified_description">准备好安全收发消息</string>
     <string name="device_manager_filter_option_verified">已验证</string>
     <string name="device_manager_filter_option_all_sessions">全部会话</string>
-    <string name="device_manager_filter_bottom_sheet_title">筛选</string>
-    <string name="device_manager_session_last_activity">上次活跃%1$s</string>
+    <string name="device_manager_filter_bottom_sheet_title">过滤器</string>
+    <string name="device_manager_session_last_activity">上次活跃 %1$s</string>
     <string name="device_manager_device_title">设备</string>
     <string name="device_manager_session_title">会话</string>
     <string name="device_manager_current_session_title">当前会话</string>
@@ -2637,4 +2637,123 @@
     <string name="onboarding_new_app_layout_welcome_title">欢迎使用新视图！</string>
     <string name="some_devices_will_not_be_able_to_decrypt">⚠ 此房间里有未经验证的设备，它们将无法解密你发送的消息。</string>
     <string name="encryption_never_send_to_unverified_devices_in_room">永远不要向这个房间里未经验证的会话发送加密的消息。</string>
+    <string name="home_empty_space_no_rooms_title">%s
+\n看起来有点空荡荡的。</string>
+    <string name="labs_enable_voice_broadcast_summary">能够在房间时间线中录制和发送语音广播。</string>
+    <string name="labs_enable_voice_broadcast_title">启用语音广播（正在积极开发中）</string>
+    <string name="labs_enable_client_info_recording_summary">记录客户端名称、版本和网址，以便在会话管理器中更轻松地识别会话。</string>
+    <string name="labs_enable_client_info_recording_title">启用客户端信息记录</string>
+    <string name="labs_enable_session_manager_summary">对所有会话有更好的可见性和控制。</string>
+    <string name="device_manager_learn_more_session_rename">您加入的直接消息和聊天室中的其他用户可以查看您的会话的完整列表。
+\n
+\n这让他们确信他们真的在与您交谈，但这也意味着他们可以看到您在此处输入的会话名称。</string>
+    <string name="device_manager_learn_more_session_rename_title">重命名会话</string>
+    <string name="device_manager_learn_more_sessions_verified">已验证会话已使用您的凭据登录，然后使用您的安全密码或通过交叉验证进行验证。
+\n
+\n这意味着他们持有您之前消息的加密密钥，并向您正在与之通信的其他用户确认这些会话确实是您。</string>
+    <string name="device_manager_learn_more_sessions_inactive">闲置会话是您一段时间未使用的会话，但它们会继续接收加密密钥。
+\n
+\n删除闲置会话可以提高安全性和性能，并使您更容易识别新会话是否可疑。</string>
+    <string name="device_manager_learn_more_sessions_inactive_title">闲置会话</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_description">您可以使用此设备通过二维码登录移动设备或网络设备。 有两种方法可以做到这一点：</string>
+    <string name="device_manager_sessions_sign_in_with_qr_code_title">使用二维码登录</string>
+    <string name="device_manager_session_rename_warning">请注意，与您交流的人也可以看到会话名称。</string>
+    <string name="device_manager_session_rename_description">自定义会话名称可以帮助您更轻松地识别您的设备。</string>
+    <string name="device_manager_session_rename">重命名会话</string>
+    <string name="device_manager_session_details_device_operating_system">操作系统</string>
+    <string name="device_manager_session_details_device_model">型号</string>
+    <string name="device_manager_session_details_device_browser">浏览器</string>
+    <string name="device_manager_session_details_application_url">网址</string>
+    <string name="device_manager_session_details_application_version">版本</string>
+    <string name="device_manager_session_details_application_name">名称</string>
+    <string name="device_manager_session_details_application">应用</string>
+    <string name="device_manager_session_details_session_last_activity">上次活动</string>
+    <string name="device_manager_session_details_session_name">会话名称</string>
+    <string name="device_manager_push_notifications_description">接收有关此会话的推送通知。</string>
+    <string name="device_manager_push_notifications_title">推送通知</string>
+    <string name="device_manager_session_details_description">应用程序、设备和活动信息。</string>
+    <string name="device_manager_session_details_title">会话详情</string>
+    <string name="device_manager_session_overview_signout">登出此会话</string>
+    <string name="device_manager_other_sessions_clear_filter">清除过滤器</string>
+    <string name="device_manager_other_sessions_no_inactive_sessions_found">未找到闲置会话。</string>
+    <string name="device_manager_other_sessions_no_unverified_sessions_found">未找到未验证的会话。</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">未找到经过验证的会话。</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="other">考虑登出您不再使用的旧会话（%1$d 天或更长时间）。</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_title_inactive">闲置</string>
+    <string name="device_manager_other_sessions_recommendation_title_unverified">未验证</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">为获得最佳安全性，请从您不认识或不再使用的任何会话中登出。</string>
+    <string name="device_manager_other_sessions_recommendation_title_verified">已验证</string>
+    <string name="a11y_device_manager_filter">过滤器</string>
+    <plurals name="device_manager_filter_option_inactive_description">
+        <item quantity="other">闲置 %1$d 天或更长时间</item>
+    </plurals>
+    <string name="device_manager_filter_option_unverified">未验证</string>
+    <string name="device_manager_other_sessions_description_unverified_current_session">未验证 · 您当前的会话</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">验证您当前的会话以显示此会话的验证状态。</string>
+    <string name="device_manager_verification_status_unknown">未知的验证状态</string>
+    <string name="tooltip_attachment_voice_broadcast">开始语音广播</string>
+    <string name="a11y_voice_broadcast_buffering">缓冲</string>
+    <string name="a11y_pause_voice_broadcast">暂停语音广播</string>
+    <string name="voice_broadcast_live">直播</string>
+    <string name="action_got_it">知道了</string>
+    <string name="rich_text_editor_format_underline">应用下划线格式</string>
+    <string name="rich_text_editor_format_strikethrough">应用删除线格式</string>
+    <string name="rich_text_editor_format_italic">应用斜体格式</string>
+    <string name="rich_text_editor_format_bold">应用粗体格式</string>
+    <string name="qr_code_login_confirm_security_code_description">请确保您知道此代码的来源。 通过链接设备，您将为某人提供对您帐户的完全访问权限。</string>
+    <string name="qr_code_login_confirm_security_code">确认</string>
+    <string name="qr_code_login_try_again">再试一次</string>
+    <string name="qr_code_login_status_no_match">不匹配？</string>
+    <string name="qr_code_login_signing_in">登录</string>
+    <string name="qr_code_login_connecting_to_device">连接到设备</string>
+    <string name="qr_code_login_scan_qr_code_button">扫描二维码</string>
+    <string name="qr_code_login_signing_in_a_mobile_device">登录移动设备？</string>
+    <string name="qr_code_login_show_qr_code_button">在此设备中显示二维码</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">选择“扫描二维码”</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">从登录屏幕开始</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">选择“使用二维码登录”</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">从登录屏幕开始</string>
+    <string name="qr_code_login_new_device_instruction_3">选择“显示二维码”</string>
+    <string name="qr_code_login_new_device_instruction_2">转到设置 -&gt; 安全和隐私</string>
+    <string name="qr_code_login_new_device_instruction_1">在您的其它设备上打开应用程序</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">主服务器不支持二维码登录。</string>
+    <string name="qr_code_login_header_failed_user_cancelled_description">登录已在另一台设备上取消。</string>
+    <string name="qr_code_login_header_failed_invalid_qr_code_description">该二维码无效。</string>
+    <string name="qr_code_login_header_failed_other_device_not_signed_in_description">另一台设备必须登录。</string>
+    <string name="qr_code_login_header_failed_other_device_already_signed_in_description">另一台设备已登录。</string>
+    <string name="qr_code_login_header_failed_timeout_description">链接未在规定时间内完成。</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">设置安全消息传递时遇到安全问题。 以下其中一项可能会受到损害：您的家庭服务器； 您的互联网连接； 您的设备；</string>
+    <string name="qr_code_login_header_failed_other_description">请求失败。</string>
+    <string name="qr_code_login_header_failed_denied_description">该请求在另一台设备上被拒绝。</string>
+    <string name="qr_code_login_header_failed_device_is_not_supported_description">不支持与此设备链接。</string>
+    <string name="qr_code_login_header_failed_title">连接不成功</string>
+    <string name="qr_code_login_header_connected_description">检查您已登录的设备，应显示以下代码。 确认以下代码与该设备匹配：</string>
+    <string name="qr_code_login_header_connected_title">已建立安全连接</string>
+    <string name="qr_code_login_header_show_qr_code_link_a_device_description">使用已退出登录的设备扫描下方二维码。</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">使用您已登录的设备扫描下方二维码：</string>
+    <string name="qr_code_login_header_show_qr_code_title">使用二维码登录</string>
+    <string name="qr_code_login_header_scan_qr_code_description">使用此设备上的相机扫描其他设备上显示的二维码：</string>
+    <string name="qr_code_login_header_scan_qr_code_title">扫描二维码</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="onboarding_new_app_layout_welcome_message">为了简化您的 ${app_name}，选项卡现在是可选的。 使用右上角的菜单管理它们。</string>
+    <string name="home_empty_no_unreads_title">无需报告。</string>
+    <string name="home_empty_no_rooms_message">适用于团队、朋友和组织的一体化安全聊天应用程序。 创建一个聊天室，或加入一个现有的房间，开始。</string>
+    <string name="home_empty_space_no_rooms_message">空间是一种对房间和人员进行分组的新方式。 使用右下角的按钮添加现有房间或创建新房间。</string>
+    <string name="device_manager_learn_more_sessions_verified_title">已验证会话</string>
+    <string name="device_manager_learn_more_sessions_unverified">未验证会话是使用您的凭据登录但未经交叉验证的会话。
+\n
+\n您应特别确定您识别这些会话，因为它们可能代表未经授权使用您的帐户。</string>
+    <string name="device_manager_learn_more_sessions_unverified_title">未验证会话</string>
+    <string name="device_manager_filter_option_inactive">闲置</string>
+    <string name="device_manager_session_rename_edit_hint">会话名称</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">验证或登出此会话以获得最佳安全性和可靠性。</string>
+    <string name="a11y_play_voice_broadcast">播放或恢复语音广播</string>
+    <string name="key_authenticity_not_guaranteed">此设备无法保证此加密消息的真实性。</string>
+    <string name="command_description_table_flip">将 (╯°□°)╯︵ ┻━┻ 添加到纯文本消息中</string>
+    <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} 需要显示通知的权限。
+\n请授予权限。</string>
 </resources>
\ No newline at end of file

From 0bd56662ab8f940f0e99d9524476ac6d753c355f Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Sun, 30 Oct 2022 15:01:54 +0000
Subject: [PATCH 278/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.2% (2474 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 4b8f201ae4..6a77b4f5ce 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -815,10 +815,10 @@
     <string name="settings_push_rules">推送规则</string>
     <string name="settings_push_rules_no_rules">尚未定义任何推送规则</string>
     <string name="settings_push_gateway_no_pushers">没有已注册的推送通道</string>
-    <string name="push_gateway_item_app_id">app_id：</string>
-    <string name="push_gateway_item_push_key">push_key：</string>
-    <string name="push_gateway_item_app_display_name">app_display_name：</string>
-    <string name="push_gateway_item_device_name">device_name：</string>
+    <string name="push_gateway_item_app_id">应用ID：</string>
+    <string name="push_gateway_item_push_key">推送密钥：</string>
+    <string name="push_gateway_item_app_display_name">应用显示名称：</string>
+    <string name="push_gateway_item_device_name">会话显示名称：</string>
     <string name="push_gateway_item_url">URL：</string>
     <string name="push_gateway_item_format">格式：</string>
     <string name="preference_voice_and_video">音频与视频</string>
@@ -991,12 +991,12 @@
     <string name="settings_discovery_identity_server_info">你正在使用 %1$s 与你知道的现有联系人相互发现。</string>
     <string name="settings_discovery_identity_server_info_none">你当前未使用身份服务器。若要与你知道的现有联系人相互发现，请在下方配置。</string>
     <string name="settings_discovery_emails_title">可发现电子邮件地址</string>
-    <string name="settings_discovery_no_mails">发现选项将在你添加电子邮件后出现。</string>
+    <string name="settings_discovery_no_mails">发现选项将在你添加电子邮件地址后出现。</string>
     <string name="settings_discovery_no_msisdn">发现选项将在你添加电话号码后出现。</string>
     <string name="settings_discovery_disconnect_identity_server_info">与你的身份服务器断开意味着你将无法被其它用户发现并且无法通过电子邮件和电话邀请他人。</string>
     <string name="settings_discovery_msisdn_title">可发现电话号码</string>
-    <string name="settings_discovery_confirm_mail">我们向 %s 给你发送了确认电子邮件，检查你的电子邮件并点击确认链接</string>
-    <string name="settings_discovery_confirm_mail_not_clicked">我们向 %s 给你发送了确认电子邮件，请先检查你的电子邮件并点击确认链接</string>
+    <string name="settings_discovery_confirm_mail">我们向%s发送了一封电子邮件，请检查你的电子邮件并点击确认链接</string>
+    <string name="settings_discovery_confirm_mail_not_clicked">我们向%s发送了电子邮件，请先检查你的电子邮件并点击确认链接</string>
     <string name="settings_discovery_enter_identity_server">输入身份服务器 URL</string>
     <string name="settings_discovery_bad_identity_server">无法连接到身份服务器</string>
     <string name="settings_discovery_please_enter_server">请输入身份服务器 url</string>
@@ -1105,16 +1105,16 @@
     <string name="login_registration_not_supported">应用无法在此服务器上创建账户。
 \n
 \n你想要通过网页客户端注册吗？</string>
-    <string name="login_login_with_email_error">电子邮件未关联到任何账户。</string>
+    <string name="login_login_with_email_error">此电子邮件地址未关联到任何账户。</string>
     <string name="login_reset_password_on">在 %1$s 上重置密码</string>
     <string name="login_reset_password_notice">验证邮件将发送到你的收件箱以确认设置你的新密码。</string>
     <string name="login_reset_password_submit">下一个</string>
     <string name="login_reset_password_email_hint">电子邮件</string>
     <string name="login_reset_password_password_hint">新密码</string>
-    <string name="login_reset_password_warning_title">注意！</string>
+    <string name="login_reset_password_warning_title">警告！</string>
     <string name="login_reset_password_warning_content">更改你的密码将重置所有会话上的端到端加密密钥，从而使加密聊天记录无法读取。在重设密码之前，请设置“密钥备份”或从另一个会话中导出房间密钥。</string>
     <string name="login_reset_password_warning_submit">继续</string>
-    <string name="login_reset_password_error_not_found">电子邮件未链接到任何账户</string>
+    <string name="login_reset_password_error_not_found">此电子邮件地址未链接到任何账户</string>
     <string name="login_reset_password_mail_confirmation_title">检查你的收件箱</string>
     <string name="login_reset_password_mail_confirmation_notice">验证电子邮件已发送到 %1$s。</string>
     <string name="login_reset_password_mail_confirmation_notice_2">点击链接以确认你的新密码。跟随包含的链接验证后，请点击下方。</string>
@@ -1123,12 +1123,12 @@
     <string name="login_reset_password_success_notice">你的密码已重置。</string>
     <string name="login_reset_password_success_notice_2">你已登出全部会话，不会再接收到推送通知。若要重新启用通知，请在每个设备上再次登录。</string>
     <string name="login_reset_password_success_submit">返回登录</string>
-    <string name="login_reset_password_cancel_confirmation_title">注意</string>
+    <string name="login_reset_password_cancel_confirmation_title">警告</string>
     <string name="login_reset_password_cancel_confirmation_content">你的密码尚未更改。
 \n
 \n是否中止密码更改过程？</string>
     <string name="login_set_email_title">设置电子邮件地址</string>
-    <string name="login_set_email_notice">设置电子邮件用于恢复你的账户。之后，你可以选择允许你认识的人通过电子邮件发现你。</string>
+    <string name="login_set_email_notice">设置电子邮件地址以用于恢复你的账户。之后，你可以选择允许你认识的人通过此地址发现你。</string>
     <string name="login_set_email_mandatory_hint">电子邮件</string>
     <string name="login_set_email_optional_hint">电子邮件（可选）</string>
     <string name="login_set_email_submit">下一个</string>
@@ -1151,7 +1151,7 @@
     <string name="login_signup_password_hint">密码</string>
     <string name="login_signup_submit">下一个</string>
     <string name="login_signup_error_user_in_use">用户名已占用</string>
-    <string name="login_signup_cancel_confirmation_title">注意</string>
+    <string name="login_signup_cancel_confirmation_title">警告</string>
     <string name="login_signup_cancel_confirmation_content">你的账户尚未创建。是否中止注册过程？</string>
     <string name="login_a11y_choose_matrix_org">选择 matrix.org</string>
     <string name="login_a11y_choose_modular">选择 Element Matrix Services</string>
@@ -1189,7 +1189,7 @@
     <string name="soft_logout_signin_submit">登录</string>
     <string name="soft_logout_signin_password_hint">密码</string>
     <string name="soft_logout_clear_data_title">清除个人数据</string>
-    <string name="soft_logout_clear_data_notice">注意：你的个人数据（包括加密密钥）仍存储在此设备上。
+    <string name="soft_logout_clear_data_notice">警告：你的个人数据（包括加密密钥）仍存储在此设备上。
 \n
 \n如果你不再使用此设备，或想登录另一个账户，请清除它。</string>
     <string name="soft_logout_clear_data_submit">清除全部数据</string>
@@ -1235,7 +1235,7 @@
     <string name="sent_a_file">文件</string>
     <string name="send_a_sticker">贴纸</string>
     <string name="verification_request_waiting">正在等待……</string>
-    <string name="verification_request_other_cancelled">%s 已取消</string>
+    <string name="verification_request_other_cancelled">%s已取消</string>
     <string name="verification_request_you_cancelled">你已取消</string>
     <string name="verification_request_other_accepted">%s 已接受</string>
     <string name="verification_request_you_accepted">你已接受</string>
@@ -1318,7 +1318,7 @@
     <string name="verification_open_other_to_verify">使用现有会话来验证此会话，并授予其访问加密消息的权限。</string>
     <string name="verification_profile_verify">验证</string>
     <string name="verification_profile_verified">已验证</string>
-    <string name="verification_profile_warning">注意</string>
+    <string name="verification_profile_warning">警告</string>
     <string name="room_member_profile_failed_to_get_devices">无法获取会话</string>
     <string name="room_member_profile_sessions_section_title">会话</string>
     <string name="trusted">可信任</string>
@@ -1492,7 +1492,7 @@
     <string name="identity_server_error_outdated_home_server">无法执行此操作。主服务器已过期。</string>
     <string name="identity_server_error_no_identity_server_configured">请先配置身份服务器。</string>
     <string name="identity_server_error_terms_not_signed">请先在设置中接受身份服务器的条款。</string>
-    <string name="identity_server_error_bulk_sha256_not_supported">为了你的隐私，${app_name} 仅支持发送用户电子邮件和电话号码的哈希值。</string>
+    <string name="identity_server_error_bulk_sha256_not_supported">为了你的隐私，${app_name}仅支持发送经过哈希处理的用户电子邮件的和电话号码。</string>
     <string name="identity_server_error_binding_error">关联失败。</string>
     <string name="identity_server_error_no_current_binding_error">当前与此标识符没有关联。</string>
     <string name="identity_server_set_default_notice">你的主服务器（%1$s）建议使用 %2$s 作为你的身份服务器</string>
@@ -1709,7 +1709,7 @@
     <string name="attachment_type_dialog_title">添加图像自</string>
     <string name="settings_discovery_consent_action_give_consent">授予许可</string>
     <string name="settings_discovery_consent_action_revoke">撤销我的许可</string>
-    <string name="settings_discovery_consent_notice_on">你已同意发送电子邮件和电话号码到身份服务器以从你的联系人发现其他用户。</string>
+    <string name="settings_discovery_consent_notice_on">你已同意发送电子邮件地址和电话号码到身份服务器以从你的联系人发现其他用户。</string>
     <string name="settings_discovery_consent_title">发送电子邮件和电话号码</string>
     <string name="direct_room_user_list_suggestions_title">建议</string>
     <string name="direct_room_user_list_known_title">已知用户</string>
@@ -2217,12 +2217,12 @@
     <string name="create_poll_question_title">投票问题或主题</string>
     <string name="create_poll_title">创建投票</string>
     <string name="attachment_type_poll">投票</string>
-    <string name="identity_server_consent_dialog_title_2">向 %s 发送电子邮件和电话号码</string>
+    <string name="identity_server_consent_dialog_title_2">向%s发送电子邮件地址和电话号码</string>
     <string name="settings_discovery_consent_notice_off_2">您的联系人是私密的。 要从您的联系人中发现用户，我们需要您的许可才能将联系信息发送到您的身份服务器。</string>
     <string name="shortcut_disabled_reason_sign_out">已登出此会话！</string>
     <string name="shortcut_disabled_reason_room_left">已离开此房间！</string>
     <string name="identity_server_consent_dialog_content_question">你同意发送此信息吗？</string>
-    <string name="identity_server_consent_dialog_content_3">要发现现有的联系人，您需要将联系人信息(电子邮件和电话号码)发送到您的身份服务器。出乎隐私考量，我们会在发送前对您的数据进行散列处理。</string>
+    <string name="identity_server_consent_dialog_content_3">要发现现有的联系人，你需要将联系人信息（电子邮件地址和电话号码）发送到你的身份服务器。出乎隐私考量，我们会在发送前对您的数据进行散列处理。</string>
     <string name="action_not_now">不是现在</string>
     <string name="delete_poll_dialog_content">您确定要删除此投票吗？一旦移除，就无法恢复。</string>
     <string name="delete_poll_dialog_title">删除投票</string>
@@ -2756,4 +2756,15 @@
     <string name="command_description_table_flip">将 (╯°□°)╯︵ ┻━┻ 添加到纯文本消息中</string>
     <string name="settings_troubleshoot_test_system_settings_permission_failed">${app_name} 需要显示通知的权限。
 \n请授予权限。</string>
+    <string name="command_description_devtools">打开开发者工具屏幕</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 你已在安全设置中为所有房间启用了仅对已验证会话加密。</string>
+    <string name="grant_permission">授予权限</string>
+    <string name="a11y_stop_voice_broadcast_record">停止语音广播录制</string>
+    <string name="a11y_pause_voice_broadcast_record">暂停语音广播录制</string>
+    <string name="a11y_resume_voice_broadcast_record">继续语音广播录制</string>
+    <string name="login_scan_qr_code">扫描QR码</string>
+    <string name="attachment_type_voice_broadcast">语音广播</string>
+    <string name="push_gateway_item_enabled">已启用：</string>
+    <string name="push_gateway_item_device_id">会话ID：</string>
+    <string name="error_check_network">出了点差错。请检查您的网络连接并重试。</string>
 </resources>
\ No newline at end of file

From 93b4c049527333c4aeba9ae730b2177dd1f56c7b Mon Sep 17 00:00:00 2001
From: Nizami <nizamismidov4@gmail.com>
Date: Sat, 29 Oct 2022 10:59:28 +0000
Subject: [PATCH 279/300] Translated using Weblate (Azerbaijani)

Currently translated at 4.7% (121 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-az/strings.xml b/library/ui-strings/src/main/res/values-az/strings.xml
index e4d3d5bdf3..044ecf900c 100644
--- a/library/ui-strings/src/main/res/values-az/strings.xml
+++ b/library/ui-strings/src/main/res/values-az/strings.xml
@@ -129,4 +129,8 @@
         <item quantity="one">%1$d seçildi</item>
         <item quantity="other">%1$d seçildi</item>
     </plurals>
+    <string name="notice_direct_room_third_party_invite">%1$s, %2$s-ı dəvət etdi</string>
+    <string name="notice_room_third_party_invite_by_you">Otağa qoşulmaq üçün %1$s-a dəvət göndərdiniz</string>
+    <string name="notice_room_server_acl_updated_title">%s, bu otaq üçün server ACL-lərini dəyişdi.</string>
+    <string name="notice_room_server_acl_set_allowed">• %s ilə uyğunlaşan serverlərə icazə verildi.</string>
 </resources>
\ No newline at end of file

From c6b1abd5b74ae5adf2358c76f32be808cbb3c808 Mon Sep 17 00:00:00 2001
From: "Auri B. P" <auri97@gmail.com>
Date: Sat, 29 Oct 2022 09:10:11 +0000
Subject: [PATCH 280/300] Translated using Weblate (Catalan)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ca/strings.xml b/library/ui-strings/src/main/res/values-ca/strings.xml
index f3e064d2f3..ce786fb87d 100644
--- a/library/ui-strings/src/main/res/values-ca/strings.xml
+++ b/library/ui-strings/src/main/res/values-ca/strings.xml
@@ -2821,4 +2821,19 @@
     <string name="a11y_pause_voice_broadcast_record">Pausa l\'enregistrament d\'emissió de veu</string>
     <string name="a11y_resume_voice_broadcast_record">Reprèn l\'enregistrament d\'emissió de veu</string>
     <string name="voice_broadcast_live">En directe</string>
+    <string name="action_deselect_all">Deselecciona-ho tot</string>
+    <string name="action_select_all">Selecciona-ho tot</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d seleccionat</item>
+        <item quantity="other">%1$d seleccionats</item>
+    </plurals>
+    <string name="attachment_type_selector_poll">Enquestes</string>
+    <string name="device_manager_other_sessions_select">Selecciona sessions</string>
+    <string name="attachment_type_selector_contact">Contacte</string>
+    <string name="attachment_type_selector_camera">Càmera</string>
+    <string name="attachment_type_selector_location">Ubicació</string>
+    <string name="attachment_type_selector_voice_broadcast">Emissió de veu</string>
+    <string name="attachment_type_selector_file">Adjunts</string>
+    <string name="attachment_type_selector_sticker">Adhesius</string>
+    <string name="attachment_type_selector_gallery">Galeria</string>
 </resources>
\ No newline at end of file

From 1d7b754b0e654096282bf438a6961a2ca4db68ce Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Mon, 31 Oct 2022 13:54:28 +0000
Subject: [PATCH 281/300] Translated using Weblate (Czech)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
index 404b19ea71..53599adce2 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -1023,7 +1023,7 @@
     <string name="labs_allow_extended_logging">Zapnout podrobné záznamy.</string>
     <string name="labs_allow_extended_logging_summary">Podrobné záznamy pomohou vývojářům mnoha podrobnostmi, odešlete-li RageShake. I když jsou zapnuty, aplikace nezaznamenává obsah zpráv nebo jakákoli soukromá data.</string>
     <string name="error_terms_not_accepted">Prosím, opakujte, jakmile jste přijali všeobecné podmínky svého domovského serveru.</string>
-    <string name="error_network_timeout">Vypadá to, že serveru dlouho trvá odpovědět, to může být způsobeno buď slabým spojením nebo chybou na serveru. Prosím, opakujte za chvíli.</string>
+    <string name="error_network_timeout">Vypadá to, že serveru trvá příliš dlouho, než odpoví, což může být způsobeno buď špatným připojením, nebo chybou serveru. Zkuste to prosím za chvíli znovu.</string>
     <string name="send_attachment">Poslat přílohu</string>
     <string name="a11y_open_drawer">Otevřít navigační zásuvku</string>
     <string name="a11y_create_menu_open">Otevřít menu založení místnosti</string>
@@ -2109,8 +2109,8 @@
     <string name="upgrade_room_update_parent_space">Automaticky aktualizovat mateřský prostor</string>
     <string name="upgrade_room_auto_invite">Automaticky pozvat uživatele</string>
     <string name="upgrade_public_room_from_to">Budete aktualizovat tuto místnost z %1$s na %2$s.</string>
-    <string name="upgrade_room_warning">Aktualizace místnosti je pokročilá akce a obvykle se doporučuje tehdy, je-li místnost nestabilní kvůli chybám, chybějícím funkcím nebo slabým místům v zabezpečení.
-\nObvykle má vliv pouze na to, jak server místnost zpracovává.</string>
+    <string name="upgrade_room_warning">Aktualizace místnosti je pokročilá akce a obvykle se doporučuje, pokud je místnost nestabilní kvůli chybám, chybějícím funkcím nebo bezpečnostním zranitelnostem.
+\nObvykle ovlivňuje pouze způsob zpracování místnosti na serveru.</string>
     <string name="upgrade_private_room">Aktualizovat soukromou místnost</string>
     <string name="upgrade_public_room">Aktualizovat veřejnou místnost</string>
     <string name="upgrade">Aktualizace</string>
@@ -2875,4 +2875,20 @@
     <string name="a11y_pause_voice_broadcast_record">Pozastavit záznam hlasového vysílání</string>
     <string name="a11y_resume_voice_broadcast_record">Obnovit záznam hlasového vysílání</string>
     <string name="voice_broadcast_live">Živě</string>
+    <string name="device_manager_other_sessions_select">Vybrat relace</string>
+    <string name="attachment_type_selector_contact">Kontakt</string>
+    <string name="attachment_type_selector_camera">Fotoaparát</string>
+    <string name="attachment_type_selector_location">Poloha</string>
+    <string name="attachment_type_selector_poll">Hlasování</string>
+    <string name="attachment_type_selector_voice_broadcast">Hlasové vysílání</string>
+    <string name="attachment_type_selector_file">Přílohy</string>
+    <string name="attachment_type_selector_sticker">Nálepky</string>
+    <string name="attachment_type_selector_gallery">Knihovna fotografií</string>
+    <string name="action_deselect_all">Zrušit výběr všech</string>
+    <string name="action_select_all">Vybrat všechny</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d vybraný</item>
+        <item quantity="few">%1$d vybrané</item>
+        <item quantity="other">%1$d vybraných</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 9440de753ecef17c3c90fa21f319dab3a6a2dd33 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Mon, 31 Oct 2022 20:44:47 +0000
Subject: [PATCH 282/300] Translated using Weblate (German)

Currently translated at 99.9% (2530 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index a400c5faae..962c8d814e 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -67,7 +67,7 @@
     <string name="notice_room_unban_with_reason">%1$s hat Sperre von %2$s aufgehoben. Grund: %3$s</string>
     <string name="notice_room_ban_with_reason">%1$s hat %2$s verbannt. Grund: %3$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s hat die Einladung für %2$s angenommen. Grund: %3$s</string>
-    <string name="notice_room_withdraw_with_reason">%1$s hat Einladung für %2$s verworfen. Grund: %3$s</string>
+    <string name="notice_room_withdraw_with_reason">%1$s hat die Einladung für %2$s zurückgezogen. Grund: %3$s</string>
     <plurals name="notice_room_aliases_added">
         <item quantity="one">%1$s fügt %2$s als eine Adresse für diesen Raum hinzu.</item>
         <item quantity="other">%1$s fügt %2$s als Adressen für diesen Raum hinzu.</item>
@@ -408,7 +408,7 @@
     <string name="room_settings_read_history_entry_anyone">Alle</string>
     <string name="room_settings_read_history_entry_members_only_option_time_shared">Nur Mitglieder</string>
     <string name="room_settings_read_history_entry_members_only_invited">Nur Mitglieder (ab Einladung)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Nur Mitglieder (ab Beitreten)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Nur Mitglieder (ab Betreten)</string>
     <string name="room_settings_banned_users_title">Verbannte Benutzer</string>
     <string name="room_settings_category_advanced_title">Erweitert</string>
     <string name="room_settings_room_internal_id">Interne ID dieses Raumes</string>
@@ -438,8 +438,8 @@
     <string name="encryption_information_verify_device_warning">Vergleiche die folgenden Zeichen mit den Einstellungen in der Sitzung des anderen Nutzers und bestätige:</string>
     <string name="encryption_information_verify_device_warning2">Falls sie nicht übereinstimmen, wurde die Kommunikation vielleicht kompromittiert.</string>
     <string name="select_room_directory">Raumverzeichnis auswählen</string>
-    <string name="directory_server_placeholder">Server-Name</string>
-    <string name="directory_server_all_rooms_on_server">Alle Räume auf dem %s-Server</string>
+    <string name="directory_server_placeholder">Name des Servers</string>
+    <string name="directory_server_all_rooms_on_server">Alle Räume auf %s</string>
     <string name="directory_server_native_rooms">Alle nativen %s-Räume</string>
     <string name="settings_user_interface">Bedienoberfläche</string>
     <string name="settings_interface_language">Sprache</string>
@@ -572,7 +572,7 @@
     <string name="command_description_op_user">Bestimmt das Berechtigungslevel des Benutzers</string>
     <string name="command_description_deop_user">Setzt Berechtigungen des Benutzers zurück</string>
     <string name="command_description_invite_user">Lädt Benutzer mit angegebener Kennung in den aktuellen Raum ein</string>
-    <string name="command_description_join_room">Raum mit angegebener Adresse beitreten</string>
+    <string name="command_description_join_room">Raum mit angegebener Adresse betreten</string>
     <string name="command_description_part_room">Verlasse Raum</string>
     <string name="command_description_topic">Raumthema ändern</string>
     <string name="command_description_remove_user">Entfernt die Person angegebener ID</string>
@@ -626,7 +626,7 @@
     <string name="settings_call_ringtone_title">Klingelton für eingehende Anrufe</string>
     <string name="settings_call_ringtone_dialog_title">Wähle Klingelton für Anrufe:</string>
     <string name="action_accept">Akzeptieren</string>
-    <string name="auth_accept_policies">Bitte lese und akzeptiere die Richtlinien dieses Homeservers:</string>
+    <string name="auth_accept_policies">Bitte lese und akzeptiere die Richtlinien dieses Heim-Servers:</string>
     <string name="settings_troubleshoot_diagnostic_run_button_title">Tests ausführen</string>
     <string name="settings_troubleshoot_diagnostic_running_status">Läuft … (%1$d von %2$d)</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">Einer oder mehrere Tests sind fehlgeschlagen. Versuche vorgeschlagene Lösung(en).</string>
@@ -877,7 +877,7 @@
     <string name="create_room_action_create">ERSTELLEN</string>
     <string name="create_room_name_hint">Name</string>
     <string name="create_room_public_title">Öffentlich</string>
-    <string name="create_room_public_description">Jeder wird diesem Raum beitreten können</string>
+    <string name="create_room_public_description">Jeder wird diesen Raum betreten können</string>
     <string name="settings_integration_manager">Integrationsmanager</string>
     <string name="key_share_request">Schlüsselaustausch anfragen</string>
     <string name="keys_backup_setup_override_backup_prompt_description">Es sieht so aus, als hättest du bereits ein Setup-Schlüssel-Backup von einer anderen Sitzung. Möchtest du es durch das, was du gerade erstellt hast, ersetzen\?</string>
@@ -1494,7 +1494,7 @@
     <string name="room_participants_ban_title">Benutzer bannen</string>
     <string name="room_participants_ban_reason">Grund für den Bann</string>
     <string name="room_participants_unban_title">Bann des Benutzers aufheben</string>
-    <string name="room_participants_unban_prompt_msg">Das Aufheben des Bannes wird dem Benutzer erlauben dem Raum wieder beizutreten.</string>
+    <string name="room_participants_unban_prompt_msg">Wenn du die Person entbannst, kann sie den Raum wieder betreten.</string>
     <string name="settings_secure_backup_section_title">Verschlüsselte Sicherung</string>
     <string name="settings_secure_backup_setup">Sicherung einrichten</string>
     <string name="settings_secure_backup_reset">Sicherung zurücksetzen</string>
@@ -1752,7 +1752,7 @@
     <string name="direct_room_user_list_suggestions_title">Vorschläge</string>
     <string name="direct_room_user_list_known_title">Bekannte Personen</string>
     <string name="qr_code">QR-Code</string>
-    <string name="add_by_qr_code">Hinzufügen via QR-Code</string>
+    <string name="add_by_qr_code">Per QR-Code hinzufügen</string>
     <string name="permissions_denied_add_contact">Gib die Erlaubnis, um auf die Kamera zu zugreifen.</string>
     <string name="permissions_denied_qr_code">Um den QR-Code zu scannen, muss der Zugriff auf die Kamera erlaubt werden.</string>
     <string name="room_alias_published_alias_title">Öffentliche Adressen</string>
@@ -1797,7 +1797,7 @@
     <string name="create_room_disable_federation_description">Aktivieren, wenn der Raum nur von Mitgliedern deines Heim-Servers zur internen Kommunikation verwendet wird. Das kann später nicht mehr geändert werden.</string>
     <string name="create_room_disable_federation_title">Begrenze Zugang zu diesem Raum (für immer!) auf Mitglieder von %s</string>
     <string name="attachment_viewer_item_x_of_y">%1$d von %2$d</string>
-    <string name="room_preview_no_preview_join">Keine Vorschau für diesen Raum verfügbar. Willst du direkt beitreten\?</string>
+    <string name="room_preview_no_preview_join">Keine Vorschau für diesen Raum verfügbar. Willst du ihn betreten\?</string>
     <string name="room_preview_not_found">Der Raum ist gerade nicht zugänglich.
 \nVersuche es später nochmal, oder bitte einen Raum-Admin um Hilfe.</string>
     <string name="room_alias_published_alias_add_manually">Eine neue Adresse veröffentlichen</string>
@@ -1947,9 +1947,9 @@
     <string name="space_type_public">Öffentlich</string>
     <string name="create_spaces_you_can_change_later">Du kannst dies später ändern</string>
     <string name="a11y_unchecked">Ungeprüft</string>
-    <string name="room_settings_room_access_public_description">Jeder kann den Raum finden und beitreten</string>
+    <string name="room_settings_room_access_public_description">Jeder kann den Raum finden und betreten</string>
     <string name="room_settings_room_access_public_title">Öffentlich</string>
-    <string name="room_settings_room_access_private_description">Nur Eingeladene können es finden und beitreten</string>
+    <string name="room_settings_room_access_private_description">Nur sichtbar und zu betreten für Eingeladene</string>
     <string name="room_settings_room_access_private_title">Privat</string>
     <string name="room_settings_room_access_entry_unknown">Unbekannte Zugriffseinstellung (%s)</string>
     <string name="room_settings_guest_access_title">Gästen erlauben beizutreten</string>
@@ -1975,8 +1975,8 @@
     <string name="leave_space">Verlassen</string>
     <string name="space_add_child_title">Räume hinzufügen</string>
     <string name="space_explore_activity_title">Räume erkunden</string>
-    <string name="join_anyway">Trotzdem beitreten</string>
-    <string name="join_space">Space beitreten</string>
+    <string name="join_anyway">Dennoch betreten</string>
+    <string name="join_space">Space betreten</string>
     <string name="create_space">Space erstellen</string>
     <string name="invite_just_to_this_room">Nur zu diesem Raum</string>
     <string name="invite_to_space_with_name">Zu %s einladen</string>
@@ -2002,7 +2002,7 @@
     <string name="create_spaces_choose_type_label">Welche Art von Space möchtest du erstellen\?</string>
     <string name="add_space">Space erstellen</string>
     <string name="command_description_create_space">Space erstellen</string>
-    <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihm beitreten. Nur die Admins des Raums können diesen zu einem Space hinzufügen.</string>
+    <string name="room_settings_room_access_restricted_description">Jeder, der sich in einem Space mit diesem Raum befindet, kann diesen Raum finden und ihn betreten. Nur die Administration des Raums kann diesen zu einem Space hinzufügen.</string>
     <string name="room_settings_room_access_restricted_title">Nur Space-Mitglieder</string>
     <plurals name="space_people_you_know">
         <item quantity="one">%d Person, die du kennst, ist bereits beigetreten</item>
@@ -2031,7 +2031,7 @@
     <string name="send_file_step_compressing_image">Komprimiere Bild …</string>
     <string name="use_as_default_and_do_not_ask_again">Als Standard festsetzen und nicht mehr fragen</string>
     <string name="option_always_ask">Jedes Mal fragen</string>
-    <string name="directory_add_a_new_server_prompt">Gib den Namen eines neuen Servers ein, den du erkunden möchtest.</string>
+    <string name="directory_add_a_new_server_prompt">Gib den Namen des neuen Servers ein, den du erkunden möchtest.</string>
     <string name="directory_add_a_new_server">Neuen Server hinzufügen</string>
     <string name="directory_your_server">Dein Server</string>
     <string name="send_feedback_space_info">Du verwendest die Betaversion von Spaces. Mit Feedback hilfst du uns, die nächsten Versionen zu verbessern. Dabei wird uns deine Platform übermittelt, damit wir deine Rückmeldung optimal nutzen können.</string>
@@ -2202,7 +2202,7 @@
     <string name="room_permissions_change_space_avatar">Space-Icon ändern</string>
     <string name="space_permissions_notice_read_only">Du hast nicht die Berechtigung, Rollenrechte zu bearbeiten</string>
     <string name="space_settings_permissions_title">Space-Berechtigungen</string>
-    <string name="space_participants_unban_prompt_msg">Wenn du die Person entbannst, kann sie wieder beitreten.</string>
+    <string name="space_participants_unban_prompt_msg">Wenn du die Person entbannst, kann sie den Space wieder betreten.</string>
     <string name="space_participants_ban_prompt_msg">Die Verbannung einer Person entfernt sie aus diesem Space und hindert sie am erneuten Beitritt.</string>
     <string name="space_participants_remove_prompt_msg">Kicken entfernt die Person aus dem Space
 \n
@@ -2222,7 +2222,7 @@
     <string name="command_description_room_name">Ändert den Raumnamen</string>
     <string name="command_description_unignore_user">Entblockt eine Person und zeigt deren Nachrichten wieder an</string>
     <string name="command_description_ignore_user">Blockiert eine Person und versteckt deren Nachrichten</string>
-    <string name="room_settings_space_access_public_description">Jeder kann den Space finden und beitreten</string>
+    <string name="room_settings_space_access_public_description">Jeder kann den Space finden und betreten</string>
     <string name="room_settings_room_notifications_manage_notifications">Du kannst deine Benachrichtigungen in den %1$s verwalten.</string>
     <string name="room_settings_room_notifications_encryption_notice">Bitte beachte, dass Benachrichtigungen zu Erwähnungen und Schlüsselwörtern in verschlüsselten Räumen mobil nicht verfügbar sind.</string>
     <string name="space_permissions_notice">Wähle die Berechtigungen der Rollen aus</string>
@@ -2305,7 +2305,7 @@
     <string name="legals_no_policy_provided">Dieser Server stellt keine Richtlinie bereit.</string>
     <string name="legals_identity_server_title">Richtlinie deines Identitäts-Servers</string>
     <string name="legals_home_server_title">Richtlinie deines Heim-Servers</string>
-    <string name="legals_application_title">${app_name} Richtlinie</string>
+    <string name="legals_application_title">Richtlinie von ${app_name}</string>
     <string name="tooltip_attachment_poll">Abstimmung erstellen</string>
     <string name="tooltip_attachment_contact">Kontakte öffnen</string>
     <string name="tooltip_attachment_sticker">Sticker verschicken</string>
@@ -2523,7 +2523,7 @@
     <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>
     <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in dieser Unterhaltung werden Ende-zu-Ende-verschlüsselt.</string>
     <string name="ftue_auth_captcha_title">Bist du ein Mensch\?</string>
-    <string name="ftue_auth_terms_subtitle">Bitte lies dir %ss Bedingungen und Richtlinien durch</string>
+    <string name="ftue_auth_terms_subtitle">Bitte lies dir die Bedingungen und Richtlinien von %s durch</string>
     <string name="ftue_auth_terms_title">Server-Richtlinien</string>
     <string name="ftue_auth_email_verification_subtitle">Folge den Anweisungen, die an %s gesendet wurden</string>
     <string name="ftue_auth_email_verification_title">E-Mail bestätigen</string>

From 634d3d97940d799d81f7d8a34c4325cb32c07721 Mon Sep 17 00:00:00 2001
From: Glandos <bugs-github@antipoul.fr>
Date: Fri, 28 Oct 2022 21:52:31 +0000
Subject: [PATCH 283/300] Translated using Weblate (French)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml
index d6f9d8957f..6c767fc350 100644
--- a/library/ui-strings/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -2821,4 +2821,19 @@
     <string name="a11y_pause_voice_broadcast_record">Mettre en pause l’enregistrement de la diffusion audio</string>
     <string name="a11y_resume_voice_broadcast_record">Continuer l’enregistrement de la diffusion audio</string>
     <string name="voice_broadcast_live">Direct</string>
+    <string name="device_manager_other_sessions_select">Sélectionner des sessions</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+    <string name="attachment_type_selector_camera">Appareil photo</string>
+    <string name="attachment_type_selector_location">Position</string>
+    <string name="attachment_type_selector_poll">Sondages</string>
+    <string name="attachment_type_selector_voice_broadcast">Diffusion audio</string>
+    <string name="attachment_type_selector_file">Pièces jointes</string>
+    <string name="attachment_type_selector_sticker">Autocollants</string>
+    <string name="attachment_type_selector_gallery">Galerie photo</string>
+    <string name="action_deselect_all">Tout désélectionner</string>
+    <string name="action_select_all">Tout sélectionner</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d sélectionné</item>
+        <item quantity="other">%1$d sélectionnés</item>
+    </plurals>
 </resources>
\ No newline at end of file

From a8f52dddbe326d343100330e8935298b76b943dd Mon Sep 17 00:00:00 2001
From: Johan Smits <johan@smitsmail.net>
Date: Mon, 31 Oct 2022 09:56:00 +0000
Subject: [PATCH 284/300] Translated using Weblate (Dutch)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-nl/strings.xml b/library/ui-strings/src/main/res/values-nl/strings.xml
index 46d5f9a675..7eacb7b232 100644
--- a/library/ui-strings/src/main/res/values-nl/strings.xml
+++ b/library/ui-strings/src/main/res/values-nl/strings.xml
@@ -2761,4 +2761,79 @@
 \n
 \nGeeft toestemming bij de volgende pop-ups om notificaties te kunnen zien.</string>
     <string name="action_got_it">Begrepen</string>
+    <string name="rich_text_editor_format_underline">Onderstreep formaat toepassen</string>
+    <string name="rich_text_editor_format_strikethrough">Doorhaal formaat toepassen</string>
+    <string name="rich_text_editor_format_italic">Cursief formaat toepassen</string>
+    <string name="rich_text_editor_format_bold">Vet formaat toepassen</string>
+    <string name="qr_code_login_confirm_security_code_description">Zorg ervoor dat u de herkomst van deze code kent. Door apparaten te koppelen, geeft u iemand volledige toegang tot uw account.</string>
+    <string name="qr_code_login_status_no_match">Geen match\?</string>
+    <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecteer \'QR-code scannen\'</string>
+    <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecteer \'Aanmelden met QR-code\'</string>
+    <string name="qr_code_login_new_device_instruction_3">Selecteer \'Toon QR-code\'</string>
+    <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">De server ondersteunt geen inloggen met QR-code.</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Er is een beveiligingsprobleem opgetreden bij het instellen van beveiligde berichtenuitwisseling. Een van de volgende zaken kan in geschonden zijn: uw server; uw internetverbinding(en); uw apparaat(en);</string>
+    <string name="qr_code_login_header_connected_description">Controleer uw aangemelde apparaat, de onderstaande code zou moeten worden weergegeven. Bevestig dat de onderstaande code overeenkomt met dat apparaat:</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Gebruik uw aangemelde apparaat om de onderstaande QR-code te scannen:</string>
+    <string name="three">3</string>
+    <string name="two">2</string>
+    <string name="one">1</string>
+    <string name="labs_enable_voice_broadcast_summary">In staat zijn om spraakuitzendingen op te nemen en te verzenden in de tijdlijn van de kamer.</string>
+    <string name="labs_enable_voice_broadcast_title">Spraakuitzending inschakelen (in actieve ontwikkeling)</string>
+    <string name="labs_enable_client_info_recording_summary">Noteer de naam, versie en url van de applicatie om sessies gemakkelijker te herkennen in sessiebeheer.</string>
+    <string name="labs_enable_client_info_recording_title">Opname van applicatie informatie inschakelen</string>
+    <string name="labs_enable_session_manager_summary">Meer zichtbaarheid en controle over al uw sessies.</string>
+    <string name="labs_enable_session_manager_title">Nieuwe sessiemanager inschakelen</string>
+    <string name="device_manager_learn_more_session_rename">Andere gebruikers in privéchats en chatruimten waaraan u deelneemt, kunnen een volledige lijst van uw sessies bekijken.
+\n
+\nDit geeft ze het vertrouwen dat ze echt met u praten, maar het betekent ook dat ze de sessienaam kunnen zien die u hier invoert.</string>
+    <string name="device_manager_learn_more_session_rename_title">Sessies hernoemen</string>
+    <string name="device_manager_learn_more_sessions_verified">Geverifieerde sessies zijn ingelogd met uw inloggegevens en vervolgens geverifieerd, hetzij met uw veilige wachtwoordzin of door kruisverificatie.
+\n
+\nDit betekent dat ze coderingssleutels bevatten voor uw eerdere berichten en bevestigen aan andere gebruikers waarmee u communiceert dat deze sessies echt van u zijn.</string>
+    <string name="device_manager_learn_more_sessions_unverified">Niet-geverifieerde sessies zijn sessies die zijn aangemeld met uw inloggegevens, maar niet zijn geverifieerd.
+\n
+\nU moet er vooral zeker van zijn dat u deze sessies herkent, omdat ze een ongeoorloofd gebruik van uw account kunnen vertegenwoordigen.</string>
+    <string name="device_manager_session_rename_description">Met aangepaste sessienamen kunt u uw apparaten gemakkelijker herkennen.</string>
+    <string name="device_manager_session_rename">Sessie hernoemen</string>
+    <string name="device_manager_session_details_device_model">Model</string>
+    <string name="device_manager_session_details_device_browser">Browser</string>
+    <string name="device_manager_session_details_application_url">URL</string>
+    <string name="device_manager_session_details_session_last_activity">Laatste activiteit</string>
+    <string name="device_manager_session_details_description">Informatie over toepassing, apparaat en activiteit.</string>
+    <string name="device_manager_other_sessions_select">Sessies selecteren</string>
+    <plurals name="device_manager_other_sessions_recommendation_description_inactive">
+        <item quantity="one">Overweeg om u af te melden bij oude sessies (%1$d dag of meer) die u niet meer gebruikt.</item>
+        <item quantity="other">Overweeg om u af te melden bij oude sessies (%1$d dagen of meer) die u niet meer gebruikt.</item>
+    </plurals>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifieer uw sessies voor verbeterde beveiligde berichtenuitwisseling of meld u af bij sessies die u niet meer herkent of gebruikt.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Voor de beste beveiliging logt u uit bij elke sessie die u niet meer herkent of gebruikt.</string>
+    <string name="a11y_device_manager_filter">Filter</string>
+    <string name="device_manager_filter_bottom_sheet_title">Filter</string>
+    <string name="device_manager_session_last_activity">Laatste activiteit %1$s</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifieer uw huidige sessie om de verificatiestatus van deze sessie weer te geven.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifieer of meld u af bij deze sessie voor de beste beveiliging en betrouwbaarheid.</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+    <string name="attachment_type_selector_camera">Camera</string>
+    <string name="attachment_type_selector_location">Locatie</string>
+    <string name="attachment_type_selector_poll">Peilingen</string>
+    <string name="attachment_type_selector_voice_broadcast">Spraakuitzending</string>
+    <string name="attachment_type_selector_file">Bijlagen</string>
+    <string name="attachment_type_selector_sticker">Stikkers</string>
+    <string name="attachment_type_selector_gallery">Fotobibliotheek</string>
+    <string name="tooltip_attachment_voice_broadcast">Een spraakuitzending starten</string>
+    <string name="a11y_pause_voice_broadcast">Spraakuitzending pauzeren</string>
+    <string name="a11y_play_voice_broadcast">Spraakuitzending afspelen of hervatten</string>
+    <string name="a11y_stop_voice_broadcast_record">Opname van spraakuitzending stoppen</string>
+    <string name="a11y_pause_voice_broadcast_record">Opname van spraakuitzending pauzeren</string>
+    <string name="a11y_resume_voice_broadcast_record">Opname van spraakuitzending hervatten</string>
+    <string name="settings_security_incognito_keyboard_summary">Verzoek dat het toetsenbord geen gepersonaliseerde gegevens, zoals typgeschiedenis en woordenboek, bijwerkt op basis van wat u in gesprekken hebt getypt. Opgelet dat sommige toetsenborden deze instelling mogelijk niet respecteren.</string>
+    <string name="command_description_devtools">Open het scherm met ontwikkelaarstools</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 U heeft de codering voor geverifieerde sessies enkel voor alle kamers ingeschakeld in Beveiligingsinstellingen.</string>
+    <string name="labs_enable_deferred_dm_summary">Maak directe chat alleen aan bij een bericht</string>
+    <string name="action_deselect_all">Deselecteer alles</string>
+    <string name="action_select_all">Selecteer alles</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d geselecteerd</item>
+        <item quantity="other">%1$d geselecteerd</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 00b15136659283cb35de5165eea7e17962f3567f Mon Sep 17 00:00:00 2001
From: lvre <7uu3qrbvm@relay.firefox.com>
Date: Tue, 1 Nov 2022 03:10:18 +0000
Subject: [PATCH 285/300] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
index 913dacd8bb..2ec5f394bd 100644
--- a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
@@ -2821,4 +2821,19 @@
     <string name="a11y_pause_voice_broadcast_record">Pausar gravação de broadcast de voz</string>
     <string name="a11y_resume_voice_broadcast_record">Retomar gravação de broadcast de voz</string>
     <string name="voice_broadcast_live">Ao vivo</string>
+    <string name="device_manager_other_sessions_select">Selecionar sessões</string>
+    <string name="attachment_type_selector_contact">Contato</string>
+    <string name="attachment_type_selector_camera">Câmera</string>
+    <string name="attachment_type_selector_location">Localização</string>
+    <string name="attachment_type_selector_poll">Sondagens</string>
+    <string name="attachment_type_selector_voice_broadcast">Broadcast de voz</string>
+    <string name="attachment_type_selector_file">Anexos</string>
+    <string name="attachment_type_selector_sticker">Stickers</string>
+    <string name="attachment_type_selector_gallery">Biblioteca de fotos</string>
+    <string name="action_deselect_all">Desselecionar todas(os)</string>
+    <string name="action_select_all">Selecionar todas(os)</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d selecionada(o)</item>
+        <item quantity="other">%1$d selecionadas(os)</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 15a72e24468fcf851ccb5758659e755ff6d6f5b0 Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Sat, 29 Oct 2022 13:52:40 +0000
Subject: [PATCH 286/300] Translated using Weblate (Russian)

Currently translated at 95.1% (2408 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index 3bd2232060..4607daaee1 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -2797,4 +2797,12 @@
     <string name="labs_enable_voice_broadcast_title">Голосовые трансляции (в активной разработке)</string>
     <string name="labs_enable_client_info_recording_summary">Записывает название клиента, версию и URL-адрес для более лёгкого распознавания сессий в менеджере сессий.</string>
     <string name="labs_enable_client_info_recording_title">Записывать информацию о клиенте</string>
+    <string name="attachment_type_selector_gallery">Галерея</string>
+    <string name="attachment_type_selector_sticker">Наклейки</string>
+    <string name="attachment_type_selector_file">Вложения</string>
+    <string name="attachment_type_selector_voice_broadcast">Голосовая трансляция</string>
+    <string name="attachment_type_selector_poll">Опрос</string>
+    <string name="attachment_type_selector_location">Местоположение</string>
+    <string name="attachment_type_selector_camera">Камера</string>
+    <string name="attachment_type_selector_contact">Контакт</string>
 </resources>
\ No newline at end of file

From 75d82771bfe560d62fa710f5b8a670b3e2b0fa0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sat, 29 Oct 2022 08:45:57 +0000
Subject: [PATCH 287/300] Translated using Weblate (Slovak)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-sk/strings.xml b/library/ui-strings/src/main/res/values-sk/strings.xml
index 393bb83426..bf57233b37 100644
--- a/library/ui-strings/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -2692,7 +2692,7 @@
     <string name="home_empty_no_unreads_message">Tu sa zobrazia neprečítané správy, ak nejaké máte.</string>
     <string name="home_empty_no_unreads_title">Nič, o čom by bolo potrebné podať správu.</string>
     <string name="home_empty_no_rooms_message">Kompletná zabezpečená aplikácia na komunikáciu pre tímy, priateľov a organizácie. Začnite konverzáciu alebo sa pridajte k existujúcej miestnosti.</string>
-    <string name="home_empty_no_rooms_title">Vitajte v aplikácii ${názov_aplikácie},
+    <string name="home_empty_no_rooms_title">Vitajte v aplikácii ${app_name},
 \n%s.</string>
     <string name="home_empty_space_no_rooms_message">Priestory sú novým spôsobom zoskupovania miestností a ľudí. Pomocou tlačidla vpravo dole môžete pridať existujúcu miestnosť alebo vytvoriť novú.</string>
     <string name="home_empty_space_no_rooms_title">%s

From d94b7bd8d85bb417df95d3a78dbe76380bb6c37b Mon Sep 17 00:00:00 2001
From: PotLice <metiozero@outlook.com>
Date: Tue, 1 Nov 2022 03:46:45 +0000
Subject: [PATCH 288/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.2% (2474 of 2519 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
---
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 6a77b4f5ce..eeba10cf0c 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2290,7 +2290,7 @@
     <string name="settings_troubleshoot_test_current_gateway">当前网关：%s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">网关</string>
     <string name="give_feedback_threads">提供反馈</string>
-    <string name="ftue_auth_carousel_workplace_title">为您的团队服务</string>
+    <string name="ftue_auth_carousel_workplace_title">为您的团队发送消息。</string>
     <string name="threads_beta_enable_notice_title">消息列beta</string>
     <string name="thread_list_title">消息列</string>
     <string name="settings_show_latest_profile_description">为所有消息显示最新资料信息（头像和显示名称）。</string>

From 7acf965cc12b7d746fa91ac82f423045d55b14cf Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 31 Oct 2022 07:09:09 +0000
Subject: [PATCH 289/300] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
index a64e5dd39e..de17ca66d2 100644
--- a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
@@ -2767,4 +2767,18 @@
     <string name="a11y_pause_voice_broadcast_record">暫停語音廣播錄製</string>
     <string name="a11y_resume_voice_broadcast_record">繼續語音廣播錄製</string>
     <string name="voice_broadcast_live">直播</string>
+    <string name="device_manager_other_sessions_select">選取工作階段</string>
+    <string name="attachment_type_selector_contact">聯絡人</string>
+    <string name="attachment_type_selector_camera">相機</string>
+    <string name="attachment_type_selector_location">位置</string>
+    <string name="attachment_type_selector_poll">投票</string>
+    <string name="attachment_type_selector_voice_broadcast">音訊廣播</string>
+    <string name="attachment_type_selector_file">附件</string>
+    <string name="attachment_type_selector_sticker">貼圖</string>
+    <string name="attachment_type_selector_gallery">照片媒體庫</string>
+    <string name="action_deselect_all">取消選取全部</string>
+    <string name="action_select_all">選取全部</string>
+    <plurals name="x_selected">
+        <item quantity="other">已選取 %1$d</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 178326ce9fbcb4eb9044432b37653b06a1282778 Mon Sep 17 00:00:00 2001
From: phardyle <bradney_ccea@aleeas.com>
Date: Sun, 30 Oct 2022 14:45:30 +0000
Subject: [PATCH 290/300] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (2531 of 2531 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
---
 library/ui-strings/src/main/res/values-zh-rTW/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
index de17ca66d2..739ea09755 100644
--- a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
@@ -942,7 +942,7 @@
     <string name="settings_discovery_no_msisdn">在您新增電話號碼後，探索選項將會出現。</string>
     <string name="settings_discovery_disconnect_identity_server_info">與您的身份識別伺服器斷線代表您無法被其他使用者探索，且您將無法透過電子郵件或電話邀請其他人。</string>
     <string name="settings_discovery_msisdn_title">可探索的電話號碼</string>
-    <string name="settings_discovery_confirm_mail">我們將會傳送電子郵件到 %s，請檢查您的電子郵件並在確認連結上點選</string>
+    <string name="settings_discovery_confirm_mail">我們已傳送電子郵件到 %s，請檢查您的電子郵件並在確認連結上點選</string>
     <string name="settings_discovery_enter_identity_server">輸入身份識別伺服器 URL</string>
     <string name="settings_discovery_bad_identity_server">無法連線到身份識別伺服器</string>
     <string name="settings_discovery_please_enter_server">請輸入身份識別伺服器 URL</string>

From 646cc7d67d41f72ec6d01ca9b91337f49eb589ad Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Tue, 25 Oct 2022 11:20:14 +0100
Subject: [PATCH 291/300] Add issue automation for the VoIP team

Move VoIP issues to VoIP team board
---
 .github/workflows/triage-labelled.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index cdb354be83..707cdfd944 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -311,7 +311,7 @@ jobs:
     name: Add labelled issues to PS features team 3
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'A-Composer-WYSIWYG')
+      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -330,3 +330,27 @@ jobs:
         env:
           PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+  voip:
+    name: Add labelled issues to VoIP project board
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'Team: VoIP')
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+              mutation add_to_project($projectid:ID!,$contentid:ID!) {
+                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
+                item {
+                  id
+                  }
+                }
+              }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.issue.node_id }}
+        env:
+          PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

From b6746653f1dd126e7648f069c3eff9e0efad7c3b Mon Sep 17 00:00:00 2001
From: Amit Kumar <mr.doc10jl96@gmail.com>
Date: Wed, 2 Nov 2022 13:43:57 +0530
Subject: [PATCH 292/300] Add metrics plugin to track device download keys task
 (#7438)

* Add metrics tracking plugin for download device keys

* Add support for multiple metrics plugin

* Update copyright license header in matrix-sdk-android

* Add tests for MetricExtension

* Update changelog

* Improve MetricsExtension and reformatting
---
 changelog.d/7438.sdk                          |  1 +
 .../android/sdk/api/MatrixConfiguration.kt    |  6 +++
 .../sdk/api/extensions/MetricsExtensions.kt   | 41 +++++++++++++++++
 .../DownloadDeviceKeysMetricsPlugin.kt        | 32 +++++++++++++
 .../android/sdk/api/metrics/MetricPlugin.kt   | 46 +++++++++++++++++++
 .../sdk/internal/crypto/DeviceListManager.kt  | 35 +++++++++-----
 .../im/vector/app/core/di/SingletonModule.kt  | 13 +++---
 .../analytics/metrics/VectorPlugins.kt        | 35 ++++++++++++++
 .../sentry/SentryDownloadDeviceKeysMetrics.kt | 45 ++++++++++++++++++
 9 files changed, 236 insertions(+), 18 deletions(-)
 create mode 100644 changelog.d/7438.sdk
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt
 create mode 100644 matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt
 create mode 100644 vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt

diff --git a/changelog.d/7438.sdk b/changelog.d/7438.sdk
new file mode 100644
index 0000000000..60463aed68
--- /dev/null
+++ b/changelog.d/7438.sdk
@@ -0,0 +1 @@
+Add MetricPlugin interface to implement metrics in SDK clients.
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
index 7119563617..00d74ab446 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/MatrixConfiguration.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.api
 import okhttp3.ConnectionSpec
 import okhttp3.Interceptor
 import org.matrix.android.sdk.api.crypto.MXCryptoConfig
+import org.matrix.android.sdk.api.metrics.MetricPlugin
 import java.net.Proxy
 
 data class MatrixConfiguration(
@@ -74,4 +75,9 @@ data class MatrixConfiguration(
          * Sync configuration.
          */
         val syncConfig: SyncConfig = SyncConfig(),
+
+        /**
+         * Metrics plugin that can be used to capture metrics from matrix-sdk-android.
+         */
+        val metricPlugins: List<MetricPlugin> = emptyList()
 )
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt
new file mode 100644
index 0000000000..9487a27086
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/extensions/MetricsExtensions.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 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.api.extensions
+
+import org.matrix.android.sdk.api.metrics.MetricPlugin
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
+
+/**
+ * Executes the given [block] while measuring the transaction.
+ */
+@OptIn(ExperimentalContracts::class)
+inline fun measureMetric(metricMeasurementPlugins: List<MetricPlugin>, block: () -> Unit) {
+    contract {
+        callsInPlace(block, InvocationKind.EXACTLY_ONCE)
+    }
+    try {
+        metricMeasurementPlugins.forEach { plugin -> plugin.startTransaction() } // Start the transaction.
+        block()
+    } catch (throwable: Throwable) {
+        metricMeasurementPlugins.forEach { plugin -> plugin.onError(throwable) } // Capture if there is any exception thrown.
+        throw throwable
+    } finally {
+        metricMeasurementPlugins.forEach { plugin -> plugin.finishTransaction() } // Finally, finish this transaction.
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt
new file mode 100644
index 0000000000..66ec0abf51
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/DownloadDeviceKeysMetricsPlugin.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 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.api.metrics
+
+import org.matrix.android.sdk.api.logger.LoggerTag
+import timber.log.Timber
+
+private val loggerTag = LoggerTag("DownloadKeysMetricsPlugin", LoggerTag.CRYPTO)
+
+/**
+ * Extension of MetricPlugin for download_device_keys task.
+ */
+interface DownloadDeviceKeysMetricsPlugin : MetricPlugin {
+
+    override fun logTransaction(message: String?) {
+        Timber.tag(loggerTag.value).v("## downloadDeviceKeysMetricPlugin() : $message")
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt
new file mode 100644
index 0000000000..3a4b13c494
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/metrics/MetricPlugin.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 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.api.metrics
+
+/**
+ * A plugin that can be used to capture metrics in Client.
+ */
+interface MetricPlugin {
+    /**
+     * Start the measurement of the metrics as soon as task is started.
+     */
+    fun startTransaction()
+
+    /**
+     * Mark the measuring transaction finished once the task is completed.
+     */
+    fun finishTransaction()
+
+    /**
+     * Invoked when there is any error in the ongoing task. The metrics tool can use this information to attach to the ongoing transaction.
+     *
+     * @param throwable Exception thrown in the running task.
+     */
+    fun onError(throwable: Throwable)
+
+    /**
+     * Can be used to log this transaction.
+     */
+    fun logTransaction(message: String? = "") {
+        // no-op
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
index 4f3900adb9..2ac6b8c854 100755
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DeviceListManager.kt
@@ -18,13 +18,17 @@ package org.matrix.android.sdk.internal.crypto
 
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.MatrixCoroutineDispatchers
 import org.matrix.android.sdk.api.MatrixPatterns
 import org.matrix.android.sdk.api.auth.data.Credentials
+import org.matrix.android.sdk.api.extensions.measureMetric
+import org.matrix.android.sdk.api.metrics.DownloadDeviceKeysMetricsPlugin
 import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel
 import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo
 import org.matrix.android.sdk.api.session.crypto.model.MXUsersDevicesMap
 import org.matrix.android.sdk.internal.crypto.model.CryptoInfoMapper
+import org.matrix.android.sdk.internal.crypto.model.rest.KeysQueryResponse
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.crypto.tasks.DownloadKeysForUsersTask
 import org.matrix.android.sdk.internal.session.SessionScope
@@ -47,8 +51,11 @@ internal class DeviceListManager @Inject constructor(
         coroutineDispatchers: MatrixCoroutineDispatchers,
         private val taskExecutor: TaskExecutor,
         private val clock: Clock,
+        matrixConfiguration: MatrixConfiguration
 ) {
 
+    private val metricPlugins = matrixConfiguration.metricPlugins
+
     interface UserDevicesUpdateListener {
         fun onUsersDeviceUpdate(userIds: List<String>)
     }
@@ -345,19 +352,25 @@ internal class DeviceListManager @Inject constructor(
             return MXUsersDevicesMap()
         }
         val params = DownloadKeysForUsersTask.Params(filteredUsers, syncTokenStore.getLastToken())
-        val response = try {
-            downloadKeysForUsersTask.execute(params)
-        } catch (throwable: Throwable) {
-            Timber.e(throwable, "## CRYPTO | doKeyDownloadForUsers(): error")
-            if (throwable is CancellationException) {
-                // the crypto module is getting closed, so we cannot access the DB anymore
-                Timber.w("The crypto module is closed, ignoring this error")
-            } else {
-                onKeysDownloadFailed(filteredUsers)
+        val relevantPlugins = metricPlugins.filterIsInstance<DownloadDeviceKeysMetricsPlugin>()
+
+        val response: KeysQueryResponse
+        measureMetric(relevantPlugins) {
+            response = try {
+                downloadKeysForUsersTask.execute(params)
+            } catch (throwable: Throwable) {
+                Timber.e(throwable, "## CRYPTO | doKeyDownloadForUsers(): error")
+                if (throwable is CancellationException) {
+                    // the crypto module is getting closed, so we cannot access the DB anymore
+                    Timber.w("The crypto module is closed, ignoring this error")
+                } else {
+                    onKeysDownloadFailed(filteredUsers)
+                }
+                throw throwable
             }
-            throw throwable
+            Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
         }
-        Timber.v("## CRYPTO | doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
+
         for (userId in filteredUsers) {
             // al devices =
             val models = response.deviceKeys?.get(userId)?.mapValues { entry -> CryptoInfoMapper.map(entry.value) }
diff --git a/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
index dbfda024d8..3c1cea57ec 100644
--- a/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -47,6 +47,7 @@ import im.vector.app.core.utils.SystemSettingsProvider
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.impl.DefaultVectorAnalytics
+import im.vector.app.features.analytics.metrics.VectorPlugins
 import im.vector.app.features.invite.AutoAcceptInvites
 import im.vector.app.features.invite.CompileTimeAutoAcceptInvites
 import im.vector.app.features.navigation.DefaultNavigator
@@ -75,9 +76,7 @@ import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.settings.LightweightSettingsStorage
 import javax.inject.Singleton
 
-@InstallIn(SingletonComponent::class)
-@Module
-abstract class VectorBindModule {
+@InstallIn(SingletonComponent::class) @Module abstract class VectorBindModule {
 
     @Binds
     abstract fun bindNavigator(navigator: DefaultNavigator): Navigator
@@ -119,9 +118,7 @@ abstract class VectorBindModule {
     abstract fun bindGetDeviceInfoUseCase(getDeviceInfoUseCase: DefaultGetDeviceInfoUseCase): GetDeviceInfoUseCase
 }
 
-@InstallIn(SingletonComponent::class)
-@Module
-object VectorStaticModule {
+@InstallIn(SingletonComponent::class) @Module object VectorStaticModule {
 
     @Provides
     fun providesContext(application: Application): Context {
@@ -143,6 +140,7 @@ object VectorStaticModule {
             vectorPreferences: VectorPreferences,
             vectorRoomDisplayNameFallbackProvider: VectorRoomDisplayNameFallbackProvider,
             flipperProxy: FlipperProxy,
+            vectorPlugins: VectorPlugins,
     ): MatrixConfiguration {
         return MatrixConfiguration(
                 applicationFlavor = BuildConfig.FLAVOR_DESCRIPTION,
@@ -150,7 +148,8 @@ object VectorStaticModule {
                 threadMessagesEnabledDefault = vectorPreferences.areThreadMessagesEnabled(),
                 networkInterceptors = listOfNotNull(
                         flipperProxy.networkInterceptor(),
-                )
+                ),
+                metricPlugins = vectorPlugins.plugins(),
         )
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt b/vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt
new file mode 100644
index 0000000000..64f143a2fd
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/metrics/VectorPlugins.kt
@@ -0,0 +1,35 @@
+/*
+ * 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 im.vector.app.features.analytics.metrics
+
+import im.vector.app.features.analytics.metrics.sentry.SentryDownloadDeviceKeysMetrics
+import org.matrix.android.sdk.api.metrics.MetricPlugin
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * Class that contains the all plugins which can be used for tracking.
+ */
+@Singleton
+data class VectorPlugins @Inject constructor(
+        val sentryDownloadDeviceKeysMetrics: SentryDownloadDeviceKeysMetrics,
+) {
+    /**
+     * Returns [List] of all [MetricPlugin] hold by this class.
+     */
+    fun plugins(): List<MetricPlugin> = listOf(sentryDownloadDeviceKeysMetrics)
+}
diff --git a/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt b/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt
new file mode 100644
index 0000000000..92213d380c
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/analytics/metrics/sentry/SentryDownloadDeviceKeysMetrics.kt
@@ -0,0 +1,45 @@
+/*
+ * 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 im.vector.app.features.analytics.metrics.sentry
+
+import io.sentry.ITransaction
+import io.sentry.Sentry
+import io.sentry.SpanStatus
+import org.matrix.android.sdk.api.metrics.DownloadDeviceKeysMetricsPlugin
+import javax.inject.Inject
+
+class SentryDownloadDeviceKeysMetrics @Inject constructor() : DownloadDeviceKeysMetricsPlugin {
+    private var transaction: ITransaction? = null
+
+    override fun startTransaction() {
+        transaction = Sentry.startTransaction("download_device_keys", "task")
+        logTransaction("Sentry transaction started")
+    }
+
+    override fun finishTransaction() {
+        transaction?.finish()
+        logTransaction("Sentry transaction finished")
+    }
+
+    override fun onError(throwable: Throwable) {
+        transaction?.apply {
+            this.throwable = throwable
+            this.status = SpanStatus.INTERNAL_ERROR
+        }
+        logTransaction("Sentry transaction encountered error ${throwable.message}")
+    }
+}

From b0a15cd10bf2e52ddd7b502c047bf3888f87dd0d Mon Sep 17 00:00:00 2001
From: Kat Gerasimova <ekaterinag@element.io>
Date: Mon, 31 Oct 2022 14:05:37 +0000
Subject: [PATCH 293/300] Add issue automation to tidy Help Wanted

All "good first issue" and "Hacktoberfest" qualify as "Help Wanted" so the label should be added automatically
---
 .github/workflows/triage-labelled.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index 707cdfd944..8e9cc6d76c 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -29,6 +29,23 @@ jobs:
               labels: ['Z-Labs']
             })
 
+  apply_Help-Wanted_label:
+    name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
+    runs-on: ubuntu-latest
+    if: >
+      contains(github.event.issue.labels.*.name, 'good first issue') ||
+      contains(github.event.issue.labels.*.name, 'Hacktoberfest')
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['Help Wanted']
+            })
+
   move_needs_info_issues:
     name: X-Needs-Info issues to Need info column on triage board
     runs-on: ubuntu-latest

From ad4d9ecf44148d2c5a2f13d0b7ed2fc81fdaeb09 Mon Sep 17 00:00:00 2001
From: Vri <element@vrifox.cc>
Date: Tue, 1 Nov 2022 18:31:28 +0000
Subject: [PATCH 294/300] Translated using Weblate (German)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 962c8d814e..409fc564f4 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -57,7 +57,7 @@
     <string name="initial_sync_start_importing_account_data">Erste Synchronisation:
 \nImportiere Benutzerdaten</string>
     <string name="notice_room_third_party_revoked_invite">%1$s hat die Einladung an %2$s, den Raum zu betreten, zurückgezogen</string>
-    <string name="notice_room_invite_no_invitee_with_reason">%1$s\'s Einladung. Grund: %2$s</string>
+    <string name="notice_room_invite_no_invitee_with_reason">Einladung von %1$s. Grund: %2$s</string>
     <string name="notice_room_invite_with_reason">%1$s hat %2$s eingeladen. Grund: %3$s</string>
     <string name="notice_room_invite_you_with_reason">%1$s hat dich eingeladen. Grund: %2$s</string>
     <string name="notice_room_join_with_reason">%1$s ist dem Raum beigetreten. Grund: %2$s</string>
@@ -479,8 +479,8 @@
     <string name="notification_listening_for_events">Auf Ereignisse lauschen</string>
     <string name="settings_containing_my_display_name">Nachrichten mit meinem Anzeigenamen</string>
     <string name="settings_containing_my_user_name">Nachrichten mit meinen Benutzernamen</string>
-    <string name="you_added_a_new_device">Du hast die neue Sitzung \'%s\' hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
-    <string name="your_unverified_device_requesting">Deine bislang nicht verifiziertes Sitzung \'%s\' fordert Verschlüsselungs-Schlüssel an.</string>
+    <string name="you_added_a_new_device">Du hast die neue Sitzung „%s“ hinzugefügt, die jetzt Verschlüsselungs-Schlüssel anfordert.</string>
+    <string name="your_unverified_device_requesting">Deine bislang nicht verifizierte Sitzung „%s“ fordert Verschlüsselungs-Schlüssel an.</string>
     <string name="start_verification">Verifizierung beginnen</string>
     <string name="call">Anruf</string>
     <string name="notification_noisy_notifications">Laute Benachrichtigungen</string>
@@ -1030,15 +1030,15 @@
     <string name="content_reported_title">Inhalt gemeldet</string>
     <string name="content_reported_content">Dieser Inhalt wurde gemeldet.
 \n
-\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\nWenn du keine weiteren Inhalte dieser Person sehen möchtest, kannst sie ignorieren, um ihre Nachrichten auszublenden.</string>
     <string name="content_reported_as_spam_title">Als Spam gemeldet</string>
     <string name="content_reported_as_spam_content">Dieser Inhalt wurde als Spam gemeldet.
 \n
-\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\nWenn du keine weiteren Inhalte dieser Person sehen möchtest, kannst sie ignorieren, um ihre Nachrichten auszublenden.</string>
     <string name="content_reported_as_inappropriate_title">Als unangebracht gemeldet</string>
     <string name="content_reported_as_inappropriate_content">Dieser Inhalt wurde als unangebracht gemeldet.
 \n
-\nWenn du keine weiteren Inhalte dieses Nutzers sehen möchtest, kannst ihn ignorieren, um jene Nachrichten auszublenden.</string>
+\nWenn du keine weiteren Inhalte dieser Person sehen möchtest, kannst sie ignorieren, um ihre Nachrichten auszublenden.</string>
     <string name="message_ignore_user">Nutzer ignorieren</string>
     <string name="room_list_quick_actions_notifications_all_noisy">Alle Nachrichten (laut)</string>
     <string name="room_list_quick_actions_notifications_all">Alle Nachrichten</string>
@@ -1066,7 +1066,7 @@
     <string name="settings_discovery_disconnect_identity_server_info">Eine Trennung von deinem Identitäts-Server würde bedeuten, dass du weder von anderen gefunden werden, noch diese per E-Mail oder Telefonnummer einladen kannst.</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine E-Mail-Adressen oder Telefonnummern momentan auf dem Identitäts-Server %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
     <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitäts-Servers (%s) zu, um per E-Mail-Adresse oder Telefonnummer auffindbar zu sein zu können.</string>
-    <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
+    <string name="error_handling_incoming_share">Konnte zu teilende Daten nicht verarbeiten</string>
     <string name="login_splash_text3">Erweitere und personalisiere deine Erfahrung</string>
     <string name="login_connect_to">Mit %1$s verbinden</string>
     <string name="login_connect_to_modular">Mit Element Matrix Services verbinden</string>
@@ -1092,7 +1092,7 @@
     <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Konto verknüpft</string>
     <string name="login_reset_password_mail_confirmation_title">Prüfe deinen Posteingang</string>
     <string name="login_reset_password_mail_confirmation_notice">Eine Bestätigungsmail wurde an %1$s versendet.</string>
-    <string name="login_reset_password_mail_confirmation_notice_2">Klicke auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.</string>
+    <string name="login_reset_password_mail_confirmation_notice_2">Tippe auf den Link um dein neues Passwort zu bestätigen. Sobald du dem enthaltenen Link gefolgt bist, klicke unten.</string>
     <string name="login_reset_password_mail_confirmation_submit">Ich habe meine E-Mail-Adresse bestätigt</string>
     <string name="login_reset_password_success_title">Erfolgreich!</string>
     <string name="login_reset_password_success_notice">Dein Passwort wurde zurückgesetzt.</string>
@@ -1140,7 +1140,7 @@
     <string name="login_set_msisdn_notice2">Bitte verwende das internationale Format.</string>
     <string name="login_set_msisdn_submit">Weiter</string>
     <string name="login_msisdn_confirm_submit">Weiter</string>
-    <string name="login_msisdn_error_not_international">Internationale Telefonnummern müssen mit \'+\' beginnen</string>
+    <string name="login_msisdn_error_not_international">Internationale Telefonnummern müssen mit „+“ beginnen</string>
     <string name="login_msisdn_error_other">Die Telefonnummer scheint ungültig zu sein. Bitte prüfen</string>
     <string name="login_signup_to">Registrieren bei %1$s</string>
     <string name="login_signup_username_hint">Benutzername</string>
@@ -1221,10 +1221,10 @@
     <string name="verification_sent">Verifizierung gesendet</string>
     <string name="verification_request">Verifizierung angefragt</string>
     <string name="verification_verify_device">Verifiziere diese Sitzung</string>
-    <string name="verification_scan_notice">Scanne den Code mit dem Gerät des Gegenüber für eine gegenseitige Überprüfung</string>
+    <string name="verification_scan_notice">Lasse den Code mit dem Gerät deines Gegenüber für eine gegenseitige Verifizierung einlesen</string>
     <string name="verification_scan_their_code">Scanne Code des Anderen</string>
-    <string name="verification_scan_emoji_title">Kann nicht scannen</string>
-    <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht Emoji stattdessen</string>
+    <string name="verification_scan_emoji_title">Kann nicht einlesen</string>
+    <string name="verification_scan_emoji_subtitle">Wenn ihr nicht am selben Ort seid, vergleicht stattdessen Emoji</string>
     <string name="verification_no_scan_emoji_title">Verifizieren via Emoji-Vergleich</string>
     <string name="verification_verify_user">%s verifizieren</string>
     <string name="verification_verified_user">%s verifiziert</string>
@@ -1253,8 +1253,8 @@
     <string name="room_member_power_level_admin_in">Administrator in %1$s</string>
     <string name="room_member_power_level_moderator_in">Moderator in %1$s</string>
     <string name="room_member_jump_to_read_receipt">Springen und als gelesen markieren</string>
-    <string name="rendering_event_error_type_of_event_not_handled">${app_name} kann keine Ereignisse vom Typ \'%1$s\'</string>
-    <string name="rendering_event_error_exception">${app_name} ist beim Verarbeiten des Ereignisinhalts mit der ID \'%1$s\' auf ein Problem gestoßen</string>
+    <string name="rendering_event_error_type_of_event_not_handled">${app_name} unterstützt keine Ereignisse vom Typ „%1$s“</string>
+    <string name="rendering_event_error_exception">${app_name} ist beim Verarbeiten des Ereignisinhalts mit der ID „%1$s“ auf ein Problem gestoßen</string>
     <string name="unignore">Nicht ignorieren</string>
     <string name="verify_cannot_cross_sign">Diese Sitzung kann diese Verifizierung nicht mit deinen anderen Sitzungen teilen.
 \nDie Überprüfung wird lokal gespeichert und in einer zukünftigen Version der App freigegeben.</string>
@@ -1269,8 +1269,8 @@
     <string name="verification_request_notice">Um sicher zu gehen, verifiziere %s, indem ein einmaliger Code überprüft wird.</string>
     <string name="verification_request_start_notice">Um sicher zu sein, tut dies persönlich oder verwendet einen anderen Kommunikationsweg.</string>
     <string name="verification_emoji_notice">Vergleiche die einzigartigen Emoji und stell sicher, dass sie in derselben Reihenfolge angezeigt werden.</string>
-    <string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenübers.</string>
-    <string name="verification_conclusion_ok_notice">Nachrichten mit diesem Gegenüber sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.</string>
+    <string name="verification_code_notice">Vergleiche den Code mit dem Code auf dem Bildschirm deines Gegenüber.</string>
+    <string name="verification_conclusion_ok_notice">Nachrichten mit dieser Person sind Ende-zu-Ende-verschlüsselt und können nicht von Dritten gelesen werden.</string>
     <string name="verification_conclusion_ok_self_notice">Deine neue Sitzung ist jetzt verifiziert. Sie hat Zugriff auf deine verschlüsselten Nachrichten, und andere Benutzer sehen sie als vertrauenswürdig an.</string>
     <string name="encryption_information_cross_signing_state">Quersignierung</string>
     <string name="encryption_information_dg_xsigning_complete">Quersignierung ist aktiviert,
@@ -1503,7 +1503,7 @@
     <string name="reset_secure_backup_title">Generiere einen neuen Sicherheitsschlüssel oder setze eine neue Sicherheitspassphrase für dein existierendes Backup.</string>
     <string name="reset_secure_backup_warning">Dieses wird deinen aktuellen Schlüssel oder deine aktuelle Phrase ersetzen.</string>
     <string name="disabled_integration_dialog_title">Integrationen sind deaktiviert</string>
-    <string name="disabled_integration_dialog_content">Aktiviere \'Erlaube Integrationen\' in den Einstellungen um dies zu machen.</string>
+    <string name="disabled_integration_dialog_content">Aktiviere hierfür „Integrationen erlauben“ in den Einstellungen.</string>
     <plurals name="room_settings_banned_users_count">
         <item quantity="one">%d gebannter Benutzer</item>
         <item quantity="other">%d gebannte Benutzer</item>
@@ -1537,7 +1537,7 @@
     <string name="login_signin_matrix_id_notice">Falls du ein Konto auf einem Heim-Server eingerichtet hast, verwende nachstehend deine Matrix-ID (z. B. @benutzer:domain.com) und dein Passwort.</string>
     <string name="login_signin_matrix_id_hint">Matrix-ID</string>
     <string name="login_signin_matrix_id_password_notice">Wenn du dein Passwort nicht weißt, gehe zurück um es zurücksetzen zu lassen.</string>
-    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: \'@benutzer:homeserver.org\'</string>
+    <string name="login_signin_matrix_id_error_invalid_matrix_id">Dies ist keine gültige Benutzerkennung. Erwartetes Format: „@benutzer:homeserver.org“</string>
     <string name="autodiscover_well_known_error">Es konnte kein gültiger Homeserver gefunden werden. Bitte prüfe deine Kennung</string>
     <string name="send_a_sticker">Sticker</string>
     <string name="room_profile_section_admin">Administrative Aktionen</string>
@@ -1592,7 +1592,7 @@
     <string name="room_settings_save_success">Du hast die Raumeinstellungen erfolgreich geändert</string>
     <string name="notice_crypto_unable_to_decrypt_final">Du kannst auf diese Nachricht nicht zugreifen</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">Warte auf diese Nachricht. Das könnte eine Weile dauern</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Wegen der Ende-zu-Ende-Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Schlüssel nicht ordnungsgemäß gesendet worden sind.</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">Wegen der Ende-zu-Ende-Verschlüsselung könnte es sein, dass du auf jemandes Nachricht warten musst, weil die Schlüssel nicht ordnungsgemäß gesendet wurden.</string>
     <string name="crypto_error_withheld_blacklisted">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender dich blockiert hat</string>
     <string name="crypto_error_withheld_unverified">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender deiner Sitzung nicht vertraut</string>
     <string name="crypto_error_withheld_generic">Du kannst auf diese Nachricht nicht zugreifen, weil der Sender absichtlich die Schlüssel nicht gesendet hat</string>
@@ -1650,7 +1650,7 @@
         <item quantity="other">Falscher Code, %d verbleibende Versuche</item>
     </plurals>
     <string name="wrong_pin_message_last_remaining_attempt">Warnung! Letzter Versuch bevor du ausgeloggt wirst!</string>
-    <string name="too_many_pin_failures">Zu viele Fehler. Du wurdest ausgeloggt</string>
+    <string name="too_many_pin_failures">Zu viele Fehler, du wurdest abgemeldet</string>
     <string name="auth_msisdn_already_defined">Diese Telefonnummer ist bereits registriert.</string>
     <string name="settings_phone_number_empty">Deinem Konto wurde keine Telefonnummer hinzugefügt</string>
     <string name="settings_emails">E-Mail-Adressen</string>
@@ -1661,10 +1661,10 @@
     <string name="settings_emails_and_phone_numbers_title">E-Mail und Telefon</string>
     <string name="settings_emails_and_phone_numbers_summary">Verwalte E-Mail-Adressen und Telefonnummern, die mit deinem Matrix-Konto verknüpft sind</string>
     <string name="settings_text_message_sent_hint">Code</string>
-    <string name="login_msisdn_notice">Bitte nutze das internationale Format (muss mit ‚+‘ beginnen)</string>
+    <string name="login_msisdn_notice">Bitte nutze das internationale Format (muss mit „+“ beginnen)</string>
     <string name="confirm_your_identity_quad_s">Bestätige deine Identität, indem du dieses Login verifizierst, um Zugriff auf verschlüsselte Nachrichten zu erhalten.</string>
-    <string name="error_opening_banned_room">Raum, indem du gebannt wurdest, kann nicht geöffnet werden.</string>
-    <string name="room_error_not_found">Raum kann nicht gefunden werden. Stelle sicher, dass er existiert.</string>
+    <string name="error_opening_banned_room">Ein Raum, aus dem du verbannt wurdest, kann nicht geöffnet werden.</string>
+    <string name="room_error_not_found">Kann diesen Raum nicht finden. Stelle sicher, dass er existiert.</string>
     <plurals name="seconds">
         <item quantity="one">%d Sekunde</item>
         <item quantity="other">%d Sekunden</item>
@@ -1778,7 +1778,7 @@
     <string name="user_code_share">Meinen Code teilen</string>
     <string name="user_code_my_code">Mein Code</string>
     <string name="user_code_scan">QR-Code einlesen</string>
-    <string name="not_a_valid_qr_code">Das ist kein korrekter QR-Code von Matrix</string>
+    <string name="not_a_valid_qr_code">Das ist kein korrekter Matrix-QR-Code</string>
     <string name="invite_friends_rich_title">🔐️ Komm mit zu ${app_name}</string>
     <string name="invite_friends_text">Hey, schreibe mit mir auf ${app_name}: %s</string>
     <string name="invite_friends">Freunde einladen</string>
@@ -2044,7 +2044,7 @@
     <string name="this_space_has_no_rooms">Dieser Space hat noch keine Räume</string>
     <string name="spaces_no_server_support_description">Für weitere Infos kontaktiere bitte die Administration des Homeservers</string>
     <string name="spaces_no_server_support_title">Dein Homeserver scheint Spaces noch nicht zu unterstützen</string>
-    <string name="space_leave_prompt_msg_as_admin">Du bist der einzige Admin von diesem Space. Wenn du ihn verlässt, hat niemand Kontrolle über ihn.</string>
+    <string name="space_leave_prompt_msg_as_admin">Du bist der einzige Admin dieses Spaces. Wenn du ihn verlässt, hat niemand Kontrolle über ihn.</string>
     <string name="space_leave_prompt_msg_private">Du wirst diesen Raum ohne erneute Einladung nicht betreten können.</string>
     <string name="space_leave_prompt_msg_only_you">Du bist die einzige Person hier. Wenn du den Space verlässt, ist er für immer verloren (eine lange Zeit).</string>
     <string name="invite_to_space">Einladen in %s</string>
@@ -2090,7 +2090,7 @@
     <string name="upgrade_room_no_power_to_manage">Du benötigst die Berechtigung, um einen Raum upzugraden</string>
     <string name="upgrade_room_update_parent_space">Übergeordneten Space automatisch updaten</string>
     <string name="upgrade_room_auto_invite">Benutzer automatisch einladen</string>
-    <string name="upgrade_public_room_from_to">Du upgradest diesen Raum von %1$s zu %2$s.</string>
+    <string name="upgrade_public_room_from_to">Du aktualisierst diesen Raum von %1$s zu %2$s.</string>
     <string name="upgrade_room_warning">Das Raumupgrade ist eine erweiterte Option und ist empfohlen wenn sich der Raum instabil verhält, von Sicherheitslücken betroffen ist oder Features fehlen.
 \nNormalerweise ändert sich dadurch nur wie der Raum am Server verarbeitet wird.</string>
     <string name="upgrade_private_room">Privaten Raum upgraden</string>
@@ -2157,7 +2157,7 @@
     <string name="call_tile_voice_call_has_ended">Sprachanruf beendet • %1$s</string>
     <string name="room_settings_room_notifications_notify_me">Benachrichtige mich bei</string>
     <string name="settings_mentions_at_room">\@room</string>
-    <string name="settings_notification_keyword_contains_invalid_character">Schlüsselwörter dürfen kein \"%s\" enthalten</string>
+    <string name="settings_notification_keyword_contains_invalid_character">Schlüsselwörter dürfen kein „%s“ enthalten</string>
     <string name="settings_notification_keyword_contains_dot">Schlüsselwörter können nicht mit einem Punkt beginnen</string>
     <string name="room_settings_none">Nichts</string>
     <string name="call_ended_invite_timeout_title">Nicht erreicht</string>
@@ -2187,7 +2187,7 @@
     <string name="create_space_in_progress">Erstelle Space …</string>
     <string name="settings_developer_mode_show_info_on_screen_summary">Hilfreiche Informationen zur Fehlersuche anzeigen</string>
     <string name="settings_developer_mode_show_info_on_screen_title">Debug-Info anzeigen</string>
-    <string name="does_not_look_like_valid_email">Das schaut nicht nach einer gültigen E-Mail-Adresse aus</string>
+    <string name="does_not_look_like_valid_email">Das scheint keine gültige E-Mail-Adresse zu sein</string>
     <string name="user_directory_search_hint_2">Mittels Name, ID oder E-Mail-Adresse suchen</string>
     <string name="create_new_space">Neuen Space erstellen</string>
     <string name="room_settings_space_access_title">Zugriff</string>
@@ -2252,7 +2252,7 @@
     <string name="notification_listening_for_notifications">Auf Benachrichtigungen warten</string>
     <string name="legals_third_party_notices">Externe Bibliotheken</string>
     <string name="analytics_opt_in_list_item_3">Du kannst dies jederzeit in den Einstellungen deaktivieren</string>
-    <string name="analytics_opt_in_list_item_2">Wir teilen <b>keine</b> Informationen mit Drittpersonen</string>
+    <string name="analytics_opt_in_list_item_2">Wir teilen <b>keine</b> Informationen mit Dritten</string>
     <string name="analytics_opt_in_list_item_1">Wir erfassen und analysieren <b>keine</b> Kontodaten</string>
     <string name="analytics_opt_in_content">Hilf uns dabei Probleme zu identifizieren und ${app_name} zu verbessern, indem du anonyme Nutzungsdaten teilst. Um zu verstehen, wie Personen mehrere Geräte benutzen, werden wir eine zufällige Kennung generieren, die zwischen deinen Geräten geteilt wird.
 \n
@@ -2312,7 +2312,7 @@
     <string name="tooltip_attachment_file">Datei hochladen</string>
     <string name="tooltip_attachment_gallery">Verschicke Fotos und Videos</string>
     <string name="tooltip_attachment_photo">Kamera öffnen</string>
-    <string name="delete_poll_dialog_content">Willst du diese Umfrage wirklich entfernen\? Du wirst sie nicht wiederherstellen können.</string>
+    <string name="delete_poll_dialog_content">Willst du diese Abstimmung wirklich entfernen\? Du wirst sie nicht wiederherstellen können.</string>
     <string name="delete_poll_dialog_title">Abstimmung entfernen</string>
     <string name="poll_end_room_list_preview">Abstimmung beendet</string>
     <string name="poll_response_room_list_preview">Stimme abgegeben</string>
@@ -2362,7 +2362,7 @@
     <string name="ftue_auth_use_case_join_existing_server">Möchtest du einem existierenden Server beitreten\?</string>
     <string name="ftue_auth_use_case_option_three">Communities</string>
     <string name="ftue_auth_use_case_option_two">Teams</string>
-    <string name="ftue_auth_use_case_subtitle">Wir helfen dir, in Verbindung zu kommen</string>
+    <string name="ftue_auth_use_case_subtitle">Wir helfen dir, dich zu vernetzen</string>
     <string name="ftue_auth_use_case_title">Mit wem wirst du am meisten schreiben\?</string>
     <string name="action_thread_copy_link_to_thread">Link zu Thread kopieren</string>
     <string name="action_view_threads">Threads anzeigen</string>
@@ -2416,7 +2416,7 @@
     <string name="call_start_screen_sharing">Bildschirm teilen</string>
     <string name="action_try_it_out">Probiere es aus</string>
     <string name="location_share_live_until">Echtzeit bis %1$s</string>
-    <string name="unifiedpush_getdistributors_dialog_title">Wähle Deine Benachrichtigungsmethode</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Wähle deine Benachrichtigungsmethode</string>
     <string name="labs_enable_live_location_summary">Vorläufige Implementierung: Standorte verbleiben im Raumverlauf</string>
     <string name="push_gateway_item_profile_tag">Profil-Tag:</string>
     <string name="time_unit_hour_short">h</string>
@@ -2784,7 +2784,7 @@
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Wähle „Mit QR-Code anmelden“</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_1">Beginne auf dem Anmeldebildschirm</string>
-    <string name="qr_code_login_new_device_instruction_3">Wähle \'QR-Code anzeigen\'</string>
+    <string name="qr_code_login_new_device_instruction_3">Wähle „QR-Code anzeigen“</string>
     <string name="qr_code_login_new_device_instruction_2">Gehe zu Einstellungen -&gt; Sicherheit und Privatsphäre</string>
     <string name="qr_code_login_new_device_instruction_1">Öffne die App auf deinem anderen Gerät</string>
     <string name="qr_code_login_header_failed_denied_description">Die Anfrage wurde auf dem anderen Gerät abgelehnt.</string>

From 92f8e087729f0b3543b23a5d2966028ea74d2fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jiri=20Gr=C3=B6nroos?= <jiri.gronroos@iki.fi>
Date: Tue, 1 Nov 2022 09:24:49 +0000
Subject: [PATCH 295/300] Translated using Weblate (Finnish)

Currently translated at 80.8% (2046 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-fi/strings.xml b/library/ui-strings/src/main/res/values-fi/strings.xml
index 486a8e5b30..4976f49a92 100644
--- a/library/ui-strings/src/main/res/values-fi/strings.xml
+++ b/library/ui-strings/src/main/res/values-fi/strings.xml
@@ -2305,4 +2305,8 @@
     <string name="create_spaces_me_and_teammates">Minä ja tiimikaverit</string>
     <string name="room_permissions_upgrade_the_space">Päivitä avaruus</string>
     <string name="room_permissions_change_space_avatar">Vaihda avaruuden kuva</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d valittu</item>
+        <item quantity="other">%1$d valittu</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 4ca7ee50b8f7ca818e0a87cf313144b89399014e Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 1 Nov 2022 19:16:27 +0000
Subject: [PATCH 296/300] Translated using Weblate (Hungarian)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-hu/strings.xml b/library/ui-strings/src/main/res/values-hu/strings.xml
index 5f65b11910..21ea6aab14 100644
--- a/library/ui-strings/src/main/res/values-hu/strings.xml
+++ b/library/ui-strings/src/main/res/values-hu/strings.xml
@@ -2821,4 +2821,19 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="a11y_pause_voice_broadcast_record">Hang közvetítés felvétel megállítása</string>
     <string name="a11y_resume_voice_broadcast_record">Hang közvetítés felvétel újraindítása</string>
     <string name="voice_broadcast_live">Élő</string>
+    <string name="device_manager_other_sessions_select">Munkamenetek kiválasztása</string>
+    <string name="attachment_type_selector_contact">Névjegy</string>
+    <string name="attachment_type_selector_camera">Kamera</string>
+    <string name="attachment_type_selector_location">Földrajzi helyzet</string>
+    <string name="attachment_type_selector_poll">Szavazások</string>
+    <string name="attachment_type_selector_voice_broadcast">Hang közvetítés</string>
+    <string name="attachment_type_selector_file">Mellékletek</string>
+    <string name="attachment_type_selector_sticker">Matricák</string>
+    <string name="attachment_type_selector_gallery">Fénykép könyvtár</string>
+    <string name="action_deselect_all">Semmit nem jelöl ki</string>
+    <string name="action_select_all">Mindet kijelöli</string>
+    <plurals name="x_selected">
+        <item quantity="one">%1$d kiválasztva</item>
+        <item quantity="other">%1$d kiválasztva</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 64ff184817fe5fd3a324b692c596c576954541dd Mon Sep 17 00:00:00 2001
From: Roel ter Maat <roel.termaat@nedap.com>
Date: Tue, 1 Nov 2022 08:49:23 +0000
Subject: [PATCH 297/300] Translated using Weblate (Dutch)

Currently translated at 100.0% (2531 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-nl/strings.xml b/library/ui-strings/src/main/res/values-nl/strings.xml
index 7eacb7b232..c5616ed761 100644
--- a/library/ui-strings/src/main/res/values-nl/strings.xml
+++ b/library/ui-strings/src/main/res/values-nl/strings.xml
@@ -2765,15 +2765,15 @@
     <string name="rich_text_editor_format_strikethrough">Doorhaal formaat toepassen</string>
     <string name="rich_text_editor_format_italic">Cursief formaat toepassen</string>
     <string name="rich_text_editor_format_bold">Vet formaat toepassen</string>
-    <string name="qr_code_login_confirm_security_code_description">Zorg ervoor dat u de herkomst van deze code kent. Door apparaten te koppelen, geeft u iemand volledige toegang tot uw account.</string>
+    <string name="qr_code_login_confirm_security_code_description">Zorg ervoor dat je de herkomst van deze code kent. Door apparaten te koppelen, geef je iemand volledige toegang tot jouw account.</string>
     <string name="qr_code_login_status_no_match">Geen match\?</string>
     <string name="qr_code_login_link_a_device_show_qr_code_instruction_2">Selecteer \'QR-code scannen\'</string>
     <string name="qr_code_login_link_a_device_scan_qr_code_instruction_2">Selecteer \'Aanmelden met QR-code\'</string>
     <string name="qr_code_login_new_device_instruction_3">Selecteer \'Toon QR-code\'</string>
     <string name="qr_code_login_header_failed_homeserver_is_not_supported_description">De server ondersteunt geen inloggen met QR-code.</string>
-    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Er is een beveiligingsprobleem opgetreden bij het instellen van beveiligde berichtenuitwisseling. Een van de volgende zaken kan in geschonden zijn: uw server; uw internetverbinding(en); uw apparaat(en);</string>
-    <string name="qr_code_login_header_connected_description">Controleer uw aangemelde apparaat, de onderstaande code zou moeten worden weergegeven. Bevestig dat de onderstaande code overeenkomt met dat apparaat:</string>
-    <string name="qr_code_login_header_show_qr_code_new_device_description">Gebruik uw aangemelde apparaat om de onderstaande QR-code te scannen:</string>
+    <string name="qr_code_login_header_failed_e2ee_security_issue_description">Er is een beveiligingsprobleem opgetreden bij het instellen van beveiligde berichtenuitwisseling. Een van de volgende zaken kan in geschonden zijn: je server; je internetverbinding(en); je apparaat(en);</string>
+    <string name="qr_code_login_header_connected_description">Controleer je aangemelde apparaat, de onderstaande code zou moeten worden weergegeven. Bevestig dat de onderstaande code overeenkomt met dat apparaat:</string>
+    <string name="qr_code_login_header_show_qr_code_new_device_description">Gebruik je aangemelde apparaat om de onderstaande QR-code te scannen:</string>
     <string name="three">3</string>
     <string name="two">2</string>
     <string name="one">1</string>
@@ -2781,19 +2781,19 @@
     <string name="labs_enable_voice_broadcast_title">Spraakuitzending inschakelen (in actieve ontwikkeling)</string>
     <string name="labs_enable_client_info_recording_summary">Noteer de naam, versie en url van de applicatie om sessies gemakkelijker te herkennen in sessiebeheer.</string>
     <string name="labs_enable_client_info_recording_title">Opname van applicatie informatie inschakelen</string>
-    <string name="labs_enable_session_manager_summary">Meer zichtbaarheid en controle over al uw sessies.</string>
+    <string name="labs_enable_session_manager_summary">Meer zichtbaarheid en controle over al je sessies.</string>
     <string name="labs_enable_session_manager_title">Nieuwe sessiemanager inschakelen</string>
-    <string name="device_manager_learn_more_session_rename">Andere gebruikers in privéchats en chatruimten waaraan u deelneemt, kunnen een volledige lijst van uw sessies bekijken.
+    <string name="device_manager_learn_more_session_rename">Andere gebruikers in privéchats en chatruimten waaraan jij deelneemt, kunnen een volledige lijst van je sessies bekijken.
 \n
-\nDit geeft ze het vertrouwen dat ze echt met u praten, maar het betekent ook dat ze de sessienaam kunnen zien die u hier invoert.</string>
+\nDit geeft ze het vertrouwen dat ze echt met jou praten, maar het betekent ook dat ze de sessienaam kunnen zien die je hier invoert.</string>
     <string name="device_manager_learn_more_session_rename_title">Sessies hernoemen</string>
-    <string name="device_manager_learn_more_sessions_verified">Geverifieerde sessies zijn ingelogd met uw inloggegevens en vervolgens geverifieerd, hetzij met uw veilige wachtwoordzin of door kruisverificatie.
+    <string name="device_manager_learn_more_sessions_verified">Geverifieerde sessies zijn ingelogd met jouw inloggegevens en vervolgens geverifieerd, hetzij met je veilige wachtwoordzin of door kruisverificatie.
 \n
-\nDit betekent dat ze coderingssleutels bevatten voor uw eerdere berichten en bevestigen aan andere gebruikers waarmee u communiceert dat deze sessies echt van u zijn.</string>
-    <string name="device_manager_learn_more_sessions_unverified">Niet-geverifieerde sessies zijn sessies die zijn aangemeld met uw inloggegevens, maar niet zijn geverifieerd.
+\nDit betekent dat ze coderingssleutels bevatten voor je eerdere berichten en bevestigen aan andere gebruikers waarmee je communiceert dat deze sessies echt van jou zijn.</string>
+    <string name="device_manager_learn_more_sessions_unverified">Niet-geverifieerde sessies zijn sessies die zijn aangemeld met jouw inloggegevens, maar niet zijn geverifieerd.
 \n
-\nU moet er vooral zeker van zijn dat u deze sessies herkent, omdat ze een ongeoorloofd gebruik van uw account kunnen vertegenwoordigen.</string>
-    <string name="device_manager_session_rename_description">Met aangepaste sessienamen kunt u uw apparaten gemakkelijker herkennen.</string>
+\nJe moet er vooral zeker van zijn dat je deze sessies herkent, omdat ze een ongeoorloofd gebruik van je account kunnen vertegenwoordigen.</string>
+    <string name="device_manager_session_rename_description">Met aangepaste sessienamen kan je jouw apparaten gemakkelijker herkennen.</string>
     <string name="device_manager_session_rename">Sessie hernoemen</string>
     <string name="device_manager_session_details_device_model">Model</string>
     <string name="device_manager_session_details_device_browser">Browser</string>
@@ -2802,16 +2802,16 @@
     <string name="device_manager_session_details_description">Informatie over toepassing, apparaat en activiteit.</string>
     <string name="device_manager_other_sessions_select">Sessies selecteren</string>
     <plurals name="device_manager_other_sessions_recommendation_description_inactive">
-        <item quantity="one">Overweeg om u af te melden bij oude sessies (%1$d dag of meer) die u niet meer gebruikt.</item>
-        <item quantity="other">Overweeg om u af te melden bij oude sessies (%1$d dagen of meer) die u niet meer gebruikt.</item>
+        <item quantity="one">Overweeg om je af te melden bij oude sessies (%1$d dag of meer) die je niet meer gebruikt.</item>
+        <item quantity="other">Overweeg om je af te melden bij oude sessies (%1$d dagen of meer) die je niet meer gebruikt.</item>
     </plurals>
-    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifieer uw sessies voor verbeterde beveiligde berichtenuitwisseling of meld u af bij sessies die u niet meer herkent of gebruikt.</string>
-    <string name="device_manager_other_sessions_recommendation_description_verified">Voor de beste beveiliging logt u uit bij elke sessie die u niet meer herkent of gebruikt.</string>
+    <string name="device_manager_other_sessions_recommendation_description_unverified">Verifieer je sessies voor verbeterde beveiligde berichtenuitwisseling of meld je af bij sessies die je niet meer herkent of gebruikt.</string>
+    <string name="device_manager_other_sessions_recommendation_description_verified">Voor de beste beveiliging log je uit bij elke sessie die je niet meer herkent of gebruikt.</string>
     <string name="a11y_device_manager_filter">Filter</string>
     <string name="device_manager_filter_bottom_sheet_title">Filter</string>
     <string name="device_manager_session_last_activity">Laatste activiteit %1$s</string>
-    <string name="device_manager_verification_status_detail_other_session_unknown">Verifieer uw huidige sessie om de verificatiestatus van deze sessie weer te geven.</string>
-    <string name="device_manager_verification_status_detail_other_session_unverified">Verifieer of meld u af bij deze sessie voor de beste beveiliging en betrouwbaarheid.</string>
+    <string name="device_manager_verification_status_detail_other_session_unknown">Verifieer je huidige sessie om de verificatiestatus van deze sessie weer te geven.</string>
+    <string name="device_manager_verification_status_detail_other_session_unverified">Verifieer of meld je af bij deze sessie voor de beste beveiliging en betrouwbaarheid.</string>
     <string name="attachment_type_selector_contact">Contact</string>
     <string name="attachment_type_selector_camera">Camera</string>
     <string name="attachment_type_selector_location">Locatie</string>
@@ -2826,9 +2826,9 @@
     <string name="a11y_stop_voice_broadcast_record">Opname van spraakuitzending stoppen</string>
     <string name="a11y_pause_voice_broadcast_record">Opname van spraakuitzending pauzeren</string>
     <string name="a11y_resume_voice_broadcast_record">Opname van spraakuitzending hervatten</string>
-    <string name="settings_security_incognito_keyboard_summary">Verzoek dat het toetsenbord geen gepersonaliseerde gegevens, zoals typgeschiedenis en woordenboek, bijwerkt op basis van wat u in gesprekken hebt getypt. Opgelet dat sommige toetsenborden deze instelling mogelijk niet respecteren.</string>
+    <string name="settings_security_incognito_keyboard_summary">Verzoek dat het toetsenbord geen gepersonaliseerde gegevens, zoals typgeschiedenis en woordenboek, bijwerkt op basis van wat je in gesprekken hebt getypt. Opgelet dat sommige toetsenborden deze instelling mogelijk niet respecteren.</string>
     <string name="command_description_devtools">Open het scherm met ontwikkelaarstools</string>
-    <string name="room_settings_global_block_unverified_info_text">🔒 U heeft de codering voor geverifieerde sessies enkel voor alle kamers ingeschakeld in Beveiligingsinstellingen.</string>
+    <string name="room_settings_global_block_unverified_info_text">🔒 Je hebt de codering voor geverifieerde sessies enkel voor alle kamers ingeschakeld in Beveiligingsinstellingen.</string>
     <string name="labs_enable_deferred_dm_summary">Maak directe chat alleen aan bij een bericht</string>
     <string name="action_deselect_all">Deselecteer alles</string>
     <string name="action_select_all">Selecteer alles</string>

From b87ee907d3a585b8fa5a5dd4e851eb8443dd2d7f Mon Sep 17 00:00:00 2001
From: Nui Harime <harime.nui@yandex.ru>
Date: Wed, 2 Nov 2022 10:26:24 +0000
Subject: [PATCH 298/300] Translated using Weblate (Russian)

Currently translated at 95.1% (2408 of 2531 strings)

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

diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index 4607daaee1..fb819efb69 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -2766,7 +2766,7 @@
     <string name="device_manager_learn_more_session_rename">Другие пользователи в личных сообщениях и комнатах, к которым вы присоединились, могут просматривать весь список ваших сессий.
 \n
 \nЭто даёт им уверенность в том, что они действительно общаются с вами, но это также означает, что они могут видеть название сессии, которое вы ввели здесь.</string>
-    <string name="labs_enable_rich_text_editor_title">Визуальный редактор текста</string>
+    <string name="labs_enable_rich_text_editor_title">Наглядный текстовый редактор</string>
     <string name="push_gateway_item_device_id">ID сессии:</string>
     <string name="device_manager_push_notifications_title">Уведомления</string>
     <string name="device_manager_push_notifications_description">Получать push-уведомления в этой сессии.</string>

From cd24ea7d605289d0889b03911b5a634e84fbc003 Mon Sep 17 00:00:00 2001
From: PotLice <metiozero@outlook.com>
Date: Tue, 1 Nov 2022 12:17:29 +0000
Subject: [PATCH 299/300] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (2519 of 2519 strings)

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

diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index eeba10cf0c..688652265b 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -11,10 +11,10 @@
     <string name="notice_room_ban">%1$s 封禁了 %2$s</string>
     <string name="notice_avatar_url_changed">%1$s 更换了他们的头像</string>
     <string name="notice_display_name_set">%1$s 将他们的显示名称设置为 %2$s</string>
-    <string name="notice_display_name_changed_from">%1$s 把他们的显示名称从 %2$s 改为 %3$s</string>
-    <string name="notice_display_name_removed">%1$s 移除了他们的显示名称 (%2$s)</string>
-    <string name="notice_room_topic_changed">%1$s 把主题改为： %2$s</string>
-    <string name="notice_room_name_changed">%1$s 把房间名称改为： %2$s</string>
+    <string name="notice_display_name_changed_from">%1$s 将其显示名称从 %2$s 更改为 %3$s</string>
+    <string name="notice_display_name_removed">%1$s 移除了他们的显示名称（%2$s）</string>
+    <string name="notice_room_topic_changed">%1$s 将话题更改为：%2$s</string>
+    <string name="notice_room_name_changed">%1$s 将房间名称更改为：%2$s</string>
     <string name="notice_placed_video_call">%s 发起了一次视频通话。</string>
     <string name="notice_placed_voice_call">%s 发起了一次语音通话。</string>
     <string name="notice_answered_call">%s 已接听通话。</string>
@@ -25,7 +25,7 @@
     <string name="notice_room_visibility_world_readable">任何人。</string>
     <string name="notice_avatar_changed_too">（头像也被更改）</string>
     <string name="notice_room_name_removed">%1$s 移除了房间名称</string>
-    <string name="notice_room_topic_removed">%1$s 移除了房间主题</string>
+    <string name="notice_room_topic_removed">%1$s 移除了房间话题</string>
     <string name="notice_crypto_unable_to_decrypt">** 无法解密：%s **</string>
     <string name="notice_crypto_error_unknown_inbound_session_id">发送者的设备没有向我们发送此消息的密钥。</string>
     <string name="unable_to_send_message">无法发送消息</string>
@@ -79,11 +79,11 @@
     <string name="notice_room_canonical_alias_unset">%1$s 为此房间移除了主要地址。</string>
     <string name="notice_room_guest_access_can_join">%1$s 已允许访客加入房间。</string>
     <string name="notice_room_guest_access_forbidden">%1$s 已禁止访客加入房间。</string>
-    <string name="notice_end_to_end_ok">%1$s已开启端到端加密。</string>
-    <string name="notice_end_to_end_unknown_algorithm">%1$s已开启端到端加密（无法识别的算法%2$s）。</string>
-    <string name="notice_room_created">%1$s 创建了这个房间</string>
+    <string name="notice_end_to_end_ok">%1$s 已开启端到端加密。</string>
+    <string name="notice_end_to_end_unknown_algorithm">%1$s 已开启端到端加密（无法识别的算法 %2$s）。</string>
+    <string name="notice_room_created">%1$s 创建了房间</string>
     <string name="notice_room_invite_no_invitee_by_you">你的邀请</string>
-    <string name="notice_room_created_by_you">你创建了这个房间</string>
+    <string name="notice_room_created_by_you">你创建了房间</string>
     <string name="notice_room_invite_by_you">你邀请了 %1$s</string>
     <string name="notice_room_join_by_you">你加入了房间</string>
     <string name="notice_room_leave_by_you">你离开了房间</string>
@@ -94,40 +94,40 @@
     <string name="notice_room_withdraw_by_you">你撤回了对 %1$s 的邀请</string>
     <string name="notice_avatar_url_changed_by_you">你更换了你的头像</string>
     <string name="notice_display_name_set_by_you">你将你的显示名称设置为 %1$s</string>
-    <string name="notice_display_name_changed_from_by_you">你将你的显示名称从 %1$s 改为 %2$s</string>
-    <string name="notice_display_name_removed_by_you">你移除了你的显示名称 (%1$s)</string>
-    <string name="notice_room_topic_changed_by_you">你把主题改为：%1$s</string>
+    <string name="notice_display_name_changed_from_by_you">您将显示名称从 %1$s 更改为 %2$s</string>
+    <string name="notice_display_name_removed_by_you">您移除了您的显示名称（%1$s）</string>
+    <string name="notice_room_topic_changed_by_you">您将话题更改为：%1$s</string>
     <string name="notice_room_avatar_changed">%1$s 更改了房间头像</string>
     <string name="notice_room_avatar_changed_by_you">你更改了房间头像</string>
-    <string name="notice_room_name_changed_by_you">你把房间名称改为：%1$s</string>
+    <string name="notice_room_name_changed_by_you">您将房间名称更改为：%1$s</string>
     <string name="notice_placed_video_call_by_you">你发起了一次视频通话。</string>
     <string name="notice_placed_voice_call_by_you">你发起了一次语音通话。</string>
     <string name="notice_call_candidates">%s 发送了数据以建立通话。</string>
     <string name="notice_call_candidates_by_you">你发送了数据以建立通话。</string>
-    <string name="notice_answered_call_by_you">你接听了通话。</string>
-    <string name="notice_ended_call_by_you">你结束了通话。</string>
-    <string name="notice_made_future_room_visibility_by_you">你已让未来的房间历史对%1$s可见</string>
+    <string name="notice_answered_call_by_you">你已接听通话。</string>
+    <string name="notice_ended_call_by_you">你已结束通话。</string>
+    <string name="notice_made_future_room_visibility_by_you">你已让未来的房间历史对 %1$s 可见</string>
     <string name="notice_room_update_by_you">你升级了此房间。</string>
     <string name="notice_room_name_removed_by_you">你移除了房间名称</string>
-    <string name="notice_room_topic_removed_by_you">你移除了房间主题</string>
+    <string name="notice_room_topic_removed_by_you">你移除了房间话题</string>
     <string name="notice_room_avatar_removed">%1$s 移除了房间头像</string>
     <string name="notice_room_avatar_removed_by_you">你移除了房间头像</string>
     <string name="notice_room_third_party_invite_by_you">你向 %1$s 发送了加入房间的邀请</string>
     <string name="notice_room_third_party_revoked_invite_by_you">你已撤回了对 %1$s 加入房间的邀请</string>
     <string name="notice_room_third_party_registered_invite_by_you">你接受了 %1$s 的邀请</string>
-    <string name="notice_widget_added">%1$s 添加了 %2$s 挂件</string>
-    <string name="notice_widget_added_by_you">你添加了 %1$s 挂件</string>
-    <string name="notice_widget_removed">%1$s 移除了 %2$s 挂件</string>
-    <string name="notice_widget_removed_by_you">你移除了 %1$s 挂件</string>
-    <string name="notice_widget_modified">%1$s 修改了 %2$s 挂件</string>
-    <string name="notice_widget_modified_by_you">你修改了 %1$s 挂件</string>
+    <string name="notice_widget_added">%1$s 添加了 %2$s 小部件</string>
+    <string name="notice_widget_added_by_you">你添加了 %1$s 小部件</string>
+    <string name="notice_widget_removed">%1$s 移除了 %2$s 小部件</string>
+    <string name="notice_widget_removed_by_you">你移除了 %1$s 小部件</string>
+    <string name="notice_widget_modified">%1$s 修改了 %2$s 小部件</string>
+    <string name="notice_widget_modified_by_you">你修改了 %1$s 小部件</string>
     <string name="power_level_admin">管理员</string>
     <string name="power_level_moderator">协管员</string>
     <string name="power_level_default">默认</string>
     <string name="power_level_custom">自定义（%1$d）</string>
     <string name="power_level_custom_no_value">自定义</string>
-    <string name="notice_power_level_changed_by_you">你更改了%1$s的权力级别。</string>
-    <string name="notice_power_level_changed">%1$s更改了%2$s的权力级别。</string>
+    <string name="notice_power_level_changed_by_you">您更改了 %1$s 的权限等级。</string>
+    <string name="notice_power_level_changed">%1$s 更改了 %2$s 的权限等级。</string>
     <string name="notice_power_level_diff">%1$s 从 %2$s 到 %3$s</string>
     <string name="notice_room_invite_no_invitee_with_reason_by_you">你的邀请。理由：%1$s</string>
     <string name="notice_room_invite_with_reason_by_you">你邀请了 %1$s。理由：%2$s</string>
@@ -178,7 +178,7 @@
     <string name="call_notification_reject">拒绝</string>
     <string name="call_notification_hangup">挂断</string>
     <string name="action_quote">引用</string>
-    <string name="action_share">分享</string>
+    <string name="action_share">共享</string>
     <string name="action_voice_call">语音通话</string>
     <string name="action_video_call">视频通话</string>
     <string name="action_mark_all_as_read">全部标记为已读</string>
@@ -298,7 +298,7 @@
     <string name="settings_old_password">当前密码</string>
     <string name="settings_unignore_user">显示所有来自 %s 的消息？</string>
     <string name="settings_select_country">选择国家</string>
-    <string name="room_settings_topic">主题</string>
+    <string name="room_settings_topic">话题</string>
     <string name="room_settings_room_read_history_rules_pref_title">房间历史可见性</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">谁可以阅读历史消息？</string>
     <string name="room_settings_read_history_entry_anyone">任何人</string>
@@ -340,7 +340,7 @@
 \n
 \n请在接下来的弹出窗口中授权允许访问，以便进行通话。</string>
     <string name="action_remove">移除</string>
-    <string name="room_participants_power_level_prompt">你将不能撤销这个修改，因为你正在让这个用户和你拥有相同的权力级别。
+    <string name="room_participants_power_level_prompt">您将无法撤消此更改，因为您正在将用户提升为与您相同的权限级别。
 \n你确定吗？</string>
     <string name="ssl_cert_not_trust">这可能意味着有人正在恶意劫持你的流量，或者你的手机不信任远程服务器提供的数字证书。</string>
     <string name="ssl_cert_new_account_expl">如果服务器管理员说这是预期的情况，请确保下面的指纹与管理员提供的指纹相匹配。</string>
@@ -416,11 +416,11 @@
     <string name="dark_theme">深色主题</string>
     <string name="black_theme">黑色主题</string>
     <string name="settings_notification_ringtone">通知声音</string>
-    <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
-    <string name="widget_delete_message_confirmation">确定要从此房间删除此挂件吗？</string>
-    <string name="widget_integration_unable_to_create">无法创建挂件。</string>
+    <string name="settings_12_24_timestamps">使用 12 小时制显示时间戳</string>
+    <string name="widget_delete_message_confirmation">确定要从此房间中删除小部件吗？</string>
+    <string name="widget_integration_unable_to_create">无法创建小部件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
-    <string name="widget_integration_positive_power_level">权力级别必须是正整数。</string>
+    <string name="widget_integration_positive_power_level">权限等级必须是正整数。</string>
     <string name="widget_integration_must_be_in_room">你不在这个房间。</string>
     <string name="widget_integration_no_permission_in_room">你没权限在当前房间执行此操作。</string>
     <string name="widget_integration_missing_room_id">请求中缺失 room_id。</string>
@@ -452,7 +452,7 @@
     <string name="room_participants_ban_prompt_msg">封禁用户会把他们移出此房间并阻止他们再次加入。</string>
     <string name="room_settings_all_messages">全部消息</string>
     <string name="room_settings_add_homescreen_shortcut">添加到主屏幕</string>
-    <string name="settings_inline_url_preview">行内URL预览</string>
+    <string name="settings_inline_url_preview">内联网址预览</string>
     <string name="settings_vibrate_on_mention">提及用户时震动</string>
     <string name="create">创建</string>
     <plurals name="room_new_messages_notification">
@@ -463,7 +463,7 @@
         <item quantity="other">%d个成员状态变动</item>
     </plurals>
     <plurals name="room_title_members">
-        <item quantity="other">%d个成员</item>
+        <item quantity="other">%d 个成员</item>
     </plurals>
     <plurals name="notification_unread_notified_messages">
         <item quantity="other">%d条未读的已通知消息</item>
@@ -473,7 +473,7 @@
         <item quantity="other">%d 个房间</item>
     </plurals>
     <plurals name="active_widgets">
-        <item quantity="other">%d个启用的挂件</item>
+        <item quantity="other">%d 个活动的小部件</item>
     </plurals>
     <string name="group_details_home">主页</string>
     <string name="rooms">房间</string>
@@ -506,25 +506,25 @@
     <string name="action_download">下载</string>
     <string name="option_send_voice">发送语音消息</string>
     <string name="error_no_external_application_found">对不起，没有可完成此操作的外部应用。</string>
-    <string name="e2e_re_request_encryption_key">从你的其他会话上重新请求加密密钥。</string>
-    <string name="e2e_re_request_encryption_key_dialog_content">请在其他可解密此消息的设备上启动 ${app_name}，以便其将密钥发送至当前会话。</string>
+    <string name="e2e_re_request_encryption_key">从你的其它会话上重新请求加密密钥。</string>
+    <string name="e2e_re_request_encryption_key_dialog_content">请在其它可解密此消息的设备上启动 ${app_name}，以便其将密钥发送至当前会话。</string>
     <string name="error_empty_field_your_password">请输入你的密码。</string>
     <string name="send_bug_report_description_in_english">如果可能的话，请使用英文撰写问题描述。</string>
     <string name="settings_preview_media_before_sending">发送前预览媒体文件</string>
     <string name="command_description_emote">显示动作</string>
     <string name="command_description_ban_user">按照 ID 封禁用户</string>
     <string name="command_description_unban_user">按照 ID 解禁用户</string>
-    <string name="command_description_op_user">定义用户的权力级别</string>
+    <string name="command_description_op_user">定义用户的权限等级</string>
     <string name="command_description_deop_user">按照 ID 取消用户管理员权限</string>
     <string name="command_description_invite_user">按照 ID 邀请用户进入当前房间</string>
     <string name="command_description_join_room">用给定地址加入房间</string>
     <string name="command_description_part_room">离开房间</string>
-    <string name="command_description_topic">设置房间主题</string>
+    <string name="command_description_topic">设置房间话题</string>
     <string name="command_description_remove_user">从此房间移除指定ID的用户</string>
     <string name="command_description_nick">更改你显示的显示名称</string>
     <string name="command_description_markdown">打开/关闭 markdown</string>
     <string name="command_description_clear_scalar_token">修复 Matrix Apps 管理</string>
-    <string name="room_tombstone_versioned_description">这个房间已经被替换并且不再活跃。</string>
+    <string name="room_tombstone_versioned_description">此房间已被替换，不再处于活动状态。</string>
     <string name="room_tombstone_continuation_link">对话在此继续</string>
     <string name="room_tombstone_continuation_description">这个房间是另一个对话的延续</string>
     <string name="room_tombstone_predecessor_link">点击此处查看更早的消息</string>
@@ -535,8 +535,8 @@
     <string name="resource_limit_contact_admin">联系你的服务管理员</string>
     <string name="resource_limit_soft_default">本服务器其中一项资源已超出限制，<b>部分用户将无法登录</b>。</string>
     <string name="resource_limit_hard_default">本服务器其中一项资源已超出限制。</string>
-    <string name="resource_limit_soft_mau"> 本服务器已达到每月活跃用户限制，<b>部分用户将无法登录</b>。</string>
-    <string name="resource_limit_hard_mau">本服务器已达到每月活跃用户限制。</string>
+    <string name="resource_limit_soft_mau">" 此主服务器已达到其每月活跃用户限制，因此&lt;b&gt;某些用户将无法登录&lt;/b&gt;。"</string>
+    <string name="resource_limit_hard_mau">此主服务器已达到其每月活跃用户限制。</string>
     <string name="resource_limit_hard_contact">请 %s 以继续使用本服务。</string>
     <string name="resource_limit_soft_contact">请 %s 以增加此限制的额度。</string>
     <string name="action_accept">接受</string>
@@ -555,7 +555,7 @@
     <string name="settings_troubleshoot_diagnostic_failure_status_with_quickfix">一个或多个测试没有通过，请尝试建议的修复方法。</string>
     <string name="settings_troubleshoot_diagnostic_failure_status_no_quickfix">一个或多个测试没有通过，请提交错误反馈以协助我们调查此问题。</string>
     <string name="settings_troubleshoot_test_system_settings_title">系统设置。</string>
-    <string name="settings_troubleshoot_test_system_settings_success">通知已在系统设置中启用。</string>
+    <string name="settings_troubleshoot_test_system_settings_success">已在系统设置中启用通知。</string>
     <string name="settings_troubleshoot_test_system_settings_failed">通知已在系统设置中禁用。
 \n请检查系统设置。</string>
     <string name="open_settings">打开设置</string>
@@ -593,8 +593,8 @@
     <string name="settings_send_typing_notifs_summary">让房间中的其他用户知道你正在输入。</string>
     <string name="settings_send_markdown">Markdown 格式化</string>
     <string name="settings_send_markdown_summary">在消息发出之前使用 Markdown 语法格式化消息。这允许你使用高级的文字格式，例如使用星号显示斜体文字。</string>
-    <string name="settings_show_read_receipts">显示已阅回执</string>
-    <string name="settings_show_read_receipts_summary">点击已阅回执以显示所有已经阅读过某条消息的用户。</string>
+    <string name="settings_show_read_receipts">显示已读回执</string>
+    <string name="settings_show_read_receipts_summary">单击已读回执以获取详细列表。</string>
     <string name="settings_show_join_leave_messages">显示加入与离开事件</string>
     <string name="settings_show_join_leave_messages_summary">邀请、移除与封禁不受影响。</string>
     <string name="settings_show_avatar_display_name_changes_messages">显示账户变动事件</string>
@@ -606,7 +606,7 @@
     <string name="merged_events_expand">展开</string>
     <string name="unknown_error">抱歉，发生了一个错误</string>
     <string name="markdown_has_been_disabled">Markdown 已禁用。</string>
-    <string name="markdown_has_been_enabled">Markdown 已启用。</string>
+    <string name="markdown_has_been_enabled">已启用 Markdown。</string>
     <string name="video_call_in_progress">视频通话中……</string>
     <string name="settings_troubleshoot_test_service_boot_success">服务将在设备重启后启动。</string>
     <string name="settings_troubleshoot_test_service_boot_failed">服务不会在设备重启后启动，在你打开 ${app_name} 一次之前你将不会收到消息通知。</string>
@@ -628,7 +628,7 @@
     <string name="title_activity_keys_backup_restore">使用密钥备份</string>
     <string name="sign_out_bottom_sheet_warning_no_backup">如果你此时登出账户，你将会失去你的已加密消息</string>
     <string name="sign_out_bottom_sheet_warning_backing_up">密钥备份进行中。如果你此时登出账户将无法再访问你的已加密消息。</string>
-    <string name="sign_out_bottom_sheet_warning_backup_not_active">你的所有会话都应当启用安全密钥备份以避免失去对你的已加密消息的访问权。</string>
+    <string name="sign_out_bottom_sheet_warning_backup_not_active">安全密钥备份应该在您的所有会话中都处于活动状态，以避免失去对加密消息的访问权限。</string>
     <string name="sign_out_bottom_sheet_dont_want_secure_messages">我不想要我的已加密消息</string>
     <string name="sign_out_bottom_sheet_backing_up_keys">正在备份密钥……</string>
     <string name="are_you_sure">确定吗？</string>
@@ -684,10 +684,10 @@
     <string name="keys_backup_setup_step3_button_title">完成</string>
     <string name="keys_backup_setup_step3_button_title_no_passphrase">我已经制作了一份拷贝</string>
     <string name="keys_backup_setup_step3_copy_button_title">保存恢复密钥</string>
-    <string name="keys_backup_setup_step3_share_recovery_file">分享</string>
+    <string name="keys_backup_setup_step3_share_recovery_file">共享</string>
     <string name="keys_backup_setup_step3_save_button_title">保存为文件</string>
     <string name="keys_backup_setup_step3_please_make_copy">请制作一份拷贝</string>
-    <string name="keys_backup_setup_step3_share_intent_chooser_title">分享恢复密钥…</string>
+    <string name="keys_backup_setup_step3_share_intent_chooser_title">与…共享恢复密钥</string>
     <string name="keys_backup_setup_step3_generating_key_status">正在使用口令词组来生成恢复密钥，此过程可能会花费几秒钟。</string>
     <string name="recovery_key">恢复密钥</string>
     <string name="unexpected_error">意外错误</string>
@@ -777,8 +777,8 @@
 \n会话名称：%1$s
 \n最近上线于：%2$s
 \n若你未曾在另一个会话上登录，则忽略此请求。</string>
-    <string name="share_without_verifying_short_label">分享</string>
-    <string name="key_share_request">密钥分享请求</string>
+    <string name="share_without_verifying_short_label">共享</string>
+    <string name="key_share_request">密钥共享请求</string>
     <string name="ignore_request_short_label">忽略</string>
     <string name="keys_backup_setup_override_replace">替换</string>
     <string name="keys_backup_setup_override_stop">终止</string>
@@ -786,7 +786,7 @@
     <string name="sas_verified">已验证！</string>
     <string name="sas_got_it">了解了</string>
     <string name="sas_incoming_request_notif_title">验证请求</string>
-    <string name="sas_incoming_request_notif_content">%s 想验证你的装置</string>
+    <string name="sas_incoming_request_notif_content">%s 想验证您的会话</string>
     <string name="sas_error_unknown">未知错误</string>
     <string name="edit">编辑</string>
     <string name="reply">回复</string>
@@ -795,7 +795,7 @@
     <string name="invited_by">由 %s 邀请</string>
     <string name="room_list_people_empty_title">对话</string>
     <string name="room_list_rooms_empty_title">房间</string>
-    <string name="title_activity_emoji_reaction_picker">反应</string>
+    <string name="title_activity_emoji_reaction_picker">回应</string>
     <string name="action_agree">同意</string>
     <string name="message_add_reaction">添加反应</string>
     <string name="message_view_reaction">查看反应</string>
@@ -837,7 +837,7 @@
     <string name="bottom_action_notification">通知</string>
     <string name="call_failed_no_connection">${app_name} 呼叫失败</string>
     <string name="call_failed_no_connection_description">无法建立实时连接。
-\n请要求你的主服务器管理员配置 TURN 服务器以使通话可靠工作。</string>
+\n请让您的主服务器的管理员配置一个 TURN 服务器，以便呼叫能够可靠地工作。</string>
     <string name="call_select_sound_device">选择声音设备</string>
     <string name="sound_device_phone">电话</string>
     <string name="sound_device_speaker">扬声器</string>
@@ -881,8 +881,8 @@
     <string name="settings_background_fdroid_sync_mode_disabled">无后台同步</string>
     <string name="settings_background_fdroid_sync_mode_disabled_description">应用在后台时你不会收到消息通知。</string>
     <string name="settings_integrations">集成</string>
-    <string name="settings_integrations_summary">使用集成管理器管理机器人、桥接、部件和贴纸包。
-\n集成管理器接收配置数据，可以代表你修改部件、发送房间邀请及设置权力级别。</string>
+    <string name="settings_integrations_summary">使用集成管理器来管理机器人、桥接、小部件和贴纸包。
+\n集成管理器接收配置数据，并可以代表您修改小部件、发送房间邀请和设置权限等级。</string>
     <string name="settings_secure_backup_section_title">安全备份</string>
     <string name="settings_secure_backup_setup">设置安全备份</string>
     <string name="settings_secure_backup_reset">重置安全备份</string>
@@ -903,24 +903,24 @@
     <string name="notification_ticker_text_dm">%1$s：%2$s</string>
     <string name="notification_ticker_text_group">%1$s：%2$s %3$s</string>
     <string name="active_widget_view_action">查看</string>
-    <string name="active_widgets_title">活动挂件</string>
-    <string name="room_widget_activity_title">挂件</string>
-    <string name="room_widget_permission_title">载入挂件</string>
-    <string name="room_widget_permission_added_by">此挂件添加者：</string>
-    <string name="room_widget_permission_webview_shared_info_title">使用它可能会设置cookie并与%s分享数据：</string>
-    <string name="room_widget_permission_shared_info_title">使用它可能会与%s分享数据：</string>
-    <string name="room_widget_failed_to_load">载入挂件失败。
+    <string name="active_widgets_title">活动小部件</string>
+    <string name="room_widget_activity_title">小部件</string>
+    <string name="room_widget_permission_title">加载小部件</string>
+    <string name="room_widget_permission_added_by">此小部件由以下人员添加：</string>
+    <string name="room_widget_permission_webview_shared_info_title">使用它可能会设置 cookie 并与 %s 共享数据：</string>
+    <string name="room_widget_permission_shared_info_title">使用它可能会与 %s 共享数据：</string>
+    <string name="room_widget_failed_to_load">加载小部件失败。
 \n%s</string>
-    <string name="room_widget_reload">重载挂件</string>
+    <string name="room_widget_reload">重新加载小部件</string>
     <string name="room_widget_open_in_browser">在浏览器中打开</string>
     <string name="room_widget_revoke_access">撤消我的访问权限</string>
     <string name="room_widget_permission_display_name">你的显示名称</string>
     <string name="room_widget_permission_avatar_url">你的头像 URL</string>
     <string name="room_widget_permission_user_id">你的用户 ID</string>
     <string name="room_widget_permission_theme">你的主题</string>
-    <string name="room_widget_permission_widget_id">挂件 ID</string>
+    <string name="room_widget_permission_widget_id">小部件 ID</string>
     <string name="room_widget_permission_room_id">房间 ID</string>
-    <string name="room_widget_resource_permission_title">挂件想使用以下资源：</string>
+    <string name="room_widget_resource_permission_title">这个小部件想要使用以下资源：</string>
     <string name="room_widget_resource_grant_permission">允许</string>
     <string name="room_widget_resource_decline_permission">阻止全部</string>
     <string name="room_widget_webview_access_camera">使用相机</string>
@@ -952,7 +952,7 @@
     <string name="keys_backup_unable_to_get_trust_info">获取信任信息时发生错误</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">获取密钥备份数据时发生错误</string>
     <string name="import_e2e_keys_from_file">从文件“%1$s”导入端到端密钥。</string>
-    <string name="settings_other_third_party_notices">其他第三方通知</string>
+    <string name="settings_other_third_party_notices">其它第三方通知</string>
     <string name="navigate_to_room_when_already_in_the_room">你已经在查看此房间！</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">注册令牌</string>
     <string name="send_suggestion">提出建议</string>
@@ -983,7 +983,7 @@
     <string name="message_view_edit_history">查看编辑历史</string>
     <string name="terms_of_service">服务条款</string>
     <string name="terms_description_for_identity_server">可被其他人发现</string>
-    <string name="terms_description_for_integration_manager">使用机器人，挂件和贴纸包</string>
+    <string name="terms_description_for_integration_manager">使用机器人、桥接、小部件和贴纸包</string>
     <string name="identity_server">身份服务器</string>
     <string name="disconnect_identity_server">断开身份服务器</string>
     <string name="add_identity_server">配置身份服务器</string>
@@ -1004,10 +1004,10 @@
     <string name="settings_discovery_no_terms">你选择的身份服务器无任何服务条款。仅在你信任服务所有者时继续</string>
     <string name="settings_text_message_sent">已向 %s 发送文字消息。请输入它包含的验证码。</string>
     <string name="settings_text_message_sent_wrong_code">验证码不正确。</string>
-    <string name="settings_discovery_disconnect_with_bound_pid">你当前在身份服务器 %1$s 上分享电子邮件地址或电话号码。你需要重连接 %2$s 已停止分享。</string>
+    <string name="settings_discovery_disconnect_with_bound_pid">您当前在身份服务器 %1$s 上共享电子邮件地址或电话号码。您需要重新连接到 %2$s 才能停止共享它们。</string>
     <string name="settings_agree_to_terms">同意身份服务器 (%s) 服务条款使你可以通过电子邮件地址或电话号码被发现。</string>
     <string name="labs_allow_extended_logging">启用详细日志。</string>
-    <string name="labs_allow_extended_logging_summary">当你发送 RageShake 时详细日志将帮助开发者提供更多日志。即使启用，应用也不会记录消息内容或任何其他私有数据。</string>
+    <string name="labs_allow_extended_logging_summary">详细日志将通过在您发送 RageShake 时提供更多日志来帮助开发人员。即使启用，应用程序也不会记录消息内容或任何其他私人数据。</string>
     <string name="error_terms_not_accepted">接收你的主服务器条款和条件后请重试。</string>
     <string name="error_network_timeout">服务器似乎响应时间太长，这可能是由于连接不良或服务器错误引起的。请稍后再试。</string>
     <string name="send_attachment">发送附件</string>
@@ -1176,9 +1176,9 @@
     <string name="signed_out_title">你已登出</string>
     <string name="signed_out_notice">这可能由于多种原因：
 \n
-\n• 你已在其他会话中更改了你的密码。
+\n• 你已在其它会话中更改了你的密码。
 \n
-\n• 你已从其他会话删除了此会话。
+\n• 你已从其它会话删除了此会话。
 \n
 \n• 你的服务器管理员出于安全原因已取消你的访问权限。</string>
     <string name="signed_out_submit">重新登录</string>
@@ -1211,13 +1211,13 @@
     <string name="rageshake_detected">检测到摇动！</string>
     <string name="settings">设置</string>
     <string name="devices_current_device">当前会话</string>
-    <string name="devices_other_devices">其他会话</string>
+    <string name="devices_other_devices">其它会话</string>
     <string name="autocomplete_limited_results">仅显示第一个结果，请输入更多字符…</string>
     <string name="settings_developer_mode_fail_fast_title">快速失败</string>
     <string name="settings_developer_mode_fail_fast_summary">发生意外错误时，${app_name} 可能更经常崩溃</string>
     <string name="command_description_shrug">在明文消息前添加 ¯\\_(ツ)_/¯</string>
     <string name="create_room_encryption_title">启用加密</string>
-    <string name="create_room_encryption_description">加密一经启用，便无法禁用。</string>
+    <string name="create_room_encryption_description">启用后，无法禁用加密。</string>
     <string name="login_error_threepid_denied">你的电子邮件域无权注册此服务器</string>
     <string name="verification_conclusion_warning">未信任的登录</string>
     <string name="verification_sas_match">匹配</string>
@@ -1227,7 +1227,7 @@
 \n
 \n - 你的主服务器
 \n - 你验证的用户连接到的主服务器
-\n - 你或其它用户的网络连接
+\n - 你或其他用户的网络连接
 \n - 你或其他用户的设备</string>
     <string name="sent_a_video">视频。</string>
     <string name="sent_an_image">图片。</string>
@@ -1276,9 +1276,9 @@
     <string name="room_member_power_level_default_in">%1$s里的默认</string>
     <string name="room_member_power_level_custom_in">%2$s里的自定义（%1$d）</string>
     <string name="rendering_event_error_type_of_event_not_handled">${app_name} 无法处理类型为 \'%1$s\' 的事件</string>
-    <string name="rendering_event_error_exception">${app_name} 在渲染 id 为 \'%1$s\' 的事件内容时遇到了一个问题</string>
+    <string name="rendering_event_error_exception">${app_name} 在呈现 ID 为“%1$s”的事件内容时遇到问题</string>
     <string name="unignore">取消忽略</string>
-    <string name="verify_cannot_cross_sign">该会话无法与你的其他会话共享此验证。
+    <string name="verify_cannot_cross_sign">该会话无法与你的其它会话共享此验证。
 \n验证将保存在本地，并在此应用的未来版本中共享。</string>
     <string name="command_description_rainbow">给给定的消息和彩虹一样上色后发送</string>
     <string name="command_description_rainbow_emote">和彩虹一样给给定的表情上色后发送</string>
@@ -1289,22 +1289,22 @@
     <string name="room_settings_enable_encryption_dialog_content">房间加密一经启用，便无法禁用。在加密房间中，发送的消息无法被服务器看到，只能被房间的参与者看到。启用加密可能会使许多机器人和桥接无法正常运作。</string>
     <string name="room_settings_enable_encryption_dialog_submit">启用加密</string>
     <string name="verification_request_notice">为保证安全，请核对一次性代码以验证 %s。</string>
-    <string name="verification_request_start_notice">为保证安全，请当面验证，或者使用其他通讯方式验证。</string>
+    <string name="verification_request_start_notice">为保证安全，请当面验证，或者使用其它通讯方式验证。</string>
     <string name="verification_emoji_notice">比较独特表情，确保它们以相同顺序出现。</string>
     <string name="verification_code_notice">与其他用户设备上显示的代码比较。</string>
     <string name="verification_conclusion_ok_notice">与此用户的消息是端到端加密的，无法被第三方读取。</string>
     <string name="verification_conclusion_ok_self_notice">你的新会话已验证。它可以访问你的加密消息，其他用户会将其视为可信任。</string>
     <string name="encryption_information_cross_signing_state">交叉签名</string>
-    <string name="encryption_information_dg_xsigning_complete">交叉签名已启用
+    <string name="encryption_information_dg_xsigning_complete">已启用交叉签名
 \n设备上的私钥。</string>
-    <string name="encryption_information_dg_xsigning_trusted">交叉签名已启用
+    <string name="encryption_information_dg_xsigning_trusted">已启用交叉签名
 \n密钥可信任。
 \n私钥未知</string>
-    <string name="encryption_information_dg_xsigning_not_trusted">交叉签名已启用。
+    <string name="encryption_information_dg_xsigning_not_trusted">已启用交叉签名。
 \n密钥未信任</string>
-    <string name="encryption_information_dg_xsigning_disabled">交叉签名未启用</string>
+    <string name="encryption_information_dg_xsigning_disabled">未启用交叉签名</string>
     <string name="settings_hs_admin_e2e_disabled">你的服务器管理员已默认禁用私有房间和私聊消息端到端加密。</string>
-    <string name="settings_active_sessions_list">活跃的会话</string>
+    <string name="settings_active_sessions_list">可用会话</string>
     <string name="settings_active_sessions_show_all">显示全部会话</string>
     <string name="settings_active_sessions_manage">管理会话</string>
     <string name="settings_active_sessions_signout_device">登出此会话</string>
@@ -1394,7 +1394,7 @@
     <string name="command_description_spoiler">将给定信息作为剧透发送</string>
     <string name="spoiler">剧透</string>
     <string name="reaction_search_type_hint">输入关键字以查找反应。</string>
-    <string name="seen_by">已阅</string>
+    <string name="seen_by">已读</string>
     <string name="room_member_jump_to_read_receipt">跳至已读回执</string>
     <string name="event_redacted_by_admin_reason_with_reason">事件被房间管理员调整，理由：%1$s</string>
     <string name="keys_backup_restore_success_title_already_up_to_date">密钥已是最新！</string>
@@ -1441,16 +1441,16 @@
     <string name="bootstrap_migration_with_passphrase_helper_with_link">不知道你的密钥备份口令词组，你可以 %s。</string>
     <string name="bootstrap_migration_backup_recovery_key">密钥备份恢复密钥</string>
     <string name="settings_security_prevent_screenshots_title">阻止应用内屏幕截图</string>
-    <string name="settings_security_prevent_screenshots_summary">启用此设置添加 FLAG_SECURE 到所有活动。重启应用使更改生效。</string>
+    <string name="settings_security_prevent_screenshots_summary">启用此设置会将 FLAG_SECURE 添加到所有活动项。重新启动应用程序以使更改生效。</string>
     <string name="error_saving_media_file">无法保存媒体文件</string>
     <string name="change_password_summary">设置新账户密码……</string>
-    <string name="use_other_session_content_description">在你的其他设备上使用最新的${app_name} 网页版、${app_name} 桌面版、${app_name} iOS 版、${app_name} 安卓版，或其他能够交叉签名的 Matrix 客户端</string>
+    <string name="use_other_session_content_description">在您的其它设备上使用最新的 ${app_name}、${app_name} Web、${app_name} Desktop、${app_name} iOS、${app_name} for Android 或其他支持交叉签名的 Matrix 客户端</string>
     <string name="app_desktop_web">${app_name} Web
 \n${app_name} Desktop</string>
     <string name="app_ios_android">${app_name} iOS
 \n${app_name} Android</string>
-    <string name="or_other_mx_capable_client">或其他能够交叉签名的 Matrix 客户端</string>
-    <string name="use_latest_app">在你的其他设备上使用最新的 ${app_name}：</string>
+    <string name="or_other_mx_capable_client">或其它支持交叉签名的 Matrix 客户端</string>
+    <string name="use_latest_app">在你的其它设备上使用最新的 ${app_name}：</string>
     <string name="command_description_discard_session">强制丢弃加密房间中的当前出站群组会话</string>
     <string name="command_description_discard_session_not_handled">仅在加密房间中支持</string>
     <string name="enter_secret_storage_passphrase_or_key">使用你的 %1$s 或使用你的 %2$s 继续。</string>
@@ -1465,7 +1465,7 @@
     <string name="cross_signing_verify_by_text">使用文本手动验证</string>
     <string name="crosssigning_verify_session">验证登录</string>
     <string name="cross_signing_verify_by_emoji">使用表情交互式验证</string>
-    <string name="confirm_your_identity">通过从你的其他会话验证此登录确认你的身份，授权它访问你的加密消息。</string>
+    <string name="confirm_your_identity">通过从你的其它会话验证此登录确认你的身份，授权它访问你的加密消息。</string>
     <string name="error_empty_field_choose_user_name">请选择用户名。</string>
     <string name="error_empty_field_choose_password">请选择密码。</string>
     <string name="external_link_confirmation_title">仔细检查此链接</string>
@@ -1484,7 +1484,7 @@
     </plurals>
     <string name="invite_users_to_room_failure">我们无法邀请用户，请检查你想要邀请的用户并重试。</string>
     <string name="choose_locale_current_locale_title">当前语言</string>
-    <string name="choose_locale_other_locales_title">其他可用语言</string>
+    <string name="choose_locale_other_locales_title">其它可用语言</string>
     <string name="choose_locale_loading_locales">正在载入可用语言…</string>
     <string name="open_terms_of">打开 %s 条款</string>
     <string name="disconnect_identity_server_dialog_content">是否从身份服务器 %s 断开？</string>
@@ -1497,7 +1497,7 @@
     <string name="identity_server_error_no_current_binding_error">当前与此标识符没有关联。</string>
     <string name="identity_server_set_default_notice">你的主服务器（%1$s）建议使用 %2$s 作为你的身份服务器</string>
     <string name="identity_server_set_default_submit">使用 %1$s</string>
-    <string name="identity_server_set_alternative_notice">或者，你可以输入任何其他身份服务器 URL</string>
+    <string name="identity_server_set_alternative_notice">或者，你可以输入任何其它身份服务器网址</string>
     <string name="identity_server_set_alternative_notice_no_default">输入身份服务器 URL</string>
     <string name="identity_server_set_alternative_submit">提交</string>
     <string name="power_level_edit_title">设置角色</string>
@@ -1511,7 +1511,7 @@
     <string name="bottom_sheet_setup_secure_backup_subtitle">通过在你的服务器上备份加密密钥，防止失去对加密消息和数据的访问。</string>
     <string name="bottom_sheet_setup_secure_backup_submit">设置</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">使用安全密钥</string>
-    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥存储在安全的地方如密码管理器或保险箱。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥以存储在密码管理器或保险箱等安全位置。</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全短语</string>
     <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有你知道的秘密短语，生成备份用的密钥。</string>
     <string name="bottom_sheet_save_your_recovery_key_title">保存你的安全密钥</string>
@@ -1521,7 +1521,7 @@
     <string name="set_a_security_phrase_hint">安全短语</string>
     <string name="set_a_security_phrase_again_notice">再次输入你的安全短语以确认。</string>
     <string name="room_settings_name_hint">房间名称</string>
-    <string name="room_settings_topic_hint">主题</string>
+    <string name="room_settings_topic_hint">话题</string>
     <string name="room_settings_save_success">你已成功更改房间设置</string>
     <string name="notice_crypto_unable_to_decrypt_final">你无法访问此消息</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此消息，可能会花费一些时间</string>
@@ -1555,20 +1555,20 @@
     <string name="settings_security_pin_code_title">启用 PIN</string>
     <string name="settings_security_pin_code_summary">如果你想要重置你的 PIN，点按忘记 PIN 登出并重置。</string>
     <string name="settings_call_show_confirmation_dialog_title">防止意外通话</string>
-    <string name="settings_call_show_confirmation_dialog_summary">发起通话之前要求确认</string>
+    <string name="settings_call_show_confirmation_dialog_summary">在开始通话之前要求确认</string>
     <string name="no_permissions_to_start_conf_call">你没有权限在此房间发起会议通话</string>
     <string name="video_meeting">发起视频会议</string>
     <string name="audio_meeting">发起音频会议</string>
-    <string name="audio_video_meeting_description">会议使用 Jitsi 安全与许可政策。你的会议进行期间当前房间内的所有人将看到加入邀请。</string>
+    <string name="audio_video_meeting_description">会议使用 Jitsi 安全和权限策略。 当前在会议室中的所有人都会在会议进行期间看到加入邀请。</string>
     <string name="cannot_call_yourself">你无法呼叫你自己</string>
     <string name="cannot_call_yourself_with_invite">你无法与自己通话，请等待参与者接受邀请</string>
-    <string name="failed_to_add_widget">添加挂件失败</string>
-    <string name="failed_to_remove_widget">移除挂件失败</string>
+    <string name="failed_to_add_widget">添加小部件失败</string>
+    <string name="failed_to_remove_widget">移除小部件失败</string>
     <plurals name="encryption_import_room_keys_success">
         <item quantity="other">成功导入 %1$d/%2$d 个密钥。</item>
     </plurals>
     <string name="room_manage_integrations">管理集成</string>
-    <string name="room_no_active_widgets">无活动挂件</string>
+    <string name="room_no_active_widgets">没有活动的小部件</string>
     <string name="create_room_federation_error">房间已创建，但由于以下原因一些邀请尚未发送：
 \n
 \n%s</string>
@@ -1605,9 +1605,9 @@
 \n
 \n小心使用，它可能导致意外行为。</string>
     <string name="universal_link_malformed">链接格式不正确</string>
-    <string name="settings_security_pin_code_grace_period_summary_off">每次打开 ${app_name} 都要求 PIN 码。</string>
-    <string name="settings_security_pin_code_grace_period_summary_on">在 2 分钟未使用 ${app_name} 后要求 PIN 码。</string>
-    <string name="settings_security_pin_code_grace_period_title">2 分钟后要求 PIN</string>
+    <string name="settings_security_pin_code_grace_period_summary_off">每次打开 ${app_name} 时都需要 PIN 码。</string>
+    <string name="settings_security_pin_code_grace_period_summary_on">未使用 ${app_name} 2 分钟后需要 PIN 码。</string>
+    <string name="settings_security_pin_code_grace_period_title">2 分钟后需要 PIN 码</string>
     <string name="settings_security_pin_code_notifications_summary_off">仅在一个简单的通知中显示未读消息的数量。</string>
     <string name="settings_security_pin_code_notifications_summary_on">显示详情，如房间名称和消息内容。</string>
     <string name="settings_security_pin_code_notifications_title">在通知中显示内容</string>
@@ -1622,7 +1622,7 @@
     </plurals>
     <string name="secure_backup_reset_no_history">你将重新启动，没有历史记录，消息，受信任的设备或受信任的用户</string>
     <string name="secure_backup_reset_if_you_reset_all">如果你重置一切</string>
-    <string name="secure_backup_reset_all_no_other_devices">仅当没有其他设备可用来验证此设备时，才执行此操作。</string>
+    <string name="secure_backup_reset_all_no_other_devices">仅当没有其它设备可用来验证此设备时，才执行此操作。</string>
     <string name="secure_backup_reset_all">全部重置</string>
     <string name="bad_passphrase_key_reset_all_action">忘记或丢失了所有的恢复选项？重置一切</string>
     <string name="direct_room_created_summary_item_by_you">你已加入。</string>
@@ -1634,7 +1634,7 @@
 \n
 \n你的消息受加密保护，并且只有你和消息接收者拥有唯一解密密钥。</string>
     <string name="direct_room_profile_not_encrypted_subtitle">此处的消息未经端到端加密。</string>
-    <string name="login_error_outdated_homeserver_warning_content">此主服务器正在运行较旧版本。要求你的主服务器管理员升级。你可以继续，但一些功能可能无法正确工作。</string>
+    <string name="login_error_outdated_homeserver_warning_content">此主服务器正在运行旧版本。 请让您的主服务器管理员升级。 您可以继续，但某些功能可能无法正常工作。</string>
     <string name="direct_room_join_rules_invite_by_you">你将此房间设为仅邀请。</string>
     <string name="direct_room_join_rules_invite">%1$s 仅发出此邀请。</string>
     <string name="settings_labs_show_complete_history_in_encrypted_room">在加密房间显示完整历史</string>
@@ -1658,7 +1658,7 @@
     <string name="permissions_denied_add_contact">允许访问你的联系人。</string>
     <string name="permissions_denied_qr_code">如需扫描二维码，你须允许相机访问权限。</string>
     <string name="no_more_results">没有更多结果</string>
-    <string name="start_chatting">开始畅聊</string>
+    <string name="start_chatting">开始聊天</string>
     <string name="room_alias_delete_confirmation">删除地址 \"%1$s\"？</string>
     <string name="room_alias_unpublish_confirmation">取消发布地址 \"%1$s\"？</string>
     <string name="room_alias_published_alias_add_manually_submit">发布</string>
@@ -1716,7 +1716,7 @@
     <string name="qr_code">二维码</string>
     <string name="add_by_qr_code">通过QR码添加</string>
     <string name="create_room_settings_section">房间设置</string>
-    <string name="create_room_topic_hint">主题</string>
+    <string name="create_room_topic_hint">话题</string>
     <string name="create_room_topic_section">房间话题（可选）</string>
     <string name="create_room_name_section">房间名称</string>
     <string name="room_preview_no_preview_join">此房间无法预览。你想加入吗？</string>
@@ -1731,10 +1731,10 @@
     <string name="room_alias_local_address_subtitle">为此房间设置地址以便用户通过你的主服务器（%1$s）找到此房间</string>
     <string name="room_alias_local_address_title">本地地址</string>
     <string name="room_alias_address_hint">新的发布的地址（例如 #alias:server）</string>
-    <string name="room_alias_address_empty">尚无其他已发布地址。</string>
+    <string name="room_alias_address_empty">尚无其它已发布地址。</string>
     <string name="room_alias_address_empty_can_add">还没有别的发布的地址，可在下方添加。</string>
-    <string name="settings_show_emoji_keyboard_summary">在消息框添加打开emoji键盘的按钮</string>
-    <string name="settings_show_emoji_keyboard">显示emoji键盘</string>
+    <string name="settings_show_emoji_keyboard_summary">在消息框添加打开 emoji 键盘的按钮</string>
+    <string name="settings_show_emoji_keyboard">显示 emoji 键盘</string>
     <string name="settings_chat_effects_description">使用 /confetti 命令或发送包含 ❄️ 或 🎉 的消息</string>
     <string name="settings_chat_effects_title">显示聊天效果</string>
     <string name="room_permissions_change_topic">更改话题</string>
@@ -1746,7 +1746,7 @@
     <string name="room_permissions_enable_room_encryption">启用房间加密</string>
     <string name="room_permissions_change_main_address_for_the_room">更改房间主要地址</string>
     <string name="room_permissions_change_room_avatar">更改房间头像</string>
-    <string name="room_permissions_modify_widgets">修改挂件</string>
+    <string name="room_permissions_modify_widgets">修改小部件</string>
     <string name="room_permissions_notify_everyone">通知每个人</string>
     <string name="room_permissions_remove_messages_sent_by_others">移除其他人发送的消息</string>
     <string name="room_permissions_ban_users">封禁用户</string>
@@ -1774,7 +1774,7 @@
     <string name="notice_room_server_acl_set_allowed">• 已允许匹配 %s 的服务器。</string>
     <string name="a11y_checked">已勾选</string>
     <string name="a11y_selected">已选中</string>
-    <string name="call_only_active">活跃通话（%1$s）</string>
+    <string name="call_only_active">可用通话（%1$s）</string>
     <string name="re_authentication_activity_title">需要重新验证</string>
     <string name="event_status_a11y_delete_all">删除失败的消息</string>
     <string name="event_status_cancel_sending_dialog_message">你确定要取消发送消息吗？</string>
@@ -1842,9 +1842,9 @@
     <string name="notice_room_server_acl_set_title_by_you">你为此房间设置了服务器访问控制列表。</string>
     <string name="phone_book_perform_lookup">在 Matrix 上查找联系人</string>
     <string name="identity_server_user_consent_not_provided">用户尚未同意条款。</string>
-    <string name="user_code_info_text">分享此二维码，其他人扫描后即可添加你，并开始聊天。</string>
+    <string name="user_code_info_text">共享此二维码，其他人扫描后即可添加你，并开始聊天。</string>
     <string name="user_code_my_code">我的二维码</string>
-    <string name="user_code_share">分享我的二维码</string>
+    <string name="user_code_share">共享我的二维码</string>
     <string name="dev_tools_error_no_message_type">消息类型缺失</string>
     <string name="dev_tools_explore_room_state">检查房间状态</string>
     <string name="a11y_view_read_receipts">查看已读回执</string>
@@ -1862,8 +1862,8 @@
     <string name="this_space_has_no_rooms">此空间没有房间</string>
     <string name="spaces_no_server_support_description">请联系你的主服务器管理员以取得进一步资讯</string>
     <string name="spaces_no_server_support_title">看来你的主服务器尚未支持空间</string>
-    <string name="spaces_feeling_experimental_subspace">想要做点实验？
-\n你可以将现有的空间添加到其他空间中。</string>
+    <string name="spaces_feeling_experimental_subspace">想要使用实验功能？
+\n你可以将现有的空间添加到其它空间中。</string>
     <string name="space_manage_rooms_and_spaces">管理房间和空间</string>
     <string name="space_mark_as_not_suggested">标记为不建议</string>
     <string name="space_mark_as_suggested">标记为建议</string>
@@ -1894,7 +1894,7 @@
     <string name="invite_just_to_this_room">刚到此房间</string>
     <string name="invite_to_space_with_name_desc">他们将可以探索 %s</string>
     <string name="invite_to_space_with_name">邀请至 %s</string>
-    <string name="invite_by_link">分享链接</string>
+    <string name="invite_by_link">共享链接</string>
     <string name="invite_by_email">通过电子邮件进行邀请</string>
     <string name="invite_people_to_your_space_desc">此刻只有你。%s与他人一道会更好。</string>
     <string name="invite_to_space">邀请至 %s</string>
@@ -1904,7 +1904,7 @@
     <string name="create_spaces_loading_message">正在创建空间……</string>
     <string name="create_spaces_default_public_random_room_name">随机</string>
     <string name="create_spaces_default_public_room_name">一般性</string>
-    <string name="create_spaces_room_private_header_desc">让我们为每个主题创建一个房间。你也可以稍后再进行增加，包括现有房间。</string>
+    <string name="create_spaces_room_private_header_desc">让我们为他们每个人创建一个房间。 您也可以稍后添加更多内容，包括已经存在的内容。</string>
     <string name="create_spaces_room_private_header">你在做些什么？</string>
     <string name="create_spaces_room_public_header_desc">我们将会为此创建房间。你也可以在稍后增加更多。</string>
     <string name="create_spaces_room_public_header">你希望在 %s 中进行哪些讨论？</string>
@@ -1933,9 +1933,9 @@
     <string name="command_description_create_space">创建空间</string>
     <string name="a11y_public_room">公开房间</string>
     <string name="a11y_unchecked">未检查</string>
-    <string name="a11y_open_widget">开启挂件</string>
+    <string name="a11y_open_widget">打开小部件</string>
     <string name="a11y_screenshot">屏幕截图</string>
-    <string name="re_authentication_default_confirm_text">${app_name} 要求你输入凭据才能执行此操作。</string>
+    <string name="re_authentication_default_confirm_text">${app_name} 需要您输入凭据才能执行此操作。</string>
     <string name="call_transfer_failure">呼叫转移时发生错误</string>
     <string name="call_transfer_consult_first">先询问</string>
     <string name="call_dial_pad_lookup_error">查找电话号码时发生了错误</string>
@@ -1944,9 +1944,9 @@
     <string name="warning_unsaved_change">有未保存的更改。要放弃更改吗？</string>
     <string name="warning_room_not_created_yet">房间尚未创建。取消创建房间？</string>
     <string name="qr_code_not_scanned">未扫描二维码！</string>
-    <string name="invalid_qr_code_uri">无效的二维码（无效的 URI）！</string>
+    <string name="invalid_qr_code_uri">无效的二维码（无效的标识）！</string>
     <string name="cannot_dm_self">无法向你自己发送私聊消息！</string>
-    <string name="share_by_text">通过文字分享</string>
+    <string name="share_by_text">通过文字共享</string>
     <string name="settings_security_pin_code_change_pin_summary">更改你当前的 PIN</string>
     <string name="settings_security_pin_code_change_pin_title">更改 PIN</string>
     <string name="invite_friends_rich_title">🔐️ 在 ${app_name} 上加入我的行列</string>
@@ -2049,7 +2049,7 @@
     <string name="settings_server_room_versions">房间版本 👓</string>
     <string name="verification_scan_self_emoji_subtitle">通过比较表情符号来验证</string>
     <string name="verification_scan_with_this_device">使用此设备扫描</string>
-    <string name="verification_scan_self_notice">使用您的其他设备扫描代码或切换并使用此设备扫描</string>
+    <string name="verification_scan_self_notice">使用其它设备扫码或切换并使用本设备扫码</string>
     <string name="hs_client_url">主服务器 API 网址</string>
     <string name="missing_permissions_title">缺少权限</string>
     <string name="denied_permission_camera">要执行此操作，请从系统设置中授予相机权限。</string>
@@ -2078,7 +2078,7 @@
     <string name="a11y_start_voice_message">录制语音消息</string>
     <string name="upgrade_required">需要升级</string>
     <string name="sent_a_voice_message">语音</string>
-    <string name="other_spaces_or_rooms_you_might_not_know">您可能不知道的其他空间或房间</string>
+    <string name="other_spaces_or_rooms_you_might_not_know">您可能不知道的其它空间或房间</string>
     <string name="space_you_know_that_contains_this_room">你知道的包含这个房间的空间</string>
     <string name="decide_who_can_find_and_join">决定谁能找到并加入这个房间。</string>
     <string name="tap_to_edit_spaces">点按即可编辑空间</string>
@@ -2102,8 +2102,8 @@
     <string name="settings_notification_other">其他</string>
     <string name="settings_notification_mentions_and_keywords">提及和关键词</string>
     <string name="settings_notification_default">默认通知</string>
-    <string name="call_tile_video_active">活跃视频通话</string>
-    <string name="call_tile_voice_active">活跃语音通话</string>
+    <string name="call_tile_video_active">可用视频通话</string>
+    <string name="call_tile_voice_active">可用语音通话</string>
     <string name="link_this_email_with_your_account">在 ${app_name} 中直接接收邀请的设置 %s。</string>
     <string name="link_this_email_settings_link">将此电子邮件地址与您的帐户相关联</string>
     <string name="this_invite_to_this_space_was_sent">加入这个空间的邀请被发送至 %s，此邮箱未与您的账户相关联</string>
@@ -2112,9 +2112,9 @@
     <string name="preference_show_all_rooms_in_home">在主页上显示所有房间</string>
     <string name="call_slide_to_end_conference">滑动结束通话</string>
     <string name="call_tap_to_return">%1$s 轻按返回</string>
-    <string name="call_one_active">活跃通话 (%1$s) ·</string>
+    <string name="call_one_active">可用通话 (%1$s) ·</string>
     <plurals name="call_active_status">
-        <item quantity="other">%1$d 个活跃通话·</item>
+        <item quantity="other">%1$d 个可用通话·</item>
     </plurals>
     <string name="call_tile_no_answer">无应答</string>
     <string name="call_tile_video_missed">未接视频通话</string>
@@ -2170,7 +2170,7 @@
     <string name="room_settings_space_access_public_description">任何人均可找到此空间并加入</string>
     <string name="room_settings_space_access_title">空间访问</string>
     <string name="room_settings_access_rules_pref_dialog_title">谁可以访问？</string>
-    <string name="settings_notification_emails_enable_for_email">启用 %s 的电邮通知</string>
+    <string name="settings_notification_emails_enable_for_email">为 %s 启用电子邮件通知</string>
     <string name="settings_notification_emails_no_emails">要接收通知邮件，请将一个电子邮件地址关联到你的Matrix账户</string>
     <string name="settings_notification_emails_category">电子邮件通知</string>
     <string name="room_permissions_upgrade_the_space">升级空间</string>
@@ -2213,8 +2213,8 @@
     <string name="create_poll_add_option">添加选项</string>
     <string name="create_poll_options_hint">选项 %1$d</string>
     <string name="create_poll_options_title">创建选项</string>
-    <string name="create_poll_question_hint">问题或主题</string>
-    <string name="create_poll_question_title">投票问题或主题</string>
+    <string name="create_poll_question_hint">问题或话题</string>
+    <string name="create_poll_question_title">投票问题或话题</string>
     <string name="create_poll_title">创建投票</string>
     <string name="attachment_type_poll">投票</string>
     <string name="identity_server_consent_dialog_title_2">向%s发送电子邮件地址和电话号码</string>
@@ -2265,33 +2265,33 @@
 \n你可以阅读我们所有的条款 %s。</string>
     <string name="analytics_opt_in_title">帮助改进 ${app_name}</string>
     <string name="action_enable">启用</string>
-    <string name="room_error_access_unauthorized">不允许加入此房间</string>
+    <string name="room_error_access_unauthorized">你不能加入这个房间</string>
     <plurals name="notice_room_server_acl_changes">
         <item quantity="other">修改服务器 %d 的 ACLs</item>
     </plurals>
     <string name="thread_list_empty_subtitle">消息列帮助你的对话不离题且易于跟踪。</string>
-    <string name="thread_list_modal_all_threads_subtitle">显示当前房间的所有子区</string>
-    <string name="thread_list_modal_all_threads_title">所有子区</string>
-    <string name="thread_list_modal_title">筛选器</string>
-    <string name="thread_timeline_title">子区</string>
-    <string name="room_threads_filter">在房间中筛选子区</string>
-    <string name="action_thread_copy_link_to_thread">复制子区的链接</string>
+    <string name="thread_list_modal_all_threads_subtitle">显示当前房间的所有消息列</string>
+    <string name="thread_list_modal_all_threads_title">所有消息列</string>
+    <string name="thread_list_modal_title">过滤器</string>
+    <string name="thread_timeline_title">消息列</string>
+    <string name="room_threads_filter">过滤房间中的消息列</string>
+    <string name="action_thread_copy_link_to_thread">复制消息列的链接</string>
     <string name="action_thread_view_in_room">在房间中查看</string>
     <string name="room_message_autocomplete_notification">房间通知</string>
-    <string name="threads_notice_migration_message">我们越来越接近将消息列发布为公开Beta版。
+    <string name="threads_notice_migration_message">我们越来越接近发布消息列的公共 Beta 版。
 \n
-\n在我们为此准备时，我们需要做一些变动：在此之前创建的消息列将会被显示为普通回复。
+\n在我们为此做准备时，我们需要进行一些更改：在此之前创建的消息列将显示为常规回复。
 \n
-\n这会是一次性的过渡，因为消息列现在是Matrix规范的一部分了。</string>
+\n这将是一次性的过渡，因为消息列现在是 Matrix 规范的一部分。</string>
     <plurals name="message_reaction_show_more">
         <item quantity="other">%1$d 更多</item>
     </plurals>
-    <string name="live_location_labs_promotion_description">请注意：这是一个使用临时实现的实验室功能。这意味着你将无法删除你的位置历史，并且在你停止与这个房间分享你的实时位置后，高级用户仍能看到你的位置历史。</string>
+    <string name="live_location_labs_promotion_description">请注意：这是使用临时实现的实验室功能。这意味着您将无法删除您的位置历史记录，即使您停止与此房间共享您的实时位置，高级用户也将能够看到您的位置历史记录。</string>
     <string name="settings_troubleshoot_test_current_gateway">当前网关：%s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">网关</string>
     <string name="give_feedback_threads">提供反馈</string>
     <string name="ftue_auth_carousel_workplace_title">为您的团队发送消息。</string>
-    <string name="threads_beta_enable_notice_title">消息列beta</string>
+    <string name="threads_beta_enable_notice_title">消息列 beta</string>
     <string name="thread_list_title">消息列</string>
     <string name="settings_show_latest_profile_description">为所有消息显示最新资料信息（头像和显示名称）。</string>
     <string name="ftue_display_name_entry_title">显示名称</string>
@@ -2301,7 +2301,7 @@
     <string name="ftue_auth_email_entry_title">电子邮件</string>
     <string name="ftue_auth_carousel_control_title">一切由您掌控。</string>
     <string name="beta">BETA</string>
-    <string name="location_share_live_select_duration_title">分享你的实时位置</string>
+    <string name="location_share_live_select_duration_title">共享你的实时位置</string>
     <string name="a11y_location_share_locate_button">缩放到当前位置</string>
     <string name="a11y_location_share_pin_on_map">地图上选定位置的图钉</string>
     <string name="poll_no_votes_cast">无投票</string>
@@ -2309,7 +2309,7 @@
     <plurals name="room_removed_messages">
         <item quantity="other">%d 条消息已移除</item>
     </plurals>
-    <string name="live_location_labs_promotion_switch_title">启用位置分享</string>
+    <string name="live_location_labs_promotion_switch_title">启用位置共享</string>
     <string name="live_location_labs_promotion_title">实时位置共享</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">找不到端点。</string>
     <string name="settings_troubleshoot_test_current_endpoint_success">当前端点：%s</string>
@@ -2319,7 +2319,7 @@
     <plurals name="settings_troubleshoot_test_distributors_many">
         <item quantity="other">找到 %d 个方式。</item>
     </plurals>
-    <string name="settings_troubleshoot_test_distributors_fdroid">除了后台同步，没有发现其他方法。</string>
+    <string name="settings_troubleshoot_test_distributors_fdroid">除了后台同步，没有发现其它方法。</string>
     <string name="settings_troubleshoot_test_distributors_gplay">找不到除了 Google Play 服务以外的方式。</string>
     <string name="settings_troubleshoot_test_distributors_title">可用方式</string>
     <string name="settings_notification_method">通知方式</string>
@@ -2331,11 +2331,11 @@
     <string name="room_message_autocomplete_users">用户</string>
     <string name="room_message_notify_everyone">通知整个房间</string>
     <string name="message_reaction_show_less">显示更少</string>
-    <string name="tooltip_attachment_location">分享位置</string>
+    <string name="tooltip_attachment_location">共享位置</string>
     <string name="message_bubbles">显示消息气泡</string>
-    <string name="live_location_share_location_item_share">分享位置</string>
-    <string name="live_location_not_enough_permission_dialog_description">你需要有正确的权限，才能在这个房间里分享实时位置。</string>
-    <string name="live_location_not_enough_permission_dialog_title">你没有权限分享实时位置</string>
+    <string name="live_location_share_location_item_share">共享位置</string>
+    <string name="live_location_not_enough_permission_dialog_description">您需要拥有正确的权限才能在此房间中共享实时位置。</string>
+    <string name="live_location_not_enough_permission_dialog_title">你没有权限共享实时位置</string>
     <string name="live_location_bottom_sheet_last_updated_at">%1$s前已更新</string>
     <string name="labs_enable_live_location_summary">临时执行：地点在房间历史中持续存在</string>
     <string name="labs_enable_live_location">启用实时位置共享</string>
@@ -2343,30 +2343,30 @@
     <string name="live_location_sharing_notification_title">${app_name}实时位置</string>
     <string name="location_share_live_remaining_time">剩余%1$s</string>
     <string name="location_share_live_stop">停止</string>
-    <string name="location_share_live_until">实时分享直到%1$s</string>
+    <string name="location_share_live_until">实时共享直到 %1$s</string>
     <string name="location_share_live_view">查看实时位置</string>
     <string name="location_share_live_ended">实时位置已结束</string>
     <string name="location_share_live_started">正在加载实时位置……</string>
-    <string name="location_share_live_enabled">实时位置已启用</string>
+    <string name="location_share_live_enabled">启用实时位置</string>
     <string name="location_timeline_failed_to_load_map">加载地图失败</string>
     <string name="location_share_external">打开，用</string>
     <string name="location_not_available_dialog_content">${app_name}无法访问你的位置。请稍后再试。</string>
     <string name="location_not_available_dialog_title">${app_name}无法访问你的位置</string>
     <string name="view_in_room">在房间中查看</string>
-    <string name="labs_enable_msc3061_share_history">MSC3061：为过去的消息分享房间密钥</string>
-    <string name="labs_enable_msc3061_share_history_desc">当在分享历史的加密的房间中邀请时，加密的历史将总是可见。</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061：为过去的消息共享房间密钥</string>
+    <string name="labs_enable_msc3061_share_history_desc">在共享历史的加密房间中邀请时，加密历史将可见。</string>
     <string name="location_share_live_select_duration_option_3">8小时</string>
     <string name="location_share_live_select_duration_option_2">1小时</string>
     <string name="location_share_live_select_duration_option_1">15分钟</string>
-    <string name="a11y_location_share_option_pinned_icon">分享此位置</string>
-    <string name="location_share_option_pinned">分享此位置</string>
-    <string name="a11y_location_share_option_user_live_icon">分享实时位置</string>
-    <string name="location_share_option_user_live">分享实时位置</string>
-    <string name="a11y_location_share_option_user_current_icon">分享我目前的位置</string>
-    <string name="location_share_option_user_current">分享我目前的位置</string>
+    <string name="a11y_location_share_option_pinned_icon">共享此位置</string>
+    <string name="location_share_option_pinned">共享此位置</string>
+    <string name="a11y_location_share_option_user_live_icon">共享实时位置</string>
+    <string name="location_share_option_user_live">共享实时位置</string>
+    <string name="a11y_location_share_option_user_current_icon">共享我当前的位置</string>
+    <string name="location_share_option_user_current">共享我当前的位置</string>
     <string name="a11y_static_map_image">地图</string>
     <string name="location_activity_title_preview">位置</string>
-    <string name="location_activity_title_static_sharing">分享位置</string>
+    <string name="location_activity_title_static_sharing">共享位置</string>
     <string name="closed_poll_option_description">结果仅在你结束投票后展示</string>
     <string name="closed_poll_option_title">封闭式投票</string>
     <string name="open_poll_option_description">投票者一投票就能看到结果</string>
@@ -2419,14 +2419,14 @@
     <string name="ftue_auth_use_case_subtitle">我们会帮你建立连接</string>
     <string name="ftue_auth_use_case_title">你会与谁聊最多？</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name}也非常适合工作场所。受到世界上最安全的组织信任。</string>
-    <string name="ftue_auth_carousel_control_body">选择保存你的对话的位置，给你控制权和独立性。通过Matrix连接。</string>
+    <string name="ftue_auth_carousel_control_body">选择保存你的对话的位置，给予你控制权和独立性。通过 Matrix 连接。</string>
     <string name="ftue_auth_carousel_secure_body">安全且独立的通信，为你提供和在家中面对面对话同样等级的隐私。</string>
     <string name="ftue_auth_carousel_encrypted_title">安全传送消息。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">向主服务器注册端点token失败：
 \n%1$s</string>
-    <string name="threads_beta_enable_notice_message">Threads帮助保持你的对话不离题且易于跟踪。%s启用消息列会刷新应用。这对一些账户可能需要更长时间。</string>
+    <string name="threads_beta_enable_notice_message">消息列有助于使您的对话保持话题并易于跟踪。%s 创建消息列将刷新应用程序。对于某些帐户，这可能需要更长的时间。</string>
     <string name="restart_the_application_to_apply_changes">重启应用以使更改生效。</string>
-    <string name="labs_enable_latex_maths">启用LaTeX数学</string>
+    <string name="labs_enable_latex_maths">启用 LaTeX 数学</string>
     <string name="audio_message_file_size">（%1$s）</string>
     <string name="audio_message_reply_content">%1$s（%2$s）</string>
     <string name="error_audio_message_unable_to_play">无法播放%1$s</string>
@@ -2445,8 +2445,8 @@
     <string name="space_leave_radio_button_all">离开全部</string>
     <string name="space_leave_radio_buttons_title">此空间里的东西</string>
     <string name="a11y_presence_busy">忙</string>
-    <string name="settings_security_pin_code_use_biometrics_error">无法启用生物验证。</string>
-    <string name="auth_biometric_key_invalidated_message">生物验证被停用了，因为最近新增了新的生物验证方式。你可以在设置里重新启用。</string>
+    <string name="settings_security_pin_code_use_biometrics_error">无法启用生物特征识别。</string>
+    <string name="auth_biometric_key_invalidated_message">生物特征识别被禁用，因为最近添加了新的生物特征识别方法。 您可以在“设置”中再次启用它。</string>
     <string name="error_forbidden_digits_only_username">主服务器不接收仅有数字的用户名。</string>
     <string name="send_your_first_msg_to_invite">发送你的第一条消息邀请%s聊天</string>
     <string name="encryption_misconfigured">加密配置错误</string>
@@ -2454,8 +2454,8 @@
     <string name="room_profile_section_restore_security">还原加密</string>
     <string name="contact_admin_to_restore_encryption">请联系管理员将加密还原到有效状态。</string>
     <string name="encryption_has_been_misconfigured">加密被错误地配置了。</string>
-    <string name="sent_live_location">分享了他们的实时位置</string>
-    <string name="sent_location">分享了他们的位置</string>
+    <string name="sent_live_location">共享了他们的实时位置</string>
+    <string name="sent_location">共享了他们的位置</string>
     <string name="permalink_unsupported_groups">无法打开此链接：社群已被空间取代</string>
     <string name="login_splash_already_have_account">我已经有账户了</string>
     <string name="login_splash_create_account">创建账户</string>
@@ -2473,7 +2473,7 @@
     <string name="ftue_auth_create_account_sso_section_header">或</string>
     <string name="ftue_auth_create_account_choose_server_header">你的对话将进行的地方</string>
     <string name="ftue_auth_create_account_password_entry_footer">必须有8个及以上的字符</string>
-    <string name="ftue_auth_create_account_username_entry_footer">其他人可以通过%s发现你</string>
+    <string name="ftue_auth_create_account_username_entry_footer">其他人可以通过 %s 发现你</string>
     <string name="ftue_auth_create_account_title">创建你的账户</string>
     <string name="ftue_account_created_congratulations_title">恭喜！</string>
     <string name="ftue_account_created_subtitle">你的账户%s已创建</string>
@@ -2509,16 +2509,16 @@
     <string name="settings_autoplay_animated_images_title">自动播放动画图片</string>
     <string name="settings_troubleshoot_test_endpoint_registration_success">端点成功注册到主服务器。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">端点注册</string>
-    <string name="threads_labs_enable_notice_message">你的主服务器当前不支持消息列，所以此功能可能不可靠。Some threaded messages may not be reliably available. %s你仍要启用消息列吗？</string>
+    <string name="threads_labs_enable_notice_message">您的主服务器当前不支持消息列，因此此功能可能不可靠。某些消息列的消息可能无法可靠地使用。 %s 您仍然要启用消息列吗？</string>
     <string name="threads_notice_migration_title">Threads接近Beta了 🎉</string>
     <string name="search_thread_from_a_thread">来自消息列</string>
     <string name="thread_list_empty_notice">实用提示：长按消息并使用“%s”。</string>
     <string name="thread_list_empty_title">使用消息列来保持讨论的条理性</string>
     <string name="thread_list_modal_my_threads_subtitle">显示你参与的所有消息列</string>
-    <string name="thread_list_modal_my_threads_title">我的消息列s</string>
+    <string name="thread_list_modal_my_threads_title">我的消息列</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">加密被错误地配置了，所以你无法发送消息。点击以打开设置。</string>
     <string name="room_unsupported_e2e_algorithm">加密被错误地配置了，所以你无法发送消息。请联系管理员将加密还原到有效的状态。</string>
-    <string name="room_notification_more_than_two_users_are_typing">%1$s、%2$s与其他人</string>
+    <string name="room_notification_more_than_two_users_are_typing">%1$s、%2$s 与其他人</string>
     <string name="room_notification_two_users_are_typing">%1$s与%2$s</string>
     <string name="call_start_screen_sharing">共享屏幕</string>
     <string name="call_stop_screen_sharing">停止共享屏幕</string>
@@ -2526,14 +2526,14 @@
     <string name="action_learn_more">进一步了解</string>
     <string name="action_try_it_out">试试看</string>
     <string name="action_disable">停用</string>
-    <string name="action_view_threads">查看Threads</string>
+    <string name="action_view_threads">查看消息列</string>
     <string name="time_unit_second_short">秒</string>
     <string name="time_unit_minute_short">分钟</string>
     <string name="time_unit_hour_short">小时</string>
     <string name="initial_sync_request_reason_unignored_users">- 一些用户已被取消忽略</string>
     <string name="initial_sync_request_title">初始同步请求</string>
     <plurals name="search_space_multiple_parents">
-        <item quantity="other">%1$s与其他%2$d人</item>
+        <item quantity="other">%1$s 与其他 %2$d人</item>
     </plurals>
     <string name="updating_your_data">正在更新你的数据……</string>
     <string name="labs_enable_element_call_permission_shortcuts_summary">自动允许 Element 通话小部件并授予相机/麦克风访问权限</string>
@@ -2544,7 +2544,7 @@
     <string name="crosssigning_cannot_verify_this_session">无法验证此设备</string>
     <string name="ftue_auth_choose_server_sign_in_subtitle">你的服务器地址是什么？</string>
     <string name="ftue_auth_sign_in_choose_server_header">你的对话发生的地方</string>
-    <string name="search_space_two_parents">%1$s和%2$s</string>
+    <string name="search_space_two_parents">%1$s 和 %2$s</string>
     <string name="auth_reset_password_error_unverified">电子邮件未确认，检查你的收件箱</string>
     <string name="location_share_loading_map_error">无法加载地图
 \n此主服务器可能没有设置好显示地图。</string>
@@ -2570,8 +2570,8 @@
     <string name="start_chat">开始聊天</string>
     <string name="timeline_error_room_not_found">抱歉，未发现此房间。
 \n请晚些重试。%s</string>
-    <string name="device_manager_other_sessions_description_unverified">未验证 · 上次活跃 %1$s</string>
-    <string name="device_manager_other_sessions_description_verified">已验证 · 上次活跃 %1$s</string>
+    <string name="device_manager_other_sessions_description_unverified">未验证 · 上次活动 %1$s</string>
+    <string name="device_manager_other_sessions_description_verified">已验证 · 上次活动 %1$s</string>
     <string name="device_manager_other_sessions_view_all">查看全部（%1$d）</string>
     <string name="device_manager_view_details">查看详情</string>
     <string name="device_manager_verify_session">验证会话</string>
@@ -2587,13 +2587,13 @@
     <string name="invites_empty_title">没有新的东西。</string>
     <string name="invites_empty_message">你的新请求和邀请会在这里。</string>
     <plurals name="device_manager_other_sessions_description_inactive">
-        <item quantity="other">%1$d+天不活跃（%2$s）</item>
+        <item quantity="other">闲置 %1$d+ 天 (%2$s)</item>
     </plurals>
     <string name="device_manager_header_section_security_recommendations_title">安全建议</string>
     <string name="device_manager_header_section_security_recommendations_description">按照这些建议改善你的账户安全。</string>
     <string name="device_manager_unverified_sessions_title">未验证的会话</string>
     <string name="device_manager_unverified_sessions_description">验证未验证的会话或从之登出。</string>
-    <string name="device_manager_inactive_sessions_title">不活跃的会话</string>
+    <string name="device_manager_inactive_sessions_title">闲置会话</string>
     <plurals name="device_manager_inactive_sessions_description">
         <item quantity="other">请考虑从不再使用的旧会话（%1$d天或更久）登出。</item>
     </plurals>
@@ -2612,7 +2612,7 @@
     <string name="device_manager_filter_option_verified">已验证</string>
     <string name="device_manager_filter_option_all_sessions">全部会话</string>
     <string name="device_manager_filter_bottom_sheet_title">过滤器</string>
-    <string name="device_manager_session_last_activity">上次活跃 %1$s</string>
+    <string name="device_manager_session_last_activity">上次活动 %1$s</string>
     <string name="device_manager_device_title">设备</string>
     <string name="device_manager_session_title">会话</string>
     <string name="device_manager_current_session_title">当前会话</string>
@@ -2624,14 +2624,14 @@
     <string name="labs_enable_deferred_dm_title">启用延迟的私聊消息</string>
     <string name="labs_enable_new_app_layout_summary">简化的Element，带有可选的标签</string>
     <string name="settings_security_incognito_keyboard_title">无痕键盘</string>
-    <string name="settings_security_incognito_keyboard_summary">要求键盘不要基于你在对话中的输入更新任何个性化数据，如输入历史和字典。请注意，某些键盘可能不会遵守此设置。</string>
+    <string name="settings_security_incognito_keyboard_summary">请求键盘不要根据您在对话中输入的内容更新任何个性化数据，例如输入历史记录和字典。 请注意，某些键盘可能不遵守此设置。</string>
     <string name="permissions_rationale_msg_notification">${app_name}需要权限来显示通知。通知可以显示消息、邀请等。
 \n
 \n请在下个弹窗允许访问以便查看通知。</string>
     <string name="labs_enable_rich_text_editor_summary">试用富文本编辑器（纯文本模式即将到来）</string>
     <string name="labs_enable_rich_text_editor_title">启用富文本编辑器</string>
-    <string name="a11y_collapse_space_children">折叠%s孩子</string>
-    <string name="a11y_expand_space_children">展开%s孩子</string>
+    <string name="a11y_collapse_space_children">折叠 %s 子空间</string>
+    <string name="a11y_expand_space_children">展开 %s 子空间</string>
     <string name="labs_enable_session_manager_title">启用新的会话管理器</string>
     <string name="onboarding_new_app_layout_spaces_title">访问空间</string>
     <string name="onboarding_new_app_layout_welcome_title">欢迎使用新视图！</string>
@@ -2677,7 +2677,7 @@
     <string name="device_manager_other_sessions_clear_filter">清除过滤器</string>
     <string name="device_manager_other_sessions_no_inactive_sessions_found">未找到闲置会话。</string>
     <string name="device_manager_other_sessions_no_unverified_sessions_found">未找到未验证的会话。</string>
-    <string name="device_manager_other_sessions_no_verified_sessions_found">未找到经过验证的会话。</string>
+    <string name="device_manager_other_sessions_no_verified_sessions_found">未找到已验证的会话。</string>
     <plurals name="device_manager_other_sessions_recommendation_description_inactive">
         <item quantity="other">考虑登出您不再使用的旧会话（%1$d 天或更长时间）。</item>
     </plurals>
@@ -2696,7 +2696,7 @@
     <string name="tooltip_attachment_voice_broadcast">开始语音广播</string>
     <string name="a11y_voice_broadcast_buffering">缓冲</string>
     <string name="a11y_pause_voice_broadcast">暂停语音广播</string>
-    <string name="voice_broadcast_live">直播</string>
+    <string name="voice_broadcast_live">实时</string>
     <string name="action_got_it">知道了</string>
     <string name="rich_text_editor_format_underline">应用下划线格式</string>
     <string name="rich_text_editor_format_strikethrough">应用删除线格式</string>
@@ -2734,7 +2734,7 @@
     <string name="qr_code_login_header_show_qr_code_link_a_device_description">使用已退出登录的设备扫描下方二维码。</string>
     <string name="qr_code_login_header_show_qr_code_new_device_description">使用您已登录的设备扫描下方二维码：</string>
     <string name="qr_code_login_header_show_qr_code_title">使用二维码登录</string>
-    <string name="qr_code_login_header_scan_qr_code_description">使用此设备上的相机扫描其他设备上显示的二维码：</string>
+    <string name="qr_code_login_header_scan_qr_code_description">使用此设备上的相机扫描其它设备上显示的二维码：</string>
     <string name="qr_code_login_header_scan_qr_code_title">扫描二维码</string>
     <string name="three">3</string>
     <string name="two">2</string>

From 8ce9874cdca3518aa56ad043a5729557a73d479e Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 2 Nov 2022 17:20:06 +0100
Subject: [PATCH 300/300] Update changes

---
 CHANGES.md                                    | 31 +++++++++++++++++++
 changelog.d/6195.misc                         |  1 -
 changelog.d/7357.bugfix                       |  1 -
 changelog.d/7369.feature                      |  1 -
 changelog.d/7396.feature                      |  1 -
 changelog.d/7400.bugfix                       |  1 -
 changelog.d/7419.wip                          |  1 -
 changelog.d/7421.wip                          |  1 -
 changelog.d/7424.misc                         |  1 -
 changelog.d/7428.bugfix                       |  1 -
 changelog.d/7429.feature                      |  1 -
 changelog.d/7438.sdk                          |  1 -
 changelog.d/7454.misc                         |  1 -
 .../android/en-US/changelogs/40105060.txt     |  2 ++
 14 files changed, 33 insertions(+), 12 deletions(-)
 delete mode 100644 changelog.d/6195.misc
 delete mode 100644 changelog.d/7357.bugfix
 delete mode 100644 changelog.d/7369.feature
 delete mode 100644 changelog.d/7396.feature
 delete mode 100644 changelog.d/7400.bugfix
 delete mode 100644 changelog.d/7419.wip
 delete mode 100644 changelog.d/7421.wip
 delete mode 100644 changelog.d/7424.misc
 delete mode 100644 changelog.d/7428.bugfix
 delete mode 100644 changelog.d/7429.feature
 delete mode 100644 changelog.d/7438.sdk
 delete mode 100644 changelog.d/7454.misc
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40105060.txt

diff --git a/CHANGES.md b/CHANGES.md
index 7e2df7716b..cfea189c21 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,34 @@
+Changes in Element v1.5.6 (2022-11-02)
+======================================
+
+Features ✨
+----------
+ - Add new UI for selecting an attachment ([#7429](https://github.com/vector-im/element-android/issues/7429))
+ - Multi selection in sessions list ([#7396](https://github.com/vector-im/element-android/issues/7396))
+
+Bugfixes 🐛
+----------
+ - New line and Enter hardware key presses deleting existing text in some keyboards. ([#7357](https://github.com/vector-im/element-android/issues/7357))
+ - Fix share actions using share dialog. ([#7400](https://github.com/vector-im/element-android/issues/7400))
+ - Fix crash by disabling Flipper on Android API 22 and below - only affects debug version of the application. ([#7428](https://github.com/vector-im/element-android/issues/7428))
+
+In development 🚧
+----------------
+ - [Voice Broadcast] Live listening support ([#7419](https://github.com/vector-im/element-android/issues/7419))
+ - [Voice Broadcast] Improve rendering in the timeline ([#7421](https://github.com/vector-im/element-android/issues/7421))
+ - Add logic for sign in with QR code ([#7369](https://github.com/vector-im/element-android/issues/7369))
+
+SDK API changes ⚠️
+------------------
+ - Add MetricPlugin interface to implement metrics in SDK clients. ([#7438](https://github.com/vector-im/element-android/issues/7438))
+
+Other changes
+-------------
+ - Upgrade Jitsi SDK to 6.2.2 and WebRtc to 1.106.1-jitsi-12039821. ([#6195](https://github.com/vector-im/element-android/issues/6195))
+ - Gets thread notifications from sync response ([#7424](https://github.com/vector-im/element-android/issues/7424))
+ - Replace org.apache.sanselan:sanselan by org.apache.commons:commons-imaging ([#7454](https://github.com/vector-im/element-android/issues/7454))
+
+
 Changes in Element v1.5.4 (2022-10-19)
 ======================================
 
diff --git a/changelog.d/6195.misc b/changelog.d/6195.misc
deleted file mode 100644
index 96fd553d5c..0000000000
--- a/changelog.d/6195.misc
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade Jitsi SDK to 6.2.2 and WebRtc to 1.106.1-jitsi-12039821.
diff --git a/changelog.d/7357.bugfix b/changelog.d/7357.bugfix
deleted file mode 100644
index 697c92b31e..0000000000
--- a/changelog.d/7357.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-New line and Enter hardware key presses deleting existing text in some keyboards.
diff --git a/changelog.d/7369.feature b/changelog.d/7369.feature
deleted file mode 100644
index 240fac3516..0000000000
--- a/changelog.d/7369.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add logic for sign in with QR code
diff --git a/changelog.d/7396.feature b/changelog.d/7396.feature
deleted file mode 100644
index 8ce14eb3d3..0000000000
--- a/changelog.d/7396.feature
+++ /dev/null
@@ -1 +0,0 @@
-Multi selection in sessions list
diff --git a/changelog.d/7400.bugfix b/changelog.d/7400.bugfix
deleted file mode 100644
index 51c0708308..0000000000
--- a/changelog.d/7400.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix share actions using share dialog.
diff --git a/changelog.d/7419.wip b/changelog.d/7419.wip
deleted file mode 100644
index 06f69dfa7f..0000000000
--- a/changelog.d/7419.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Live listening support
diff --git a/changelog.d/7421.wip b/changelog.d/7421.wip
deleted file mode 100644
index 4a399eee04..0000000000
--- a/changelog.d/7421.wip
+++ /dev/null
@@ -1 +0,0 @@
-[Voice Broadcast] Improve rendering in the timeline
diff --git a/changelog.d/7424.misc b/changelog.d/7424.misc
deleted file mode 100644
index 6c6673eaf0..0000000000
--- a/changelog.d/7424.misc
+++ /dev/null
@@ -1 +0,0 @@
-Gets thread notifications from sync response
diff --git a/changelog.d/7428.bugfix b/changelog.d/7428.bugfix
deleted file mode 100644
index 8f014af31b..0000000000
--- a/changelog.d/7428.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix crash by disabling Flipper on Android API 22 and below - only affects debug version of the application.
diff --git a/changelog.d/7429.feature b/changelog.d/7429.feature
deleted file mode 100644
index 9857452eca..0000000000
--- a/changelog.d/7429.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new UI for selecting an attachment
diff --git a/changelog.d/7438.sdk b/changelog.d/7438.sdk
deleted file mode 100644
index 60463aed68..0000000000
--- a/changelog.d/7438.sdk
+++ /dev/null
@@ -1 +0,0 @@
-Add MetricPlugin interface to implement metrics in SDK clients.
diff --git a/changelog.d/7454.misc b/changelog.d/7454.misc
deleted file mode 100644
index beba9717b8..0000000000
--- a/changelog.d/7454.misc
+++ /dev/null
@@ -1 +0,0 @@
-Replace org.apache.sanselan:sanselan by org.apache.commons:commons-imaging
diff --git a/fastlane/metadata/android/en-US/changelogs/40105060.txt b/fastlane/metadata/android/en-US/changelogs/40105060.txt
new file mode 100644
index 0000000000..8269f7145c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40105060.txt
@@ -0,0 +1,2 @@
+Main changes in this version: new UI for selecting an attachment.
+Full changelog: https://github.com/vector-im/element-android/releases